diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index de098ef7b263..d730336dadf5 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -186,6 +186,16 @@ jobs:
             type=semver,pattern={{version}},value=${{ needs.setup.outputs.version }}
           images: |
             ${{ env.REGISTRY_IMAGE }}
+      - name: Restore vendor/bundle
+        id: restore-vendor-bundle
+        uses: actions/cache/restore@v4
+        with:
+          path: |
+            vendor/bundle
+          key: ${{ matrix.platform }}-vendor-bundle-${{ github.ref }}
+      - name: Include vendor/bundle in this build (so we can use it from the cache above)
+        run: |
+          sed -i 's/vendor\/bundle//g' .dockerignore
       - name: Build image
         id: build
         uses: docker/build-push-action@v6
@@ -195,12 +205,26 @@ jobs:
           target: ${{ matrix.target }}
           build-args: |
             BIM_SUPPORT=${{ matrix.bim_support }}
+            BUILDKIT_PROGRESS=plain
           pull: true
           load: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=s3,blobs_prefix=cache/${{ github.repository }}/,manifests_prefix=cache/${{ github.repository }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }}
           cache-to: type=s3,blobs_prefix=cache/${{ github.repository }}/,manifests_prefix=cache/${{ github.repository }}/,region=${{ env.RUNS_ON_AWS_REGION }},bucket=${{ env.RUNS_ON_S3_BUCKET_CACHE }},mode=max
+      - name: Extract vendor/bundle from container
+        run: |
+          docker create --name bundle ${{ steps.build.outputs.imageid }}
+          rm -rf vendor/bundle || true
+          docker cp bundle:/app/vendor/bundle vendor/bundle
+          docker rm bundle
+      - name: Save vendor/bundle
+        id: save-vendor-bundle
+        uses: actions/cache/save@v4
+        with:
+          path: |
+            vendor/bundle
+          key: ${{ steps.restore-vendor-bundle.outputs.cache-primary-key }}
       - name: Test
         # We only test the native container. If that fails the builds for the others
         # will be cancelled as well.
diff --git a/.gitignore b/.gitignore
index 0a27bf8e565e..a677a999f576 100644
--- a/.gitignore
+++ b/.gitignore
@@ -134,6 +134,8 @@ structure.sql
 lefthook-local.yml
 .rubocop-local.yml
 
+/.lefthook-local/
+
 frontend/package-lock.json
 
 # Testing and nextcloud infrastructure
diff --git a/Gemfile b/Gemfile
index 366d19ea5233..b604d3d3c9f8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -36,7 +36,7 @@ ruby File.read(File.expand_path(".ruby-version", __dir__)).strip
 
 gem "actionpack-xml_parser", "~> 2.0.0"
 gem "activemodel-serializers-xml", "~> 1.0.1"
-gem "activerecord-import", "~> 1.8.0"
+gem "activerecord-import", "~> 2.0.0"
 gem "activerecord-session_store", "~> 2.1.0"
 gem "ox"
 gem "rails", "~> 7.1.3"
@@ -61,7 +61,7 @@ gem "friendly_id", "~> 5.5.0"
 
 gem "acts_as_list", "~> 1.2.0"
 gem "acts_as_tree", "~> 2.9.0"
-gem "awesome_nested_set", "~> 3.7.0"
+gem "awesome_nested_set", "~> 3.8.0"
 gem "closure_tree", "~> 7.4.0"
 gem "rubytree", "~> 2.1.0"
 # Only used in down migrations now.
@@ -140,7 +140,7 @@ gem "rack-attack", "~> 6.7.0"
 gem "secure_headers", "~> 7.0.0"
 
 # Browser detection for incompatibility checks
-gem "browser", "~> 6.0.0"
+gem "browser", "~> 6.2.0"
 
 # Providing health checks
 gem "okcomputer", "~> 1.18.1"
@@ -171,6 +171,9 @@ gem "paper_trail", "~> 15.2.0"
 
 gem "op-clamav-client", "~> 3.4", require: "clamav"
 
+# Recurring meeting events definition
+gem "ice_cube", "~> 0.17.0"
+
 group :production do
   # we use dalli as standard memcache client
   # requires memcached 1.4+
@@ -188,7 +191,7 @@ gem "puma", "~> 6.5"
 gem "puma-plugin-statsd", "~> 2.0"
 gem "rack-timeout", "~> 0.7.0", require: "rack/timeout/base"
 
-gem "nokogiri", "~> 1.16.0"
+gem "nokogiri", "~> 1.17.0"
 
 gem "carrierwave", "~> 1.3.4"
 gem "carrierwave_direct", "~> 2.1.0"
@@ -229,7 +232,7 @@ gem "factory_bot", "~> 6.5.0", require: false
 # require factory_bot_rails for convenience in core development
 gem "factory_bot_rails", "~> 6.4.4", require: false
 
-gem "turbo_power", "~> 0.6.2"
+gem "turbo_power", "~> 0.7.0"
 gem "turbo-rails", "~> 2.0.0"
 
 gem "httpx"
@@ -269,7 +272,7 @@ group :test do
   gem "rails-controller-testing", "~> 1.0.2"
 
   gem "capybara", "~> 3.40.0"
-  gem "capybara_accessible_selectors", git: "https://github.com/citizensadvice/capybara_accessible_selectors", branch: "main"
+  gem "capybara_accessible_selectors", git: "https://github.com/citizensadvice/capybara_accessible_selectors", tag: "v0.12.0"
   gem "capybara-screenshot", "~> 1.0.17"
   gem "cuprite", "~> 0.15.0"
   gem "rspec-wait"
@@ -379,7 +382,7 @@ platforms :mri, :mingw, :x64_mingw do
   end
 
   # Support application loading when no database exists yet.
-  gem "activerecord-nulldb-adapter", "~> 1.0.0"
+  gem "activerecord-nulldb-adapter", "~> 1.1.0"
 
   # Have application level locks on the database to have a mutex shared between workers/hosts.
   # We e.g. employ this to safeguard the creation of journals.
@@ -398,6 +401,6 @@ gemfiles.each do |file|
   send(:eval_gemfile, file) if File.readable?(file)
 end
 
-gem "openproject-octicons", "~>19.19.0"
-gem "openproject-octicons_helper", "~>19.19.0"
-gem "openproject-primer_view_components", "~>0.49.2"
+gem "openproject-octicons", "~>19.20.0 "
+gem "openproject-octicons_helper", "~>19.20.0 "
+gem "openproject-primer_view_components", "~>0.52.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index e42bda9e0386..2ff8ccffa25d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 GIT
   remote: https://github.com/citizensadvice/capybara_accessible_selectors
-  revision: aed2860e5b5df7f39284fdc35a5bf57bda7e1ad9
-  branch: main
+  revision: 347bbe06cb420416855e80bb4e3a3016b2d5872c
+  tag: v0.12.0
   specs:
     capybara_accessible_selectors (0.11.0)
       capybara (~> 3.36)
@@ -206,7 +206,7 @@ PATH
   remote: modules/two_factor_authentication
   specs:
     openproject-two_factor_authentication (1.0.0)
-      aws-sdk-sns (~> 1.90.0)
+      aws-sdk-sns (~> 1.92.0)
       messagebird-rest (~> 1.4.2)
       rotp (~> 6.1)
       webauthn (~> 3.0)
@@ -226,35 +226,35 @@ GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (2.0.1)
-    actioncable (7.1.5)
-      actionpack (= 7.1.5)
-      activesupport (= 7.1.5)
+    actioncable (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.5)
-      actionpack (= 7.1.5)
-      activejob (= 7.1.5)
-      activerecord (= 7.1.5)
-      activestorage (= 7.1.5)
-      activesupport (= 7.1.5)
+    actionmailbox (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activestorage (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.1.5)
-      actionpack (= 7.1.5)
-      actionview (= 7.1.5)
-      activejob (= 7.1.5)
-      activesupport (= 7.1.5)
+    actionmailer (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      actionview (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.5)
-      actionview (= 7.1.5)
-      activesupport (= 7.1.5)
+    actionpack (7.1.5.1)
+      actionview (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4)
@@ -265,36 +265,36 @@ GEM
     actionpack-xml_parser (2.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
-    actiontext (7.1.5)
-      actionpack (= 7.1.5)
-      activerecord (= 7.1.5)
-      activestorage (= 7.1.5)
-      activesupport (= 7.1.5)
+    actiontext (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activestorage (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.5)
-      activesupport (= 7.1.5)
+    actionview (7.1.5.1)
+      activesupport (= 7.1.5.1)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.1.5)
-      activesupport (= 7.1.5)
+    activejob (7.1.5.1)
+      activesupport (= 7.1.5.1)
       globalid (>= 0.3.6)
-    activemodel (7.1.5)
-      activesupport (= 7.1.5)
+    activemodel (7.1.5.1)
+      activesupport (= 7.1.5.1)
     activemodel-serializers-xml (1.0.3)
       activemodel (>= 5.0.0.a)
       activesupport (>= 5.0.0.a)
       builder (~> 3.1)
-    activerecord (7.1.5)
-      activemodel (= 7.1.5)
-      activesupport (= 7.1.5)
+    activerecord (7.1.5.1)
+      activemodel (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       timeout (>= 0.4.0)
-    activerecord-import (1.8.1)
+    activerecord-import (2.0.0)
       activerecord (>= 4.2)
-    activerecord-nulldb-adapter (1.0.1)
-      activerecord (>= 5.2.0, < 7.2)
+    activerecord-nulldb-adapter (1.1.1)
+      activerecord (>= 6.0, < 8.1)
     activerecord-session_store (2.1.0)
       actionpack (>= 6.1)
       activerecord (>= 6.1)
@@ -302,13 +302,13 @@ GEM
       multi_json (~> 1.11, >= 1.11.2)
       rack (>= 2.0.8, < 4)
       railties (>= 6.1)
-    activestorage (7.1.5)
-      actionpack (= 7.1.5)
-      activejob (= 7.1.5)
-      activerecord (= 7.1.5)
-      activesupport (= 7.1.5)
+    activestorage (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       marcel (~> 1.0)
-    activesupport (7.1.5)
+    activesupport (7.1.5.1)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -330,7 +330,7 @@ GEM
       public_suffix (>= 2.0.2, < 7.0)
     aes_key_wrap (1.1.0)
     afm (0.2.2)
-    airbrake (13.0.4)
+    airbrake (13.0.5)
       airbrake-ruby (~> 6.0)
     airbrake-ruby (6.2.2)
       rbtree3 (~> 0.6)
@@ -341,10 +341,10 @@ GEM
     attr_required (1.0.2)
     auto_strip_attributes (2.6.0)
       activerecord (>= 4.0)
-    awesome_nested_set (3.7.0)
-      activerecord (>= 4.0.0, < 8.0)
+    awesome_nested_set (3.8.0)
+      activerecord (>= 4.0.0, < 8.1)
     aws-eventstream (1.3.0)
-    aws-partitions (1.1013.0)
+    aws-partitions (1.1023.0)
     aws-sdk-core (3.214.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
@@ -353,11 +353,11 @@ GEM
     aws-sdk-kms (1.96.0)
       aws-sdk-core (~> 3, >= 3.210.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.174.0)
+    aws-sdk-s3 (1.176.1)
       aws-sdk-core (~> 3, >= 3.210.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sdk-sns (1.90.0)
+    aws-sdk-sns (1.92.0)
       aws-sdk-core (~> 3, >= 3.210.0)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.10.1)
@@ -391,7 +391,7 @@ GEM
       msgpack (~> 1.2)
     brakeman (6.2.2)
       racc
-    browser (6.0.0)
+    browser (6.2.0)
     builder (3.3.0)
     byebug (11.1.3)
     capybara (3.40.0)
@@ -441,15 +441,15 @@ GEM
       bigdecimal
       rexml
     crass (1.0.6)
-    css_parser (1.19.1)
+    css_parser (1.21.0)
       addressable
-    csv (3.3.0)
+    csv (3.3.1)
     cuprite (0.15.1)
       capybara (~> 3.0)
       ferrum (~> 0.15.0)
     daemons (1.4.1)
     dalli (3.2.8)
-    date (3.4.0)
+    date (3.4.1)
     date_validator (0.12.0)
       activemodel (>= 3)
       activesupport (>= 3)
@@ -465,11 +465,11 @@ GEM
     disposable (0.6.3)
       declarative (>= 0.0.9, < 1.0.0)
       representable (>= 3.1.1, < 4)
-    doorkeeper (5.8.0)
+    doorkeeper (5.8.1)
       railties (>= 5)
-    dotenv (3.1.4)
-    dotenv-rails (3.1.4)
-      dotenv (= 3.1.4)
+    dotenv (3.1.7)
+    dotenv-rails (3.1.7)
+      dotenv (= 3.1.7)
       railties (>= 6.1)
     drb (2.2.1)
     dry-auto_inject (1.0.1)
@@ -545,20 +545,20 @@ GEM
       tzinfo
     eventmachine (1.2.7)
     eventmachine_httpserver (0.2.1)
-    excon (1.2.0)
+    excon (1.2.2)
     factory_bot (6.5.0)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.4.4)
       factory_bot (~> 6.5)
       railties (>= 5.0.0)
-    faraday (2.12.0)
-      faraday-net_http (>= 2.0, < 3.4)
+    faraday (2.12.2)
+      faraday-net_http (>= 2.0, < 3.5)
       json
       logger
     faraday-follow_redirects (0.3.0)
       faraday (>= 1, < 3)
-    faraday-net_http (3.3.0)
-      net-http
+    faraday-net_http (3.4.0)
+      net-http (>= 0.5.0)
     fastimage (2.3.1)
     ferrum (0.15)
       addressable (~> 2.5)
@@ -567,7 +567,7 @@ GEM
       websocket-driver (~> 0.7)
     ffi (1.17.0)
     flamegraph (0.9.5)
-    fog-aws (3.29.0)
+    fog-aws (3.30.0)
       base64 (~> 0.2.0)
       fog-core (~> 2.6)
       fog-json (~> 1.1)
@@ -620,9 +620,11 @@ GEM
       google-apis-core (>= 0.15.0, < 2.a)
     google-cloud-env (2.2.1)
       faraday (>= 1.0, < 3.a)
-    googleauth (1.11.2)
+    google-logging-utils (0.1.0)
+    googleauth (1.12.1)
       faraday (>= 1.0, < 3.a)
-      google-cloud-env (~> 2.1)
+      google-cloud-env (~> 2.2)
+      google-logging-utils (~> 0.1)
       jwt (>= 1.4, < 3.0)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
@@ -652,7 +654,7 @@ GEM
     http-2 (1.0.2)
     http_parser.rb (0.6.0)
     httpclient (2.8.3)
-    httpx (1.3.3)
+    httpx (1.4.0)
       http-2 (>= 1.0.0)
     i18n (1.14.6)
       concurrent-ruby (~> 1.0)
@@ -675,13 +677,13 @@ GEM
     ice_cube (0.17.0)
     ice_nine (0.11.2)
     interception (0.5)
-    io-console (0.7.2)
-    irb (1.14.1)
+    io-console (0.8.0)
+    irb (1.14.2)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     iso8601 (0.13.0)
     jmespath (1.6.2)
-    json (2.8.2)
+    json (2.9.1)
     json-jwt (1.16.7)
       activesupport (>= 4.2)
       aes_key_wrap
@@ -707,7 +709,7 @@ GEM
     launchy (3.0.1)
       addressable (~> 2.8)
       childprocess (~> 5.0)
-    lefthook (1.8.4)
+    lefthook (1.10.0)
     letter_opener (1.10.0)
       launchy (>= 2.2, < 4)
     letter_opener_web (3.0.0)
@@ -722,7 +724,7 @@ GEM
       omniauth (~> 1.1)
       omniauth-openid-connect (>= 0.2.1)
       rails (>= 3.2.21)
-    logger (1.6.1)
+    logger (1.6.4)
     lograge (0.14.0)
       actionpack (>= 4)
       activesupport (>= 4)
@@ -758,11 +760,11 @@ GEM
     mime-types (3.6.0)
       logger
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.1105)
+    mime-types-data (3.2024.1203)
     mini_magick (5.0.1)
     mini_mime (1.1.5)
     mini_portile2 (2.8.8)
-    minitest (5.25.1)
+    minitest (5.25.4)
     msgpack (1.7.5)
     multi_json (1.15.0)
     mustermann (3.0.3)
@@ -770,7 +772,7 @@ GEM
     mustermann-grape (1.1.0)
       mustermann (>= 1.0.0)
     mutex_m (0.3.0)
-    net-http (0.4.1)
+    net-http (0.6.0)
       uri
     net-imap (0.5.1)
       date
@@ -783,10 +785,10 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.4)
-    nokogiri (1.16.7)
+    nokogiri (1.17.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    oj (3.16.7)
+    oj (3.16.8)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
     okcomputer (1.18.5)
@@ -807,15 +809,15 @@ GEM
       validate_email
       validate_url
       webfinger (~> 2.0)
-    openproject-octicons (19.19.0)
-    openproject-octicons_helper (19.19.0)
+    openproject-octicons (19.20.0)
+    openproject-octicons_helper (19.20.0)
       actionview
-      openproject-octicons (= 19.19.0)
+      openproject-octicons (= 19.20.0)
       railties
-    openproject-primer_view_components (0.49.2)
+    openproject-primer_view_components (0.52.0)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
-      openproject-octicons (>= 19.17.0)
+      openproject-octicons (>= 19.20.0)
       view_component (>= 3.1, < 4.0)
     openproject-token (4.0.0)
       activemodel
@@ -868,7 +870,8 @@ GEM
     pry-rescue (1.6.0)
       interception (>= 0.5)
       pry (>= 0.12.0)
-    psych (5.2.0)
+    psych (5.2.2)
+      date
       stringio
     public_suffix (6.0.1)
     puffing-billy (4.0.0)
@@ -913,20 +916,20 @@ GEM
     rackup (1.0.1)
       rack (< 3)
       webrick
-    rails (7.1.5)
-      actioncable (= 7.1.5)
-      actionmailbox (= 7.1.5)
-      actionmailer (= 7.1.5)
-      actionpack (= 7.1.5)
-      actiontext (= 7.1.5)
-      actionview (= 7.1.5)
-      activejob (= 7.1.5)
-      activemodel (= 7.1.5)
-      activerecord (= 7.1.5)
-      activestorage (= 7.1.5)
-      activesupport (= 7.1.5)
+    rails (7.1.5.1)
+      actioncable (= 7.1.5.1)
+      actionmailbox (= 7.1.5.1)
+      actionmailer (= 7.1.5.1)
+      actionpack (= 7.1.5.1)
+      actiontext (= 7.1.5.1)
+      actionview (= 7.1.5.1)
+      activejob (= 7.1.5.1)
+      activemodel (= 7.1.5.1)
+      activerecord (= 7.1.5.1)
+      activestorage (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       bundler (>= 1.15.0)
-      railties (= 7.1.5)
+      railties (= 7.1.5.1)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -935,15 +938,15 @@ GEM
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
+    rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
-      nokogiri (~> 1.14)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
     rails-i18n (7.0.10)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
-    railties (7.1.5)
-      actionpack (= 7.1.5)
-      activesupport (= 7.1.5)
+    railties (7.1.5.1)
+      actionpack (= 7.1.5.1)
+      activesupport (= 7.1.5.1)
       irb
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -954,22 +957,22 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rb_sys (0.9.102)
+    rb_sys (0.9.103)
     rbtrace (0.5.1)
       ffi (>= 1.0.6)
       msgpack (>= 0.4.3)
       optimist (>= 3.0.0)
     rbtree3 (0.7.1)
-    rdoc (6.8.1)
+    rdoc (6.9.1)
       psych (>= 4.0.0)
-    recaptcha (5.17.0)
+    recaptcha (5.18.0)
     redcarpet (3.6.0)
     redis (5.3.0)
       redis-client (>= 0.22.0)
-    redis-client (0.22.2)
+    redis-client (0.23.0)
       connection_pool
-    regexp_parser (2.9.2)
-    reline (0.5.11)
+    regexp_parser (2.9.3)
+    reline (0.6.0)
       io-console (~> 0.5)
     representable (3.2.0)
       declarative (< 0.1.0)
@@ -981,7 +984,7 @@ GEM
       actionpack (>= 5.2)
       railties (>= 5.2)
     retriable (3.1.2)
-    rexml (3.3.9)
+    rexml (3.4.0)
     rinku (2.0.6)
     roar (1.2.0)
       representable (~> 3.1)
@@ -1009,20 +1012,20 @@ GEM
       rspec-support (~> 3.13)
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
-    rspec-support (3.13.1)
+    rspec-support (3.13.2)
     rspec-wait (1.0.1)
       rspec (>= 3.4)
-    rubocop (1.68.0)
+    rubocop (1.69.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.4, < 3.0)
-      rubocop-ast (>= 1.32.2, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.36.2, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.36.1)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.37.0)
       parser (>= 3.3.1.0)
     rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
@@ -1038,7 +1041,7 @@ GEM
       rack (>= 1.1)
       rubocop (>= 1.52.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (3.2.0)
+    rubocop-rspec (3.3.0)
       rubocop (~> 1.61)
     rubocop-rspec_rails (2.30.0)
       rubocop (~> 1.61)
@@ -1055,8 +1058,8 @@ GEM
       nokogiri (>= 1.13.10)
       rexml
     ruby2_keywords (0.0.5)
-    rubytree (2.1.0)
-      json (~> 2.0, > 2.3.1)
+    rubytree (2.1.1)
+      json (~> 2.0, > 2.9)
     rubyzip (2.3.2)
     safety_net_attestation (0.4.0)
       jwt (~> 2.0)
@@ -1064,10 +1067,10 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     secure_headers (7.0.0)
-    securerandom (0.3.2)
-    selenium-devtools (0.130.0)
+    securerandom (0.4.1)
+    selenium-devtools (0.131.0)
       selenium-webdriver (~> 4.2)
-    selenium-webdriver (4.26.0)
+    selenium-webdriver (4.27.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
@@ -1118,12 +1121,12 @@ GEM
     table_print (1.5.7)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    test-prof (1.4.2)
+    test-prof (1.4.3)
     text-hyphen (1.5.0)
     thor (1.3.2)
     thread_safe (0.3.6)
     timecop (0.9.10)
-    timeout (0.4.2)
+    timeout (0.4.3)
     tpm-key_attestation (0.12.1)
       bindata (~> 2.4)
       openssl (> 2.0)
@@ -1133,7 +1136,7 @@ GEM
     turbo-rails (2.0.11)
       actionpack (>= 6.0.0)
       railties (>= 6.0.0)
-    turbo_power (0.6.2)
+    turbo_power (0.7.0)
       turbo-rails (>= 1.3.0)
     typed_dag (2.0.2)
       rails (>= 5.0.4)
@@ -1143,7 +1146,7 @@ GEM
       tzinfo (>= 1.0.0)
     uber (0.1.0)
     unicode-display_width (2.6.0)
-    uri (0.13.1)
+    uri (1.0.2)
     validate_email (0.1.6)
       activemodel (>= 3.0)
       mail (>= 2.2.5)
@@ -1152,7 +1155,7 @@ GEM
       public_suffix
     vcr (6.3.1)
       base64
-    vernier (1.4.0)
+    vernier (1.5.0)
     view_component (3.20.0)
       activesupport (>= 5.2.0, < 8.1)
       concurrent-ruby (~> 1.0)
@@ -1181,7 +1184,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    webrick (1.9.0)
+    webrick (1.9.1)
     websocket (1.2.11)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
@@ -1201,8 +1204,8 @@ PLATFORMS
 DEPENDENCIES
   actionpack-xml_parser (~> 2.0.0)
   activemodel-serializers-xml (~> 1.0.1)
-  activerecord-import (~> 1.8.0)
-  activerecord-nulldb-adapter (~> 1.0.0)
+  activerecord-import (~> 2.0.0)
+  activerecord-nulldb-adapter (~> 1.1.0)
   activerecord-session_store (~> 2.1.0)
   acts_as_list (~> 1.2.0)
   acts_as_tree (~> 2.9.0)
@@ -1210,14 +1213,14 @@ DEPENDENCIES
   airbrake (~> 13.0.0)
   appsignal (~> 3.10.0)
   auto_strip_attributes (~> 2.5)
-  awesome_nested_set (~> 3.7.0)
+  awesome_nested_set (~> 3.8.0)
   aws-sdk-core (~> 3.107)
   aws-sdk-s3 (~> 1.91)
   axe-core-rspec
   bcrypt (~> 3.1.6)
   bootsnap (~> 1.18.0)
   brakeman (~> 6.2.0)
-  browser (~> 6.0.0)
+  browser (~> 6.2.0)
   budgets!
   capybara (~> 3.40.0)
   capybara-screenshot (~> 1.0.17)
@@ -1269,6 +1272,7 @@ DEPENDENCIES
   httpx
   i18n-js (~> 4.2.3)
   i18n-tasks (~> 1.0.13)
+  ice_cube (~> 0.17.0)
   json_schemer (~> 2.3.0)
   json_spec (~> 1.1.4)
   ladle
@@ -1287,7 +1291,7 @@ DEPENDENCIES
   multi_json (~> 1.15.0)
   my_page!
   net-ldap (~> 0.19.0)
-  nokogiri (~> 1.16.0)
+  nokogiri (~> 1.17.0)
   oj (~> 3.16.0)
   okcomputer (~> 1.18.1)
   omniauth!
@@ -1309,10 +1313,10 @@ DEPENDENCIES
   openproject-job_status!
   openproject-ldap_groups!
   openproject-meeting!
-  openproject-octicons (~> 19.19.0)
-  openproject-octicons_helper (~> 19.19.0)
+  openproject-octicons (~> 19.20.0)
+  openproject-octicons_helper (~> 19.20.0)
   openproject-openid_connect!
-  openproject-primer_view_components (~> 0.49.2)
+  openproject-primer_view_components (~> 0.52.0)
   openproject-recaptcha!
   openproject-reporting!
   openproject-storages!
@@ -1394,7 +1398,7 @@ DEPENDENCIES
   timecop (~> 0.9.0)
   ttfunk (~> 1.7.0)
   turbo-rails (~> 2.0.0)
-  turbo_power (~> 0.6.2)
+  turbo_power (~> 0.7.0)
   turbo_tests!
   typed_dag (~> 2.0.2)
   tzinfo-data (~> 1.2024.1)
diff --git a/README.md b/README.md
index 33d6cc10ae2d..c64ea5a710be 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ You found a bug? Please [report it](https://www.openproject.org/docs/development
 
 OpenProject is supported by its Community members, both companies and individuals.
 
-We are always looking for new members to our Community, so if you are interested in improving OpenProject we would be glad to welcome and support you getting into the code. There are guides as well, e.g. a [Quick Start for Developers](https://www.openproject.org/development/setting-up-development-environment/), but don't hesitate to simply [contact us](https://www.openproject.org/contact) if you have questions.
+We are always looking for new members to our Community, so if you are interested in improving OpenProject we would be glad to welcome and support you getting into the code. There are guides as well, e.g. a [Quick Start for Developers](https://www.openproject.org/docs/development/development-environment/), but don't hesitate to simply [contact us](https://www.openproject.org/contact) if you have questions.
 
 Working on OpenProject comes with the satisfaction of working on a widely used open source application.
 
diff --git a/app/assets/images/lookbook/hover_card.png b/app/assets/images/lookbook/hover_card.png
index 8dde8feb902b..f2389dd7ded0 100644
Binary files a/app/assets/images/lookbook/hover_card.png and b/app/assets/images/lookbook/hover_card.png differ
diff --git a/app/assets/images/lookbook/user_hover_card.png b/app/assets/images/lookbook/user_hover_card.png
new file mode 100644
index 000000000000..b225bcfad038
Binary files /dev/null and b/app/assets/images/lookbook/user_hover_card.png differ
diff --git a/app/components/_index.sass b/app/components/_index.sass
index 45a89e33bc3f..59f6c3cdfa43 100644
--- a/app/components/_index.sass
+++ b/app/components/_index.sass
@@ -6,6 +6,7 @@
 @import "work_packages/activities_tab/journals/item_component/add_reactions"
 @import "work_packages/activities_tab/journals/item_component/reactions"
 @import "shares/modal_body_component"
+@import "work_packages/reminder/modal_body_component"
 @import "shares/invite_user_form_component"
 @import "work_packages/details/tab_component"
 @import "work_packages/progress/modal_body_component"
@@ -18,3 +19,5 @@
 @import "op_primer/border_box_table_component"
 @import "work_packages/exports/modal_dialog_component"
 @import "work_package_relations_tab/index_component"
+@import "users/hover_card_component"
+@import "enterprise_edition/banner_component"
diff --git a/app/components/concerns/op_turbo/streamable.rb b/app/components/concerns/op_turbo/streamable.rb
index dfad026a7825..89180a56ddc2 100644
--- a/app/components/concerns/op_turbo/streamable.rb
+++ b/app/components/concerns/op_turbo/streamable.rb
@@ -33,6 +33,8 @@ class MissingComponentWrapper < StandardError; end
     # rubocop:enable OpenProject/AddPreviewForViewComponent
 
     INLINE_ACTIONS = %i[dialog flash].freeze
+    # Turbo allows the response method for these actions only:
+    ACTIONS_WITH_METHOD = %i[update replace].freeze
 
     extend ActiveSupport::Concern
 
@@ -43,7 +45,7 @@ def wrapper_key
     end
 
     included do
-      def render_as_turbo_stream(view_context:, action: :update)
+      def render_as_turbo_stream(view_context:, action: :update, method: nil)
         case action
         when :update, *INLINE_ACTIONS
           @inner_html_only = true
@@ -63,8 +65,13 @@ def render_as_turbo_stream(view_context:, action: :update)
                 "Wrap your component in a `component_wrapper` block in order to use turbo-stream methods"
         end
 
+        if method && !action.in?(ACTIONS_WITH_METHOD)
+          raise ArgumentError, "The #{action} action does not supports a method"
+        end
+
         OpTurbo::StreamComponent.new(
           action:,
+          method:,
           target: wrapper_key,
           template:
         ).render_in(view_context)
diff --git a/app/components/enterprise_edition/banner_component.html.erb b/app/components/enterprise_edition/banner_component.html.erb
new file mode 100644
index 000000000000..5161729b5d58
--- /dev/null
+++ b/app/components/enterprise_edition/banner_component.html.erb
@@ -0,0 +1,19 @@
+<%=
+  grid_layout("op-ee-banner", **@system_arguments) do |grid|
+    grid.with_area(:'icon-container') do
+      content_tag :div, class: "op-ee-banner--shield" do
+        render(Primer::Beta::Octicon.new(icon: 'op-enterprise-addons',
+                                         size: :medium,
+                                         classes: "op-ee-banner--icon"))
+      end
+    end
+    grid.with_area(:'title-container') { render(Primer::Beta::Text.new) { title } }
+    grid.with_area(:'description-container') { render(Primer::Beta::Text.new) { description } }
+    grid.with_area(:'link-container') do
+      render(Primer::Beta::Link.new(href: href)) do |link|
+        link.with_trailing_visual_icon(icon: 'link-external')
+        link_title
+      end
+    end
+  end
+%>
diff --git a/app/components/enterprise_edition/banner_component.rb b/app/components/enterprise_edition/banner_component.rb
new file mode 100644
index 000000000000..f7ac7ed39bab
--- /dev/null
+++ b/app/components/enterprise_edition/banner_component.rb
@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2024 the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+# ++
+
+module EnterpriseEdition
+  # Add a general description of component here
+  # Add additional usage considerations or best practices that may aid the user to use the component correctly.
+  # @accessibility Add any accessibility considerations
+  class BannerComponent < ApplicationComponent
+    include OpPrimer::ComponentHelpers
+
+    # @param feature_key [Symbol, NilClass] The key of the feature to show the banner for.
+    # @param title [String] The title of the banner.
+    # @param description [String] The description of the banner.
+    # @param href [String] The URL to link to.
+    # @param skip_render [Boolean] Whether to skip rendering the banner.
+    # @param system_arguments [Hash] <%= link_to_system_arguments_docs %>
+    def initialize(feature_key,
+                   title: nil,
+                   description: nil,
+                   link_title: nil,
+                   href: nil,
+                   skip_render: !EnterpriseToken.show_banners?,
+                   **system_arguments)
+      @system_arguments = system_arguments
+      @system_arguments[:tag] = "div"
+      super
+
+      @feature_key = feature_key
+      @title = title
+      @description = description
+      @link_title = link_title
+      @href = href
+      @skip_render = skip_render
+    end
+
+    private
+
+    attr_reader :skip_render,
+                :feature_key
+
+    def title
+      @title || I18n.t("ee.upsale.#{feature_key}.title", default: I18n.t("ee.upsale.title"))
+    end
+
+    def description
+      @description || begin
+        I18n.t("ee.upsale.#{feature_key}.description")
+      rescue StandardError
+        I18n.t("ee.upsale.#{feature_key}.description_html")
+      end
+    rescue I18n::MissingTranslationData => e
+      raise e.exception(
+        <<~TEXT.squish
+          The expected '#{I18n.locale}.ee.upsale.#{feature_key}.description' key does not exist.
+          Ideally, provide it in the locale file.
+          If that isn't applicable, a description parameter needs to be provided.
+        TEXT
+      )
+    end
+
+    def link_title
+      @link_title || I18n.t("ee.upsale.#{feature_key}.link_title", default: I18n.t("ee.upsale.link_title"))
+    end
+
+    def href
+      href_value = @href || OpenProject::Static::Links.links.dig(:enterprise_docs, feature_key, :href)
+
+      unless href_value
+        raise "Neither a custom href is provided nor is a value set " \
+              "in OpenProject::Static::Links.enterprise_docs[#{feature_key}][:href]"
+      end
+
+      href_value
+    end
+
+    def render?
+      !skip_render
+    end
+  end
+end
diff --git a/app/components/enterprise_edition/banner_component.sass b/app/components/enterprise_edition/banner_component.sass
new file mode 100644
index 000000000000..d8ca7bc2f193
--- /dev/null
+++ b/app/components/enterprise_edition/banner_component.sass
@@ -0,0 +1,68 @@
+/*!
+ / -- copyright
+ / OpenProject is an open source project management software.
+ / Copyright (C) 2024 the OpenProject GmbH
+ /
+ / This program is free software; you can redistribute it and/or
+ / modify it under the terms of the GNU General Public License version 3.
+ /
+ / OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+ / Copyright (C) 2006-2013 Jean-Philippe Lang
+ / Copyright (C) 2010-2013 the ChiliProject Team
+ /
+ / This program is free software; you can redistribute it and/or
+ / modify it under the terms of the GNU General Public License
+ / as published by the Free Software Foundation; either version 2
+ / of the License, or (at your option) any later version.
+ /
+ / This program is distributed in the hope that it will be useful,
+ / but WITHOUT ANY WARRANTY; without even the implied warranty of
+ / MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ / GNU General Public License for more details.
+ /
+ / You should have received a copy of the GNU General Public License
+ / along with this program; if not, write to the Free Software
+ / Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ /
+ / See COPYRIGHT and LICENSE files for more details.
+ / ++
+ /
+
+$op-ee-banner--shield-width: 32px
+
+// This is not named op-enterprise-banner because as of now, there is still a legacy angular component that uses that block name.
+.op-ee-banner
+  display: grid
+  grid-template-columns: $op-ee-banner--shield-width auto auto
+  grid-template-areas: "icon-container title-container" "icon-container description-container" "icon-container link-container"
+  grid-column-gap: 0.5rem
+  justify-content: left
+  @media screen and (min-width: $breakpoint-md)
+    grid-template-areas: "icon-container title-container title-container" "icon-container description-container link-container"
+
+  &--icon-container
+    @extend .upsale-colored
+    align-self: start
+    justify-self: center
+
+  &--shield
+    @extend .upsale-border-colored
+    width: $op-ee-banner--shield-width
+    height: 42px
+    border-width: 10px 5px 10px 5px
+    border-radius: 0 0 10px 10px
+    border-style: solid
+    display: flex
+    align-items: center
+    justify-content: center
+
+  &--icon
+    width: $op-ee-banner--shield-width
+    height: $op-ee-banner--shield-width
+
+  &--title-container
+    @extend .upsale-colored
+    font-weight: bold
+
+  &--link-container
+    align-self: end
diff --git a/app/components/messages/show_page_header_component.html.erb b/app/components/messages/show_page_header_component.html.erb
new file mode 100644
index 000000000000..4cec4fedc5d1
--- /dev/null
+++ b/app/components/messages/show_page_header_component.html.erb
@@ -0,0 +1,56 @@
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { @topic.subject }
+    header.with_breadcrumbs(breadcrumb_items)
+
+    watcher_action_button(header, @topic)
+
+    if !@topic.locked? && authorize_for('messages', 'reply')
+      header.with_action_button(tag: :a,
+                                scheme: :default,
+                                mobile_icon: :quote,
+                                mobile_label: t(:button_quote),
+                                size: :medium,
+                                href: url_for({ action: 'quote', id: @topic }),
+                                aria: { label: I18n.t(:button_delete) },
+                                data: { 'action': 'forum-messages#quote', test_selector: "message-quote-button" },
+                                title: t(:button_quote)) do |button|
+        button.with_leading_visual_icon(icon: :quote)
+        t(:button_quote)
+      end
+    end
+
+    if @message.editable_by?(User.current)
+      header.with_action_button(tag: :a,
+                                scheme: :default,
+                                mobile_icon: :pencil,
+                                mobile_label: t(:button_edit),
+                                size: :medium,
+                                href: edit_topic_path(@topic),
+                                aria: { label: t(:button_edit) },
+                                data: { test_selector: "message-edit-button" },
+                                title: t(:button_edit)) do |button|
+        button.with_leading_visual_icon(icon: :pencil)
+        t(:button_edit)
+      end
+    end
+
+    if @message.destroyable_by?(User.current)
+      header.with_action_button(tag: :a,
+                                scheme: :danger,
+                                mobile_icon: :trash,
+                                mobile_label: t(:button_delete),
+                                size: :medium,
+                                href: topic_path(@topic),
+                                aria: { label: I18n.t(:button_delete) },
+                                data: {
+                                  confirm: I18n.t(:text_are_you_sure),
+                                  method: :delete
+                                },
+                                title: I18n.t(:button_delete)) do |button|
+        button.with_leading_visual_icon(icon: :trash)
+        t(:button_delete)
+      end
+    end
+  end
+%>
diff --git a/app/components/messages/show_page_header_component.rb b/app/components/messages/show_page_header_component.rb
new file mode 100644
index 000000000000..23a606034599
--- /dev/null
+++ b/app/components/messages/show_page_header_component.rb
@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+# ++
+
+module Messages
+  class ShowPageHeaderComponent < ApplicationComponent
+    include OpPrimer::ComponentHelpers
+    include ApplicationHelper
+    include WatchersHelper
+
+    def initialize(topic:, message:, forum:, project:)
+      super
+      @topic = topic
+      @message = message
+      @forum = forum
+      @project = project
+    end
+
+    def breadcrumb_items
+      [
+        { href: project_overview_path(@project.id), text: @project.name },
+        { href: project_forums_path(@project), text: t(:label_forum_plural) },
+        { href: project_forum_path(@project, @forum), text: @forum.name },
+        @topic.subject
+      ]
+    end
+  end
+end
diff --git a/app/components/my/access_token/access_token_created_dialog_component.html.erb b/app/components/my/access_token/access_token_created_dialog_component.html.erb
index cd773f77eda9..395e20e6b180 100644
--- a/app/components/my/access_token/access_token_created_dialog_component.html.erb
+++ b/app/components/my/access_token/access_token_created_dialog_component.html.erb
@@ -37,7 +37,7 @@ See COPYRIGHT and LICENSE files for more details.
       message.with_heading(tag: :h2) { I18n.t("my.access_token.create_dialog.header", type: "API") }
     end
 
-    dialog.with_additional_content do
+    dialog.with_additional_details do
       flex_layout do |flex|
         flex.with_row(mb: 2) do
           render(Primer::OpenProject::InputGroup.new) do |input_group|
diff --git a/app/components/op_primer/border_box_table_component.html.erb b/app/components/op_primer/border_box_table_component.html.erb
index 4c96232aa95f..a026da0f9aa1 100644
--- a/app/components/op_primer/border_box_table_component.html.erb
+++ b/app/components/op_primer/border_box_table_component.html.erb
@@ -58,6 +58,12 @@ See COPYRIGHT and LICENSE files for more details.
         end
       end
     end
+
+    if has_footer?
+      component.with_footer(classes: grid_class, color: :muted) do
+        footer
+      end
+    end
   end
 %>
 
diff --git a/app/components/op_primer/border_box_table_component.rb b/app/components/op_primer/border_box_table_component.rb
index b005fe4be6d0..1e1160790966 100644
--- a/app/components/op_primer/border_box_table_component.rb
+++ b/app/components/op_primer/border_box_table_component.rb
@@ -43,7 +43,7 @@ class << self
       #
       # This results in the description columns to be hidden on mobile
       def mobile_columns(*names)
-        return @mobile_columns || columns if names.empty?
+        return Array(@mobile_columns || columns) if names.empty?
 
         @mobile_columns = names.map(&:to_sym)
       end
@@ -54,7 +54,7 @@ def mobile_columns(*names)
       #
       # This results in the description columns to be hidden on mobile
       def mobile_labels(*names)
-        return @mobile_labels if names.empty?
+        return Array(@mobile_labels) if names.empty?
 
         @mobile_labels = names.map(&:to_sym)
       end
@@ -106,6 +106,10 @@ def has_actions?
       false
     end
 
+    def has_footer?
+      false
+    end
+
     def sortable?
       false
     end
@@ -133,5 +137,9 @@ def blank_description
     def blank_icon
       nil
     end
+
+    def footer
+      raise ArgumentError, "Need to provide footer content"
+    end
   end
 end
diff --git a/app/components/op_primer/flash_component.erb b/app/components/op_primer/flash_component.html.erb
similarity index 100%
rename from app/components/op_primer/flash_component.erb
rename to app/components/op_primer/flash_component.html.erb
diff --git a/app/components/op_primer/flash_component.rb b/app/components/op_primer/flash_component.rb
index fed84bf511f7..15a445c03316 100644
--- a/app/components/op_primer/flash_component.rb
+++ b/app/components/op_primer/flash_component.rb
@@ -38,6 +38,8 @@ def initialize(**system_arguments)
       system_arguments[:test_selector] ||= "op-primer-flash-message"
       system_arguments[:dismiss_scheme] ||= :remove
       system_arguments[:dismiss_label] ||= I18n.t(:button_close)
+      system_arguments[:data] ||= {}
+      system_arguments[:data]["flash-target"] = "flash"
 
       @autohide = system_arguments[:scheme] == :success && system_arguments[:dismiss_scheme] != :none
 
diff --git a/app/components/projects/life_cycle_type_component.html.erb b/app/components/projects/life_cycle_type_component.html.erb
new file mode 100644
index 000000000000..921c1cf191a2
--- /dev/null
+++ b/app/components/projects/life_cycle_type_component.html.erb
@@ -0,0 +1,8 @@
+<%= flex_layout(align_items: :center) do |type_container|
+  type_container.with_column(mr: 1, classes: icon_color_class) do
+    render Primer::Beta::Octicon.new(icon: icon)
+  end
+  type_container.with_column do
+    render(Primer::Beta::Text.new(**text_options)) { text }
+  end
+end %>
diff --git a/app/components/projects/life_cycle_type_component.rb b/app/components/projects/life_cycle_type_component.rb
new file mode 100644
index 000000000000..453f5d90c5d6
--- /dev/null
+++ b/app/components/projects/life_cycle_type_component.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2010-2024 the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+# ++
+module Projects
+  class LifeCycleTypeComponent < ApplicationComponent
+    include OpPrimer::ComponentHelpers
+
+    def text
+      model.model_name.human
+    end
+
+    def icon
+      case model
+      when Project::StageDefinition
+        :"git-commit"
+      when Project::GateDefinition
+        :diamond
+      else
+        raise NotImplementedError, "Unknown model #{model.class} to render a LifeCycleTypeComponent with"
+      end
+    end
+
+    def icon_color_class
+      helpers.hl_inline_class("life_cycle_step_definition", model)
+    end
+
+    def text_options
+      # The tag: :div is is a hack to fix the line height difference
+      # caused by font_size: :small. That line height difference
+      # would otherwise lead to the text being not on the same height as the icon
+      { color: :muted, font_size: :small, tag: :div }.merge(options)
+    end
+  end
+end
diff --git a/app/components/projects/row_component.rb b/app/components/projects/row_component.rb
index 3f540eac0ecd..66ff579a9d0e 100644
--- a/app/components/projects/row_component.rb
+++ b/app/components/projects/row_component.rb
@@ -29,8 +29,9 @@
 #++
 module Projects
   class RowComponent < ::RowComponent
-    delegate :favored_project_ids, to: :table
     delegate :identifier, to: :project
+    delegate :favored_project_ids, to: :table
+    delegate :project_life_cycle_step_by_definition, to: :table
 
     def project
       model.first
@@ -69,6 +70,8 @@ def currently_favored?
     def column_value(column)
       if custom_field_column?(column)
         custom_field_column(column)
+      elsif life_cycle_step_column?(column)
+        life_cycle_step_column(column)
       else
         send(column.attribute)
       end
@@ -94,6 +97,16 @@ def custom_field_column(column)
       end
     end
 
+    def life_cycle_step_column(column)
+      return nil unless user_can_view_project_stages_and_gates?
+
+      life_cycle_step = project_life_cycle_step_by_definition(column.life_cycle_step_definition, project)
+
+      return nil if life_cycle_step.blank?
+
+      fmt_date_or_range(life_cycle_step.start_date, life_cycle_step.end_date)
+    end
+
     def created_at
       helpers.format_date(project.created_at)
     end
@@ -370,12 +383,37 @@ def user_can_view_project?
       User.current.allowed_in_project?(:view_project_attributes, project)
     end
 
+    def user_can_view_project_stages_and_gates?
+      User.current.allowed_in_project?(:view_project_stages_and_gates, project)
+    end
+
     def custom_field_column?(column)
       column.is_a?(::Queries::Projects::Selects::CustomField)
     end
 
+    def life_cycle_step_column?(column)
+      column.is_a?(::Queries::Projects::Selects::LifeCycleStep)
+    end
+
     def current_page
       table.model.current_page.to_s
     end
+
+    private
+
+    # If only the `start_date` is given, will return a formatted version of that date as string.
+    # When `end_date` is given as well, will return a representation of the date range from start to end.
+    # @example
+    #    fmt_date_or_range(Date.new(2024, 12, 4))
+    #      "04/12/2024"
+    #
+    #    fmt_date_or_range(Date.new(2024, 12, 4), Date.new(2024, 12, 10))
+    #      "04/12/2024 - 10/12/2024"
+    def fmt_date_or_range(start_date, end_date = nil)
+      [start_date, end_date]
+        .compact
+        .map { |d| helpers.format_date(d) }
+        .join(" - ")
+    end
   end
 end
diff --git a/app/components/projects/settings/index_page_header_component.html.erb b/app/components/projects/settings/index_page_header_component.html.erb
new file mode 100644
index 000000000000..06c1f59002e5
--- /dev/null
+++ b/app/components/projects/settings/index_page_header_component.html.erb
@@ -0,0 +1,100 @@
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { t(:label_information_plural) }
+    header.with_breadcrumbs( [
+                               { href: project_overview_path(@project.id), text: @project.name  },
+                               { href: project_settings_general_path(@project.id), text: I18n.t("label_project_settings") },
+                               t(:label_information_plural)
+                             ])
+
+    if User.current.allowed_in_project?(:add_subprojects, @project)
+      header.with_action_button(scheme: :primary,
+                                mobile_icon: :plus,
+                                mobile_label: t(:label_subproject_new),
+                                aria: { label: t(:label_subproject_new) },
+                                title: t(:label_subproject_new),
+                                tag: :a,
+                                href: new_project_path(parent_id: @project.id)) do |button|
+        button.with_leading_visual_icon(icon: :plus)
+        t(:label_subproject)
+      end
+    end
+
+    header.with_action_button(tag: :a,
+                              mobile_icon: :pencil,
+                              mobile_label: t('projects.settings.change_identifier'),
+                              size: :medium,
+                              href: project_identifier_path(@project),
+                              aria: { label: t('projects.settings.change_identifier') },
+                              title: t('projects.settings.change_identifier')) do |button|
+      button.with_leading_visual_icon(icon: :pencil)
+      t('projects.settings.change_identifier')
+    end
+
+    header.with_action_menu(
+      menu_arguments: {
+        anchor_align: :end
+      },
+      button_arguments: {
+        icon: "op-kebab-vertical",
+        "aria-label": t(:label_more),
+        test_selector: "project-settings-more-menu"
+      }
+    ) do |menu|
+      if @project.copy_allowed?
+        menu.with_item(
+          label:t(:button_copy),
+          href: copy_project_path(@project),
+          content_arguments: {
+            data: { turbo: false },
+            test_selector: "project-settings--copy"
+          },
+          accesskey: helpers.accesskey(:copy),
+          ) do |item|
+          item.with_leading_visual_icon(icon: :copy)
+        end
+      end
+
+      if User.current.allowed_in_project?(:archive_project, @project)
+        menu.with_item(
+          tag: :a,
+          label: t(:button_archive),
+          href: project_archive_path(@project, status: '', name: @project.name),
+          content_arguments: {
+            data: { confirm: t('project.archive.are_you_sure', name: @project.name), method: :post, },
+            test_selector: "project-settings--archive"
+          }
+        ) do |item|
+          item.with_leading_visual_icon(icon: 'lock')
+        end
+      end
+      if User.current.admin?
+        label = @project.templated ? 'remove_from_templates' : 'make_template'
+        menu.with_item(
+          tag: :a,
+          label: t("project.template.#{label}"),
+          href: project_templated_path(@project),
+          content_arguments: {
+            data: { method: @project.templated ? :delete : :post },
+            test_selector: "project-settings--mark-template"
+          }
+        ) do |item|
+          item.with_leading_visual_icon(icon: @project.templated ? :"file-removed" : :"file-added")
+        end
+
+        menu.with_item(
+          tag: :a,
+          scheme: :danger,
+          label: t(:button_delete),
+          href: confirm_destroy_project_path(@project),
+          content_arguments: {
+            data: { turbo: false },
+            test_selector: "project-settings--delete"
+          }
+        ) do |item|
+          item.with_leading_visual_icon(icon: :trash)
+        end
+      end
+    end
+  end
+%>
diff --git a/app/components/projects/settings/index_page_header_component.rb b/app/components/projects/settings/index_page_header_component.rb
new file mode 100644
index 000000000000..a57128ce4f05
--- /dev/null
+++ b/app/components/projects/settings/index_page_header_component.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+# ++
+
+class Projects::Settings::IndexPageHeaderComponent < ApplicationComponent
+  include OpPrimer::ComponentHelpers
+
+  def initialize(project:)
+    super
+
+    @project = project
+  end
+end
diff --git a/app/components/projects/settings/life_cycle_steps/index_component.html.erb b/app/components/projects/settings/life_cycle_steps/index_component.html.erb
new file mode 100644
index 000000000000..8ab58ef17910
--- /dev/null
+++ b/app/components/projects/settings/life_cycle_steps/index_component.html.erb
@@ -0,0 +1,88 @@
+<%=
+  flex_layout(data: wrapper_data_attributes) do |flex|
+    flex.with_row do
+      render(Primer::OpenProject::SubHeader.new) do |subheader|
+        subheader.with_filter_input(name: "border-box-filter",
+                                    label: t('projects.settings.life_cycle.filter.label'),
+                                    visually_hide_label: true,
+                                    placeholder: t('projects.settings.life_cycle.filter.label'),
+                                    leading_visual: {
+                                      icon: :search,
+                                      size: :small
+                                    },
+                                    show_clear_button: true,
+                                    clear_button_id: clear_button_id,
+                                    data: {
+                                      action: "input->projects--settings--border-box-filter#filterLists",
+                                      "projects--settings--border-box-filter-target": "filter"
+                                    })
+      end
+    end
+
+    flex.with_row do
+      render(border_box_container(mb: 3, data: { test_selector: "project-life-cycle-administration" })) do |component|
+        component.with_header(font_weight: :bold, py: 2) do
+          flex_layout(justify_content: :space_between, align_items: :center) do |header_container|
+            header_container.with_column(py: 2) do
+              # adding py: 2 here to match the padding of the actions_container
+              # otherwise the header height changes when the actions gets hidden when filtering
+              render(Primer::Beta::Text.new(font_weight: :bold)) do
+                I18n.t('projects.settings.life_cycle.section_header')
+              end
+            end
+            header_container.with_column(flex_layout: true, justify_content: :flex_end) do |actions_container|
+              actions_container.with_column(data: { 'projects--settings--border-box-filter-target': 'bulkActionContainer' }) do
+                render(Primer::Beta::Button.new(
+                  tag: :a,
+                  href: enable_all_project_settings_life_cycle_steps_path(project_id: project),
+                  scheme: :invisible,
+                  font_weight: :bold,
+                  color: :subtle,
+                  'aria-label': t('projects.settings.actions.label_enable_all'),
+                  data: { 'turbo-method': :post, test_selector: "enable-all-life-cycle-steps" }
+                )) do |button|
+                  button.with_leading_visual_icon(icon: 'check-circle', color: :subtle)
+                  t('projects.settings.actions.label_enable_all')
+                end
+              end
+              actions_container.with_column(data: { 'projects--settings--border-box-filter-target': 'bulkActionContainer' }) do
+                render(Primer::Beta::Button.new(
+                  tag: :a,
+                  href: disable_all_project_settings_life_cycle_steps_path(project_id: project),
+                  scheme: :invisible,
+                  font_weight: :bold,
+                  color: :subtle,
+                  'aria-label': t('projects.settings.actions.label_disable_all'),
+                  data: { 'turbo-method': :post, test_selector: "disable-all-life-cycle-steps" }
+                )) do |button|
+                  button.with_leading_visual_icon(icon: 'x-circle', color: :subtle)
+                  t('projects.settings.actions.label_disable_all')
+                end
+              end
+            end
+          end
+        end
+        if life_cycle_definitions.empty?
+          component.with_row do
+            render(Primer::Beta::Text.new(color: :subtle)) { t("projects.settings.life_cycle.non_defined") }
+          end
+        else
+          life_cycle_definitions_and_step_active.each do |definition, active|
+            component.with_row(data: { 'projects--settings--border-box-filter-target': 'searchItem' },
+                                       test_selector: "project-life-cycle-step-#{definition.id}") do
+              render(Projects::Settings::LifeCycleSteps::StepComponent.new(definition:, active?: active))
+            end
+          end
+        end
+      end
+    end
+    flex.with_row do
+      render Primer::Beta::Text.new(display: :none,
+                                    data: {
+                                      "projects--settings--border-box-filter-target": "noResultsText",
+                                    }) do
+        I18n.t("js.autocompleter.notFoundText")
+      end
+    end
+  end
+%>
diff --git a/app/components/projects/settings/life_cycle_steps/index_component.rb b/app/components/projects/settings/life_cycle_steps/index_component.rb
new file mode 100644
index 000000000000..bd1c174f1ccc
--- /dev/null
+++ b/app/components/projects/settings/life_cycle_steps/index_component.rb
@@ -0,0 +1,64 @@
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2010-2024 the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+# ++
+
+module Projects
+  module Settings
+    module LifeCycleSteps
+      class IndexComponent < ApplicationComponent
+        include ApplicationHelper
+        include OpPrimer::ComponentHelpers
+        include OpTurbo::Streamable
+
+        options :project,
+                :life_cycle_definitions
+
+        private
+
+        def life_cycle_definitions_and_step_active
+          active_ids = project.life_cycle_steps.where(active: true).pluck(:definition_id).to_set
+
+          life_cycle_definitions.all.map do |definition|
+            [definition, definition.id.in?(active_ids)]
+          end
+        end
+
+        def wrapper_data_attributes
+          {
+            controller: "projects--settings--border-box-filter",
+            "application-target": "dynamic",
+            "projects--settings--border-box-filter-clear-button-id-value": clear_button_id
+          }
+        end
+
+        def clear_button_id
+          "border-box-filter-clear-button"
+        end
+      end
+    end
+  end
+end
diff --git a/app/components/projects/settings/life_cycle_steps/index_page_header_component.html.erb b/app/components/projects/settings/life_cycle_steps/index_page_header_component.html.erb
new file mode 100644
index 000000000000..8c7eb8f55bcc
--- /dev/null
+++ b/app/components/projects/settings/life_cycle_steps/index_page_header_component.html.erb
@@ -0,0 +1,11 @@
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { t('projects.settings.life_cycle.header.title') }
+    header.with_description do
+      t('projects.settings.life_cycle.header.description_html',
+        overview_url: project_path(project),
+        admin_settings_url: admin_settings_project_life_cycle_step_definitions_path)
+    end
+    header.with_breadcrumbs(breadcrumb_items)
+  end
+%>
diff --git a/app/components/projects/settings/life_cycle_steps/index_page_header_component.rb b/app/components/projects/settings/life_cycle_steps/index_page_header_component.rb
new file mode 100644
index 000000000000..8be423936dbe
--- /dev/null
+++ b/app/components/projects/settings/life_cycle_steps/index_page_header_component.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2010-2024 the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+# ++
+
+module Projects::Settings::LifeCycleSteps
+  class IndexPageHeaderComponent < ApplicationComponent
+    include ApplicationHelper
+
+    options :project
+
+    def breadcrumb_items
+      [{ href: project_overview_path(project), text: project.name },
+       { href: project_settings_general_path(project), text: I18n.t("label_project_settings") },
+       t("projects.settings.life_cycle.header.title")]
+    end
+  end
+end
diff --git a/app/components/projects/settings/life_cycle_steps/step_component.html.erb b/app/components/projects/settings/life_cycle_steps/step_component.html.erb
new file mode 100644
index 000000000000..9eda07459e3c
--- /dev/null
+++ b/app/components/projects/settings/life_cycle_steps/step_component.html.erb
@@ -0,0 +1,30 @@
+<%=
+  flex_layout(align_items: :center,
+              justify_content: :space_between) do |step_container|
+    step_container.with_column(flex_layout: true) do |title_container|
+      title_container.with_column(pt: 1, mr: 3) do
+        render(Primer::Beta::Text.new(classes: 'filter-target-visible-text')) { definition.name }
+      end
+      title_container.with_column(pt: 1) do
+        render(Projects::LifeCycleTypeComponent.new(definition))
+      end
+    end
+    # py: 1 quick fix: prevents the row from bouncing as the toggle switch currently changes height while toggling
+    step_container.with_column(py: 1, mr: 2) do
+      # buggy currently:
+      # small variant +  status_label_position: :start leads to a small bounce while toggling
+      # behavior can be seen on primer's viewbook as well -> https://view-components-storybook.eastus.cloudapp.azure.com/view-components/lookbook/inspect/primer/alpha/toggle_switch/small
+      # quick fix: don't display loading indicator which is causing the bounce
+      render(Primer::Alpha::ToggleSwitch.new(
+        src: toggle_project_settings_life_cycle_step_path(id: definition.id),
+        csrf_token: form_authenticity_token,
+        data: { test_selector: "toggle-project-life-cycle-#{definition.id}" },
+        aria: { label: toggle_aria_label },
+        checked: active?,
+        size: :small,
+        status_label_position: :start,
+        classes: "op-primer-adjustments__toggle-switch--hidden-loading-indicator",
+        ))
+    end
+  end
+%>
diff --git a/app/components/projects/settings/life_cycle_steps/step_component.rb b/app/components/projects/settings/life_cycle_steps/step_component.rb
new file mode 100644
index 000000000000..2dd0f59b6479
--- /dev/null
+++ b/app/components/projects/settings/life_cycle_steps/step_component.rb
@@ -0,0 +1,46 @@
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2010-2024 the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+# ++
+
+module Projects
+  module Settings
+    module LifeCycleSteps
+      class StepComponent < ApplicationComponent
+        include ApplicationHelper
+        include OpPrimer::ComponentHelpers
+        include OpTurbo::Streamable
+
+        options :definition,
+                :active?
+
+        def toggle_aria_label
+          I18n.t("projects.settings.life_cycle.step.use_in_project", step: definition.name)
+        end
+      end
+    end
+  end
+end
diff --git a/app/components/projects/settings/project_custom_field_sections/custom_field_row_component.html.erb b/app/components/projects/settings/project_custom_field_sections/custom_field_row_component.html.erb
index 374bb4ed0642..fae8cdf15c38 100644
--- a/app/components/projects/settings/project_custom_field_sections/custom_field_row_component.html.erb
+++ b/app/components/projects/settings/project_custom_field_sections/custom_field_row_component.html.erb
@@ -5,7 +5,7 @@
     }) do |custom_field_container|
       custom_field_container.with_column(flex_layout: true) do |title_container|
         title_container.with_column(pt: 1, mr: 2) do
-          render(Primer::Beta::Text.new) do
+          render(Primer::Beta::Text.new(classes: 'filter-target-visible-text')) do
             @project_custom_field.name
           end
         end
diff --git a/app/components/projects/settings/project_custom_field_sections/index_component.html.erb b/app/components/projects/settings/project_custom_field_sections/index_component.html.erb
index b4044ee99669..f54e78c9f20b 100644
--- a/app/components/projects/settings/project_custom_field_sections/index_component.html.erb
+++ b/app/components/projects/settings/project_custom_field_sections/index_component.html.erb
@@ -3,7 +3,7 @@
     flex_layout do |flex|
       flex.with_row do
         render(Primer::OpenProject::SubHeader.new) do |subheader|
-          subheader.with_filter_input(name: "project-custom-fields-mapping-filter",
+          subheader.with_filter_input(name: "border-box-filter",
                                       label: t('projects.settings.project_custom_fields.filter.label'),
                                       visually_hide_label: true,
                                       placeholder: t('projects.settings.project_custom_fields.filter.label'),
@@ -14,8 +14,8 @@
                                       show_clear_button: true,
                                       clear_button_id: clear_button_id,
                                       data: {
-                                        action: "input->projects--settings--project-custom-fields-mapping-filter#filterLists",
-                                        "projects--settings--project-custom-fields-mapping-filter-target": "filter"
+                                        action: "input->projects--settings--border-box-filter#filterLists",
+                                        "projects--settings--border-box-filter-target": "filter"
                                       })
         end
       end
diff --git a/app/components/projects/settings/project_custom_field_sections/index_component.rb b/app/components/projects/settings/project_custom_field_sections/index_component.rb
index 25b8a86e8b71..b405aa381d38 100644
--- a/app/components/projects/settings/project_custom_field_sections/index_component.rb
+++ b/app/components/projects/settings/project_custom_field_sections/index_component.rb
@@ -45,14 +45,14 @@ def initialize(project:, project_custom_field_sections:)
 
         def wrapper_data_attributes
           {
-            controller: "projects--settings--project-custom-fields-mapping-filter",
+            controller: "projects--settings--border-box-filter",
             "application-target": "dynamic",
-            "projects--settings--project-custom-fields-mapping-filter-clear-button-id-value": clear_button_id
+            "projects--settings--border-box-filter-clear-button-id-value": clear_button_id
           }
         end
 
         def clear_button_id
-          "project-custom-fields-mapping-filter-clear-button"
+          "border-box-filter-clear-button"
         end
       end
     end
diff --git a/app/components/projects/settings/project_custom_field_sections/index_page_header_component.html.erb b/app/components/projects/settings/project_custom_field_sections/index_page_header_component.html.erb
index 7cbbd5903e1d..b56371d9d989 100644
--- a/app/components/projects/settings/project_custom_field_sections/index_page_header_component.html.erb
+++ b/app/components/projects/settings/project_custom_field_sections/index_page_header_component.html.erb
@@ -1,8 +1,7 @@
 <%= render Primer::OpenProject::PageHeader.new do |header| %>
-  <%= header.with_title(variant: :default) { t('projects.settings.project_custom_fields.header.title') } %>
-  <%= header.with_description { t('projects.settings.project_custom_fields.header.description',
-                                  overview_url: project_path(@project),
-                                  admin_settings_url: admin_settings_project_custom_fields_path
-  ).html_safe } %>
+  <%= header.with_title { t('projects.settings.project_custom_fields.header.title') } %>
+  <%= header.with_description { t('projects.settings.project_custom_fields.header.description_html',
+                                  overview_url: project_path(project),
+                                  admin_settings_url: admin_settings_project_custom_fields_path) } %>
   <%= header.with_breadcrumbs(breadcrumb_items) %>
 <% end %>
diff --git a/app/components/projects/settings/project_custom_field_sections/index_page_header_component.rb b/app/components/projects/settings/project_custom_field_sections/index_page_header_component.rb
index 13014aae6aab..fe1b93434a1f 100644
--- a/app/components/projects/settings/project_custom_field_sections/index_page_header_component.rb
+++ b/app/components/projects/settings/project_custom_field_sections/index_page_header_component.rb
@@ -33,14 +33,11 @@ module Projects::Settings::ProjectCustomFieldSections
   class IndexPageHeaderComponent < ApplicationComponent
     include ApplicationHelper
 
-    def initialize(project: nil)
-      super
-      @project = project
-    end
+    options :project
 
     def breadcrumb_items
-      [{ href: project_overview_path(@project.id), text: @project.name },
-       { href: project_settings_general_path(@project.id), text: I18n.t("label_project_settings") },
+      [{ href: project_overview_path(project), text: project.name },
+       { href: project_settings_general_path(project), text: I18n.t("label_project_settings") },
        t("settings.project_attributes.heading")]
     end
   end
diff --git a/app/components/projects/settings/project_custom_field_sections/show_component.html.erb b/app/components/projects/settings/project_custom_field_sections/show_component.html.erb
index 727d8901228b..f2c5ee4e3a7f 100644
--- a/app/components/projects/settings/project_custom_field_sections/show_component.html.erb
+++ b/app/components/projects/settings/project_custom_field_sections/show_component.html.erb
@@ -13,7 +13,7 @@
             end
           end
           section_header_container.with_column(flex_layout: true, justify_content: :flex_end) do |actions_container|
-            actions_container.with_column(data: { 'projects--settings--project-custom-fields-mapping-filter-target': 'bulkActionContainer' }) do
+            actions_container.with_column(data: { 'projects--settings--border-box-filter-target': 'bulkActionContainer' }) do
               render(Primer::Beta::Button.new(
                 tag: :a,
                 href: enable_all_of_section_project_settings_project_custom_fields_path(
@@ -25,14 +25,14 @@
                 scheme: :invisible,
                 font_weight: :bold,
                 color: :subtle,
-                'aria-label': t('projects.settings.project_custom_fields.actions.label_enable_all'),
+                'aria-label': t('projects.settings.actions.label_enable_all'),
                 data: { 'turbo-method': :put, 'turbo-stream': true, test_selector: "enable-all-project-custom-field-mappings-#{@project_custom_field_section.id}" }
               )) do |button|
                 button.with_leading_visual_icon(icon: 'check-circle', color: :subtle)
-                t('projects.settings.project_custom_fields.actions.label_enable_all')
+                t('projects.settings.actions.label_enable_all')
               end
             end
-            actions_container.with_column(data: { 'projects--settings--project-custom-fields-mapping-filter-target': 'bulkActionContainer' }) do
+            actions_container.with_column(data: { 'projects--settings--border-box-filter-target': 'bulkActionContainer' }) do
               render(Primer::Beta::Button.new(
                 tag: :a,
                 href: disable_all_of_section_project_settings_project_custom_fields_path(
@@ -44,11 +44,11 @@
                 scheme: :invisible,
                 font_weight: :bold,
                 color: :subtle,
-                'aria-label': t('projects.settings.project_custom_fields.actions.label_disable_all'),
+                'aria-label': t('projects.settings.actions.label_disable_all'),
                 data: { 'turbo-method': :put, 'turbo-stream': true, test_selector: "disable-all-project-custom-field-mappings-#{@project_custom_field_section.id}" }
               )) do |button|
                 button.with_leading_visual_icon(icon: 'x-circle', color: :subtle)
-                t('projects.settings.project_custom_fields.actions.label_disable_all')
+                t('projects.settings.actions.label_disable_all')
               end
             end
           end
@@ -60,7 +60,7 @@
         end
       else
         @project_custom_fields.each do |project_custom_field|
-          component.with_row(data: { 'projects--settings--project-custom-fields-mapping-filter-target': 'searchItem' }) do
+          component.with_row(data: { 'projects--settings--border-box-filter-target': 'searchItem' }) do
             render(Projects::Settings::ProjectCustomFieldSections::CustomFieldRowComponent.new(
               project: @project,
               project_custom_field:,
diff --git a/app/components/projects/table_component.html.erb b/app/components/projects/table_component.html.erb
index a114faeff841..9f33feb4aeea 100644
--- a/app/components/projects/table_component.html.erb
+++ b/app/components/projects/table_component.html.erb
@@ -56,7 +56,7 @@ See COPYRIGHT and LICENSE files for more details.
                     </th>
                   <% else %>
                     <% if use_quick_action_table_headers? %>
-                      <%= quick_action_table_header column.attribute, order_options(column, turbo: true) %>
+                      <%= quick_action_table_header column, order_options(column, turbo: true) %>
                     <% else %>
                       <th>
                         <div class="generic-table--sort-header-outer">
diff --git a/app/components/projects/table_component.rb b/app/components/projects/table_component.rb
index 7958c81df2ad..93378fcfa7b3 100644
--- a/app/components/projects/table_component.rb
+++ b/app/components/projects/table_component.rb
@@ -195,6 +195,14 @@ def favored_project_ids
       @favored_project_ids ||= Favorite.where(user: current_user, favored_type: "Project").pluck(:favored_id)
     end
 
+    def project_life_cycle_step_by_definition(definition, project)
+      @project_life_cycle_steps_by_definition ||= Project::LifeCycleStep
+                                                    .visible
+                                                    .index_by { |s| [s.definition_id, s.project_id] }
+
+      @project_life_cycle_steps_by_definition[[definition.id, project.id]]
+    end
+
     def sorted_by_lft?
       query.orders.first&.attribute == :lft
     end
diff --git a/app/components/shares/invite_user_form_component.html.erb b/app/components/shares/invite_user_form_component.html.erb
index dea952c59aa6..f1bc280c58b9 100644
--- a/app/components/shares/invite_user_form_component.html.erb
+++ b/app/components/shares/invite_user_form_component.html.erb
@@ -10,7 +10,7 @@
       ) do |form|
         grid_layout('invite-user-form', tag: :div) do |invite_form|
           invite_form.with_area('invitee') do
-            render(Shares::Invitee.new(form))
+            render(Shares::Invitee.new(form, allow_hover_cards:))
           end
 
           invite_form.with_area('permission') do
diff --git a/app/components/shares/invite_user_form_component.rb b/app/components/shares/invite_user_form_component.rb
index f8d40024bae9..07f5559506f2 100644
--- a/app/components/shares/invite_user_form_component.rb
+++ b/app/components/shares/invite_user_form_component.rb
@@ -32,14 +32,15 @@ class InviteUserFormComponent < ApplicationComponent # rubocop:disable OpenProje
     include OpTurbo::Streamable
     include OpPrimer::ComponentHelpers
 
-    attr_reader :entity, :strategy, :errors
+    attr_reader :entity, :strategy, :errors, :allow_hover_cards
 
-    def initialize(strategy:, errors: nil)
+    def initialize(strategy:, errors: nil, allow_hover_cards: false)
       super
 
       @strategy = strategy
       @entity = strategy.entity
       @errors = errors
+      @allow_hover_cards = allow_hover_cards
     end
 
     def new_share
diff --git a/app/components/shares/manage_shares_component.html.erb b/app/components/shares/manage_shares_component.html.erb
index 9cca5dea7e57..af18bb5f4229 100644
--- a/app/components/shares/manage_shares_component.html.erb
+++ b/app/components/shares/manage_shares_component.html.erb
@@ -1,7 +1,7 @@
 <%=
   if strategy.manageable?
     modal_content.with_row do
-      render(Shares::InviteUserFormComponent.new(strategy:, errors: errors))
+      render(Shares::InviteUserFormComponent.new(strategy:, errors:, allow_hover_cards:))
     end
   end
 
@@ -100,10 +100,15 @@
         end
       else
         strategy.shares.each do |share|
-          render(Shares::ShareRowComponent.new(share:, strategy:, container: border_box))
+          render(Shares::ShareRowComponent.new(share:, strategy:, container: border_box, allow_hover_cards:))
         end
       end
     end
   end
 
+  if allow_hover_cards
+    modal_content.with_row do
+      helpers.angular_component_tag 'opce-custom-modal-overlay', class: 'op-user-share-modal-overlay'
+    end
+  end
 %>
diff --git a/app/components/shares/manage_shares_component.rb b/app/components/shares/manage_shares_component.rb
index fa61c6afdd57..22246aed01a3 100644
--- a/app/components/shares/manage_shares_component.rb
+++ b/app/components/shares/manage_shares_component.rb
@@ -36,6 +36,7 @@ class ManageSharesComponent < ApplicationComponent # rubocop:disable OpenProject
     attr_reader :strategy,
                 :entity,
                 :errors,
+                :allow_hover_cards,
                 :modal_content
 
     def initialize(strategy:, modal_content:, errors: nil)
@@ -45,6 +46,7 @@ def initialize(strategy:, modal_content:, errors: nil)
       @entity = strategy.entity
       @errors = errors
       @modal_content = modal_content
+      @allow_hover_cards = strategy.allow_hover_cards?
     end
 
     def self.wrapper_key
diff --git a/app/components/shares/project_queries/upsale_component.html.erb b/app/components/shares/project_queries/upsale_component.html.erb
index 0568cec7557f..946bbda996a5 100644
--- a/app/components/shares/project_queries/upsale_component.html.erb
+++ b/app/components/shares/project_queries/upsale_component.html.erb
@@ -1,15 +1,13 @@
 <%=
   modal_content.with_row(data: { 'test-selector': 'op-share-dialog-upsale-block' }) do
     render Primer::OpenProject::FeedbackMessage.new(icon_arguments: { icon: :"op-enterprise-addons", classes: "upsale-colored" }, border: true) do |component|
-      component.with_heading(tag: :h2, classes: 'upsale-colored').with_content(I18n.t(:label_enterprise_addon))
+      component.with_heading(tag: :h2, classes: 'upsale-colored').with_content(I18n.t(:"ee.upsale.title"))
       component.with_description { I18n.t('sharing.project_queries.upsale.message') }
 
       href = "#{OpenProject::Static::Links.links[:upsale][:href]}/?utm_source=unknown&utm_medium=community-edition&utm_campaign=project-list-sharing-modal"
-      component.with_secondary_action(href:) do
-        flex_layout(justify_content: :center) do |flex|
-          flex.with_column(mr: 1) { I18n.t("admin.enterprise.enterprise_link") }
-          flex.with_column { render(Primer::Beta::Octicon.new(icon: :'link-external')) }
-        end
+      component.with_secondary_action(href:) do |link|
+        link.with_trailing_visual_icon(icon: "link-external")
+        I18n.t("admin.enterprise.enterprise_link")
       end
     end
   end
diff --git a/app/components/shares/share_row_component.html.erb b/app/components/shares/share_row_component.html.erb
index b7045299e475..47c931db3e76 100644
--- a/app/components/shares/share_row_component.html.erb
+++ b/app/components/shares/share_row_component.html.erb
@@ -13,7 +13,8 @@
       end
 
       user_row_grid.with_area(:avatar, tag: :div) do
-        render(Users::AvatarComponent.new(user: principal, show_name: false, size: :medium))
+        render(Users::AvatarComponent.new(user: principal, show_name: false, size: :medium,
+                                          hover_card: { active: allow_hover_cards, target: :custom }))
       end
 
       user_row_grid.with_area(:user_details, tag: :div, classes: 'ellipsis') do
diff --git a/app/components/shares/share_row_component.rb b/app/components/shares/share_row_component.rb
index 45df3ab20e0b..ae3b98457683 100644
--- a/app/components/shares/share_row_component.rb
+++ b/app/components/shares/share_row_component.rb
@@ -36,7 +36,7 @@ class ShareRowComponent < ApplicationComponent # rubocop:disable OpenProject/Add
     include OpTurbo::Streamable
     include OpPrimer::ComponentHelpers
 
-    def initialize(share:, strategy:, container: nil)
+    def initialize(share:, strategy:, container: nil, allow_hover_cards: false)
       super
 
       @share = share
@@ -45,6 +45,7 @@ def initialize(share:, strategy:, container: nil)
       @principal = share.principal
       @available_roles = strategy.available_roles
       @container = container
+      @allow_hover_cards = allow_hover_cards
     end
 
     def wrapper_uniq_by
@@ -53,7 +54,7 @@ def wrapper_uniq_by
 
     private
 
-    attr_reader :share, :entity, :principal, :container, :available_roles, :strategy
+    attr_reader :share, :entity, :principal, :container, :available_roles, :strategy, :allow_hover_cards
 
     def share_editable?
       @share_editable ||= User.current != share.principal && sharing_manageable?
diff --git a/app/components/shares/work_packages/modal_upsale_component.html.erb b/app/components/shares/work_packages/modal_upsale_component.html.erb
index d1c89c491a12..036bc35a673b 100644
--- a/app/components/shares/work_packages/modal_upsale_component.html.erb
+++ b/app/components/shares/work_packages/modal_upsale_component.html.erb
@@ -1,15 +1,13 @@
 <%=
   component_wrapper(tag: 'turbo-frame') do
     render Primer::OpenProject::FeedbackMessage.new(icon_arguments: { icon: :"op-enterprise-addons", classes: "upsale-colored" }, border: true) do |component|
-      component.with_heading(tag: :h2, classes: 'upsale-colored').with_content(I18n.t(:label_enterprise_addon))
+      component.with_heading(tag: :h2, classes: 'upsale-colored').with_content(I18n.t(:"ee.upsale.title"))
       component.with_description { I18n.t('mail.sharing.work_packages.enterprise_text') }
 
       href = "#{OpenProject::Static::Links.links[:upsale][:href]}/?utm_source=unknown&utm_medium=community-edition&utm_campaign=work-package-sharing-modal"
-      component.with_secondary_action(href:) do
-        flex_layout(justify_content: :center) do |flex|
-          flex.with_column(mr: 1) { I18n.t("admin.enterprise.enterprise_link") }
-          flex.with_column { render(Primer::Beta::Octicon.new(icon: :'link-external')) }
-        end
+      component.with_secondary_action(href:) do |link|
+        link.with_trailing_visual_icon(icon: "link-external")
+        I18n.t("admin.enterprise.enterprise_link")
       end
     end
   end
diff --git a/app/components/types/edit_page_header_component.html.erb b/app/components/types/edit_page_header_component.html.erb
index 70c2494d3950..27e38756b3c1 100644
--- a/app/components/types/edit_page_header_component.html.erb
+++ b/app/components/types/edit_page_header_component.html.erb
@@ -35,7 +35,7 @@ See COPYRIGHT and LICENSE files for more details.
     header.with_tab_nav(label: nil) do |tab_nav|
       @tabs.each do |tab|
         tab_nav.with_tab(selected: selected_tab(@tabs) == tab, href: tab[:path]) do |t|
-          t.with_text { I18n.t("js.#{tab[:label]}") }
+          t.with_text { I18n.t(tab[:label]) }
         end
       end
     end if @tabs.present?
diff --git a/app/components/users/avatar_component.rb b/app/components/users/avatar_component.rb
index 907f226ce736..c0c84ed78e65 100644
--- a/app/components/users/avatar_component.rb
+++ b/app/components/users/avatar_component.rb
@@ -32,7 +32,8 @@ class AvatarComponent < ApplicationComponent
     include AvatarHelper
     include OpPrimer::ComponentHelpers
 
-    def initialize(user:, show_name: true, link: true, size: "default", classes: "", title: nil, name_classes: "")
+    def initialize(user:, show_name: true, link: true, size: "default", classes: "", title: nil, name_classes: "",
+                   hover_card: { active: true, target: :default })
       super
 
       @user = user
@@ -40,6 +41,7 @@ def initialize(user:, show_name: true, link: true, size: "default", classes: "",
       @link = link
       @size = size
       @title = title
+      @hover_card = hover_card
       @classes = classes
       @name_classes = name_classes
     end
@@ -49,14 +51,19 @@ def render?
     end
 
     def call
-      helpers.avatar(
-        @user,
+      options = {
         size: @size,
         link: @link,
         hide_name: !@show_name,
         title: @title,
         class: @classes,
-        name_classes: @name_classes
+        name_classes: @name_classes,
+        hover_card: @hover_card
+      }
+
+      helpers.avatar(
+        @user,
+        **options
       )
     end
   end
diff --git a/app/components/users/hover_card_component.html.erb b/app/components/users/hover_card_component.html.erb
new file mode 100644
index 000000000000..7af47f81965e
--- /dev/null
+++ b/app/components/users/hover_card_component.html.erb
@@ -0,0 +1,86 @@
+<%#-- copyright
+OpenProject is an open source project management software.
+Copyright (C) the OpenProject GmbH
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License version 3.
+
+OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+Copyright (C) 2006-2013 Jean-Philippe Lang
+Copyright (C) 2010-2013 the ChiliProject Team
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+See COPYRIGHT and LICENSE files for more details.
+
+++#%>
+
+<%=
+    if @user.present?
+      flex_layout(classes: 'op-user-hover-card', data: { test_selector: "user-hover-card-#{@user.id}" }) do |flex|
+        flex.with_row do
+          render(Users::AvatarComponent.new(user: @user, show_name: false, link: false, hover_card: { active: false }))
+        end
+
+        flex.with_row do
+          flex_layout(classes: 'op-user-hover-card--info') do |f|
+            f.with_column(classes: 'op-user-hover-card--name') do
+              render(Primer::Beta::Text.new(font_weight: :semibold, data: { test_selector: 'user-hover-card-name' })) do
+                @user.name
+              end
+            end
+
+            if show_email?
+              f.with_column(classes: 'op-user-hover-card--email') do
+                render(Primer::Beta::Text.new(font_size: :small,
+                                              color: :muted,
+                                              data: { test_selector: 'user-hover-card-email' })) do
+                  @user.mail
+                end
+              end
+            end
+          end
+        end
+
+        flex.with_row do
+          flex_layout(classes: 'op-user-hover-card--group-list') do |f|
+            f.with_column do
+              render(Primer::Beta::Octicon.new(icon: :people))
+            end
+
+            f.with_column do
+              render(Primer::Beta::Text.new(color: :muted, data: { test_selector: 'user-hover-card-groups' })) do
+                group_membership_summary
+              end
+            end
+          end
+        end
+
+        flex.with_row do
+          render(Primer::Beta::Button.new(tag: :a,
+                                          href: helpers.allowed_management_user_profile_path(@user),
+                                          data: { test_selector: 'user-hover-card-profile-btn' })) do
+            I18n.t("users.open_profile")
+          end
+        end
+      end
+    else
+      render Primer::Beta::Blankslate.new(border: false, narrow: true) do |component|
+        component.with_visual_icon(icon: "x-circle")
+        # Show a generic error message to avoid leaking information
+        component.with_heading(tag: :h3).with_content(I18n.t("http.response.unexpected"))
+      end
+    end
+%>
diff --git a/app/components/users/hover_card_component.rb b/app/components/users/hover_card_component.rb
new file mode 100644
index 000000000000..6afd44af19b2
--- /dev/null
+++ b/app/components/users/hover_card_component.rb
@@ -0,0 +1,95 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+class Users::HoverCardComponent < ApplicationComponent
+  include OpPrimer::ComponentHelpers
+
+  def initialize(id:)
+    super
+
+    @id = id
+    @user = User.find_by(id: @id)
+  end
+
+  def show_email?
+    (@user == User.current) || User.current.allowed_globally?(:view_user_email)
+  end
+
+  # Constructs a string in the form of:
+  # "Member of group4, group5"
+  # or
+  # "Member of group1, group2 and 3 more"
+  # The latter string is cut off since the complete list of group names would exceed the allowed `max_length`.
+  def group_membership_summary(max_length = 40)
+    groups = @user.groups.visible
+    return no_group_text if groups.empty?
+
+    group_links = linked_group_names(groups)
+
+    cutoff_index = calculate_cutoff_index(groups.map(&:name), max_length)
+    build_summary(group_links, cutoff_index)
+  end
+
+  private
+
+  def linked_group_names(groups)
+    groups.map { |group| link_to(h(group.name), show_group_path(group)) }
+  end
+
+  def no_group_text
+    t("users.groups.no_results_title_text")
+  end
+
+  # Calculate the index at which to cut off the group names, based on plain text length
+  def calculate_cutoff_index(names, max_length)
+    current_length = 0
+
+    names.each_with_index do |name, index|
+      new_length = current_length + name.length + (index > 0 ? 2 : 0) # 2 for ", " separator
+      return index if new_length > max_length
+
+      current_length = new_length
+    end
+
+    names.size # No cutoff needed -> return the total size
+  end
+
+  def build_summary(links, cutoff_index)
+    summary_links = safe_join(links[0...cutoff_index], ", ")
+    remaining_count = links.size - cutoff_index
+    remaining_count_link = link_to(t("users.groups.more", count: remaining_count), user_path(@user))
+
+    if remaining_count > 0
+      t("users.groups.summary_with_more", names: summary_links, count_link: remaining_count_link).html_safe
+    else
+      t("users.groups.summary", names: summary_links).html_safe
+    end
+  end
+end
diff --git a/app/components/users/hover_card_component.sass b/app/components/users/hover_card_component.sass
new file mode 100644
index 000000000000..5f8fc8e212b6
--- /dev/null
+++ b/app/components/users/hover_card_component.sass
@@ -0,0 +1,24 @@
+// Correct the z-index of the regular hover card container so that it is above the dropdown of user auto completers
+.spot-modal-overlay:has(.op-user-hover-card)
+  z-index: 9600
+
+// On the project list page, there is a bug when a hover card is invoked within the share dialog. The global spot
+// modal overlay will darken the background while the hover card is active, since its semi-transparent bg shading is
+// added on top of the other dialog background shaders. We don't want an additional spot modal background here,
+// so we disable it for this edge case.
+.controller-projects.action-index, .controller-meetings.action-show
+  .spot-modal-overlay:not(:has(.op-user-hover-card))
+    background: transparent
+
+.op-user-hover-card
+  gap: 1rem
+  overflow: hidden
+
+  &--info
+    gap: 0.5rem
+
+    &--name, &--email
+      @include text-shortener()
+
+  &--group-list
+    gap: 0.5rem
diff --git a/app/components/users/show_page_header_component.html.erb b/app/components/users/show_page_header_component.html.erb
index 9a8ac99ceed6..73a8d63c799f 100644
--- a/app/components/users/show_page_header_component.html.erb
+++ b/app/components/users/show_page_header_component.html.erb
@@ -28,7 +28,9 @@ See COPYRIGHT and LICENSE files for more details.
 ++#%>
 <%=
   render(Primer::OpenProject::PageHeader.new) do |header|
-    header.with_title { "#{avatar @user} #{h(@user.name)}".html_safe }
+    header.with_title do
+      "#{avatar(@user, hover_card: { active: false })} #{h(@user.name)}".html_safe
+    end
     header.with_breadcrumbs(breadcrumb_items)
 
     if @current_user.allowed_globally?(:manage_user)
diff --git a/app/components/work_package_relations_tab/index_component.html.erb b/app/components/work_package_relations_tab/index_component.html.erb
index c12694bc30e6..15d71639e656 100644
--- a/app/components/work_package_relations_tab/index_component.html.erb
+++ b/app/components/work_package_relations_tab/index_component.html.erb
@@ -22,7 +22,7 @@
               Relation::TYPES.each do |relation_type, type_configuration_hash|
                 label_key = "#{I18N_NAMESPACE}.relations.#{type_configuration_hash[:name]}_singular"
                 menu.with_item(
-                  label: t(label_key).capitalize,
+                  label: t(label_key).upcase_first,
                   href: new_relation_path(relation_type:),
                   test_selector: new_button_test_selector(relation_type:),
                   content_arguments: {
@@ -36,7 +36,7 @@
 
             if should_render_add_child?
               menu.with_item(
-                label: t("#{I18N_NAMESPACE}.relations.label_child_singular").capitalize,
+                label: t("#{I18N_NAMESPACE}.relations.label_child_singular").upcase_first,
                 href: new_work_package_children_relation_path(@work_package),
                 test_selector: new_button_test_selector(relation_type: :child),
                 content_arguments: {
@@ -63,7 +63,7 @@
 
           flex.with_row(mb: 4) do
             render_relation_group(
-              title: t("#{base_key}_plural").capitalize,
+              title: t("#{base_key}_plural").upcase_first,
               relation_type:,
               items: relations_of_type
             ) do |relation|
@@ -79,7 +79,7 @@
 
           flex.with_row do
             render_relation_group(
-              title: t("#{base_key}_plural").capitalize,
+              title: t("#{base_key}_plural").upcase_first,
               relation_type: :children,
               items: children
             ) do |child|
diff --git a/app/components/work_package_relations_tab/index_component.rb b/app/components/work_package_relations_tab/index_component.rb
index f886f99da77f..247cc5195945 100644
--- a/app/components/work_package_relations_tab/index_component.rb
+++ b/app/components/work_package_relations_tab/index_component.rb
@@ -1,5 +1,11 @@
 # frozen_string_literal: true
 
+# Component for rendering the relations tab content of a work package
+#
+# This includes:
+# - Controls for adding new relations if the user has permission
+# - Related work packages grouped by relation type (follows, precedes, blocks, etc.)
+# - Child work packages
 class WorkPackageRelationsTab::IndexComponent < ApplicationComponent
   FRAME_ID = "work-package-relations-tab-content"
   NEW_RELATION_ACTION_MENU = "new-relation-action-menu"
@@ -9,15 +15,22 @@ class WorkPackageRelationsTab::IndexComponent < ApplicationComponent
   include Turbo::FramesHelper
   include OpTurbo::Streamable
 
-  attr_reader :work_package, :relations, :children, :directionally_aware_grouped_relations
+  attr_reader :work_package, :relations, :children, :directionally_aware_grouped_relations, :relation_to_scroll_to
 
-  def initialize(work_package:, relations:, children:)
+  # Initialize the component with required data
+  #
+  # @param work_package [WorkPackage] The work package whose relations are being displayed
+  # @param relations [Array<Relation>] The relations associated with this work package
+  # @param children [Array<WorkPackage>] Child work packages
+  # @param relation_to_scroll_to [Relation, WorkPackage, nil] Optional relation or child to scroll to when rendering
+  def initialize(work_package:, relations:, children:, relation_to_scroll_to: nil)
     super()
 
     @work_package = work_package
     @relations = relations
     @children = children
     @directionally_aware_grouped_relations = group_relations_by_directional_context
+    @relation_to_scroll_to = relation_to_scroll_to
   end
 
   def self.wrapper_key
@@ -49,27 +62,55 @@ def group_relations_by_directional_context
   def any_relations? = relations.any? || children.any?
 
   def render_relation_group(title:, relation_type:, items:, &_block)
-    render(border_box_container(padding: :condensed,
-                                data: { test_selector: "op-relation-group-#{relation_type}" })) do |border_box|
-      border_box.with_header(py: 3) do
-        flex_layout(align_items: :center) do |flex|
-          flex.with_column(mr: 2) do
-            render(Primer::Beta::Text.new(font_size: :normal, font_weight: :bold)) { title }
-          end
-          flex.with_column do
-            render(Primer::Beta::Counter.new(count: items.size, round: true, scheme: :primary))
-          end
+    render(border_box_container(
+             padding: :condensed,
+             data: { test_selector: "op-relation-group-#{relation_type}" }
+           )) do |border_box|
+      render_header(border_box, title, items)
+      render_items(border_box, items, &_block)
+    end
+  end
+
+  def render_header(border_box, title, items)
+    border_box.with_header(py: 3) do
+      flex_layout(align_items: :center) do |flex|
+        flex.with_column(mr: 2) do
+          render(Primer::Beta::Text.new(font_size: :normal, font_weight: :bold)) { title }
+        end
+        flex.with_column do
+          render(Primer::Beta::Counter.new(count: items.size, round: true, scheme: :primary))
         end
       end
+    end
+  end
 
-      items.each do |item|
-        border_box.with_row(test_selector: row_test_selector(item)) do
-          yield(item)
-        end
+  def render_items(border_box, items)
+    items.each do |item|
+      border_box.with_row(
+        test_selector: row_test_selector(item),
+        data: data_attribute(item)
+      ) do
+        yield(item)
       end
     end
   end
 
+  def data_attribute(item)
+    if scroll_to?(item)
+      {
+        controller: "work-packages--relations-tab--scroll",
+        application_target: "dynamic",
+        "work-packages--relations-tab--scroll-target": "scrollToRow"
+      }
+    end
+  end
+
+  def scroll_to?(item)
+    relation_to_scroll_to \
+      && item.id == relation_to_scroll_to.id \
+      && item.instance_of?(relation_to_scroll_to.class)
+  end
+
   def new_relation_path(relation_type:)
     raise ArgumentError, "Invalid relation type: #{relation_type}" unless Relation::TYPES.key?(relation_type)
 
@@ -85,11 +126,15 @@ def new_button_test_selector(relation_type:)
   end
 
   def row_test_selector(item)
+    related_work_package_id = find_related_work_package_id(item)
+    "op-relation-row-#{related_work_package_id}"
+  end
+
+  def find_related_work_package_id(item)
     if item.is_a?(Relation)
-      target = item.to == work_package ? item.from : item.to
-      "op-relation-row-#{target.id}"
-    else # Work Package object
-      "op-relation-row-#{item.id}"
+      item.from_id == work_package.id ? item.to_id : item.from_id
+    else
+      item.id
     end
   end
 end
diff --git a/app/components/work_package_relations_tab/relation_component.html.erb b/app/components/work_package_relations_tab/relation_component.html.erb
index 12788bdb76d0..b4cdd78822b4 100644
--- a/app/components/work_package_relations_tab/relation_component.html.erb
+++ b/app/components/work_package_relations_tab/relation_component.html.erb
@@ -58,20 +58,44 @@ flex_layout do |flex|
     end
   end
 
-  if should_display_start_and_end_dates?
-    flex.with_row(flex_layout: true, align_items: :center, mb: 2) do |start_and_end_dates_row|
-      start_and_end_dates_row.with_column(mr: 1) do
-        icon = if follows?
-                 :calendar
-               elsif precedes?
-                 :pin
-               end
+  if should_display_dates_row?
+    flex.with_row(flex_layout: true, align_items: :center, color: :muted, mb: 2) do |dates_row|
+      if precedes? && lag_present?
+        dates_row.with_column(mr: 1) do
+          render(Primer::Beta::Octicon.new(icon: "arrow-both"))
+        end
+        dates_row.with_column(mr: 3) do
+          render(Primer::Beta::Text.new) do
+            lag_as_text(relation.lag)
+          end
+        end
+      end
+
+      if related_work_package.start_date.present? || related_work_package.due_date.present?
+        dates_row.with_column(mr: 1) do
+          icon = if follows?
+                   :calendar
+                 elsif precedes?
+                   :pin
+                 end
 
-        render(Primer::Beta::Octicon.new(icon:, color: :muted))
+          render(Primer::Beta::Octicon.new(icon:))
+        end
+        dates_row.with_column do
+          render(Primer::Beta::Text.new) do
+            "#{format_date(related_work_package.start_date)} - #{format_date(related_work_package.due_date)}"
+          end
+        end
       end
-      start_and_end_dates_row.with_column do
-        render(Primer::Beta::Text.new(color: :muted)) do
-          "#{format_date(related_work_package.start_date)} - #{format_date(related_work_package.due_date)}"
+
+      if follows? && lag_present?
+        dates_row.with_column(ml: 3, mr: 1) do
+          render(Primer::Beta::Octicon.new(icon: "arrow-both"))
+        end
+        dates_row.with_column(mr: 1) do
+          render(Primer::Beta::Text.new) do
+            lag_as_text(relation.lag)
+          end
         end
       end
     end
diff --git a/app/components/work_package_relations_tab/relation_component.rb b/app/components/work_package_relations_tab/relation_component.rb
index c3d210607bc2..5df345651d22 100644
--- a/app/components/work_package_relations_tab/relation_component.rb
+++ b/app/components/work_package_relations_tab/relation_component.rb
@@ -61,7 +61,11 @@ def should_display_description?
     relation.description.present?
   end
 
-  def should_display_start_and_end_dates?
+  def lag_present?
+    relation.lag.present? && relation.lag != 0
+  end
+
+  def should_display_dates_row?
     return false if parent_child_relationship?
 
     relation.follows? || relation.precedes?
@@ -91,6 +95,10 @@ def destroy_path
     end
   end
 
+  def lag_as_text(lag)
+    "#{I18n.t('work_package_relations_tab.lag.subject')}: #{I18n.t('datetime.distance_in_words.x_days', count: lag)}"
+  end
+
   def action_menu_test_selector
     "op-relation-row-#{underlying_resource_id}-action-menu"
   end
diff --git a/app/components/work_package_relations_tab/work_package_relation_dialog_component.html.erb b/app/components/work_package_relations_tab/work_package_relation_dialog_component.html.erb
index 2a804ff50d0b..7d436a98c102 100644
--- a/app/components/work_package_relations_tab/work_package_relation_dialog_component.html.erb
+++ b/app/components/work_package_relations_tab/work_package_relation_dialog_component.html.erb
@@ -21,7 +21,11 @@
           form: FORM_ID,
           data: { turbo: true },
           type: :submit)) do
-          t(:button_save)
+          if @relation.id.present?
+            t(:button_save)
+          else
+            t(:button_add)
+          end
         end
       end
     end
diff --git a/app/components/work_package_relations_tab/work_package_relation_form_component.html.erb b/app/components/work_package_relations_tab/work_package_relation_form_component.html.erb
index 0a6f63688a42..83879e8a97c6 100644
--- a/app/components/work_package_relations_tab/work_package_relation_form_component.html.erb
+++ b/app/components/work_package_relations_tab/work_package_relation_form_component.html.erb
@@ -19,6 +19,7 @@
           # These are not available inside the render_inline_form block
           # so we need to re-define them here. Figure out solution for this.
           relation = @relation
+          lag_shown = show_lag?
           to_id_field_value = relation.to.present? ? "#{related_work_package.type.name.upcase} ##{related_work_package.id} - #{related_work_package.subject}" : nil
           url = ::API::V3::Utilities::PathHelper::ApiV3Path.work_package_available_relation_candidates(@work_package.id, type: relation.relation_type_for(@work_package))
           render_inline_form(f) do |my_form|
@@ -58,6 +59,17 @@
               label: Relation.human_attribute_name(:description),
               autofocus: relation.persisted?
             )
+
+            if lag_shown
+              my_form.text_field(
+                name: :lag,
+                type: :number,
+                min: 0,
+                label: I18n.t("work_package_relations_tab.lag.title"),
+                caption: I18n.t("work_package_relations_tab.lag.caption"),
+                input_width: :small,
+              )
+            end
           end
         end
       end %>
diff --git a/app/components/work_package_relations_tab/work_package_relation_form_component.rb b/app/components/work_package_relations_tab/work_package_relation_form_component.rb
index 938ce175ddf6..264d08770fab 100644
--- a/app/components/work_package_relations_tab/work_package_relation_form_component.rb
+++ b/app/components/work_package_relations_tab/work_package_relation_form_component.rb
@@ -64,4 +64,8 @@ def submit_url_options
         url: work_package_relations_path(@work_package) }
     end
   end
+
+  def show_lag?
+    @relation.relation_type == Relation::TYPE_PRECEDES || @relation.relation_type == Relation::TYPE_FOLLOWS
+  end
 end
diff --git a/app/components/work_packages/exports/generate/modal_dialog_component.html.erb b/app/components/work_packages/exports/generate/modal_dialog_component.html.erb
index 2ca7ef37b7e4..9ed56454b52d 100644
--- a/app/components/work_packages/exports/generate/modal_dialog_component.html.erb
+++ b/app/components/work_packages/exports/generate/modal_dialog_component.html.erb
@@ -1,7 +1,7 @@
 <%= render(Primer::Alpha::Dialog.new(
   title: I18n.t("pdf_generator.dialog.title"),
   id: MODAL_ID,
-  size: :large
+  size: :medium_portrait
 )) do |dialog|
   dialog.with_header(variant: :large)
   dialog.with_body do
diff --git a/app/components/work_packages/reminder/modal_body_component.html.erb b/app/components/work_packages/reminder/modal_body_component.html.erb
new file mode 100644
index 000000000000..ba6347a66282
--- /dev/null
+++ b/app/components/work_packages/reminder/modal_body_component.html.erb
@@ -0,0 +1,52 @@
+<%= component_wrapper(tag: "turbo-frame") do %>
+  <%= primer_form_with(
+        model: reminder,
+        url: submit_path,
+        id: FORM_ID
+      ) do |f| %>
+    <%= flex_layout(classes: "reminder-modal-body--form-flex-container") do |form_flex_container| %>
+      <%= form_flex_container.with_row do %>
+        <%= render(WorkPackages::Reminder::RemindAtDate.new(f, initial_value: remind_at_date_initial_value)) %>
+      <% end %>
+      <%= form_flex_container.with_row do %>
+        <%= render(WorkPackages::Reminder::RemindAtTime.new(f, initial_value: remind_at_time_initial_value)) %>
+      <% end %>
+      <%= form_flex_container.with_row do %>
+        <%= render(WorkPackages::Reminder::Note.new(f)) %>
+      <% end %>
+      <% if reminder.persisted? %>
+        <%= form_flex_container.with_row(flex_layout: true,
+                                         justify_content: :space_between) do |actions_row| %>
+          <%= actions_row.with_column do %>
+            <%= render(Primer::Beta::Button.new(
+                        scheme: :danger,
+                        type: :submit,
+                        formaction: work_package_reminder_path(remindable, reminder),
+                        formmethod: :delete
+                      )) { I18n.t(:button_remove_reminder) } %>
+          <% end %>
+          <%= actions_row.with_column(flex_layout: true) do |actions_sub_row| %>
+            <%= actions_sub_row.with_column(mr: 2) do %>
+              <%= render(Primer::Beta::Button.new(**cancel_button_props)) { I18n.t(:button_cancel) } %>
+            <% end %>
+            <%= actions_sub_row.with_column do %>
+              <%= render(Primer::Beta::Button.new(scheme: :primary,
+                                                type: :submit)) { I18n.t(:button_save) } %>
+            <% end %>
+          <% end%>
+        <% end %>
+      <% else%>
+        <%= form_flex_container.with_row(flex_layout: true,
+                                         justify_content: :flex_end) do |actions_row| %>
+          <%= actions_row.with_column(mr: 2) do %>
+            <%= render(Primer::Beta::Button.new(**cancel_button_props)) { I18n.t(:button_cancel) } %>
+          <% end %>
+          <%= actions_row.with_column do %>
+            <%= render(Primer::Beta::Button.new(scheme: :primary,
+                                              type: :submit)) { I18n.t(:button_set_reminder) } %>
+          <% end %>
+        <% end %>
+      <% end%>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/components/work_packages/reminder/modal_body_component.rb b/app/components/work_packages/reminder/modal_body_component.rb
new file mode 100644
index 000000000000..b723e4621973
--- /dev/null
+++ b/app/components/work_packages/reminder/modal_body_component.rb
@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module WorkPackages
+  module Reminder
+    class ModalBodyComponent < ApplicationComponent
+      include ApplicationHelper
+      include OpTurbo::Streamable
+      include OpPrimer::ComponentHelpers
+
+      FORM_ID = "reminder-form"
+
+      attr_reader :remindable, :reminder, :errors
+
+      def initialize(remindable:, reminder:, errors: nil)
+        super
+
+        @remindable = remindable
+        @reminder = reminder
+        @errors = errors
+      end
+
+      class << self
+        def wrapper_key
+          "reminder_modal_body"
+        end
+      end
+
+      def submit_path
+        if @reminder.persisted?
+          work_package_reminder_path(@remindable, @reminder)
+        else
+          work_package_reminders_path(@remindable)
+        end
+      end
+
+      def submit_button_text
+        if @reminder.persisted?
+          I18n.t(:button_save)
+        else
+          I18n.t(:button_set_reminder)
+        end
+      end
+
+      def cancel_button_props
+        {
+          scheme: :secondary,
+          data: {
+            controller: "primer-to-angular-modal",
+            application_target: "dynamic",
+            action: "click->primer-to-angular-modal#close",
+            test_selector: "op-reminder-modal-close-button"
+          }
+        }
+      end
+
+      def remind_at_date_initial_value
+        format_time_as_date(@reminder.remind_at, format: "%Y-%m-%d")
+      end
+
+      def remind_at_time_initial_value
+        format_time(@reminder.remind_at, include_date: false, format: "%H:%M")
+      end
+    end
+  end
+end
diff --git a/app/components/work_packages/reminder/modal_body_component.sass b/app/components/work_packages/reminder/modal_body_component.sass
new file mode 100644
index 000000000000..3383e0b00196
--- /dev/null
+++ b/app/components/work_packages/reminder/modal_body_component.sass
@@ -0,0 +1,3 @@
+.reminder-modal-body
+  &--form-flex-container
+    gap: 1rem
diff --git a/app/views/projects/settings/_form_toolbar.html.erb b/app/components/work_packages/types/subject_configuration_component.html.erb
similarity index 90%
rename from app/views/projects/settings/_form_toolbar.html.erb
rename to app/components/work_packages/types/subject_configuration_component.html.erb
index 0ec768f89424..95792457632a 100644
--- a/app/views/projects/settings/_form_toolbar.html.erb
+++ b/app/components/work_packages/types/subject_configuration_component.html.erb
@@ -27,6 +27,8 @@ See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
 
-<li class="form--toolbar-item -in-header">
-  (<%= check_all_links form_name %>)
-</li>
+<%=
+  primer_form_with(**form_options) do |f|
+    render(WorkPackages::Types::SubjectConfigurationForm.new(f))
+  end
+%>
diff --git a/app/components/work_packages/types/subject_configuration_component.rb b/app/components/work_packages/types/subject_configuration_component.rb
new file mode 100644
index 000000000000..88850e1b7e9d
--- /dev/null
+++ b/app/components/work_packages/types/subject_configuration_component.rb
@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module WorkPackages
+  module Types
+    class SubjectConfigurationComponent < ApplicationComponent
+      include OpPrimer::ComponentHelpers
+      include OpTurbo::Streamable
+
+      def form_options
+        {
+          url: "https://example.com",
+          method: :put,
+          model:,
+          data: {
+            application_target: "dynamic",
+            controller: "admin--subject-configuration",
+            admin__subject_configuration_hide_pattern_input_value: true
+          }
+        }
+      end
+    end
+  end
+end
diff --git a/app/contracts/api_tokens/create_contract.rb b/app/contracts/api_tokens/create_contract.rb
index f9c3d93484f4..b4835e55eb6c 100644
--- a/app/contracts/api_tokens/create_contract.rb
+++ b/app/contracts/api_tokens/create_contract.rb
@@ -32,7 +32,7 @@ module APITokens
   class CreateContract < BaseContract
     attribute :token_name
 
-    validates :token_name, presence: { message: I18n.t("my.access_token.errors.token_name_blank") }
+    validates :token_name, presence: { message: proc { I18n.t("my.access_token.errors.token_name_blank") } }
     validate :token_name_is_unique, unless: :token_name_is_blank?
 
     private
diff --git a/app/contracts/model_contract.rb b/app/contracts/model_contract.rb
index efa06281f331..35cdf5b58c62 100644
--- a/app/contracts/model_contract.rb
+++ b/app/contracts/model_contract.rb
@@ -48,7 +48,7 @@ class ModelContract < BaseContract
   # This of course is only true if that contract validates the model and
   # if the model has an errors object.
   def valid?(context = nil)
-    model.valid? if validate_model?
+    model.valid?(context) if validate_model?
 
     contract_valid?(context, clear_errors: !validate_model?)
   end
@@ -61,7 +61,8 @@ def valid?(context = nil)
   #   Clearing would then be done in the #valid? method by calling model.valid?
   # * Checks for readonly attributes being changed
   def contract_valid?(context = nil, clear_errors: false)
-    current_context, self.validation_context = validation_context, context # rubocop:disable Style/ParallelAssignment
+    current_context = validation_context
+    self.validation_context = context
 
     errors.clear if clear_errors
 
diff --git a/app/contracts/project_life_cycle_steps/base_contract.rb b/app/contracts/project_life_cycle_steps/base_contract.rb
new file mode 100644
index 000000000000..9e4124d06e63
--- /dev/null
+++ b/app/contracts/project_life_cycle_steps/base_contract.rb
@@ -0,0 +1,87 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module ProjectLifeCycleSteps
+  class BaseContract < ::ModelContract
+    validate :select_custom_fields_permission
+    validate :consecutive_steps_have_increasing_dates
+
+    def valid?(context = :saving_life_cycle_steps)
+      super
+    end
+
+    def select_custom_fields_permission
+      return if user.allowed_in_project?(:edit_project_stages_and_gates, model)
+
+      errors.add :base, :error_unauthorized
+    end
+
+    def consecutive_steps_have_increasing_dates
+      # Filter out steps with missing dates before proceeding with comparison
+      filtered_steps = model.available_life_cycle_steps.select(&:start_date)
+
+      # Only proceed with comparisons if there are at least 2 valid steps
+      return if filtered_steps.size < 2
+
+      # Compare consecutive steps in pairs
+      filtered_steps.each_cons(2) do |previous_step, current_step|
+        if has_invalid_dates?(previous_step, current_step)
+          step = previous_step.is_a?(Project::Stage) ? "Stage" : "Gate"
+          field = current_step.is_a?(Project::Stage) ? :date_range : :date
+          model.errors.import(
+            current_step.errors.add(field, :non_continuous_dates, step:),
+            attribute: :"available_life_cycle_steps.#{field}"
+          )
+        end
+      end
+    end
+
+    private
+
+    def start_date_for(step)
+      step.start_date
+    end
+
+    def end_date_for(step)
+      case step
+      when Project::Gate
+        step.date
+      when Project::Stage
+        step.end_date || step.start_date # Use the start_date as fallback for single date stages
+      end
+    end
+
+    def has_invalid_dates?(previous_step, current_step)
+      if previous_step.instance_of?(current_step.class)
+        start_date_for(current_step) <= end_date_for(previous_step)
+      else
+        start_date_for(current_step) < end_date_for(previous_step)
+      end
+    end
+  end
+end
diff --git a/app/contracts/project_life_cycle_steps/update_contract.rb b/app/contracts/project_life_cycle_steps/update_contract.rb
new file mode 100644
index 000000000000..28b22227eaa4
--- /dev/null
+++ b/app/contracts/project_life_cycle_steps/update_contract.rb
@@ -0,0 +1,32 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module ProjectLifeCycleSteps
+  class UpdateContract < BaseContract
+  end
+end
diff --git a/app/contracts/reminders/base_contract.rb b/app/contracts/reminders/base_contract.rb
new file mode 100644
index 000000000000..6f2767ccf5ca
--- /dev/null
+++ b/app/contracts/reminders/base_contract.rb
@@ -0,0 +1,91 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2012-2024 the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module Reminders
+  class BaseContract < ::ModelContract
+    MAX_NOTE_CHARS_LENGTH = 128
+
+    attribute :creator_id
+    attribute :remindable_id
+    attribute :remindable_type
+    attribute :remind_at
+    attribute :note
+
+    validate :validate_creator_exists
+    validate :validate_acting_user
+    validate :validate_remindable_exists
+    validate :validate_manage_reminders_permissions
+    validate :validate_remind_at_present
+    validate :validate_remind_at_is_in_future
+    validate :validate_note_length
+
+    def self.model = Reminder
+
+    private
+
+    def validate_creator_exists
+      errors.add :creator, :not_found unless User.exists?(model.creator_id)
+    end
+
+    def validate_acting_user
+      errors.add :creator, :invalid unless model.creator_id == user.id
+    end
+
+    def validate_remindable_exists
+      errors.add :remindable, :not_found if model.remindable.blank?
+    end
+
+    def validate_remind_at_present
+      errors.add :remind_at, :blank if model.remind_at.blank?
+    end
+
+    def validate_remind_at_is_in_future
+      if model.remind_at.present? && model.remind_at < Time.current
+        errors.add :remind_at, :datetime_must_be_in_future
+      end
+    end
+
+    def validate_note_length
+      if model.note.present? && model.note.length > MAX_NOTE_CHARS_LENGTH
+        errors.add :note, :too_long, count: MAX_NOTE_CHARS_LENGTH
+      end
+    end
+
+    def validate_manage_reminders_permissions
+      return if errors.added?(:remindable, :not_found)
+
+      unless can_manage_reminders?
+        errors.add :base, :error_unauthorized
+      end
+    end
+
+    def can_manage_reminders?
+      user.logged? && user.allowed_in_project?(:view_work_packages, model.remindable.project)
+    end
+  end
+end
diff --git a/app/contracts/reminders/create_contract.rb b/app/contracts/reminders/create_contract.rb
new file mode 100644
index 000000000000..6bc3c01eb76a
--- /dev/null
+++ b/app/contracts/reminders/create_contract.rb
@@ -0,0 +1,32 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2012-2024 the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module Reminders
+  class CreateContract < BaseContract
+  end
+end
diff --git a/app/contracts/reminders/delete_contract.rb b/app/contracts/reminders/delete_contract.rb
new file mode 100644
index 000000000000..06895868e6c4
--- /dev/null
+++ b/app/contracts/reminders/delete_contract.rb
@@ -0,0 +1,36 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2012-2024 the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module Reminders
+  class DeleteContract < ::DeleteContract
+    delete_permission -> {
+      # The user can delete the reminder if they created it
+      model.creator_id == user.id
+    }
+  end
+end
diff --git a/app/contracts/reminders/update_contract.rb b/app/contracts/reminders/update_contract.rb
new file mode 100644
index 000000000000..de462cfec17d
--- /dev/null
+++ b/app/contracts/reminders/update_contract.rb
@@ -0,0 +1,41 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2012-2024 the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module Reminders
+  class UpdateContract < BaseContract
+    validate :unchangeable_attributes
+
+    private
+
+    def unchangeable_attributes
+      if model.remindable_changed? || model.creator_id_changed?
+        errors.add(:base, :unchangeable)
+      end
+    end
+  end
+end
diff --git a/app/controllers/concerns/accounts/authorization.rb b/app/controllers/concerns/accounts/authorization.rb
index 3d4227a43ded..93320f71eb19 100644
--- a/app/controllers/concerns/accounts/authorization.rb
+++ b/app/controllers/concerns/accounts/authorization.rb
@@ -196,5 +196,27 @@ def clone_authorization_ensured
                                      generally_allowed: authorization_ensured[:generally_allowed],
                                      controller: self }
     end
+
+    # Authorize on the given permission
+    def authorize_with_permission(permission, global: false, **args)
+      authorization_checked_by_default_action(**args.slice(:only, :except))
+
+      before_action(**args) do
+        do_authorize(permission, global:)
+      end
+    end
+
+    # Find a project based on params[:project_id]
+    # and authorize on a given permission
+    def load_and_authorize_with_permission_in_optional_project(permission, **args)
+      authorization_checked_by_default_action(**args.slice(:only, :except))
+
+      before_action(**args) do
+        @project = Project.find(params[:project_id]) if params[:project_id].present?
+        do_authorize(permission, global: params[:project_id].blank?)
+      rescue ActiveRecord::RecordNotFound
+        render_404
+      end
+    end
   end
 end
diff --git a/app/controllers/concerns/op_turbo/component_stream.rb b/app/controllers/concerns/op_turbo/component_stream.rb
index 6d3b3fa27162..f7cd5e1369bc 100644
--- a/app/controllers/concerns/op_turbo/component_stream.rb
+++ b/app/controllers/concerns/op_turbo/component_stream.rb
@@ -42,23 +42,24 @@ def respond_to_with_turbo_streams(status: turbo_status, &format_block)
 
     alias_method :respond_with_turbo_streams, :respond_to_with_turbo_streams
 
-    def update_via_turbo_stream(component:, status: :ok)
-      modify_via_turbo_stream(component:, action: :update, status:)
+    def update_via_turbo_stream(component:, status: :ok, method: nil)
+      modify_via_turbo_stream(component:, action: :update, status:, method:)
     end
 
-    def replace_via_turbo_stream(component:, status: :ok)
-      modify_via_turbo_stream(component:, action: :replace, status:)
+    def replace_via_turbo_stream(component:, status: :ok, method: nil)
+      modify_via_turbo_stream(component:, action: :replace, status:, method:)
     end
 
     def remove_via_turbo_stream(component:, status: :ok)
       modify_via_turbo_stream(component:, action: :remove, status:)
     end
 
-    def modify_via_turbo_stream(component:, action:, status:)
+    def modify_via_turbo_stream(component:, action:, status:, method: nil)
       @turbo_status = status
       turbo_streams << component.render_as_turbo_stream(
         view_context:,
-        action:
+        action:,
+        method:
       )
     end
 
@@ -74,8 +75,8 @@ def add_before_via_turbo_stream(component:, target_component:)
       turbo_streams << target_component.insert_as_turbo_stream(component:, view_context:, action: :before)
     end
 
-    def render_error_flash_message_via_turbo_stream(**kwargs)
-      update_flash_message_via_turbo_stream(**kwargs.merge(scheme: :danger, icon: :stop))
+    def render_error_flash_message_via_turbo_stream(**)
+      update_flash_message_via_turbo_stream(**, scheme: :danger, icon: :stop)
     end
 
     def update_flash_message_via_turbo_stream(message:, component: OpPrimer::FlashComponent, **)
@@ -89,6 +90,12 @@ def scroll_into_view_via_turbo_stream(target, behavior: :auto, block: :start)
         .render_in(view_context)
     end
 
+    def add_caption_to_input_element_via_turbo_stream(target, caption:, clean_other_captions: true)
+      turbo_streams << OpTurbo::StreamComponent
+        .new(action: :addInputCaption, target:, caption:, clean_other_captions:)
+        .render_in(view_context)
+    end
+
     def turbo_streams
       @turbo_streams ||= []
     end
diff --git a/app/controllers/forums_controller.rb b/app/controllers/forums_controller.rb
index 434b7686ffd9..414248f8161a 100644
--- a/app/controllers/forums_controller.rb
+++ b/app/controllers/forums_controller.rb
@@ -35,7 +35,6 @@ class ForumsController < ApplicationController
   accept_key_auth :show
 
   include SortHelper
-  include WatchersHelper
   include PaginationHelper
 
   def index
diff --git a/app/controllers/projects/settings/life_cycle_steps_controller.rb b/app/controllers/projects/settings/life_cycle_steps_controller.rb
new file mode 100644
index 000000000000..c28a3b12ab93
--- /dev/null
+++ b/app/controllers/projects/settings/life_cycle_steps_controller.rb
@@ -0,0 +1,81 @@
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2010-2024 the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+# ++
+
+class Projects::Settings::LifeCycleStepsController < Projects::SettingsController
+  include OpTurbo::ComponentStream
+
+  before_action :deny_access_on_feature_flag
+
+  before_action :load_life_cycle_definitions, only: %i[index enable_all disable_all]
+
+  menu_item :settings_life_cycle_steps
+
+  def index; end
+
+  def toggle
+    definition = Project::LifeCycleStepDefinition.where(id: params[:id])
+
+    upsert_steps(definition, active: params["value"])
+  end
+
+  def disable_all
+    upsert_steps(@life_cycle_definitions, active: false)
+
+    redirect_to action: :index
+  end
+
+  def enable_all
+    upsert_steps(@life_cycle_definitions, active: true)
+
+    redirect_to action: :index
+  end
+
+  private
+
+  def load_life_cycle_definitions
+    @life_cycle_definitions = Project::LifeCycleStepDefinition.order(position: :asc)
+  end
+
+  def deny_access_on_feature_flag
+    deny_access(not_found: true) unless OpenProject::FeatureDecisions.stages_and_gates_active?
+  end
+
+  def upsert_steps(definitions, active:)
+    Project::LifeCycleStep.upsert_all(
+      definitions.map do |definition|
+        {
+          project_id: @project.id,
+          definition_id: definition.id,
+          active:,
+          type: definition.step_class
+        }
+      end,
+      unique_by: %i[project_id definition_id]
+    )
+  end
+end
diff --git a/app/controllers/users/hover_card_controller.rb b/app/controllers/users/hover_card_controller.rb
new file mode 100644
index 000000000000..714c09a96589
--- /dev/null
+++ b/app/controllers/users/hover_card_controller.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+class Users::HoverCardController < ApplicationController
+  no_authorization_required! :show
+
+  def show
+    @id = params[:id]
+    render layout: nil
+  end
+end
diff --git a/app/controllers/work_package_children_relations_controller.rb b/app/controllers/work_package_children_relations_controller.rb
index 2f1fb1574e5f..539961766bbe 100644
--- a/app/controllers/work_package_children_relations_controller.rb
+++ b/app/controllers/work_package_children_relations_controller.rb
@@ -46,7 +46,7 @@ def create
     child = WorkPackage.find(params[:work_package][:id])
     service_result = set_relation(child:, parent: @work_package)
 
-    respond_with_relations_tab_update(service_result)
+    respond_with_relations_tab_update(service_result, relation_to_scroll_to: service_result.result)
   end
 
   def destroy
@@ -63,13 +63,14 @@ def set_relation(child:, parent:)
                                .call(parent:)
   end
 
-  def respond_with_relations_tab_update(service_result)
+  def respond_with_relations_tab_update(service_result, **)
     if service_result.success?
       @work_package.reload
       component = WorkPackageRelationsTab::IndexComponent.new(
         work_package: @work_package,
         relations: @work_package.relations.visible,
-        children: @work_package.children.visible
+        children: @work_package.children.visible,
+        **
       )
       replace_via_turbo_stream(component:)
       update_flash_message_via_turbo_stream(
diff --git a/app/controllers/work_package_relations_controller.rb b/app/controllers/work_package_relations_controller.rb
index 6be607a1669d..02e7f68b0134 100644
--- a/app/controllers/work_package_relations_controller.rb
+++ b/app/controllers/work_package_relations_controller.rb
@@ -63,7 +63,8 @@ def create
       @work_package.reload
       component = WorkPackageRelationsTab::IndexComponent.new(work_package: @work_package,
                                                               relations: @work_package.relations.visible,
-                                                              children: @work_package.children.visible)
+                                                              children: @work_package.children.visible,
+                                                              relation_to_scroll_to: service_result.result)
       replace_via_turbo_stream(component:)
       respond_with_turbo_streams
     else
@@ -122,12 +123,12 @@ def set_relation
 
   def create_relation_params
     params.require(:relation)
-          .permit(:relation_type, :to_id, :description)
+          .permit(:relation_type, :to_id, :description, :lag)
           .merge(from_id: @work_package.id)
   end
 
   def update_relation_params
     params.require(:relation)
-          .permit(:description)
+          .permit(:description, :lag)
   end
 end
diff --git a/app/controllers/work_packages/reminders_controller.rb b/app/controllers/work_packages/reminders_controller.rb
new file mode 100644
index 000000000000..7866147aea1d
--- /dev/null
+++ b/app/controllers/work_packages/reminders_controller.rb
@@ -0,0 +1,213 @@
+# frozen_string_literal: true
+
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+# ++
+
+class WorkPackages::RemindersController < ApplicationController
+  include OpTurbo::ComponentStream
+  layout false
+  before_action :find_work_package
+  before_action :build_or_find_reminder, only: %i[modal_body create]
+  before_action :find_reminder, only: %i[update destroy]
+
+  before_action :authorize
+
+  def modal_body
+    render modal_component_class.new(
+      remindable: @work_package,
+      reminder: @reminder
+    )
+  end
+
+  def create
+    service_result = Reminders::CreateService.new(user: current_user)
+                                             .call(reminder_params)
+
+    if service_result.success?
+      update_flash_message_via_turbo_stream(
+        message: I18n.t("work_package.reminders.success_creation_message"),
+        scheme: :success
+      )
+      respond_with_turbo_streams
+    else
+      prepare_errors_from_result(service_result)
+
+      replace_via_turbo_stream(
+        component: modal_component_class.new(
+          remindable: @work_package,
+          reminder: @reminder,
+          errors: @errors
+        )
+      )
+
+      respond_with_turbo_streams(status: :unprocessable_entity)
+    end
+  end
+
+  def update
+    service_result = Reminders::UpdateService.new(user: current_user,
+                                                  model: @reminder)
+                                             .call(reminder_params)
+
+    if service_result.success?
+      update_flash_message_via_turbo_stream(
+        message: I18n.t("work_package.reminders.success_update_message"),
+        scheme: :success
+      )
+      respond_with_turbo_streams
+    else
+      prepare_errors_from_result(service_result)
+
+      replace_via_turbo_stream(
+        component: modal_component_class.new(
+          remindable: @work_package,
+          reminder: @reminder,
+          errors: @errors
+        )
+      )
+
+      respond_with_turbo_streams(status: :unprocessable_entity)
+    end
+  end
+
+  def destroy
+    service_result = Reminders::DeleteService.new(user: current_user,
+                                                  model: @reminder)
+                                             .call
+
+    if service_result.success?
+      update_flash_message_via_turbo_stream(
+        message: I18n.t("work_package.reminders.success_deletion_message"),
+        scheme: :success
+      )
+      respond_with_turbo_streams
+    else
+      update_flash_message_via_turbo_stream(
+        message: service_result.errors.full_messages,
+        scheme: :danger
+      )
+      respond_with_turbo_streams(status: :unprocessable_entity)
+    end
+  end
+
+  private
+
+  def modal_component_class
+    WorkPackages::Reminder::ModalBodyComponent
+  end
+
+  def find_work_package
+    @work_package = WorkPackage.visible.find(params[:work_package_id])
+  end
+
+  # At the form level, we split the date and time into two form fields.
+  # In order to be a bit more informative of which field is causing
+  # the remind_at attribute to be in the past/invalid, we need to
+  # remap the error attribute to the appropriate field.
+  def prepare_errors_from_result(service_result)
+    # We set the reminder here for "create" case
+    # as the record comes from the service.
+    @reminder = service_result.result
+    @errors = service_result.errors
+
+    case @errors.find { |error| error.attribute == :remind_at }&.type
+    when :blank
+      handle_blank_error
+    when :datetime_must_be_in_future
+      handle_future_error
+    end
+
+    @errors.delete(:remind_at)
+  end
+
+  def handle_blank_error
+    @errors.add(:remind_at_date, :blank) if remind_at_date.blank?
+    @errors.add(:remind_at_time, :blank) if remind_at_time.blank?
+  end
+
+  def handle_future_error
+    @errors.add(:remind_at_date, :datetime_must_be_in_future) if @reminder.remind_at.to_date < today_in_user_time_zone
+    @errors.add(:remind_at_time, :datetime_must_be_in_future) if @reminder.remind_at < now_in_user_time_zone
+  end
+
+  def now_in_user_time_zone
+    @now_in_user_time_zone ||= Time.current
+                                   .in_time_zone(User.current.time_zone)
+  end
+
+  def today_in_user_time_zone
+    @today_in_user_time_zone ||= now_in_user_time_zone.to_date
+  end
+
+  # We assume for now that there is only one reminder per work package
+  def build_or_find_reminder
+    @reminder = @work_package.reminders
+                             .upcoming_and_visible_to(User.current)
+                             .last || @work_package.reminders.build
+  end
+
+  def find_reminder
+    @reminder = @work_package.reminders
+                             .upcoming_and_visible_to(User.current)
+                             .find(params[:id])
+  rescue ActiveRecord::RecordNotFound
+    update_flash_message_via_turbo_stream(
+      message: I18n.t(:error_reminder_not_found),
+      scheme: :danger
+    )
+    respond_with_turbo_streams(status: :not_found)
+    false
+  end
+
+  def reminder_params
+    params.require(:reminder)
+          .permit(%i[remind_at_date remind_at_time note])
+          .tap do |initial_params|
+      date = initial_params.delete(:remind_at_date)
+      time = initial_params.delete(:remind_at_time)
+
+      initial_params[:remind_at] = build_remind_at_from_params(date, time)
+      initial_params[:remindable] = @work_package
+      initial_params[:creator] = User.current
+    end
+  end
+
+  def build_remind_at_from_params(remind_at_date, remind_at_time)
+    if remind_at_date.present? && remind_at_time.present?
+      DateTime.parse("#{remind_at_date} #{User.current.time_zone.parse(remind_at_time)}")
+    end
+  end
+
+  def remind_at_date
+    params[:reminder][:remind_at_date]
+  end
+
+  def remind_at_time
+    params[:reminder][:remind_at_time]
+  end
+end
diff --git a/app/forms/application_form.rb b/app/forms/application_form.rb
index cb52b5b980f0..2fe86546d088 100644
--- a/app/forms/application_form.rb
+++ b/app/forms/application_form.rb
@@ -40,6 +40,11 @@ def url_helpers
     Rails.application.routes.url_helpers
   end
 
+  # @return [ActionView::Base] the view helper instance
+  def helpers
+    @view_context.helpers
+  end
+
   # @return [ActiveRecord::Base] the model instance given to the form builder
   def model
     @builder.object
diff --git a/app/forms/projects/life_cycles/form.rb b/app/forms/projects/life_cycles/form.rb
new file mode 100644
index 000000000000..6d0233b90460
--- /dev/null
+++ b/app/forms/projects/life_cycles/form.rb
@@ -0,0 +1,104 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+module Projects::LifeCycles
+  class Form < ApplicationForm
+    form do |f|
+      life_cycle_input(f)
+    end
+
+    private
+
+    def life_cycle_input(form)
+      case model
+      when Project::Stage
+        multi_value_life_cycle_input(form)
+      when Project::Gate
+        single_value_life_cycle_input(form)
+      else
+        raise NotImplementedError, "Unknown life cycle definition type #{model.class.name}"
+      end
+    end
+
+    def qa_field_name
+      "life-cycle-step-#{model.id}"
+    end
+
+    def base_input_attributes
+      {
+        label: "#{icon} #{text}".html_safe, # rubocop:disable Rails/OutputSafety
+        leading_visual: { icon: :calendar },
+        datepicker_options: {
+          inDialog: true,
+          data: { action: "change->overview--project-life-cycles-form#previewForm" }
+        },
+        wrapper_data_attributes: {
+          "qa-field-name": qa_field_name
+        }
+      }
+    end
+
+    def single_value_life_cycle_input(form)
+      input_attributes = { name: :date, value: model.date }
+
+      form.single_date_picker **base_input_attributes, **input_attributes
+    end
+
+    def multi_value_life_cycle_input(form)
+      value = [model.start_date, model.end_date].compact.join(" - ")
+
+      input_attributes = { name: :date_range, value: }
+      if model.working_days_count
+        input_attributes[:caption] =
+          I18n.t("project_stage.working_days_count", count: model.working_days_count)
+      end
+
+      form.range_date_picker **base_input_attributes, **input_attributes
+    end
+
+    def text
+      model.name
+    end
+
+    def icon
+      icon_name = case model
+                  when Project::Stage
+                    :"git-commit"
+                  when Project::Gate
+                    :diamond
+                  else
+                    raise NotImplementedError, "Unknown model #{model.class} to render a LifeCycleForm with"
+                  end
+
+      render Primer::Beta::Octicon.new(icon: icon_name, classes: icon_color_class)
+    end
+
+    def icon_color_class
+      helpers.hl_inline_class("life_cycle_step_definition", model.definition)
+    end
+  end
+end
diff --git a/app/forms/shares/invitee.rb b/app/forms/shares/invitee.rb
index e8eb8f8407d9..c60ed79d1c3c 100644
--- a/app/forms/shares/invitee.rb
+++ b/app/forms/shares/invitee.rb
@@ -51,14 +51,17 @@ class Invitee < ApplicationForm
           multiple: true,
           focusDirectly: true,
           appendToComponent: true,
-          disabled: @disabled
+          disabled: @disabled,
+          isOpenedInModal: true,
+          hoverCards: @allow_hover_cards
         }
       )
     end
 
-    def initialize(disabled: false)
+    def initialize(disabled: false, allow_hover_cards: false)
       super()
       @disabled = disabled
+      @allow_hover_cards = allow_hover_cards
     end
   end
 end
diff --git a/app/forms/statuses/form.rb b/app/forms/statuses/form.rb
index 522755be2aad..c8b3c46490e1 100644
--- a/app/forms/statuses/form.rb
+++ b/app/forms/statuses/form.rb
@@ -106,7 +106,8 @@ def initialize(submit_label: nil)
       statuses_form.color_select_list(
         label: attribute_name(:color_id),
         name: :color_id,
-        caption: I18n.t("statuses.edit.status_color_text")
+        caption: I18n.t("statuses.edit.status_color_text"),
+        input_width: :medium
       )
 
       statuses_form.submit(
diff --git a/app/forms/work_packages/activities_tab/journals/submit.rb b/app/forms/work_packages/activities_tab/journals/submit.rb
index 08bce83ed9ea..defd84b26d54 100644
--- a/app/forms/work_packages/activities_tab/journals/submit.rb
+++ b/app/forms/work_packages/activities_tab/journals/submit.rb
@@ -28,7 +28,7 @@
 module WorkPackages::ActivitiesTab::Journals
   class Submit < ApplicationForm
     form do |notes_form|
-      notes_form.submit(name: :submit, label: "Save", scheme: :primary,
+      notes_form.submit(name: :submit, label: I18n.t("button_save"), scheme: :primary,
                         data: { test_selector: "op-submit-work-package-journal-form" })
     end
   end
diff --git a/app/forms/work_packages/reminder/note.rb b/app/forms/work_packages/reminder/note.rb
new file mode 100644
index 000000000000..35d278583718
--- /dev/null
+++ b/app/forms/work_packages/reminder/note.rb
@@ -0,0 +1,45 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+class WorkPackages::Reminder::Note < ApplicationForm
+  form do |reminder_form|
+    reminder_form.text_field(
+      name: :note,
+      required: false,
+      label: WorkPackage.human_attribute_name(:note),
+      placeholder: @placeholder,
+      visually_hide_label: false
+    )
+  end
+
+  def initialize
+    super
+
+    @placeholder = I18n.t("work_package.reminders.note_placeholder")
+  end
+end
diff --git a/modules/meeting/app/forms/meeting/start_date.rb b/app/forms/work_packages/reminder/remind_at_date.rb
similarity index 85%
rename from modules/meeting/app/forms/meeting/start_date.rb
rename to app/forms/work_packages/reminder/remind_at_date.rb
index ff5824535374..68c0e01f2b4f 100644
--- a/modules/meeting/app/forms/meeting/start_date.rb
+++ b/app/forms/work_packages/reminder/remind_at_date.rb
@@ -26,14 +26,14 @@
 # See COPYRIGHT and LICENSE files for more details.
 #++
 
-class Meeting::StartDate < ApplicationForm
-  form do |meeting_form|
-    meeting_form.text_field(
-      name: :start_date,
+class WorkPackages::Reminder::RemindAtDate < ApplicationForm
+  form do |reminder_form|
+    reminder_form.text_field(
+      name: :remind_at_date,
       type: "date",
       value: @initial_value,
-      placeholder: Meeting.human_attribute_name(:start_date),
-      label: Meeting.human_attribute_name(:start_date),
+      placeholder: I18n.t(:label_date),
+      label: I18n.t(:label_date),
       leading_visual: { icon: :calendar },
       required: true,
       autofocus: false
@@ -41,6 +41,8 @@ class Meeting::StartDate < ApplicationForm
   end
 
   def initialize(initial_value: DateTime.now.strftime("%Y-%m-%d"))
+    super()
+
     @initial_value = initial_value
   end
 end
diff --git a/modules/meeting/app/forms/meeting/start_time.rb b/app/forms/work_packages/reminder/remind_at_time.rb
similarity index 85%
rename from modules/meeting/app/forms/meeting/start_time.rb
rename to app/forms/work_packages/reminder/remind_at_time.rb
index 36b43092839e..221b9ab27618 100644
--- a/modules/meeting/app/forms/meeting/start_time.rb
+++ b/app/forms/work_packages/reminder/remind_at_time.rb
@@ -26,23 +26,26 @@
 # See COPYRIGHT and LICENSE files for more details.
 #++
 
-class Meeting::StartTime < ApplicationForm
+class WorkPackages::Reminder::RemindAtTime < ApplicationForm
   include Redmine::I18n
 
-  form do |meeting_form|
-    meeting_form.text_field(
-      name: :start_time_hour,
+  form do |reminder_form|
+    reminder_form.text_field(
+      name: :remind_at_time,
       type: "time",
       value: @initial_value,
-      placeholder: Meeting.human_attribute_name(:start_time),
-      label: Meeting.human_attribute_name(:start_time),
+      placeholder: I18n.t(:label_time),
+      label: I18n.t(:label_time),
       leading_visual: { icon: :clock },
       required: true,
+      autofocus: false,
       caption: formatted_time_zone_offset
     )
   end
 
   def initialize(initial_value: DateTime.now.strftime("%H:%M"))
+    super()
+
     @initial_value = initial_value
   end
 end
diff --git a/app/forms/work_packages/types/subject_configuration_form.rb b/app/forms/work_packages/types/subject_configuration_form.rb
new file mode 100644
index 000000000000..455b1213e5ad
--- /dev/null
+++ b/app/forms/work_packages/types/subject_configuration_form.rb
@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module WorkPackages
+  module Types
+    class SubjectConfigurationForm < ApplicationForm
+      form do |subject_form|
+        subject_form.radio_button_group(name: :subject_configuration) do |group|
+          group.radio_button(
+            value: "manual",
+            checked: !has_pattern?,
+            label: I18n.t("types.edit.subject_configuration.manually_editable_subjects.label"),
+            caption: I18n.t("types.edit.subject_configuration.manually_editable_subjects.caption"),
+            data: { action: "admin--subject-configuration#hidePatternInput" }
+          )
+          group.radio_button(
+            value: "auto",
+            checked: has_pattern?,
+            label: I18n.t("types.edit.subject_configuration.automatically_generated_subjects.label"),
+            caption: I18n.t("types.edit.subject_configuration.automatically_generated_subjects.caption"),
+            data: { action: "admin--subject-configuration#showPatternInput" }
+          )
+        end
+
+        subject_form.group(data: { "admin--subject-configuration-target": "patternInput" }) do |toggleable_group|
+          toggleable_group.text_field(
+            name: :pattern,
+            label: I18n.t("types.edit.subject_configuration.pattern.label"),
+            caption: I18n.t("types.edit.subject_configuration.pattern.caption"),
+            required: true,
+            input_width: :large
+          )
+        end
+
+        subject_form.submit(name: :submit, label: I18n.t(:button_save), scheme: :primary)
+      end
+
+      private
+
+      def has_pattern?
+        false
+      end
+    end
+  end
+end
diff --git a/app/helpers/custom_fields_helper.rb b/app/helpers/custom_fields_helper.rb
index f9880b5d14e6..1c81066a9009 100644
--- a/app/helpers/custom_fields_helper.rb
+++ b/app/helpers/custom_fields_helper.rb
@@ -219,7 +219,7 @@ def label_for_custom_field_format(format_string)
     label = format.label.is_a?(Proc) ? format.label.call : I18n.t(format.label)
 
     show_enterprise_text = format_string == "hierarchy" && !EnterpriseToken.allows_to?(:custom_field_hierarchies)
-    suffix = show_enterprise_text ? " (#{I18n.t(:label_enterprise_addon)})" : ""
+    suffix = show_enterprise_text ? " (#{I18n.t(:"ee.upsale.title")})" : ""
 
     "#{label}#{suffix}"
   end
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index c01a2c1bc15c..2a733586906b 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -73,8 +73,7 @@ def projects_columns_options
   def selected_projects_columns_options
     Setting
       .enabled_projects_columns
-      .map { |c| projects_columns_options.find { |o| o[:id].to_s == c } }
-      .compact
+      .filter_map { |c| projects_columns_options.find { |o| o[:id].to_s == c } }
   end
 
   def protected_projects_columns_options
diff --git a/app/helpers/sort_helper.rb b/app/helpers/sort_helper.rb
index 3ec0eadd99e7..8a5bc7dfafc3 100644
--- a/app/helpers/sort_helper.rb
+++ b/app/helpers/sort_helper.rb
@@ -331,8 +331,8 @@ def sort_header_tag(column, allowed_params: nil, **options)
   # This is a more specific version of #sort_header_tag.
   # For "filter by" to work properly, you must pass a Hash for `filter_column_mapping`.
   def sort_header_with_action_menu(column, all_columns, filter_column_mapping = {}, allowed_params: nil, **options)
-    with_sort_header_options(column, allowed_params:, **options) do |col, cap, default_order, **opts|
-      action_menu(col, all_columns, cap, default_order, filter_column_mapping, **opts)
+    with_sort_header_options(column.attribute, allowed_params:, **options) do |_col, cap, default_order, **opts|
+      action_menu(column, all_columns, cap, default_order, filter_column_mapping, **opts)
     end
   end
 
@@ -381,6 +381,9 @@ def build_columns_link(columns, allowed_params: nil, **html_options)
   def find_filter_for_column(column, filter_mapping)
     col = column.to_s
 
+    # Temporarily disabled filters for stages and gates columns for now. Remove this line for #59183
+    return nil if column.start_with?("lcsd_")
+
     filter_mapping.fetch(col, col)
   end
 
@@ -389,9 +392,10 @@ def find_filter_for_column(column, filter_mapping)
   # Some of the method arguments are only needed for specific actions.
   def action_menu(column, table_columns, caption, default_order, filter_column_mapping = {},
                   allowed_params: nil, **html_options)
-    caption ||= column.to_s.humanize
+    attribute = column.attribute
+    caption ||= attribute.to_s.humanize
 
-    filter = find_filter_for_column(column, filter_column_mapping)
+    filter = find_filter_for_column(attribute, filter_column_mapping)
     sortable = html_options.delete(:sortable)
 
     # `param` is not needed in the `content_arguments`, but should remain in the `html_options`.
@@ -399,26 +403,32 @@ def action_menu(column, table_columns, caption, default_order, filter_column_map
     # the action menu.
     content_args = html_options.merge(rel: :nofollow, param: nil)
 
-    render Primer::Alpha::ActionMenu.new(menu_id: "menu-#{column}") do |menu|
-      action_button(menu, caption, favorite: column == :favored)
+    render Primer::Alpha::ActionMenu.new(menu_id: "menu-#{attribute}") do |menu|
+      action_button(menu, column, caption, favorite: column == :favored)
 
       # Some columns are not sortable or do not offer a suitable filter. Omit those actions for them.
-      sort_actions(menu, column, default_order, content_args:, allowed_params:, **html_options) if sortable
-      filter_action(menu, column, filter, content_args:) if filter
+      sort_actions(menu, attribute, default_order, content_args:, allowed_params:, **html_options) if sortable
+      filter_action(menu, attribute, filter, content_args:) if filter
 
-      move_column_actions(menu, column, table_columns, content_args:, allowed_params:, **html_options)
-      add_and_remove_column_actions(menu, column, table_columns, content_args:, allowed_params:, **html_options)
+      move_column_actions(menu, attribute, table_columns, content_args:, allowed_params:, **html_options)
+      add_and_remove_column_actions(menu, attribute, table_columns, content_args:, allowed_params:, **html_options)
     end
   end
 
-  def action_button(menu, caption, favorite: false)
+  def action_button(menu, column, caption, favorite: false)
+    additional_menu_classes = ["generic-table--action-menu-button",
+                               column.respond_to?(:action_menu_classes) ? column.action_menu_classes : nil]
+                                .compact
+                                .join(" ")
+
     menu.with_show_button(scheme: :link, color: :default, text_transform: :uppercase,
                           underline: false, display: :inline_flex,
-                          classes: "generic-table--action-menu-button") do |button|
+                          classes: additional_menu_classes) do |button|
       if favorite
         # This column only shows an icon, no text.
         render Primer::Beta::Octicon.new(icon: "star-fill", color: :subtle, "aria-label": I18n.t(:label_favorite))
       else
+        button.with_leading_visual_icon(**column.visual_icon) if column.respond_to?(:visual_icon)
         button.with_trailing_action_icon(icon: :"triangle-down")
 
         h(caption).to_s
diff --git a/app/helpers/types_helper.rb b/app/helpers/types_helper.rb
index fcac23fc709a..2fcb024f7009 100644
--- a/app/helpers/types_helper.rb
+++ b/app/helpers/types_helper.rb
@@ -27,29 +27,45 @@
 #++
 
 module ::TypesHelper
+  # rubocop:disable Rails/HelperInstanceVariable
   def types_tabs
-    [
+    tabs = [
       {
         name: "settings",
         partial: "types/form/settings",
         path: edit_type_tab_path(id: @type.id, tab: :settings),
-        label: "types.edit.settings"
+        label: "types.edit.settings.tab"
       },
       {
         name: "form_configuration",
         partial: "types/form/form_configuration",
         path: edit_type_tab_path(id: @type.id, tab: :form_configuration),
-        label: "types.edit.form_configuration"
+        label: "types.edit.form_configuration.tab"
       },
       {
         name: "projects",
         partial: "types/form/projects",
         path: edit_type_tab_path(id: @type.id, tab: :projects),
-        label: "types.edit.projects"
+        label: "types.edit.projects.tab"
       }
     ]
+
+    if OpenProject::FeatureDecisions.generate_work_package_subjects_active?
+      subject_configuration_tab = {
+        name: "subject_configuration",
+        path: edit_type_tab_path(id: @type.id, tab: :subject_configuration),
+        label: "types.edit.subject_configuration.tab",
+        view_component: WorkPackages::Types::SubjectConfigurationComponent
+      }
+
+      tabs.insert(2, subject_configuration_tab)
+    end
+
+    tabs
   end
 
+  # rubocop:enable Rails/HelperInstanceVariable
+
   def icon_for_type(type)
     return unless type
 
@@ -95,8 +111,8 @@ def active_group_attributes_map(group, available, inactive)
     return nil unless group.group_type == :attribute
 
     group.attributes
-      .select { |key| inactive.delete(key) }
-      .map! { |key| attr_form_map(key, available[key]) }
+         .select { |key| inactive.delete(key) }
+         .map! { |key| attr_form_map(key, available[key]) }
   end
 
   def query_to_query_props(group)
diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb
index 22e7fb2743be..198d77037058 100644
--- a/app/helpers/watchers_helper.rb
+++ b/app/helpers/watchers_helper.rb
@@ -30,25 +30,85 @@ module WatchersHelper
   # Create a link to watch/unwatch object
   #
   # * :replace - a string or array of strings with css selectors that will be updated, whenever the watcher status is changed
-  def watcher_link(object, user, options = { replace: ".watcher_link", class: "watcher_link" })
-    options = options.with_indifferent_access
-    raise ArgumentError, "Missing :replace option in options hash" if options["replace"].blank?
+  def watcher_link(object, user, options = {})
+    options = { replace: ".watcher_link", class: "watcher_link" }.merge(options)
 
-    return "" unless user&.logged? && object.respond_to?(:watched_by?)
+    return "" unless valid_watcher_conditions?(object, user, options)
 
     watched = object.watched_by?(user)
 
-    html_options = options
-    path = send(:"#{(watched ? 'unwatch' : 'watch')}_path", object_type: object.class.to_s.underscore.pluralize,
-                                                            object_id: object.id,
-                                                            replace: options.delete("replace"))
-    html_options[:class] = html_options[:class].to_s + " button"
+    path = watcher_path(object, watched, options)
+
+    html_options = prepare_html_options(watched, options)
+
+    link_to_watcher_button(watched, path, html_options)
+  end
+
+  def watcher_action_button(container, object)
+    watcher_button_args = watcher_button_arguments(object, User.current)
+    return if watcher_button_args.nil?
+
+    container.with_action_button(**watcher_button_args) do |button|
+      button.with_leading_visual_icon(icon: watcher_button_args[:mobile_icon])
+      watcher_button_args[:mobile_label]
+    end
+  end
+
+  def watcher_button_arguments(object, user)
+    return nil unless user&.logged? && object.respond_to?(:watched_by?)
+
+    watched = object.watched_by?(user)
+
+    path = send(:"#{(watched ? 'unwatch' : 'watch')}_path",
+                object_type: object.class.to_s.underscore.pluralize,
+                object_id: object.id)
 
     method = watched ? :delete : :post
 
     label = watched ? I18n.t(:button_unwatch) : I18n.t(:button_watch)
 
-    link_to(content_tag(:i, "", class: watched ? "button--icon icon-watched" : " button--icon icon-unwatched") + " " +
-      content_tag(:span, label, class: "button--text"), path, html_options.merge(method:))
+    {
+      tag: :a,
+      href: path,
+      scheme: :default,
+      aria: { label: label },
+      data: {
+        method:
+      },
+      mobile_icon: watched ? "eye-closed" : "eye",
+      mobile_label: label
+    }
+  end
+
+  private
+
+  def valid_watcher_conditions?(object, user, options)
+    raise ArgumentError, "Missing :replace option in options hash" if options[:replace].blank?
+
+    user&.logged? && object.respond_to?(:watched_by?)
+  end
+
+  def watcher_path(object, watched, options)
+    action = watched ? "unwatch" : "watch"
+    send(:"#{action}_path", object_type: object.class.to_s.underscore.pluralize, object_id: object.id, replace: options[:replace])
+  end
+
+  def prepare_html_options(watched, options)
+    options.merge(
+      class: "#{options[:class]} button",
+      method: watched ? :delete : :post
+    )
+  end
+
+  def link_to_watcher_button(watched, path, html_options)
+    label = watched ? I18n.t(:button_unwatch) : I18n.t(:button_watch)
+    icon_class = watched ? "icon-watched" : "icon-unwatched"
+
+    link_to(
+      content_tag(:i, "", class: "button--icon #{icon_class}") +
+        content_tag(:span, label, class: "button--text"),
+      path,
+      html_options
+    )
   end
 end
diff --git a/app/mailers/reminders/notification_mailer.rb b/app/mailers/reminders/notification_mailer.rb
new file mode 100644
index 000000000000..e193727ebef6
--- /dev/null
+++ b/app/mailers/reminders/notification_mailer.rb
@@ -0,0 +1,82 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+class Reminders::NotificationMailer < ApplicationMailer
+  include MailNotificationHelper
+  include Redmine::I18n
+
+  helper :mail_notification
+  helper_method :reminder_summary_text,
+                :reminder_timestamp_text,
+                :reminder_note_text,
+                :work_package_subject_text_wrapper,
+                :text_email_wrapper
+
+  def reminder_notification(notification)
+    @notification = notification
+    @user = notification.recipient
+    @work_package = notification.resource
+    @reminder = notification.reminder
+
+    open_project_headers User: notification.recipient.name
+    message_id "reminder", notification.recipient
+
+    send_localized_mail(notification.recipient) do
+      "#{Setting.app_title} - #{email_subject_suffix}"
+    end
+  end
+
+  private
+
+  def email_subject_suffix
+    note = @reminder.note.presence || @work_package.subject
+    I18n.t(:"mail.reminder_notifications.subject", note:)
+  end
+
+  def reminder_summary_text
+    I18n.t(:"mail.reminder_notifications.heading")
+  end
+
+  def reminder_timestamp_text
+    "#{format_time(@notification.created_at)}."
+  end
+
+  def reminder_note_text
+    return if @reminder.note.blank?
+
+    I18n.t(:"mail.reminder_notifications.note", note: @reminder.note)
+  end
+
+  def work_package_subject_text_wrapper
+    "=" * ("# #{@work_package.id}#{@work_package.subject}".length + 4)
+  end
+
+  def text_email_wrapper
+    "-" * 100
+  end
+end
diff --git a/app/menus/notifications/menu.rb b/app/menus/notifications/menu.rb
index cc6961c823ef..a4fd9781af43 100644
--- a/app/menus/notifications/menu.rb
+++ b/app/menus/notifications/menu.rb
@@ -63,7 +63,7 @@ def inbox_menu
     end
 
     def reason_filters
-      %w[mentioned assigned responsible watched dateAlert shared].map do |reason|
+      %w[mentioned assigned responsible watched dateAlert reminder shared].map do |reason|
         count = unread_by_reason[reason]
         menu_item(title: I18n.t("notifications.reasons.#{reason}"),
                   icon_key: reason,
@@ -128,7 +128,8 @@ def icon_map
         "responsible" => :"op-person-accountable",
         "watched" => :eye,
         "shared" => :"share-android",
-        "dateAlert" => :"op-calendar-alert"
+        "dateAlert" => :"op-calendar-alert",
+        "reminder" => :"op-alarm"
       }
     end
 
diff --git a/app/menus/submenu.rb b/app/menus/submenu.rb
index 8909c15f32fa..6bd27e89a4a5 100644
--- a/app/menus/submenu.rb
+++ b/app/menus/submenu.rb
@@ -29,7 +29,7 @@ class Submenu
   include Rails.application.routes.url_helpers
   attr_reader :view_type, :project, :params
 
-  def initialize(view_type:, project: nil, params: nil)
+  def initialize(view_type:, params:, project: nil)
     @view_type = view_type
     @project = project
     @params = params
@@ -108,12 +108,13 @@ def query_params(id)
     { query_id: id }
   end
 
-  def menu_item(title:, icon_key: nil, count: nil, show_enterprise_icon: false, query_params: {})
+  def menu_item(title:, icon_key: nil, count: nil, show_enterprise_icon: false,
+                query_params: {}, selected: selected?(query_params))
     OpenProject::Menu::MenuItem.new(title:,
                                     href: query_path(query_params),
                                     icon: icon_map.fetch(icon_key, icon_key),
                                     count:,
-                                    selected: selected?(query_params),
+                                    selected:,
                                     favored: favored?(query_params),
                                     show_enterprise_icon:)
   end
@@ -144,4 +145,8 @@ def icon_map
   def query_path(query_params)
     raise NotImplementedError
   end
+
+  def url_helpers
+    @url_helpers ||= OpenProject::StaticRouting::StaticRouter.new.url_helpers
+  end
 end
diff --git a/app/models/concerns/remindable.rb b/app/models/concerns/remindable.rb
new file mode 100644
index 000000000000..d55e65bf912b
--- /dev/null
+++ b/app/models/concerns/remindable.rb
@@ -0,0 +1,35 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2012-2024 the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module Remindable
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :reminders, as: :remindable, dependent: :destroy
+  end
+end
diff --git a/app/models/custom_field.rb b/app/models/custom_field.rb
index 9fc37427bde9..88504e26a014 100644
--- a/app/models/custom_field.rb
+++ b/app/models/custom_field.rb
@@ -66,7 +66,7 @@ def uniqueness_of_name_with_scope
     errors.add(:name, :taken) if name.in?(taken_names)
   end
 
-  validates :field_format, inclusion: { in: OpenProject::CustomFieldFormat.available_formats }
+  validates :field_format, inclusion: { in: -> { OpenProject::CustomFieldFormat.available_formats } }
 
   validate :validate_default_value
   validate :validate_regex
@@ -326,12 +326,15 @@ def possible_version_values_options(obj)
 
   def possible_user_values_options(obj)
     mapped_with_deduced_project(obj) do |project|
-      if project&.persisted?
-        project.principals
-      else
-        Principal
-          .in_visible_project_or_me(User.current)
-      end
+      scope = if project&.persisted?
+                project.principals
+              else
+                Principal
+                  .in_visible_project_or_me(User.current)
+              end
+
+      scope
+        .select(User::USER_FORMATS_STRUCTURE[Setting.user_format].map(&:to_s), "id", "type")
     end
   end
 
diff --git a/app/models/custom_field/hierarchy/hierarchy_item_adapter.rb b/app/models/custom_field/hierarchy/hierarchy_item_adapter.rb
new file mode 100644
index 000000000000..14cd4053bc73
--- /dev/null
+++ b/app/models/custom_field/hierarchy/hierarchy_item_adapter.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+class CustomField::Hierarchy::HierarchyItemAdapter
+  delegate :id, :label, :short, :to_s, to: :item
+
+  def initialize(item:) = @item = item
+
+  def name = @item.label
+
+  private
+
+  attr_accessor :item
+end
diff --git a/app/models/custom_field/hierarchy/item.rb b/app/models/custom_field/hierarchy/item.rb
index dcb12cc27597..3490e7009ef3 100644
--- a/app/models/custom_field/hierarchy/item.rb
+++ b/app/models/custom_field/hierarchy/item.rb
@@ -35,4 +35,10 @@ class CustomField::Hierarchy::Item < ApplicationRecord
   has_closure_tree order: "sort_order", numeric_order: true, dont_order_roots: true, dependent: :destroy
 
   scope :including_children, -> { includes(children: :children) }
+
+  def to_s = short.nil? ? label : "#{label} (#{short})"
+
+  def ancestry_path
+    self_and_ancestors.filter_map(&:to_s).reverse.join(" / ")
+  end
 end
diff --git a/app/models/custom_field/order_statements.rb b/app/models/custom_field/order_statements.rb
index 86984954feea..945e22fa02f0 100644
--- a/app/models/custom_field/order_statements.rb
+++ b/app/models/custom_field/order_statements.rb
@@ -31,7 +31,7 @@ module CustomField::OrderStatements
   # value of the custom field.
   def order_statement
     case field_format
-    when "string", "date", "bool", "link", "int", "float", "list", "user", "version"
+    when "string", "date", "bool", "link", "int", "float", "list", "user", "version", "hierarchy"
       "cf_order_#{id}.value"
     end
   end
@@ -52,6 +52,8 @@ def order_join_statement
       join_for_order_by_user_sql
     when "version"
       join_for_order_by_version_sql
+    when "hierarchy"
+      join_for_order_by_hierarchy_sql
     end
   end
 
@@ -73,7 +75,7 @@ def group_by_statement
   # Returns the expression to use in SELECT clause if it differs from one used
   # to group by
   def group_by_select_statement
-    return unless field_format == "list"
+    return unless field_format == "list" || field_format == "hierarchy"
 
     # MIN needed to not add this column to group by, ANY_VALUE can be used when
     # minimum required PostgreSQL becomes 16
@@ -90,7 +92,7 @@ def group_by_join_statement
 
   private
 
-  def can_be_used_for_grouping? = field_format.in?(%w[list date bool int float string link])
+  def can_be_used_for_grouping? = field_format.in?(%w[list date bool int float string link hierarchy])
 
   # Template for all the join statements.
   #
@@ -167,4 +169,13 @@ def join_for_order_by_version_sql
       multi_value:
     )
   end
+
+  def join_for_order_by_hierarchy_sql
+    join_for_order_sql(
+      value: multi_value? ? "ARRAY_AGG(item.position_cache ORDER BY item.position_cache)" : "item.position_cache",
+      add_select: "#{multi_value? ? "ARRAY_TO_STRING(ARRAY_AGG(cv.value ORDER BY item.position_cache), '.')" : 'cv.value'} ids",
+      join: "INNER JOIN #{CustomField::Hierarchy::Item.quoted_table_name} item ON item.id = cv.value::bigint",
+      multi_value:
+    )
+  end
 end
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 65dff4c23ab5..e21493cc10db 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -40,17 +40,20 @@ class Notification < ApplicationRecord
     responsible: 9,
     date_alert_start_date: 10,
     date_alert_due_date: 11,
-    shared: 12
+    shared: 12,
+    reminder: 13
   }.freeze
 
-  enum reason: REASONS,
-       _prefix: true
+  enum :reason, REASONS, prefix: true
 
   belongs_to :recipient, class_name: "User"
   belongs_to :actor, class_name: "User"
   belongs_to :journal
   belongs_to :resource, polymorphic: true
 
+  has_one :reminder_notification, dependent: :destroy
+  has_one :reminder, through: :reminder_notification
+
   include Scopes::Scoped
   scopes :unsent_reminders_before,
          :mail_reminder_unsent,
diff --git a/app/models/permitted_params.rb b/app/models/permitted_params.rb
index ba22823578ba..d145da84d561 100644
--- a/app/models/permitted_params.rb
+++ b/app/models/permitted_params.rb
@@ -290,6 +290,12 @@ def project
     whitelist.merge(custom_field_values(:project))
   end
 
+  def project_life_cycles
+    params.require(:project).permit(
+      available_life_cycle_steps_attributes: %i[id date date_range]
+    )
+  end
+
   def project_custom_field_project_mapping
     params.require(:project_custom_field_project_mapping)
       .permit(*self.class.permitted_attributes[:project_custom_field_project_mapping])
diff --git a/app/models/project.rb b/app/models/project.rb
index 89191c1eba8b..5bdb1f1f83f5 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -87,6 +87,14 @@ class Project < ApplicationRecord
   has_many :project_storages, dependent: :destroy, class_name: "Storages::ProjectStorage"
   has_many :storages, through: :project_storages
   has_many :life_cycle_steps, class_name: "Project::LifeCycleStep", dependent: :destroy
+  has_many :available_life_cycle_steps,
+           -> { visible.eager_load(:definition).order(position: :asc) },
+           class_name: "Project::LifeCycleStep",
+           inverse_of: :project,
+           dependent: :destroy
+
+  accepts_nested_attributes_for :available_life_cycle_steps
+  validates_associated :available_life_cycle_steps, on: :saving_life_cycle_steps
 
   store_attribute :settings, :deactivate_work_package_attachments, :boolean
 
diff --git a/app/models/project/gate.rb b/app/models/project/gate.rb
index 46ee6fffdb74..8c49a5360c5c 100644
--- a/app/models/project/gate.rb
+++ b/app/models/project/gate.rb
@@ -31,7 +31,6 @@ class Project::Gate < Project::LifeCycleStep
 
   # This ensures the type cannot be changed after initialising the class.
   validates :type, inclusion: { in: %w[Project::Gate], message: :must_be_a_gate }
-  validates :date, presence: true
   validate :end_date_not_allowed
 
   def end_date_not_allowed
@@ -39,4 +38,8 @@ def end_date_not_allowed
       errors.add(:base, :end_date_not_allowed)
     end
   end
+
+  def not_set?
+    date.blank?
+  end
 end
diff --git a/app/models/project/gate_definition.rb b/app/models/project/gate_definition.rb
index a51561075728..a0cfef69352e 100644
--- a/app/models/project/gate_definition.rb
+++ b/app/models/project/gate_definition.rb
@@ -32,4 +32,8 @@ class Project::GateDefinition < Project::LifeCycleStepDefinition
            foreign_key: :definition_id,
            inverse_of: :definition,
            dependent: :destroy
+
+  def step_class
+    Project::Gate
+  end
 end
diff --git a/app/models/project/life_cycle_step.rb b/app/models/project/life_cycle_step.rb
index dfa4b11efda9..e703c0b26b70 100644
--- a/app/models/project/life_cycle_step.rb
+++ b/app/models/project/life_cycle_step.rb
@@ -27,23 +27,36 @@
 #++
 
 class Project::LifeCycleStep < ApplicationRecord
-  belongs_to :project, optional: false
+  belongs_to :project, optional: false, inverse_of: :available_life_cycle_steps
   belongs_to :definition,
              optional: false,
              class_name: "Project::LifeCycleStepDefinition"
   has_many :work_packages, inverse_of: :project_life_cycle_step, dependent: :nullify
 
+  delegate :name, :position, to: :definition
+
   attr_readonly :definition_id, :type
 
   validates :type, inclusion: { in: %w[Project::Stage Project::Gate], message: :must_be_a_stage_or_gate }
+  validate :validate_type_and_class_name_are_identical
+
+  scope :active, -> { where(active: true) }
+
+  class << self
+    def visible(user = User.current)
+      allowed_projects = Project.allowed_to(user, :view_project_stages_and_gates)
+      active.where(project: allowed_projects)
+    end
+  end
 
-  def initialize(*args)
-    if instance_of? Project::LifeCycleStep
-      # Do not allow directly instantiating this class
-      raise NotImplementedError, "Cannot instantiate the base Project::LifeCycleStep class directly. " \
-                                 "Use Project::Stage or Project::Gate instead."
+  def validate_type_and_class_name_are_identical
+    if type != self.class.name
+      errors.add(:type, :type_and_class_name_mismatch)
     end
+  end
 
-    super
+  def column_name
+    # The id of the associated definition is relevant for displaying the correct column headers
+    "lcsd_#{definition_id}"
   end
 end
diff --git a/app/models/project/life_cycle_step_definition.rb b/app/models/project/life_cycle_step_definition.rb
index d511cc284cc4..f80cc6116931 100644
--- a/app/models/project/life_cycle_step_definition.rb
+++ b/app/models/project/life_cycle_step_definition.rb
@@ -35,20 +35,27 @@ class Project::LifeCycleStepDefinition < ApplicationRecord
   has_many :projects, through: :life_cycle_steps
   belongs_to :color, optional: false
 
-  validates :name, presence: true
+  validates :name, presence: true, uniqueness: true
   validates :type, inclusion: { in: %w[Project::StageDefinition Project::GateDefinition], message: :must_be_a_stage_or_gate }
+  validate :validate_type_and_class_name_are_identical
 
   attr_readonly :type
 
   acts_as_list
 
-  def initialize(*args)
-    if instance_of? Project::LifeCycleStepDefinition
-      # Do not allow directly instantiating this class
-      raise NotImplementedError, "Cannot instantiate the base Project::LifeCycleStepDefinition class directly. " \
-                                 "Use Project::StageDefinition or Project::GateDefinition instead."
-    end
+  def step_class
+    raise NotImplementedError
+  end
+
+  def column_name
+    "lcsd_#{id}"
+  end
+
+  private
 
-    super
+  def validate_type_and_class_name_are_identical
+    if type != self.class.name
+      errors.add(:type, :type_and_class_name_mismatch)
+    end
   end
 end
diff --git a/app/models/project/stage.rb b/app/models/project/stage.rb
index b49ca7787b71..2ee54f26cd3e 100644
--- a/app/models/project/stage.rb
+++ b/app/models/project/stage.rb
@@ -29,5 +29,36 @@
 class Project::Stage < Project::LifeCycleStep
   # This ensures the type cannot be changed after initialising the class.
   validates :type, inclusion: { in: %w[Project::Stage], message: :must_be_a_stage }
-  validates :start_date, :end_date, presence: true
+  validate :validate_date_range
+
+  def working_days_count
+    return nil if not_set?
+
+    Day.working.from_range(from: start_date, to: end_date).count
+  end
+
+  def date_range=(param)
+    self.start_date, self.end_date = param.split(" - ")
+    self.end_date ||= start_date # Allow single dates as range
+  end
+
+  def not_set?
+    start_date.blank? || end_date.blank?
+  end
+
+  def range_set?
+    !not_set?
+  end
+
+  def range_incomplete?
+    start_date.blank? ^ end_date.blank?
+  end
+
+  def validate_date_range
+    if range_incomplete?
+      errors.add(:date_range, :incomplete)
+    elsif range_set? && (start_date > end_date)
+      errors.add(:date_range, :start_date_must_be_before_end_date)
+    end
+  end
 end
diff --git a/app/models/project/stage_definition.rb b/app/models/project/stage_definition.rb
index 91ae98584def..f373d13cd646 100644
--- a/app/models/project/stage_definition.rb
+++ b/app/models/project/stage_definition.rb
@@ -32,4 +32,8 @@ class Project::StageDefinition < Project::LifeCycleStepDefinition
            foreign_key: :definition_id,
            inverse_of: :definition,
            dependent: :destroy
+
+  def step_class
+    Project::Stage
+  end
 end
diff --git a/app/models/queries/filters/shared/custom_fields/hierarchy.rb b/app/models/queries/filters/shared/custom_fields/hierarchy.rb
index 81538bc4bdb4..c29e545b9bed 100644
--- a/app/models/queries/filters/shared/custom_fields/hierarchy.rb
+++ b/app/models/queries/filters/shared/custom_fields/hierarchy.rb
@@ -40,24 +40,9 @@ def ar_object_filter?
           def value_objects
             CustomField::Hierarchy::Item
               .where(id: @values)
-              .map { |item| HierarchyItemFilterAdapter.new(item:) }
+              .map { |item| CustomField::Hierarchy::HierarchyItemAdapter.new(item:) }
           end
         end
-
-        class HierarchyItemFilterAdapter
-          attr_reader :name
-
-          delegate :id, to: :item
-
-          def initialize(item:)
-            @item = item
-            @name = item.label
-          end
-
-          private
-
-          attr_accessor :item
-        end
       end
     end
   end
diff --git a/app/models/queries/filters/strategies/integer_list_optional.rb b/app/models/queries/filters/strategies/integer_list_optional.rb
index df55d434c6c3..f7a0ff61c3d1 100644
--- a/app/models/queries/filters/strategies/integer_list_optional.rb
+++ b/app/models/queries/filters/strategies/integer_list_optional.rb
@@ -33,6 +33,7 @@ class IntegerListOptional < ::Queries::Filters::Strategies::Integer
     def operator_map
       super_value = super.dup
       super_value["="] = ::Queries::Operators::EqualsOr
+      super_value["*"] = ::Queries::Operators::All
 
       super_value
     end
diff --git a/app/models/queries/projects.rb b/app/models/queries/projects.rb
index bb25098c5322..64b721b7596a 100644
--- a/app/models/queries/projects.rb
+++ b/app/models/queries/projects.rb
@@ -62,6 +62,7 @@ module Queries::Projects
     select Selects::CustomField
     select Selects::Default
     select Selects::LatestActivityAt
+    select Selects::LifeCycleStep
     select Selects::RequiredDiskSpace
     select Selects::Status
     select Selects::Favored
diff --git a/app/models/queries/projects/selects/life_cycle_step.rb b/app/models/queries/projects/selects/life_cycle_step.rb
new file mode 100644
index 000000000000..16b14d901aa9
--- /dev/null
+++ b/app/models/queries/projects/selects/life_cycle_step.rb
@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+# ++
+
+class Queries::Projects::Selects::LifeCycleStep < Queries::Selects::Base
+  KEY = /\Alcsd_(\d+)\z/
+
+  def self.key
+    KEY
+  end
+
+  def self.all_available
+    return [] unless available?
+
+    Project::LifeCycleStepDefinition
+      .pluck(:id)
+      .map { |id| new(:"lcsd_#{id}") }
+  end
+
+  def caption
+    life_cycle_step_definition.name
+  end
+
+  def life_cycle_step_definition
+    return @life_cycle_step_definition if defined?(@life_cycle_step_definition)
+
+    @life_cycle_step_definition = Project::LifeCycleStepDefinition
+                                    .find_by(id: attribute[KEY, 1])
+  end
+
+  def self.available?
+    OpenProject::FeatureDecisions.stages_and_gates_active? &&
+    User.current.allowed_in_any_project?(:view_project_stages_and_gates)
+  end
+
+  def available?
+    life_cycle_step_definition.present?
+  end
+
+  def visual_icon
+    # Show the proper icon for the definition with the correct color.
+    icon = case life_cycle_step_definition
+           when Project::StageDefinition
+             :"git-commit"
+           when Project::GateDefinition
+             :diamond
+           else
+             raise "Unknown life cycle definition for: #{life_cycle_step_definition}"
+           end
+
+    classes = helpers.hl_inline_class("life_cycle_step_definition", life_cycle_step_definition)
+
+    { icon:, classes: }
+  end
+
+  def action_menu_classes
+    "leading-visual-icon-header"
+  end
+
+  private
+
+  def helpers
+    @helpers ||= Object.new.extend(ColorsHelper)
+  end
+end
diff --git a/app/models/query/results/group_by.rb b/app/models/query/results/group_by.rb
index c3097fdb03e7..6ee9d9ef2805 100644
--- a/app/models/query/results/group_by.rb
+++ b/app/models/query/results/group_by.rb
@@ -89,21 +89,55 @@ def transform_custom_field_keys(groups)
 
     if custom_field.list?
       transform_list_custom_field_keys(custom_field, groups)
+    elsif custom_field.field_format_hierarchy?
+      transform_hierarchy_custom_field_keys(custom_field, groups)
     else
       transform_single_custom_field_keys(custom_field, groups)
     end
   end
 
+  def transform_hierarchy_custom_field_keys(custom_field, groups)
+    items = hierarchy_items_for_keys(custom_field, groups)
+
+    groups.transform_keys do |key|
+      if custom_field.multi_value?
+        Array(key&.split(".")).map { |subkey| items[subkey].first }
+      else
+        items[key] || []
+      end
+    end
+  end
+
+  # rubocop:disable Metrics/AbcSize
+  def hierarchy_items_for_keys(custom_field, groups)
+    keys = groups.keys.map { |k| k ? k.split(".") : [] }.flatten.uniq
+
+    CustomFields::Hierarchy::HierarchicalItemService
+      .new
+      .get_descendants(item: custom_field.hierarchy_root, include_self: false)
+      .fmap do |list|
+        list.filter_map { |item| CustomField::Hierarchy::HierarchyItemAdapter.new(item:) if keys.include?(item.id.to_s) }
+          .group_by { |item| item.id.to_s }
+      end
+      .either(
+        ->(list) { list },
+        ->(error) do
+          msg = "#{I18n.t('api_v3.errors.code_500')} #{error}"
+          raise ::API::Errors::InternalError.new(msg)
+        end
+      )
+  end
+
+  # rubocop:enable Metrics/AbcSize
+
   def transform_list_custom_field_keys(custom_field, groups)
     options = custom_options_for_keys(custom_field, groups)
 
     groups.transform_keys do |key|
       if custom_field.multi_value?
-        (key ? key.split(".") : []).map do |subkey|
-          options[subkey].first
-        end
+        Array(key&.split(".")).map.map { |subkey| options[subkey].first }
       else
-        options[key] ? options[key].first : nil
+        options[key]&.first
       end
     end
   end
@@ -111,7 +145,7 @@ def transform_list_custom_field_keys(custom_field, groups)
   def custom_options_for_keys(custom_field, groups)
     keys = groups.keys.map { |k| k ? k.split(".") : [] }
     # Because of multi select cfs we might end up having overlapping groups
-    # (e.g group "1" and group "1.3" and group "3" which represent concatenated ids).
+    # (e.g. group "1" and group "1.3" and group "3" which represent concatenated ids).
     # This can result in us having ids in the keys array multiple times (e.g. ["1", "1", "3", "3"]).
     # If we were to use the keys array with duplicates to find the actual custom options,
     # AR would throw an error as the number of records returned does not match the number
diff --git a/app/models/reminder.rb b/app/models/reminder.rb
new file mode 100644
index 000000000000..9b6213dd2a1a
--- /dev/null
+++ b/app/models/reminder.rb
@@ -0,0 +1,63 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2012-2024 the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+class Reminder < ApplicationRecord
+  belongs_to :remindable, polymorphic: true
+  belongs_to :creator, class_name: "User"
+
+  has_many :reminder_notifications, dependent: :destroy
+  has_many :notifications, through: :reminder_notifications
+
+  # Currently, reminders are personal, meaning
+  # they are only visible to the user who created them.
+  def self.visible(user)
+    where(creator: user)
+  end
+
+  def self.upcoming_and_visible_to(user)
+    visible(user)
+      .where(completed_at: nil)
+      .where.missing(:reminder_notifications)
+  end
+
+  def unread_notifications?
+    unread_notifications.exists?
+  end
+
+  def unread_notifications
+    notifications.where(read_ian: [false, nil])
+  end
+
+  def completed?
+    completed_at.present?
+  end
+
+  def scheduled?
+    job_id.present? && !completed?
+  end
+end
diff --git a/app/models/reminder_notification.rb b/app/models/reminder_notification.rb
new file mode 100644
index 000000000000..c005f39a6ee1
--- /dev/null
+++ b/app/models/reminder_notification.rb
@@ -0,0 +1,32 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2012-2024 the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+class ReminderNotification < ApplicationRecord
+  belongs_to :reminder
+  belongs_to :notification, dependent: :destroy
+end
diff --git a/app/models/setting/aliases.rb b/app/models/setting/aliases.rb
index 98aa5bbbf4fd..154aabab71db 100644
--- a/app/models/setting/aliases.rb
+++ b/app/models/setting/aliases.rb
@@ -51,5 +51,13 @@ def host_without_protocol
     def optional_port_from_host_name
       Setting.host_name&.split(":")&.[](1)
     end
+
+    ##
+    # Get the names of working days
+    # @return [Array<String>] the names of the working days
+    def working_day_names
+      weekdays = %i[monday tuesday wednesday thursday friday saturday sunday]
+      Setting.working_days.map { |day| weekdays[day - 1] }
+    end
   end
 end
diff --git a/app/models/sharing_strategies/base_strategy.rb b/app/models/sharing_strategies/base_strategy.rb
index bff01d94d896..25c00ff2e859 100644
--- a/app/models/sharing_strategies/base_strategy.rb
+++ b/app/models/sharing_strategies/base_strategy.rb
@@ -50,6 +50,10 @@ def manageable?
       raise NotImplementedError, "Override in a subclass and return true if the current user can manage sharing"
     end
 
+    def allow_hover_cards?
+      raise NotImplementedError, "Override in a subclass and return true if hover cards should appear hovering users"
+    end
+
     def create_contract_class
       raise NotImplementedError, "Override in a subclass and return the contract class for creating a share"
     end
diff --git a/app/models/sharing_strategies/project_query_strategy.rb b/app/models/sharing_strategies/project_query_strategy.rb
index eb05b1970d78..7a898438bb62 100644
--- a/app/models/sharing_strategies/project_query_strategy.rb
+++ b/app/models/sharing_strategies/project_query_strategy.rb
@@ -54,6 +54,10 @@ def viewable?
       @entity.visible?
     end
 
+    def allow_hover_cards?
+      true
+    end
+
     def create_contract_class
       Shares::ProjectQueries::CreateContract
     end
diff --git a/app/models/sharing_strategies/work_package_strategy.rb b/app/models/sharing_strategies/work_package_strategy.rb
index 556767dc08aa..018c6b0f5c71 100644
--- a/app/models/sharing_strategies/work_package_strategy.rb
+++ b/app/models/sharing_strategies/work_package_strategy.rb
@@ -53,6 +53,13 @@ def viewable?
       user.allowed_in_project?(:view_shared_work_packages, @entity.project)
     end
 
+    # Since the work package share dialog is embedded into an angular page, hover cards would compete for the
+    # portal outlet when rendering, causing bugs. Until the work package share dialog is refactored to be an
+    # async-dialog, we must disable hover cards for it.
+    def allow_hover_cards?
+      false
+    end
+
     def share_description(share) # rubocop:disable Metrics/PerceivedComplexity,Metrics/AbcSize
       scope = %i[sharing user_details]
 
diff --git a/app/models/type.rb b/app/models/type.rb
index 2c7deb928070..0117f8aaa6b8 100644
--- a/app/models/type.rb
+++ b/app/models/type.rb
@@ -34,6 +34,8 @@ class Type < ApplicationRecord
 
   include ::Scopes::Scoped
 
+  attribute :patterns, Types::PatternCollectionType.new
+
   before_destroy :check_integrity
 
   has_many :work_packages
@@ -50,16 +52,11 @@ def copy_from_type(source_type)
                           join_table: "#{table_name_prefix}custom_fields_types#{table_name_suffix}",
                           association_foreign_key: "custom_field_id"
 
-  belongs_to :color,
-             optional: true,
-             class_name: "Color"
+  belongs_to :color, optional: true, class_name: "Color"
 
   acts_as_list
 
-  validates :name,
-            presence: true,
-            uniqueness: { case_sensitive: false },
-            length: { maximum: 255 }
+  validates :name, presence: true, uniqueness: { case_sensitive: false }, length: { maximum: 255 }
 
   validates :is_default, :is_milestone, inclusion: { in: [true, false] }
 
@@ -67,10 +64,7 @@ def copy_from_type(source_type)
 
   default_scope { order("position ASC") }
 
-  scope :without_standard, -> {
-    where(is_standard: false)
-      .order(:position)
-  }
+  scope :without_standard, -> { where(is_standard: false).order(:position) }
 
   def to_s; name end
 
diff --git a/app/models/types/pattern.rb b/app/models/types/pattern.rb
new file mode 100644
index 000000000000..62dcbd2b2c18
--- /dev/null
+++ b/app/models/types/pattern.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module Types
+  Pattern = Data.define(:blueprint, :enabled) do
+    def call(object)
+      # calculate string using object
+      blueprint.to_s + object.to_s
+    end
+
+    def to_h
+      super.stringify_keys
+    end
+  end
+end
diff --git a/app/models/types/pattern_collection.rb b/app/models/types/pattern_collection.rb
new file mode 100644
index 000000000000..52a6dda2e459
--- /dev/null
+++ b/app/models/types/pattern_collection.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module Types
+  PatternCollection = Data.define(:patterns) do
+    private_class_method :new
+
+    def self.build(patterns:, contract: PatternCollectionContract.new)
+      contract.call(patterns).to_monad.fmap { |success| new(success.to_h) }
+    end
+
+    def initialize(patterns:)
+      transformed = patterns.transform_values { Pattern.new(**_1) }.freeze
+
+      super(patterns: transformed)
+    end
+
+    def [](value)
+      patterns.fetch(value)
+    end
+
+    def to_h
+      patterns.stringify_keys.transform_values(&:to_h)
+    end
+  end
+end
diff --git a/app/models/types/pattern_collection_contract.rb b/app/models/types/pattern_collection_contract.rb
new file mode 100644
index 000000000000..2a8e7c16a1e1
--- /dev/null
+++ b/app/models/types/pattern_collection_contract.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module Types
+  class PatternCollectionContract < Dry::Validation::Contract
+    params do
+      required(:subject).hash do
+        required(:blueprint).filled(:string)
+        required(:enabled).filled(:bool)
+      end
+    end
+  end
+end
diff --git a/app/models/types/pattern_collection_type.rb b/app/models/types/pattern_collection_type.rb
new file mode 100644
index 000000000000..9758ee50c339
--- /dev/null
+++ b/app/models/types/pattern_collection_type.rb
@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module Types
+  class PatternCollectionType < ActiveModel::Type::Value
+    def assert_valid_value(value)
+      cast(value)
+    end
+
+    def cast(value)
+      PatternCollection.build(patterns: value).value_or { nil }
+    end
+
+    def serialize(pattern)
+      return super if pattern.nil?
+
+      YAML.dump(pattern.to_h)
+    end
+
+    def deserialize(value)
+      return if value.blank?
+
+      data = YAML.safe_load(value)
+      cast(data)
+    end
+  end
+end
diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb
index 041f930fe201..0e90fe646d18 100644
--- a/app/models/user_preference.rb
+++ b/app/models/user_preference.rb
@@ -140,7 +140,7 @@ def workdays
   end
 
   def immediate_reminders
-    super.presence || { mentioned: true }.with_indifferent_access
+    super.presence || { mentioned: true, personal_reminder: true }.with_indifferent_access
   end
 
   def pause_reminders
diff --git a/app/models/work_package.rb b/app/models/work_package.rb
index a1ec03892668..a16611e48b03 100644
--- a/app/models/work_package.rb
+++ b/app/models/work_package.rb
@@ -41,6 +41,7 @@ class WorkPackage < ApplicationRecord
   include WorkPackages::Relations
   include ::Scopes::Scoped
   include HasMembers
+  include Remindable
 
   include OpenProject::Journal::AttachmentHelper
 
diff --git a/app/models/work_package/pdf_export/common/common.rb b/app/models/work_package/pdf_export/common/common.rb
index c91d44836ab5..63c055a40044 100644
--- a/app/models/work_package/pdf_export/common/common.rb
+++ b/app/models/work_package/pdf_export/common/common.rb
@@ -35,7 +35,7 @@ module WorkPackage::PDFExport::Common::Common
 
   private
 
-  def get_pdf(_language)
+  def get_pdf
     ::WorkPackage::PDFExport::Common::View.new(current_language)
   end
 
@@ -164,6 +164,13 @@ def draw_text_multiline_part(line, text_style, x_position, y_position)
     measure_text_height(line, text_style)
   end
 
+  def ellipsis_if_longer(text, available_width, text_style)
+    title_text_width = measure_text_width(text, text_style)
+    return text if title_text_width < available_width
+
+    truncate_ellipsis(text, available_width, text_style)
+  end
+
   def truncate_ellipsis(text, available_width, text_style)
     line = text.dup
     while line.present? && (measure_text_width("#{line}...", text_style) > available_width)
@@ -285,4 +292,12 @@ def footer_date
   def current_page_nr
     pdf.page_number + @page_count - (with_cover? ? 1 : 0)
   end
+
+  def write_horizontal_line(y_position, height, color)
+    draw_horizontal_line(
+      y_position,
+      pdf.bounds.left, pdf.bounds.right,
+      height, color
+    )
+  end
 end
diff --git a/app/models/work_package/pdf_export/document_generator.rb b/app/models/work_package/pdf_export/document_generator.rb
index 37b69c6b4ea0..26a3a46ceb88 100644
--- a/app/models/work_package/pdf_export/document_generator.rb
+++ b/app/models/work_package/pdf_export/document_generator.rb
@@ -52,7 +52,7 @@ def initialize(work_package, _options = {})
   end
 
   def setup_page!
-    self.pdf = get_pdf(current_language)
+    self.pdf = get_pdf
   end
 
   def export!
diff --git a/app/models/work_package/pdf_export/export/cover.rb b/app/models/work_package/pdf_export/export/cover.rb
index e50d0c101c30..a91eed6ead2f 100644
--- a/app/models/work_package/pdf_export/export/cover.rb
+++ b/app/models/work_package/pdf_export/export/cover.rb
@@ -40,17 +40,34 @@ def write_cover_page!
   def write_cover_hero
     max_width = pdf.bounds.width - styles.cover_hero_padding[:right_padding]
     float_top = write_background_image
-    float_top -= write_hero_title(float_top, max_width) if project
+    float_top -= write_hero_title(float_top, max_width)
     float_top -= write_hero_heading(float_top, max_width)
-    write_hero_subheading(float_top, max_width) unless User.current.nil?
+    float_top -= write_hero_dates(float_top, max_width)
+    write_hero_subheading(float_top, max_width)
   end
 
   def available_title_height(current_y)
     current_y -
-      styles.cover_hero_title_max_height -
-      styles.cover_hero_title_spacing -
-      styles.cover_hero_heading_spacing -
-      styles.cover_hero_subheading_max_height
+      cover_hero_title_max_height -
+      cover_hero_heading_max_height -
+      cover_hero_dates_max_height -
+      cover_hero_subheading_max_height
+  end
+
+  def cover_hero_title_max_height
+    cover_page_title&.then { styles.cover_hero_title_max_height + styles.cover_hero_title_spacing } || 0
+  end
+
+  def cover_hero_heading_max_height
+    cover_page_heading&.then { styles.cover_hero_heading_spacing } || 0
+  end
+
+  def cover_hero_dates_max_height
+    cover_page_dates&.then { styles.cover_hero_dates_max_height } || 0
+  end
+
+  def cover_hero_subheading_max_height
+    cover_page_title&.then { styles.cover_hero_title_max_height + styles.cover_hero_title_spacing } || 0
   end
 
   def write_cover_hr
@@ -81,27 +98,44 @@ def validate_cover_text_color
   end
 
   def write_hero_title(top, width)
+    return 0 if cover_page_title.blank?
+
     write_hero_text(
       top:, width:,
-      text: project.name,
+      text: cover_page_title,
       text_style: styles.cover_hero_title,
       height: styles.cover_hero_title_max_height
     ) + styles.cover_hero_title_spacing
   end
 
   def write_hero_heading(top, width)
+    return 0 if cover_page_heading.blank?
+
     write_hero_text(
       top:, width:,
-      text: heading,
+      text: cover_page_heading,
       text_style: styles.cover_hero_heading,
       height: available_title_height(top)
     ) + styles.cover_hero_heading_spacing
   end
 
+  def write_hero_dates(top, width)
+    return 0 if cover_page_dates.blank?
+
+    write_hero_text(
+      top:, width:,
+      text: cover_page_dates,
+      text_style: styles.cover_hero_dates,
+      height: styles.cover_hero_dates_max_height
+    ) + styles.cover_hero_dates_spacing
+  end
+
   def write_hero_subheading(top, width)
+    return 0 if cover_page_subheading.blank?
+
     write_hero_text(
       top:, width:,
-      text: User.current.name,
+      text: cover_page_subheading,
       text_style: styles.cover_hero_subheading,
       height: styles.cover_hero_subheading_max_height
     )
diff --git a/app/models/work_package/pdf_export/export/schema.json b/app/models/work_package/pdf_export/export/schema.json
index 50c64700b44a..316f60469667 100644
--- a/app/models/work_package/pdf_export/export/schema.json
+++ b/app/models/work_package/pdf_export/export/schema.json
@@ -193,6 +193,42 @@
             }
           ]
         },
+        "dates" : {
+          "title" : "The dates block in the hero",
+          "type" : "object",
+          "x-example" : {
+            "heading" : {
+              "spacing" : 10,
+              "max_height" : 20,
+              "size" : 32,
+              "color" : "414d5f",
+              "styles" : [
+                "bold"
+              ]
+            }
+          },
+          "properties" : {
+            "max_height" : {
+              "title" : "Maximum height of the block",
+              "examples" : [
+                30
+              ],
+              "$ref" : "#/$defs/measurement"
+            },
+            "spacing" : {
+              "title" : "Minimum spacing between dates and subheading",
+              "examples" : [
+                10
+              ],
+              "$ref" : "#/$defs/measurement"
+            }
+          },
+          "allOf" : [
+            {
+              "$ref" : "#/$defs/font"
+            }
+          ]
+        },
         "subheading" : {
           "title" : "The last block in the hero",
           "type" : "object",
diff --git a/app/models/work_package/pdf_export/export/standard.yml b/app/models/work_package/pdf_export/export/standard.yml
index 915d6dd37c2e..ecfc8a0a904b 100644
--- a/app/models/work_package/pdf_export/export/standard.yml
+++ b/app/models/work_package/pdf_export/export/standard.yml
@@ -275,9 +275,14 @@ cover:
       styles:
         - bold
       size: 16
+    dates:
+      spacing: 4
+      max_height: 16
+      color: '414d5f'
+      size: 10
+      styles:
+        - bold
     subheading:
       max_height: 30
       color: '414d5f'
-      styles:
-        - italic
       size: 10
diff --git a/app/models/work_package/pdf_export/export/style.rb b/app/models/work_package/pdf_export/export/style.rb
index 4a1a152adf1f..8e4197138903 100644
--- a/app/models/work_package/pdf_export/export/style.rb
+++ b/app/models/work_package/pdf_export/export/style.rb
@@ -253,6 +253,18 @@ def cover_hero_heading_spacing
       resolve_pt(@styles.dig(:cover, :hero, :heading, :spacing), 0)
     end
 
+    def cover_hero_dates
+      resolve_font(@styles.dig(:cover, :hero, :dates))
+    end
+
+    def cover_hero_dates_spacing
+      resolve_pt(@styles.dig(:cover, :hero, :dates, :spacing), 0)
+    end
+
+    def cover_hero_dates_max_height
+      resolve_pt(@styles.dig(:cover, :hero, :dates, :max_height), 0)
+    end
+
     def cover_hero_subheading
       resolve_font(@styles.dig(:cover, :hero, :subheading))
     end
diff --git a/app/models/work_package/pdf_export/work_package_list_to_pdf.rb b/app/models/work_package/pdf_export/work_package_list_to_pdf.rb
index 9a1ca49c949e..b62855f71c5b 100644
--- a/app/models/work_package/pdf_export/work_package_list_to_pdf.rb
+++ b/app/models/work_package/pdf_export/work_package_list_to_pdf.rb
@@ -86,7 +86,7 @@ def export!
   private
 
   def setup_page!
-    self.pdf = get_pdf(current_language)
+    self.pdf = get_pdf
 
     configure_page_size!(wants_report? ? :portrait : :landscape)
   end
@@ -111,6 +111,22 @@ def with_cover?
     wants_report?
   end
 
+  def cover_page_title
+    project&.name
+  end
+
+  def cover_page_heading
+    heading
+  end
+
+  def cover_page_subheading
+    User.current&.name
+  end
+
+  def cover_page_dates
+    nil
+  end
+
   def render_work_packages_pdfs(work_packages, filename)
     write_cover_page! if with_cover?
     if wants_gantt?
diff --git a/app/models/work_package/pdf_export/work_package_to_pdf.rb b/app/models/work_package/pdf_export/work_package_to_pdf.rb
index 5dcfa09dd8c8..2006616c0fc4 100644
--- a/app/models/work_package/pdf_export/work_package_to_pdf.rb
+++ b/app/models/work_package/pdf_export/work_package_to_pdf.rb
@@ -63,7 +63,7 @@ def export!
   end
 
   def setup_page!
-    self.pdf = get_pdf(current_language)
+    self.pdf = get_pdf
     @page_count = 0
     configure_page_size!(:portrait)
   end
diff --git a/app/services/concerns/reminders/service_helpers.rb b/app/services/concerns/reminders/service_helpers.rb
new file mode 100644
index 000000000000..b6e27e2d446a
--- /dev/null
+++ b/app/services/concerns/reminders/service_helpers.rb
@@ -0,0 +1,57 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module Reminders
+  module ServiceHelpers
+    extend ActiveSupport::Concern
+
+    def reschedule_reminder(reminder)
+      destroy_scheduled_reminder_job(reminder)
+      mark_unread_notifications_as_read_for(reminder)
+      schedule_new_reminder_job(reminder)
+    end
+
+    def schedule_new_reminder_job(reminder)
+      job = Reminders::ScheduleReminderJob.schedule(reminder)
+      reminder.update_columns(job_id: job.job_id)
+    end
+
+    def destroy_scheduled_reminder_job(reminder)
+      return unless reminder.scheduled?
+      return unless job = GoodJob::Job.find_by(id: reminder.job_id)
+
+      job.destroy unless job.finished?
+    end
+
+    def mark_unread_notifications_as_read_for(reminder)
+      return unless reminder.unread_notifications?
+
+      reminder.unread_notifications.update_all(read_ian: true, updated_at: Time.zone.now)
+    end
+  end
+end
diff --git a/app/services/custom_fields/hierarchy/hierarchical_item_service.rb b/app/services/custom_fields/hierarchy/hierarchical_item_service.rb
index 8d9421054652..2123063571b4 100644
--- a/app/services/custom_fields/hierarchy/hierarchical_item_service.rb
+++ b/app/services/custom_fields/hierarchy/hierarchical_item_service.rb
@@ -105,7 +105,10 @@ def get_descendants(item:, include_self: true)
       # @param new_parent [CustomField::Hierarchy::Item] the new parent of the node
       # @return [Success(CustomField::Hierarchy::Item)]
       def move_item(item:, new_parent:)
-        Success(new_parent.append_child(item))
+        updated_item = new_parent.append_child(item)
+        update_position_cache(new_parent.root)
+
+        Success(updated_item)
       end
 
       # Reorder the item along its siblings.
@@ -116,7 +119,6 @@ def reorder_item(item:, new_sort_order:)
         return Success() if item.siblings.empty?
 
         new_sort_order = [0, new_sort_order.to_i].max
-
         return Success() if item.sort_order == new_sort_order
 
         update_item_order(item:, new_sort_order:)
@@ -129,6 +131,10 @@ def soft_delete_item(item:)
         raise NotImplementedError
       end
 
+      # Returns a hash of Item => { Item => [Item] }
+      # @param item [CustomField::Hierarchy::Item] the start node
+      # @param depth [Integer] limits the max depth of the hash. see {ClosureTree#hash_tree}
+      # @return [Success({CustomField::Hierarchy::Item => Array, Hash})]
       def hashed_subtree(item:, depth:)
         if depth >= 0
           Success(item.hash_tree(limit_depth: depth + 1))
@@ -137,6 +143,10 @@ def hashed_subtree(item:, depth:)
         end
       end
 
+      # Checks if an item is a descendant of another node
+      # @param item [CustomField::Hierarchy::Item] the item to be tested
+      # @param parent [CustomField::Hierarchy::Item] the node to be checked against
+      # @return [Success, Failure]
       def descendant_of?(item:, parent:)
         item.descendant_of?(parent) ? Success() : Failure()
       end
@@ -147,6 +157,7 @@ def create_root_item(custom_field)
         item = CustomField::Hierarchy::Item.create(custom_field: custom_field)
         return Failure(item.errors) if item.new_record?
 
+        update_position_cache(item)
         Success(item)
       end
 
@@ -157,7 +168,8 @@ def create_child_item(validation:, sort_order: nil)
         item = validation[:parent].children.create(**attributes)
         return Failure(item.errors) if item.new_record?
 
-        Success(item)
+        update_position_cache(item.root)
+        Success(item.reload)
       end
 
       def update_item_attributes(item:, attributes:)
@@ -176,6 +188,37 @@ def update_item_order(item:, new_sort_order:)
           target_item = item.siblings.last
           target_item.append_sibling(item)
         end
+
+        update_position_cache(item.root)
+      end
+
+      def update_position_cache(root)
+        sql = <<-SQL.squish
+          UPDATE hierarchical_items
+          SET position_cache = subquery.position
+          FROM (
+            SELECT hi.id
+                  , SUM((1 + COALESCE(anc.sort_order, 0)) *
+                      POWER(count_max.total_descendants, count_max.max_gens - depths.generations)) AS position
+            FROM hierarchical_items hi
+                 INNER JOIN hierarchical_item_hierarchies hih ON hi.id = hih.descendant_id
+                 JOIN hierarchical_item_hierarchies anc_h ON anc_h.descendant_id = hih.descendant_id
+                 JOIN hierarchical_items anc ON anc.id = anc_h.ancestor_id
+                 JOIN hierarchical_item_hierarchies depths ON depths.ancestor_id = #{root.id} AND depths.descendant_id = anc.id
+               , (
+                SELECT COUNT(1) AS total_descendants, MAX(generations) + 1 AS max_gens
+                FROM hierarchical_items hi
+                    INNER JOIN hierarchical_item_hierarchies hih ON hi.id = hih.ancestor_id
+                WHERE ancestor_id = #{root.id}
+                ) count_max
+            WHERE hih.ancestor_id = #{root.id}
+            GROUP BY hi.id) as subquery
+          WHERE hierarchical_items.id = subquery.id;
+        SQL
+
+        OpenProject::Mutex.with_advisory_lock(CustomField::Hierarchy::Item, "position_update_anc_#{root.id}") do
+          CustomField::Hierarchy::Item.connection.exec_update(sql)
+        end
       end
     end
   end
diff --git a/app/services/duration_converter.rb b/app/services/duration_converter.rb
index e2efe5a771e7..c16c3b58b0bf 100644
--- a/app/services/duration_converter.rb
+++ b/app/services/duration_converter.rb
@@ -96,7 +96,7 @@ def valid?(duration)
       false
     end
 
-    def output(duration_in_hours)
+    def output(duration_in_hours, format: default_format)
       return duration_in_hours if duration_in_hours.nil?
 
       seconds = (duration_in_hours * 3600).to_i
@@ -142,7 +142,7 @@ def do_parse(duration_string)
                             **duration_length_options) / 3600.to_f
     end
 
-    def format
+    def default_format
       Setting.duration_format == "days_and_hours" ? :days_and_hours : :hours_only
     end
 
diff --git a/app/services/principals/replace_references_service.rb b/app/services/principals/replace_references_service.rb
index 14d46adac922..a3b7af255f81 100644
--- a/app/services/principals/replace_references_service.rb
+++ b/app/services/principals/replace_references_service.rb
@@ -30,6 +30,25 @@
 # No data is to be removed.
 module Principals
   class ReplaceReferencesService
+    class << self
+      attr_reader :replacements, :foreign_keys
+
+      def add_replacements(attributes_by_class_name)
+        attributes_by_class_name.each do |class_name, attributes|
+          Array(attributes).each { |attribute| add_replacement(class_name, attribute) }
+        end
+      end
+
+      def add_replacement(class_name, attribute)
+        @replacements ||= {}
+        @replacements[class_name] ||= Set.new
+        @replacements[class_name] << attribute
+
+        @foreign_keys ||= Set.new
+        @foreign_keys << attribute.to_s
+      end
+    end
+
     def call(from:, to:)
       rewrite_active_models(from, to)
       rewrite_custom_value(from, to)
@@ -42,15 +61,10 @@ def call(from:, to:)
     private
 
     def rewrite_active_models(from, to)
-      rewrite_author(from, to)
-      rewrite_creator(from, to)
-      rewrite_user(from, to)
-      rewrite_assigned_to(from, to)
-      rewrite_responsible(from, to)
-      rewrite_actor(from, to)
-      rewrite_owner(from, to)
-      rewrite_logged_by(from, to)
-      rewrite_presenter(from, to)
+      self.class.replacements.each do |class_name, attributes|
+        klass = class_name.constantize
+        attributes.each { |attribute| rewrite(klass, attribute, from, to) }
+      end
     end
 
     def rewrite_custom_value(from, to)
@@ -62,7 +76,7 @@ def rewrite_custom_value(from, to)
 
     def rewrite_default_journals(from, to)
       journal_classes.each do |klass|
-        foreign_keys.each do |foreign_key|
+        self.class.foreign_keys.each do |foreign_key|
           if klass.column_names.include? foreign_key
             rewrite(klass, foreign_key, from, to)
           end
@@ -78,87 +92,10 @@ def rewrite_customizable_journals(from, to)
         .update_all(value: to.id.to_s)
     end
 
-    def rewrite_author(from, to)
-      [WorkPackage,
-       Attachment,
-       WikiPage,
-       News,
-       Comment,
-       Message,
-       Budget,
-       MeetingAgenda,
-       MeetingMinutes,
-       MeetingAgendaItem].each do |klass|
-        rewrite(klass, :author_id, from, to)
-      end
-    end
-
-    def rewrite_creator(from, to)
-      [AuthProvider].each do |klass|
-        rewrite(klass, :creator_id, from, to)
-      end
-    end
-
-    def rewrite_user(from, to)
-      [TimeEntry,
-       CostEntry,
-       ::Query,
-       Changeset,
-       CostQuery,
-       MeetingParticipant].each do |klass|
-        rewrite(klass, :user_id, from, to)
-      end
-    end
-
-    def rewrite_actor(from, to)
-      [::Notification].each do |klass|
-        rewrite(klass, :actor_id, from, to)
-      end
-    end
-
-    def rewrite_owner(from, to)
-      [::Doorkeeper::Application].each do |klass|
-        rewrite(klass, :owner_id, from, to)
-      end
-    end
-
-    def rewrite_assigned_to(from, to)
-      [WorkPackage].each do |klass|
-        rewrite(klass, :assigned_to_id, from, to)
-      end
-    end
-
-    def rewrite_responsible(from, to)
-      [WorkPackage].each do |klass|
-        rewrite(klass, :responsible_id, from, to)
-      end
-    end
-
-    def rewrite_logged_by(from, to)
-      [
-        TimeEntry,
-        CostEntry
-      ].each do |klass|
-        rewrite(klass, :logged_by_id, from, to)
-      end
-    end
-
-    def rewrite_presenter(from, to)
-      [
-        MeetingAgendaItem
-      ].each do |klass|
-        rewrite(klass, :presenter_id, from, to)
-      end
-    end
-
     def journal_classes
       [Journal] + Journal::BaseJournal.subclasses
     end
 
-    def foreign_keys
-      %w[author_id creator_id user_id assigned_to_id responsible_id logged_by_id presenter_id]
-    end
-
     def rewrite(klass, attribute, from, to)
       klass.where(attribute => from.id).update_all(attribute => to.id)
     end
diff --git a/app/services/project_life_cycle_steps/preview_attributes_service.rb b/app/services/project_life_cycle_steps/preview_attributes_service.rb
new file mode 100644
index 000000000000..0070cabfe246
--- /dev/null
+++ b/app/services/project_life_cycle_steps/preview_attributes_service.rb
@@ -0,0 +1,47 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module ProjectLifeCycleSteps
+  class PreviewAttributesService < ::BaseServices::SetAttributes
+    def perform(*)
+      super.tap do |service_call|
+        clear_unchanged_fields(service_call)
+      end
+    end
+
+    private
+
+    def clear_unchanged_fields(service_call)
+      service_call
+        .result
+        .available_life_cycle_steps
+        .select(&:not_set?)
+        .each { _1.errors.clear }
+    end
+  end
+end
diff --git a/app/services/project_life_cycle_steps/set_attributes_service.rb b/app/services/project_life_cycle_steps/set_attributes_service.rb
new file mode 100644
index 000000000000..c1603d42603b
--- /dev/null
+++ b/app/services/project_life_cycle_steps/set_attributes_service.rb
@@ -0,0 +1,32 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module ProjectLifeCycleSteps
+  class SetAttributesService < ::BaseServices::SetAttributes
+  end
+end
diff --git a/app/services/project_life_cycle_steps/update_service.rb b/app/services/project_life_cycle_steps/update_service.rb
new file mode 100644
index 000000000000..a8a5a33aa923
--- /dev/null
+++ b/app/services/project_life_cycle_steps/update_service.rb
@@ -0,0 +1,32 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module ProjectLifeCycleSteps
+  class UpdateService < ::BaseServices::Update
+  end
+end
diff --git a/app/services/reminders/create_service.rb b/app/services/reminders/create_service.rb
new file mode 100644
index 000000000000..340f980a289f
--- /dev/null
+++ b/app/services/reminders/create_service.rb
@@ -0,0 +1,39 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2012-2024 the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module Reminders
+  class CreateService < ::BaseServices::Create
+    include Reminders::ServiceHelpers
+
+    def after_perform(service_call)
+      schedule_new_reminder_job(service_call.result)
+
+      service_call
+    end
+  end
+end
diff --git a/app/services/reminders/delete_service.rb b/app/services/reminders/delete_service.rb
new file mode 100644
index 000000000000..8250ffe12f8f
--- /dev/null
+++ b/app/services/reminders/delete_service.rb
@@ -0,0 +1,39 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2012-2024 the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module Reminders
+  class DeleteService < ::BaseServices::Delete
+    include Reminders::ServiceHelpers
+
+    def destroy(reminder)
+      destroy_scheduled_reminder_job(reminder)
+      mark_unread_notifications_as_read_for(reminder)
+      reminder.update(completed_at: Time.zone.now)
+    end
+  end
+end
diff --git a/app/services/reminders/set_attributes_service.rb b/app/services/reminders/set_attributes_service.rb
new file mode 100644
index 000000000000..c1cbff56aa64
--- /dev/null
+++ b/app/services/reminders/set_attributes_service.rb
@@ -0,0 +1,32 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2012-2024 the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module Reminders
+  class SetAttributesService < ::BaseServices::SetAttributes
+  end
+end
diff --git a/app/services/reminders/update_service.rb b/app/services/reminders/update_service.rb
new file mode 100644
index 000000000000..9a1bd002e1cd
--- /dev/null
+++ b/app/services/reminders/update_service.rb
@@ -0,0 +1,47 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2012-2024 the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module Reminders
+  class UpdateService < ::BaseServices::Update
+    include Reminders::ServiceHelpers
+
+    def after_perform(service_call)
+      reschedule_reminder(service_call.result) if remind_at_changed?
+
+      service_call
+    end
+
+    private
+
+    def remind_at_changed?
+      # For some reason reminder.remind_at_changed? returns false
+      # so we assume a change if remind_at is present in the params (would have passed contract validation)
+      params[:remind_at].present?
+    end
+  end
+end
diff --git a/app/services/sessions/clear_old_sessions_service.rb b/app/services/sessions/clear_old_sessions_service.rb
new file mode 100644
index 000000000000..95b7a8846c5d
--- /dev/null
+++ b/app/services/sessions/clear_old_sessions_service.rb
@@ -0,0 +1,39 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+module Sessions
+  class ClearOldSessionsService
+    class << self
+      ##
+      # Drop all sessions for the given user
+      def call!(days_ago: 30)
+        # sessions expire after 30 days of inactivity by default
+        ActiveRecord::SessionStore::Session.where("updated_at < ?", days_ago.days.ago).delete_all
+      end
+    end
+  end
+end
diff --git a/app/views/account/lost_password.html.erb b/app/views/account/lost_password.html.erb
index 5f2859f265c4..1a5fced1d7c6 100644
--- a/app/views/account/lost_password.html.erb
+++ b/app/views/account/lost_password.html.erb
@@ -27,7 +27,15 @@ See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
 <% html_title t(:label_password_lost) %>
-<%= toolbar title: t(:label_password_lost) %>
+
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { t(:label_password_lost) }
+    header.with_breadcrumbs([{ href: home_path, text: organization_name },
+                             t(:label_password_lost)])
+  end
+%>
+
 <section class="form--section">
   <%= styled_form_tag({action: "lost_password"}) do %>
     <div class="form--field -required">
diff --git a/app/views/account/password_recovery.html.erb b/app/views/account/password_recovery.html.erb
index 47b1f76db29f..3e33e162f621 100644
--- a/app/views/account/password_recovery.html.erb
+++ b/app/views/account/password_recovery.html.erb
@@ -27,7 +27,15 @@ See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
 <% html_title t(:label_password_lost) %>
-<%= toolbar title: t(:label_password_lost) %>
+
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { t(:label_password_lost) }
+    header.with_breadcrumbs([{ href: home_path, text: organization_name },
+                             t(:label_password_lost)])
+  end
+%>
+
 <%= error_messages_for 'user' %>
 <%= styled_form_tag({token: @token.value}, autocomplete: 'off') do %>
   <section class="form--section">
diff --git a/app/views/admin/settings/project_custom_fields/edit.html.erb b/app/views/admin/settings/project_custom_fields/edit.html.erb
index 9651e2fb7db1..4b28742f4731 100644
--- a/app/views/admin/settings/project_custom_fields/edit.html.erb
+++ b/app/views/admin/settings/project_custom_fields/edit.html.erb
@@ -28,7 +28,6 @@ See COPYRIGHT and LICENSE files for more details.
 ++#%>
 
 <% html_title t(:label_administration), t("settings.project_attributes.heading"), @custom_field.name %>
-<% local_assigns[:additional_breadcrumb] = @custom_field.name %>
 
 <%=
   render(Settings::ProjectCustomFields::EditFormHeaderComponent.new(
diff --git a/app/views/admin/settings/project_custom_fields/new.html.erb b/app/views/admin/settings/project_custom_fields/new.html.erb
index f95642bc2048..0384cb23b787 100644
--- a/app/views/admin/settings/project_custom_fields/new.html.erb
+++ b/app/views/admin/settings/project_custom_fields/new.html.erb
@@ -28,7 +28,6 @@ See COPYRIGHT and LICENSE files for more details.
 ++#%>
 
 <% html_title t(:label_administration), t("settings.project_attributes.heading"), t('settings.project_attributes.new.heading') %>
-<% local_assigns[:additional_breadcrumb] = t('settings.project_attributes.new.heading') %>
 
 <%= render(Settings::ProjectCustomFields::NewFormHeaderComponent.new) %>
 
diff --git a/app/views/categories/destroy.html.erb b/app/views/categories/destroy.html.erb
index ea75334d6a64..430fd0185378 100644
--- a/app/views/categories/destroy.html.erb
+++ b/app/views/categories/destroy.html.erb
@@ -26,7 +26,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
-<%= toolbar title: "#{Category.model_name.human} #{@category.name}" %>
+
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { @category.name }
+    header.with_breadcrumbs([{ href: project_overview_path(@project.id), text: @project.name  },
+                             { href: project_settings_general_path(@project.id), text: I18n.t("label_project_settings") },
+                             { href: project_settings_categories_path(@project.id), text: t(:label_work_package_category_plural) },
+                             @category.name])
+  end %>
+
 <%= form_tag({}, {method: :delete, class: 'form'}) do %>
   <p><strong><%= t(:text_work_package_category_destroy_question, count: @issue_count) %></strong></p>
 
diff --git a/app/views/categories/edit.html.erb b/app/views/categories/edit.html.erb
index cd0a4711ef27..ea7ef00d6d33 100644
--- a/app/views/categories/edit.html.erb
+++ b/app/views/categories/edit.html.erb
@@ -26,7 +26,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
-<%= toolbar title: Category.model_name.human %>
+
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { @category.name }
+    header.with_breadcrumbs([{ href: project_overview_path(@project.id), text: @project.name  },
+                             { href: project_settings_general_path(@project.id), text: I18n.t("label_project_settings") },
+                             { href: project_settings_categories_path(@project.id), text: t(:label_work_package_category_plural) },
+                             @category.name])
+  end
+%>
+
 <%= labelled_tabular_form_for @category, as: :category do |f| %>
   <%= render partial: 'categories/form', locals: { f: f } %>
   <%= f.button t(:button_save), class: 'button -primary -with-icon icon-checkmark' %>
diff --git a/app/views/categories/new.html.erb b/app/views/categories/new.html.erb
index f93042e60ecc..bcb04b11371c 100644
--- a/app/views/categories/new.html.erb
+++ b/app/views/categories/new.html.erb
@@ -26,7 +26,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
-<%= toolbar title: t(:label_work_package_category_new) %>
+
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { t(:label_work_package_category_new) }
+    header.with_breadcrumbs([{ href: project_overview_path(@project.id), text: @project.name  },
+                             { href: project_settings_general_path(@project.id), text: I18n.t("label_project_settings") },
+                             { href: project_settings_categories_path(@project.id), text: t(:label_work_package_category_plural) },
+                            t(:label_work_package_category_new)
+                            ])
+  end %>
+
 <%= labelled_tabular_form_for [@project, @category], as: :category  do |f| %>
   <%= render partial: 'categories/form', locals: { f: f } %>
   <%= f.button t(:button_create), class: 'button -primary -with-icon icon-checkmark' %>
diff --git a/app/views/colors/confirm_destroy.html.erb b/app/views/colors/confirm_destroy.html.erb
index 878cb53b1785..a8bd724e9195 100644
--- a/app/views/colors/confirm_destroy.html.erb
+++ b/app/views/colors/confirm_destroy.html.erb
@@ -26,7 +26,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
-<%= toolbar title: @color.name %>
+
+<%=
+  render(Primer::OpenProject::PageHeader.new) do |header|
+    header.with_title { @color.name }
+    header.with_breadcrumbs([{ href: admin_index_path, text: t(:label_administration) },
+                            { href: colors_path, text: t(:label_color_plural) },
+                            @color.name])
+  end
+%>
+
 <%= labelled_tabular_form_for @color,
             url: color_url(@color),
             html: {method: 'delete'},
diff --git a/app/views/enterprises/_info.html.erb b/app/views/enterprises/_info.html.erb
index 14ac77975146..2d83f73f2c05 100644
--- a/app/views/enterprises/_info.html.erb
+++ b/app/views/enterprises/_info.html.erb
@@ -27,9 +27,8 @@ See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
 <% content_for :header_tags do %>
-  <script src="<%= OpenProject::Static::Links.links[:chargebee][:href] %>"
-          data-cb-site="<%= OpenProject::Configuration.enterprise_chargebee_site %>">
-  </script>
+  <%= nonced_javascript_include_tag OpenProject::Static::Links.links[:chargebee][:href],
+                                    "data-cb-site": OpenProject::Configuration.enterprise_chargebee_site %>
 <% end %>
 
 <div class="upsale--information-container">
diff --git a/app/views/forums/edit.html.erb b/app/views/forums/edit.html.erb
index 55eecad24ebf..db71092e464e 100644
--- a/app/views/forums/edit.html.erb
+++ b/app/views/forums/edit.html.erb
@@ -26,7 +26,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
-<%= toolbar title: Forum.model_name.human %>
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { @forum.name }
+    header.with_breadcrumbs( [{ href: project_overview_path(@project.id), text: @project.name  },
+                              { href: project_forums_path(@project.id), text: t(:label_forum_plural)  },
+                              @forum.name
+                             ]) end %>
 
 <%= labelled_tabular_form_for [@project, @forum] do |f| %>
   <%= render partial: 'form', locals: { f: f } %>
diff --git a/app/views/forums/index.html.erb b/app/views/forums/index.html.erb
index 73a2c166a9a7..b228b5921e34 100644
--- a/app/views/forums/index.html.erb
+++ b/app/views/forums/index.html.erb
@@ -27,20 +27,28 @@ See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
 <% html_title t(:label_forum_plural) %>
-<%= toolbar title: t(:label_forum_plural) do %>
-  <% if User.current.allowed_in_project?(:manage_forums, @project) %>
-    <li class="toolbar-item">
-      <%= link_to(new_project_forum_path(@project),
-                  { aria: { label: t(:label_forum_new) },
-                    title: t(:label_forum_new),
-                    class: 'button -primary' }) do %>
-        <%= op_icon('button--icon icon-add') %>
-        <span class="button--text"><%= t('activerecord.models.forum') %></span>
-      <% end %>
-    </li>
-  <% end  %>
-<% end %>
 
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { t(:label_forum_plural) }
+    header.with_breadcrumbs( [{ href: project_overview_path(@project.id), text: @project.name },
+                               t(:label_forum_plural)
+                             ]) end %>
+
+<% if User.current.allowed_in_project?(:manage_forums, @project) %>
+  <%=
+    render(Primer::OpenProject::SubHeader.new) do |subheader|
+      subheader.with_action_button(scheme: :primary,
+                                   aria: { label: t(:label_forum_new) },
+                                   title: t(:label_forum_new),
+                                   tag: :a,
+                                   href: new_project_forum_path(@project)) do |button|
+        button.with_leading_visual_icon(icon: :plus)
+        t('activerecord.models.forum')
+      end
+    end
+  %>
+<% end %>
 <% if @forums.empty? %>
   <%= no_results_box(action_url: new_project_forum_path(@project)) %>
 <% else %>
diff --git a/app/views/forums/new.html.erb b/app/views/forums/new.html.erb
index 47c22c0fd526..97f41c0d1be0 100644
--- a/app/views/forums/new.html.erb
+++ b/app/views/forums/new.html.erb
@@ -27,8 +27,14 @@ See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
 
-<%= toolbar title: t(:label_forum_new) %>
-
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { t(:label_forum_new) }
+    header.with_breadcrumbs( [{ href: project_overview_path(@project.id), text: @project.name  },
+                               { href: project_forums_path(@project.id), text: t(:label_forum_plural) },
+                               t(:label_forum_new)
+                             ])
+    end %>
 <%= labelled_tabular_form_for [@project, @forum] do |f| %>
   <%= render partial: 'form', locals: {f: f} %>
   <%= f.button t(:button_create), class: 'button -primary -with-icon icon-checkmark' %>
diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb
index 576da3808a90..3f0ddfa73894 100644
--- a/app/views/forums/show.html.erb
+++ b/app/views/forums/show.html.erb
@@ -49,24 +49,34 @@ See COPYRIGHT and LICENSE files for more details.
   <% end %>
 </div>
 
-<%= toolbar title: @forum.name, subtitle: format_text(@forum.description) do %>
-  <% if authorize_for(:messages, :new) %>
-    <li class="toolbar-item">
-      <%= link_to({ controller: '/messages', action: 'new', forum_id: @forum },
-                  { class: 'add-message-button button -primary',
-                    aria: { label: t(:label_message_new) },
-                    title: t(:label_message_new) }) do %>
-        <%= op_icon('button--icon icon-add') %>
-        <span class="button--text"><%= t(:label_message) %></span>
-      <% end %>
-      <% csp_onclick('jQuery("#add-message").show(); jQuery("#message_subject").focus();', '.add-message-button') %>
-    </li>
-  <% end %>
-  <% unless User.current.anonymous? %>
-    <li class="toolbar-item">
-      <%= watcher_link(@forum, User.current) %>
-    </li>
-  <% end %>
+
+<%=
+  render(Primer::OpenProject::PageHeader.new) do |header|
+    header.with_title { @forum.name }
+    header.with_description { @forum.description }
+    header.with_breadcrumbs([{ href: project_overview_path(@project.id), text: @project.name },
+                             { href: project_forums_path(@project), text: t(:label_forum_plural) },
+                             @forum.name])
+
+    watcher_action_button(header, @forum)
+  end
+%>
+<% if authorize_for(:messages, :new) %>
+  <%=
+    render(Primer::OpenProject::SubHeader.new) do |subheader|
+      if authorize_for(:messages, :new)
+        subheader.with_action_button(scheme: :primary,
+                                     aria: { label: t(:label_message_new) },
+                                     title: t(:label_message_new),
+                                     tag: :a,
+                                     class: 'add-message-button',
+                                     href: url_for({ controller: '/messages', action: 'new', forum_id: @forum })) do |button|
+          button.with_leading_visual_icon(icon: :plus)
+          t(:label_message)
+        end
+      end
+    end
+  %>
 <% end %>
 
 <% if @topics.any? %>
diff --git a/app/views/groups/_memberships.html.erb b/app/views/groups/_memberships.html.erb
index a7d554fff612..8426d22ee27b 100644
--- a/app/views/groups/_memberships.html.erb
+++ b/app/views/groups/_memberships.html.erb
@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
-<% roles = Role.givable %>
+<% roles = ProjectRole.givable %>
 <% projects = Project.active.order(Arel.sql('lft')) %>
 <% memberships = @group.memberships %>
 
diff --git a/app/views/layouts/_common_head.html.erb b/app/views/layouts/_common_head.html.erb
index ff5c33451036..1e895933c5f2 100644
--- a/app/views/layouts/_common_head.html.erb
+++ b/app/views/layouts/_common_head.html.erb
@@ -4,6 +4,7 @@
 <%= appsignal_frontend_tag %>
 
 <% relative_url_root = OpenProject::Configuration['rails_relative_url_root'] || '' %>
+<meta name="app_title" content="<%= page_title(*html_title_parts) %>"/>
 <meta name="app_base_path" content="<%= relative_url_root %>"/>
 <base href="<%= relative_url_root %>/" />
 <% if @project %>
diff --git a/app/views/messages/edit.html.erb b/app/views/messages/edit.html.erb
index 503d85c27e51..f906ee6ed300 100644
--- a/app/views/messages/edit.html.erb
+++ b/app/views/messages/edit.html.erb
@@ -27,7 +27,14 @@ See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
 
-<h2><%= link_to h(@forum.name), controller: '/forums', action: 'show', project_id: @project, id: @forum %> &#187; <%= h @message.subject %></h2>
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { @message.subject }
+    header.with_breadcrumbs( [{ href: project_overview_path(@project.id), text: @project.name },
+                              { href: project_forums_path(@project), text: t(:label_forum_plural) },
+                              { href: project_forum_path(@project, @forum), text: @forum.name },
+                             @message.subject])
+ end %>
 
 <%= labelled_tabular_form_for @message,
                               url: topic_path(@message),
diff --git a/app/views/messages/new.html.erb b/app/views/messages/new.html.erb
index 58fed5b40082..3b6e0879f527 100644
--- a/app/views/messages/new.html.erb
+++ b/app/views/messages/new.html.erb
@@ -27,8 +27,15 @@ See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
 
-<h2><%= link_to h(@forum.name), controller: '/forums', action: 'show', project_id: @project, id: @forum %> &#187; <%= t(:label_message_new) %></h2>
-
+<%=
+  render(Primer::OpenProject::PageHeader.new) do |header|
+    header.with_title { t(:label_message_new) }
+    header.with_breadcrumbs([{ href: project_overview_path(@project.id), text: @project.name },
+                             { href: project_forums_path(@project), text: t(:label_forum_plural) },
+                             { href: url_for(controller: '/forums', action: 'show', project_id: @project, id: @forum), text: @forum.name },
+                             t(:label_message_new)])
+  end
+%>
 <%= labelled_tabular_form_for @message,
                               url: forum_topics_path(@forum),
                               html: {
diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb
index f294bd74e145..5ec9cbdda7d5 100644
--- a/app/views/messages/show.html.erb
+++ b/app/views/messages/show.html.erb
@@ -27,48 +27,12 @@ See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
 
-<% breadcrumb_paths(
-     link_to(t(:label_forum_plural), project_forums_path(@project)),
-     link_to(h(@forum.name), project_forum_path(@project, @forum)))
-%>
+<%= render Messages::ShowPageHeaderComponent.new(topic: @topic, message: @message, forum: @forum, project:@project) %>
 
 <% content_controller 'forum-messages',
                       dynamic: true %>
 
 <% title avatar(@topic.author) + h(@topic.subject) %>
-<%= toolbar title: title do %>
-  <li class="toolbar-item hidden-for-tablet">
-    <%= watcher_link(@topic, User.current) %>
-  </li>
-  <li class="toolbar-item hidden-for-tablet">
-    <% if !@topic.locked? && authorize_for('messages', 'reply') %>
-      <%= link_to(
-            { action: 'quote', id: @topic },
-            data: { 'action': 'forum-messages#quote' },
-            class: 'boards--quote-button button'
-          ) do %>
-        <%= op_icon('button--icon icon-quote') %>
-        <span class="button--text"><%= t(:button_quote) %></span>
-      <% end %>
-    <% end %>
-  </li>
-  <li class="toolbar-item">
-    <% if @message.editable_by?(User.current) %>
-      <%= link_to(edit_topic_path(@topic), accesskey: accesskey(:edit), class: 'button') do %>
-        <%= op_icon('button--icon icon-edit') %>
-        <span class="button--text"><%= t(:button_edit) %></span>
-      <% end %>
-    <% end %>
-  </li>
-  <li class="toolbar-item">
-    <% if @message.destroyable_by?(User.current) %>
-      <%= link_to(topic_path(@topic), method: :delete, data: { confirm: t(:text_are_you_sure) }, class: 'button') do %>
-        <%= op_icon('button--icon icon-delete') %>
-        <span class="button--text"><%= t(:button_delete) %></span>
-      <% end %>
-    <% end %>
-  </li>
-<% end %>
 
 <div class="forum-message">
   <p class="author additional-information"><%= authoring @topic.created_at, @topic.author %></p>
diff --git a/app/views/news/edit.html.erb b/app/views/news/edit.html.erb
index dd8cadc3a921..0509feb45196 100644
--- a/app/views/news/edit.html.erb
+++ b/app/views/news/edit.html.erb
@@ -28,7 +28,15 @@ See COPYRIGHT and LICENSE files for more details.
 ++#%>
 
 <% html_title t(:label_news_edit) %>
-<%= toolbar title: News.model_name.human %>
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { @news.title }
+    header.with_breadcrumbs([*([ href: home_path, text: organization_name ] unless @project),
+                             *([ href: project_overview_path(@project.id), text: @project.name ] if @project),
+                             *([ href: project_news_index_path(@project.id), text: t(:label_news_plural) ] if @project),
+                             @news.title])
+  end
+%>
 
 <%= labelled_tabular_form_for @news, html: { id: 'news-form' } do |f| %>
   <%= render partial: 'form', locals: { f: f } %>
diff --git a/app/views/news/index.html.erb b/app/views/news/index.html.erb
index 968d66ba0867..6b18570a3df2 100644
--- a/app/views/news/index.html.erb
+++ b/app/views/news/index.html.erb
@@ -26,6 +26,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
+
+<% html_title t(:label_news_plural) %>
+
 <%
   managable = User.current.allowed_in_project?(:manage_news, @project)
  %>
@@ -58,9 +61,9 @@ See COPYRIGHT and LICENSE files for more details.
 <% if @newss.any? %>
   <% @newss.each do |news| %>
    <div class="news">
-    <h3 class="news--header"><%= avatar(news.author) %><%= link_to_project(news.project) + ': ' unless news.project == @project %>
-      <%= link_to h(news.title), news_path(news) %>
-      <%= "(#{t(:label_x_comments, count: news.comments_count)})" if news.comments_count > 0 %></h3>
+     <h3 class="news--header"><%= avatar(news.author) %><%= link_to_project(news.project) + ': ' unless news.project == @project %>
+       <%= link_to h(news.title), news_path(news) %>
+       <%= "(#{t(:label_x_comments, count: news.comments_count)})" if news.comments_count > 0 %></h3>
     <p class="author additional-information"><%= authoring news.created_at, news.author %></p>
     <div class="wiki op-uc-container">
       <%= format_text(news.summary.present? ? news.summary : truncate(news.description, length: 150, escape: false), object: news) %>
diff --git a/app/views/news/new.html.erb b/app/views/news/new.html.erb
index f031848d2b34..383750570f35 100644
--- a/app/views/news/new.html.erb
+++ b/app/views/news/new.html.erb
@@ -26,10 +26,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
-
 <% html_title t(:label_news_new) %>
 
-<%= toolbar title: t(:label_news_new) %>
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { t(:label_news_new) }
+    header.with_breadcrumbs([{  href: project_overview_path(@project.id), text: @project.name },
+                             { href: project_news_index_path(@project), text: t(:label_news_plural)},
+                             t(:label_news_new)])
+  end
+%>
 
 <%= labelled_tabular_form_for [@project, @news], html: { id: 'news-form' } do |f| %>
   <%= render partial: 'news/form', locals: { f: f } %>
diff --git a/app/views/news/show.html.erb b/app/views/news/show.html.erb
index 6e6820b3def3..9b0fd627fb1d 100644
--- a/app/views/news/show.html.erb
+++ b/app/views/news/show.html.erb
@@ -27,33 +27,44 @@ See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
 
-<%= toolbar title: "#{avatar(@news.author)}  #{h @news.title}".html_safe do %>
-  <% if User.current.allowed_in_project?(:manage_news, @project) %>
-    <li class="toolbar-item">
-      <%= link_to(edit_news_path(@news),
-        accesskey: accesskey(:edit),
-        class: 'button edit-news-button') do %>
-        <%= op_icon('button--icon icon-edit') %>
-        <span class="button--text"><%= t(:button_edit) %></span>
-      <% end %>
-      <% csp_onclick('jQuery("#edit-news").show()', '.edit-news-button') %>
-    </li>
-  <% end %>
-  <li class="toolbar-item">
-    <%= watcher_link(@news, User.current) %>
-  </li>
-  <% if User.current.allowed_in_project?(:manage_news, @project) %>
-    <li class="toolbar-item">
-      <%= link_to(news_path(@news),
-        data: { confirm: t(:text_are_you_sure) },
-        method: :delete,
-        class: 'button') do %>
-        <%= op_icon('button--icon icon-delete') %>
-        <span class="button--text"><%= t(:button_delete) %></span>
-      <% end %>
-    </li>
-  <% end %>
-<% end %>
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { "#{avatar(@news.author)}  #{h @news.title}".html_safe }
+    header.with_breadcrumbs([*([ href: home_path, text: organization_name ] unless @project),
+                             *([ href: project_overview_path(@project.id), text: @project.name ] if @project),
+                             *([ href: project_news_index_path(@project.id), text: t(:label_news_plural) ] if @project),
+                             @news.title])
+    if User.current.allowed_in_project?(:manage_news, @project)
+      header.with_action_button(tag: :a,
+                                mobile_icon: :pencil,
+                                mobile_label: t(:button_edit),
+                                size: :medium,
+                                href: edit_news_path(@news),
+                                aria: { label: I18n.t(:button_edit) },
+                                title: I18n.t(:button_edit)) do |button|
+        csp_onclick('jQuery("#edit-news").show()', '.edit-news-button')
+        button.with_leading_visual_icon(icon: :pencil)
+        t(:button_edit)
+      end
+    end
+
+    watcher_action_button(header, @news)
+
+    if User.current.allowed_in_project?(:manage_news, @project)
+      header.with_action_button(scheme: :danger,
+                                tag: :a,
+                                href: news_path(@news),
+                                mobile_icon: :trash,
+                                mobile_label: I18n.t("button_delete"),
+                                data: { confirm: t(:text_are_you_sure), method: :delete, },
+                                aria: { label: I18n.t("button_delete") },
+                                ) do |button|
+        button.with_leading_visual_icon(icon: :trash)
+        I18n.t("button_delete")
+      end
+    end
+  end
+%>
 
 <% if authorize_for('news', 'edit') %>
   <div id="edit-news" style="display:none;">
diff --git a/app/views/projects/_toolbar.html.erb b/app/views/projects/_toolbar.html.erb
deleted file mode 100644
index 88047c9c6caf..000000000000
--- a/app/views/projects/_toolbar.html.erb
+++ /dev/null
@@ -1,89 +0,0 @@
-<%#-- copyright
-OpenProject is an open source project management software.
-Copyright (C) the OpenProject GmbH
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License version 3.
-
-OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-Copyright (C) 2006-2013 Jean-Philippe Lang
-Copyright (C) 2010-2013 the ChiliProject Team
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-See COPYRIGHT and LICENSE files for more details.
-
-++#%>
-
-<%= toolbar title: t(:label_information_plural) do %>
-  <% if User.current.allowed_in_project?(:add_subprojects, @project) %>
-    <li class="toolbar-item">
-      <%= link_to new_project_path(parent_id: @project.id),
-                  { class: 'button -primary',
-                    aria: {label: t(:label_subproject_new)},
-                    title: t(:label_subproject_new)} do %>
-        <%= op_icon('button--icon icon-add') %>
-        <span class="button--text"><%= t(:label_subproject) %></span>
-      <% end %>
-    </li>
-  <% end %>
-  <li class="toolbar-item hidden-for-tablet">
-    <%= link_to project_identifier_path(@project), class: 'button' do %>
-      <%= op_icon('button--icon icon-edit') %>
-      <span class="button--text"><%= t('projects.settings.change_identifier') %></span>
-    <% end %>
-  </li>
-  <% if @project.copy_allowed? %>
-    <li class="toolbar-item hidden-for-tablet">
-      <%= link_to copy_project_path(@project), class: 'button copy', accesskey: accesskey(:copy), data: { turbo: false } do %>
-        <%= op_icon('button--icon icon-copy') %>
-        <span class="button--text"><%= t(:button_copy) %></span>
-      <% end %>
-    </li>
-  <% end %>
-  <% if User.current.allowed_in_project?(:archive_project, @project) %>
-    <li class="toolbar-item hidden-for-tablet">
-      <%= link_to(project_archive_path(@project, status: '', name: @project.name),
-                  data: { confirm: t('project.archive.are_you_sure', name: @project.name) },
-                  method: :post,
-                  title: t(:label_archive_project),
-                  class: 'button') do %>
-        <%= op_icon('button--icon icon-locked') %>
-        <span class="button--text"><%= t(:button_archive) %></span>
-      <% end %>
-    </li>
-  <% end %>
-  <% if User.current.admin? %>
-    <li class="toolbar-item hidden-for-tablet">
-      <% label = @project.templated ? 'remove_from_templates' : 'make_template' %>
-      <%= link_to(project_templated_path(@project),
-                  method: @project.templated ? :delete : :post,
-                  title: t("project.template.#{label}"),
-                  class: 'button') do %>
-        <%= op_icon('button--icon icon-duplicate') unless @project.templated %>
-        <span class="button--text"><%= t("project.template.#{label}") %></span>
-      <% end %>
-    </li>
-    <li class="toolbar-item">
-      <%= link_to confirm_destroy_project_path(@project),
-                  class: 'button delete',
-                  title: t(:label_delete_project),
-                  data: { turbo: false } do %>
-        <%= op_icon('button--icon icon-delete') %>
-        <span class="button--text"><%= t(:button_delete) %></span>
-      <% end %>
-    </li>
-  <% end %>
-<% end %>
diff --git a/app/views/projects/copy.html.erb b/app/views/projects/copy.html.erb
index 3ff9984f198f..d3e510aa7fdd 100644
--- a/app/views/projects/copy.html.erb
+++ b/app/views/projects/copy.html.erb
@@ -29,6 +29,11 @@ See COPYRIGHT and LICENSE files for more details.
 
 <% title = t("copy_project.title", source_project_name: @project.name) %>
 <% html_title title %>
-<%= toolbar title: title %>
 
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { title }
+    header.with_breadcrumbs([{ href: project_overview_path(@project.id), text: @project.name },
+                             { href: project_settings_general_path(@project.id), text: I18n.t("label_project_settings") },
+                             title ]) end %>
 <%= angular_component_tag "opce-copy-project" %>
diff --git a/app/views/projects/destroy_info.html.erb b/app/views/projects/destroy_info.html.erb
index 30f0d06cd679..c9ad867ce15c 100644
--- a/app/views/projects/destroy_info.html.erb
+++ b/app/views/projects/destroy_info.html.erb
@@ -26,6 +26,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { t('project.destroy.title', name: @project_to_destroy) }
+    header.with_breadcrumbs([{ href: project_overview_path(@project_to_destroy.id), text: @project_to_destroy.name },
+                             { href: project_settings_general_path(@project_to_destroy.id), text: I18n.t("label_project_settings") },
+                             t('project.destroy.title', name: @project_to_destroy)]) end %>
+
 <%= styled_form_tag(project_path(@project_to_destroy),
                     class: 'danger-zone',
                     data: { turbo: false },
diff --git a/app/views/projects/identifier/show.html.erb b/app/views/projects/identifier/show.html.erb
index c69c3227dbea..4cecc698dfe2 100644
--- a/app/views/projects/identifier/show.html.erb
+++ b/app/views/projects/identifier/show.html.erb
@@ -27,6 +27,13 @@ See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
 
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { t('project.identifier.title') }
+    header.with_breadcrumbs([{ href: project_overview_path(@project.id), text: @project.name },
+                             { href: project_settings_general_path(@project.id), text: I18n.t("label_project_settings") },
+                             t('project.identifier.title')]) end %>
+
 <%= error_messages_for @project %>
 
 <%= form_for @project,
diff --git a/app/views/projects/new.html.erb b/app/views/projects/new.html.erb
index 2ce73219a92c..794bc43dc582 100644
--- a/app/views/projects/new.html.erb
+++ b/app/views/projects/new.html.erb
@@ -27,6 +27,10 @@ See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
 <% html_title t("label_project_new") %>
-<%= toolbar title: t(:label_project_new) %>
-
+<%=
+  render(Primer::OpenProject::PageHeader.new) do |header|
+    header.with_title { t(:label_project_new)}
+    header.with_breadcrumbs([{ href: home_path, text: organization_name}, t(:label_project_new)])
+  end
+%>
 <%= angular_component_tag "opce-new-project" %>
diff --git a/app/views/projects/settings/categories/show.html.erb b/app/views/projects/settings/categories/show.html.erb
index 8b8a000aaba6..b9056169ce41 100644
--- a/app/views/projects/settings/categories/show.html.erb
+++ b/app/views/projects/settings/categories/show.html.erb
@@ -26,19 +26,29 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { t(:label_work_package_category_plural) }
+    header.with_breadcrumbs([{ href: project_overview_path(@project.id), text: @project.name  },
+                               { href: project_settings_general_path(@project.id), text: I18n.t("label_project_settings") },
+                               t(:label_work_package_category_plural)
+                             ])
+  end %>
 
-<%= toolbar title: t(:label_work_package_category_plural) do -%>
-  <% if current_user.allowed_in_project?(:manage_categories, @project)  %>
-    <li class="toolbar-item">
-      <%= link_to_if_authorized({ controller: '/categories', action: 'new', project_id: @project },
-                                { aria: { label: t(:label_work_package_category_new) },
-                                  title: t(:label_work_package_category_new),
-                                  class: 'button -primary'}) do %>
-        <%= op_icon('icon-add button--icon') %>
-        <span class="button--text"><%= t('activerecord.models.category') %></span>
-      <% end %>
-    </li>
-  <% end %>
+
+<% if current_user.allowed_in_project?(:manage_categories, @project) %>
+  <%=
+    render(Primer::OpenProject::SubHeader.new) do |subheader|
+      subheader.with_action_button(scheme: :primary,
+                                   aria: { label: t(:label_work_package_category_new) },
+                                   title: t(:label_work_package_category_new),
+                                   tag: :a,
+                                   href: url_for({ controller: '/categories', action: 'new', project_id: @project })) do |button|
+        button.with_leading_visual_icon(icon: :plus)
+        t('activerecord.models.category')
+      end
+    end
+  %>
 <% end %>
 
 <% if @project.categories.any? %>
diff --git a/app/views/projects/settings/custom_fields/show.html.erb b/app/views/projects/settings/custom_fields/show.html.erb
index 02e415838207..b779df10af69 100644
--- a/app/views/projects/settings/custom_fields/show.html.erb
+++ b/app/views/projects/settings/custom_fields/show.html.erb
@@ -27,21 +27,29 @@ See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
 
-<%= toolbar title: t(:label_custom_field_plural) , html: { class: '-minimum-title' } do -%>
-  <%= render partial: 'projects/settings/form_toolbar', locals: { form_name: "modules-form" } %>
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { I18n.t(:label_custom_field_plural) }
+    header.with_breadcrumbs( [ { href: project_overview_path(@project.id), text: @project.name  },
+                               { href: project_settings_general_path(@project.id), text: I18n.t("label_project_settings") },
+                               I18n.t(:label_custom_field_plural)])
+  end
+%>
 
-  <% if current_user.admin? %>
-    <li class="toolbar-item -no-grow">
-      <%= link_to new_custom_field_path(type: 'WorkPackageCustomField'),
-                  { class: 'button -primary',
-                    aria: {label: t(:label_custom_field_new)},
-                    title: t(:label_custom_field_new)} do %>
-        <%= op_icon('button--icon icon-add') %>
-        <span class="button--text"><%= CustomField.model_name.human %></span>
-      <% end %>
-    </li>
-  <% end %>
-<% end %>
+<%=
+  if current_user.admin?
+    render(Primer::OpenProject::SubHeader.new) do |subheader|
+      subheader.with_action_button(scheme: :primary,
+                                   aria: { label: t(:label_custom_field_new)},
+                                   title: I18n.t(:label_custom_field_new),
+                                   tag: :a,
+                                   href: new_custom_field_path(type: 'WorkPackageCustomField')) do |button|
+        button.with_leading_visual_icon(icon: :plus)
+        CustomField.model_name.human
+      end
+    end
+  end
+%>
 
 <% if @wp_custom_fields.any? %>
   <%= labelled_tabular_form_for @project,
diff --git a/app/views/projects/settings/general/show.html.erb b/app/views/projects/settings/general/show.html.erb
index c5bc207a347f..a52a028bcaad 100644
--- a/app/views/projects/settings/general/show.html.erb
+++ b/app/views/projects/settings/general/show.html.erb
@@ -26,6 +26,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
-<%= render partial: 'projects/toolbar' %>
+<%= render Projects::Settings::IndexPageHeaderComponent.new(project: @project) %>
 
 <%= angular_component_tag "opce-project-settings" %>
diff --git a/app/views/projects/settings/life_cycle_steps/index.html.erb b/app/views/projects/settings/life_cycle_steps/index.html.erb
new file mode 100644
index 000000000000..05e2233b8a80
--- /dev/null
+++ b/app/views/projects/settings/life_cycle_steps/index.html.erb
@@ -0,0 +1,33 @@
+<%#-- copyright
+OpenProject is an open source project management software.
+Copyright (C) the OpenProject GmbH
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License version 3.
+
+OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+Copyright (C) 2006-2013 Jean-Philippe Lang
+Copyright (C) 2010-2013 the ChiliProject Team
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+See COPYRIGHT and LICENSE files for more details.
+
+++#%>
+
+<%= render(Projects::Settings::LifeCycleSteps::IndexPageHeaderComponent.new(project: @project)) %>
+
+<%= render(Projects::Settings::LifeCycleSteps::IndexComponent.new(project: @project,
+                                                                  life_cycle_definitions: @life_cycle_definitions)) %>
diff --git a/app/views/projects/settings/modules/show.html.erb b/app/views/projects/settings/modules/show.html.erb
index 08fe1ab7448a..f848b2ffd6a6 100644
--- a/app/views/projects/settings/modules/show.html.erb
+++ b/app/views/projects/settings/modules/show.html.erb
@@ -27,9 +27,14 @@ See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
 
-<%= toolbar title: t(:label_module_plural), html: { class: '-minimum-title' } do -%>
-  <%= render partial: 'projects/settings/form_toolbar', locals: { form_name: "edit_project_#{@project.id}" } %>
-<% end %>
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { I18n.t(:label_module_plural) }
+    header.with_breadcrumbs( [ { href: project_overview_path(@project.id), text: @project.name  },
+                               { href: project_settings_general_path(@project.id), text: I18n.t("label_project_settings") },
+                               I18n.t(:label_module_plural)])
+  end
+%>
 
 <%= error_messages_for(@project) %>
 
diff --git a/app/views/projects/settings/project_custom_fields/show.html.erb b/app/views/projects/settings/project_custom_fields/show.html.erb
index 34103faae4c9..be4ac50fa5f2 100644
--- a/app/views/projects/settings/project_custom_fields/show.html.erb
+++ b/app/views/projects/settings/project_custom_fields/show.html.erb
@@ -26,11 +26,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
-<div data-turbo="true">
- <%= render Projects::Settings::ProjectCustomFieldSections::IndexPageHeaderComponent.new(project: @project) %>
-
-  <%= render(Projects::Settings::ProjectCustomFieldSections::IndexComponent.new(
-    project: @project,
-    project_custom_field_sections: @project_custom_field_sections,
-  )) %>
-</div>
+<%= render(Projects::Settings::ProjectCustomFieldSections::IndexPageHeaderComponent.new(project: @project)) %>
+
+<%= render(Projects::Settings::ProjectCustomFieldSections::IndexComponent.new(
+  project: @project,
+  project_custom_field_sections: @project_custom_field_sections,
+)) %>
diff --git a/app/views/projects/settings/repository/show.html.erb b/app/views/projects/settings/repository/show.html.erb
index ca93b4ec114f..26d5542ec93a 100644
--- a/app/views/projects/settings/repository/show.html.erb
+++ b/app/views/projects/settings/repository/show.html.erb
@@ -27,7 +27,14 @@ See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
 
-<%= toolbar title: t(:label_repository) %>
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { t(:label_repository) }
+    header.with_breadcrumbs([{ href: project_overview_path(@project.id), text: @project.name  },
+                             { href: project_settings_general_path(@project.id), text: I18n.t("label_project_settings") },
+                             t(:label_repository)])
+  end
+%>
 
 <% is_creation_form = @repository.nil? || @repository.new_record? %>
 <%= form_for :repository,
diff --git a/app/views/projects/settings/storage/show.html.erb b/app/views/projects/settings/storage/show.html.erb
index a1ab2e53d1f5..d2f3de25dc98 100644
--- a/app/views/projects/settings/storage/show.html.erb
+++ b/app/views/projects/settings/storage/show.html.erb
@@ -27,7 +27,12 @@ See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
 <% html_title t(:label_required_disk_storage) %>
-<%= toolbar title: t(:label_required_disk_storage) %>
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { t(:label_required_disk_storage) }
+    header.with_breadcrumbs([{ href: project_overview_path(@project.id), text: @project.name },
+                             { href: project_settings_general_path(@project.id), text: I18n.t("label_project_settings") },
+                             t(:label_required_disk_storage)]) end %>
 
 <section class="form--section">
   <% if storage['modules'].empty? %>
diff --git a/app/views/projects/settings/types/show.html.erb b/app/views/projects/settings/types/show.html.erb
index fc053d7105ce..fd28b8ce8cec 100644
--- a/app/views/projects/settings/types/show.html.erb
+++ b/app/views/projects/settings/types/show.html.erb
@@ -27,9 +27,14 @@ See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
 
-<%= toolbar title: t(:label_work_package_types), html: { class: '-minimum-title' } do -%>
-  <%= render partial: 'projects/settings/form_toolbar', locals: { form_name: "types-form" } %>
-<% end %>
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { I18n.t(:label_work_package_types) }
+    header.with_breadcrumbs( [ { href: project_overview_path(@project.id), text: @project.name  },
+                               { href: project_settings_general_path(@project.id), text: I18n.t("label_project_settings") },
+                               I18n.t(:label_work_package_types)])
+  end
+%>
 
 <% if Type.any? %>
   <%= form_for @project,
diff --git a/app/views/projects/settings/versions/show.html.erb b/app/views/projects/settings/versions/show.html.erb
index aad2ca59bc90..7b97ddfe4640 100644
--- a/app/views/projects/settings/versions/show.html.erb
+++ b/app/views/projects/settings/versions/show.html.erb
@@ -26,19 +26,27 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { t(:label_version_plural) }
+    header.with_breadcrumbs( [{ href: project_overview_path(@project.id), text: @project.name  },
+                              { href: project_settings_general_path(@project.id), text: I18n.t("label_project_settings") },
+                              t(:label_version_plural)
+                             ])
+  end
+%>
 
-<%= toolbar title: t(:label_version_plural) do %>
-  <% if current_user.allowed_in_project?(:manage_versions, @project) %>
-    <li class="toolbar-item">
-      <%= link_to_if_authorized({ controller: '/versions', action: 'new', project_id: @project },
-                                { class: 'button -primary',
-                                  aria: {label: t(:label_version_new)},
-                                  title: t(:label_version_new)}) do %>
-        <%= op_icon('button--icon icon-add') %>
-        <span class="button--text"><%= t('activerecord.models.version') %></span>
-      <% end %>
-    </li>
-  <% end %>
+<% if current_user.allowed_in_project?(:manage_versions, @project) %>
+  <%= render(Primer::OpenProject::SubHeader.new) do |subheader|
+    subheader.with_action_button(scheme: :primary,
+                                 aria: { label: t(:label_version_new) },
+                                 title: t(:label_version_new),
+                                 tag: :a,
+                                 href: url_for({ controller: '/versions', action: 'new', project_id: @project })) do |button|
+      button.with_leading_visual_icon(icon: :plus)
+      t('activerecord.models.version')
+    end
+  end %>
 <% end %>
 
 <% if @versions.any? %>
diff --git a/app/views/reminders/notification_mailer/reminder_notification.html.erb b/app/views/reminders/notification_mailer/reminder_notification.html.erb
new file mode 100644
index 000000000000..aea025f165e9
--- /dev/null
+++ b/app/views/reminders/notification_mailer/reminder_notification.html.erb
@@ -0,0 +1,54 @@
+<table <%= placeholder_table_styles %>>
+  <tr>
+    <%= placeholder_cell('20px', vertical: false) %>
+  </tr>
+</table>
+
+<table <%= placeholder_table_styles(width: '100%', style: 'width:100%;max-width:700px;') %>>
+  <tr>
+    <%= placeholder_cell('12px', vertical: true) %>
+    <td>
+      <%= render partial: 'mailer/mailer_header',
+                 locals: {
+                   summary: reminder_summary_text,
+                   button_href: notifications_url,
+                   button_text: I18n.t(:'mail.notification.center'),
+                   user: @user,
+                 } %>
+
+      <%= render layout: 'mailer/notification_row',
+                  locals: {
+                    work_package: @notification.resource,
+                    unique_reasons: [@notification.reason],
+                    show_count: true,
+                    count: 1,
+                    user: @user
+                  } do %>
+        <table <%= placeholder_table_styles %>>
+          <tr>
+            <td style="line-height: 24px; font-size: 14px; white-space: normal;">
+              <span style="color: #878787;">
+                <%= reminder_timestamp_text %>
+              </span>
+              <%= reminder_note_text %>
+            </td>
+          </tr>
+        </table>
+      <% end %>
+
+      <%= render layout: 'mailer/notification_settings_table',
+                 locals: {
+                   button_url: my_reminders_url,
+                   button_text: I18n.t(:'mail.notification.settings')
+                 } do %>
+      <% end %>
+
+      <table>
+        <tr>
+          <%= placeholder_cell('40px', vertical: false) %>
+        </tr>
+      </table>
+    </td>
+    <%= placeholder_cell('12px', vertical: true) %>
+  </tr>
+</table>
diff --git a/app/views/reminders/notification_mailer/reminder_notification.text.erb b/app/views/reminders/notification_mailer/reminder_notification.text.erb
new file mode 100644
index 000000000000..8a945818408d
--- /dev/null
+++ b/app/views/reminders/notification_mailer/reminder_notification.text.erb
@@ -0,0 +1,12 @@
+<%= I18n.t(:'mail.salutation', user: @user.firstname) %>
+<%= reminder_summary_text %>
+<%= text_email_wrapper %>
+
+<%= work_package_subject_text_wrapper %>
+= #<%= @work_package.id %> <%= @work_package.subject %> =
+<%= work_package_subject_text_wrapper %>
+
+<%= reminder_timestamp_text %>
+<%= reminder_note_text %>
+
+<%= text_email_wrapper %>
diff --git a/app/views/repositories/committers.html.erb b/app/views/repositories/committers.html.erb
index 510ae2296958..9f09f1a89894 100644
--- a/app/views/repositories/committers.html.erb
+++ b/app/views/repositories/committers.html.erb
@@ -26,7 +26,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
-<%= toolbar title: t(:label_repository) %>
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { t(:label_user_plural) }
+    header.with_breadcrumbs([{ href: project_overview_path(@project.id), text: @project.name },
+                             { href: project_settings_general_path(@project.id), text: I18n.t("label_project_settings") },
+                             { href: project_settings_repository_path, text: t(:label_repository) },
+                             t(:label_user_plural)]) end %>
+
 <%= simple_format(t(:text_repository_usernames_mapping)) %>
 <% if @committers.empty? %>
   <% no_results_box %>
diff --git a/app/views/repositories/destroy_info.html.erb b/app/views/repositories/destroy_info.html.erb
index 0df0c2318ca5..d483d99f0a87 100644
--- a/app/views/repositories/destroy_info.html.erb
+++ b/app/views/repositories/destroy_info.html.erb
@@ -26,6 +26,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
+
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { t(:label_repository_remove) }
+    header.with_breadcrumbs([{ href: project_overview_path(@project.id), text: @project.name },
+                             { href: project_settings_general_path(@project.id), text: I18n.t("label_project_settings") },
+                             { href: project_settings_repository_path, text: t(:label_repository) },
+                             t(:label_repository_remove)]) end %>
 <% if @repository.managed? %>
   <%= styled_form_tag(project_repository_path(@project), method: :delete, class: 'danger-zone') do %>
     <section class="form--section">
@@ -78,9 +86,10 @@ See COPYRIGHT and LICENSE files for more details.
       </p>
       <p>
         <%= link_to project_repository_path(@project),
-          title: t(:button_delete),
-          method: :delete,
-          class: 'button' do %>
+                    title: t(:button_delete),
+                    method: :delete,
+                    data: { "test-selector": "remove-repository-button"},
+                    class: 'button' do %>
           <%= op_icon('button--icon icon-remove') %>
           <span class="button--text"><%= t(:button_remove) %></span>
         <% end %>
diff --git a/app/views/types/edit.html.erb b/app/views/types/edit.html.erb
index c3b52c8f96a7..cdba71ebc004 100644
--- a/app/views/types/edit.html.erb
+++ b/app/views/types/edit.html.erb
@@ -33,12 +33,19 @@ See COPYRIGHT and LICENSE files for more details.
 
 <%= render ::Types::EditPageHeaderComponent.new(type: @type, tabs: tabs) %>
 
-<%= form_for @type,
+<%=
+  selected_tab = selected_tab(tabs)
+
+  if selected_tab.key?(:view_component)
+    render selected_tab[:view_component].new(@type)
+  else
+    form_for @type,
              url: update_type_tab_path(id: @type.id, tab: @tab),
              builder: TabularFormBuilder,
-             lang: current_language do |f| %>
-
-  <%= render_tabs tabs, f, with_tab_nav: false %>
-<% end %>
+             lang: current_language do |f|
+      render partial: "common/tabs", locals: { f:, tabs:, selected_tab:, with_tab_nav: false }
+    end
+  end
+%>
 
 <%= error_messages_for 'type' %>
diff --git a/app/views/types/form/_projects.html.erb b/app/views/types/form/_projects.html.erb
index 081f5cf2d592..68407540cf19 100644
--- a/app/views/types/form/_projects.html.erb
+++ b/app/views/types/form/_projects.html.erb
@@ -33,7 +33,7 @@ See COPYRIGHT and LICENSE files for more details.
       <% if @projects.any? %>
         <fieldset class="form--fieldset" id="type_project_ids">
           <legend class="form--fieldset-legend" >
-            <%= t('types.edit.enabled_projects') %>
+            <%= t('types.edit.projects.enabled_projects') %>
           </legend>
             <div class="form--toolbar">
               <span class="form--toolbar-item">
diff --git a/app/views/types/form/_settings.html.erb b/app/views/types/form/_settings.html.erb
index eb2d6a224515..13ba08e6a564 100644
--- a/app/views/types/form/_settings.html.erb
+++ b/app/views/types/form/_settings.html.erb
@@ -38,7 +38,7 @@ See COPYRIGHT and LICENSE files for more details.
                    object: @type,
                    type: 'type',
                    highlight_text_inline: true,
-                   label: t('types.edit.type_color_text'),
+                   label: t('types.edit.settings.type_color_text'),
                    form_field_class: '-wide-label',
                    container_class: '-slim'
                } %>
diff --git a/app/views/users/hover_card/show.html.erb b/app/views/users/hover_card/show.html.erb
new file mode 100644
index 000000000000..5fd0177bb0eb
--- /dev/null
+++ b/app/views/users/hover_card/show.html.erb
@@ -0,0 +1,3 @@
+<turbo-frame id="op-hover-card-body">
+  <%= render Users::HoverCardComponent.new(id: @id) %>
+</turbo-frame>
diff --git a/app/views/versions/edit.html.erb b/app/views/versions/edit.html.erb
index a32dd511565d..b506d9610f05 100644
--- a/app/views/versions/edit.html.erb
+++ b/app/views/versions/edit.html.erb
@@ -27,8 +27,17 @@ See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
 
-<% html_title t("label_roadmap_edit", name: @version.name) %>
-<%= toolbar title: Version.model_name.human %>
+<% html_title( @version.name, t(:label_version_edit)) %>
+
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { @version.name }
+    header.with_breadcrumbs( [{ href: project_overview_path(@project.id), text: @project.name },
+                              { href: project_settings_general_path(@project.id), text: I18n.t("label_project_settings") },
+                              { href: project_settings_versions_path(@project.id), text: I18n.t("label_version_plural")},
+                              @version.name])
+  end
+%>
 
 <%= labelled_tabular_form_for @version do |f| %>
 
diff --git a/app/views/versions/index.html.erb b/app/views/versions/index.html.erb
index 8a7c9d84ff43..64c413f3777f 100644
--- a/app/views/versions/index.html.erb
+++ b/app/views/versions/index.html.erb
@@ -27,17 +27,25 @@ See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
 
-<%= toolbar title: t(:label_roadmap) do %>
-  <li class="toolbar-item">
-    <%= link_to_if_authorized({ controller: '/versions', action: 'new', project_id: @project },
-                { class: 'button -primary',
-                  aria: { label: t(:label_version_new) },
-                  title: t(:label_version_new) }) do %>
-        <%= op_icon('button--icon icon-add') %>
-        <span class="button--text"><%= t('activerecord.models.version') %></span>
-    <% end %>
-  </li>
-<% end %>
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { t(:label_roadmap) }
+    header.with_breadcrumbs( [{ href: project_overview_path(@project.id), text: @project.name },
+                              t(:label_roadmap)
+                             ])
+  end
+%>
+
+<%= render(Primer::OpenProject::SubHeader.new) do |subheader|
+  subheader.with_action_button(scheme: :primary,
+                               aria: { label: t(:label_version_new) },
+                               title: t(:label_version_new),
+                               tag: :a,
+                               href: url_for({ controller: '/versions', action: 'new', project_id: @project })) do |button|
+    button.with_leading_visual_icon(icon: :plus)
+    t('activerecord.models.version')
+  end
+end %>
 
 <% if @versions.empty? %>
   <%= no_results_box %>
diff --git a/app/views/versions/new.html.erb b/app/views/versions/new.html.erb
index 611e08914928..5c881f226ac6 100644
--- a/app/views/versions/new.html.erb
+++ b/app/views/versions/new.html.erb
@@ -28,7 +28,15 @@ See COPYRIGHT and LICENSE files for more details.
 ++#%>
 <% html_title t("label_version_new") %>
 
-<%= toolbar title: t(:label_version_new) %>
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { t(:label_version_new) }
+    header.with_breadcrumbs( [{ href: project_overview_path(@project.id), text: @project.name  },
+                               { href: project_settings_general_path(@project.id), text: I18n.t("label_project_settings") },
+                               { href: project_settings_versions_path(@project.id), text: I18n.t("label_version_plural") },
+                               t(:label_version_new)
+                             ])
+  end %>
 
 <%= labelled_tabular_form_for [@project, @version] do |f| %>
 
diff --git a/app/views/versions/show.html.erb b/app/views/versions/show.html.erb
index 63198f80c000..91278a36d541 100644
--- a/app/views/versions/show.html.erb
+++ b/app/views/versions/show.html.erb
@@ -26,40 +26,59 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
-
-<%= toolbar title: @version.name do %>
-  <% if authorize_for(:versions, :edit) %>
-    <li class="toolbar-item">
-      <%= link_to(edit_version_path(@version), class: 'button') do %>
-        <%= op_icon('button--icon icon-edit') %>
-        <span class="button--text"><%= t(:button_edit) %></span>
-      <% end %>
-    </li>
-  <% end %>
-  <% if authorize_for(:versions, :destroy) %>
-    <li class="toolbar-item">
-      <%= link_to version_path(@version),
-                  method: :delete,
-                  data: { confirm: t(:text_are_you_sure) },
-                  class: "button -danger" do %>
-        <%= op_icon 'button--icon icon-delete' %>
-        <span class="button--text"><%= t(:button_delete) %></span>
-      <% end %>
-    </li>
-  <% end %>
-  <% if authorize_for(:wiki, :edit) && !(@version.wiki_page_title.blank? || @version.project.wiki.nil?) %>
-    <li class="toolbar-item hidden-for-tablet">
-      <%= link_to({ controller: '/wiki', action: 'edit',
-                    project_id: @version.project,
-                    id: @version.wiki_page_title },
-                  class: 'button') do %>
-        <%= op_icon('button--icon icon-edit') %>
-        <span class="button--text"><%= t(:button_edit_associated_wikipage, page_title: truncate(@version.wiki_page_title, length: 50, separator: ' ')) %></span>
-      <% end %>
-    </li>
-  <% end %>
-  <%= call_hook(:view_versions_show_contextual, { version: @version, project: @project }) %>
-<% end %>
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { @version.name }
+    header.with_breadcrumbs( [{ href: project_overview_path(@project.id), text: @project.name  },
+                              { href: project_settings_general_path(@project.id), text: I18n.t("label_project_settings") },
+                              { href: project_settings_versions_path(@project.id), text: I18n.t("label_version_plural") },
+                              @version.name
+                             ])
+    if authorize_for(:versions, :edit)
+      header.with_action_button(tag: :a,
+                                mobile_icon: :pencil,
+                                mobile_label: t(:button_edit),
+                                size: :medium,
+                                href: edit_version_path(@version),
+                                aria: { label: I18n.t(:button_edit) },
+                                data: { test_selector: "version-edit-button" },
+                                title: I18n.t(:button_edit)) do |button|
+        button.with_leading_visual_icon(icon: :pencil)
+        t(:button_edit)
+      end
+    end
+    if authorize_for(:versions, :destroy)
+      header.with_action_button(tag: :a,
+                                scheme: :danger,
+                                mobile_icon: :trash,
+                                mobile_label: t(:button_delete),
+                                size: :medium,
+                                href: version_path(@version),
+                                aria: { label: I18n.t(:button_delete) },
+                                data: {
+                                  confirm: I18n.t(:text_are_you_sure),
+                                  method: :delete,
+                                  test_selector: "version-delete-button"
+                                },
+                                title: I18n.t(:button_delete)) do |button|
+        button.with_leading_visual_icon(icon: :trash)
+        t(:button_delete)
+      end
+    end
+    if authorize_for(:wiki, :edit) && !(@version.wiki_page_title.blank? || @version.project.wiki.nil?)
+      header.with_action_button(tag: :a,
+                                mobile_icon: :pencil,
+                                mobile_label: t(:button_edit_associated_wikipage, page_title: truncate(@version.wiki_page_title, length: 50, separator: ' ')),
+                                size: :medium,
+                                href: url_for({ controller: '/wiki', action: 'edit', project_id: @version.project, id: @version.wiki_page_title }),
+                                aria: { label: t(:button_edit_associated_wikipage, page_title: truncate(@version.wiki_page_title, length: 50, separator: ' ')) },
+                                title: t(:button_edit_associated_wikipage, page_title: truncate(@version.wiki_page_title, length: 50, separator: ' '))) do |button|
+        button.with_leading_visual_icon(icon: :pencil)
+        t(:button_edit_associated_wikipage, page_title: truncate(@version.wiki_page_title, length: 50, separator: ' '))
+      end
+    end
+    call_hook(:view_versions_show_contextual, { version: @version, project: @project })
+  end %>
 
 <div class="widget-boxes -grid">
   <div class="widget-box -thin">
diff --git a/app/workers/cron/clear_old_sessions_job.rb b/app/workers/cron/clear_old_sessions_job.rb
index 0398b3a8859c..088574463485 100644
--- a/app/workers/cron/clear_old_sessions_job.rb
+++ b/app/workers/cron/clear_old_sessions_job.rb
@@ -31,7 +31,7 @@ class ClearOldSessionsJob < ApplicationJob
     include ::RakeJob
 
     def perform
-      super("db:sessions:expire", 7)
+      Sessions::ClearOldSessionsService.call!
     end
   end
 end
diff --git a/app/workers/mails/reminders/notification_delivery_job.rb b/app/workers/mails/reminders/notification_delivery_job.rb
new file mode 100644
index 000000000000..039326b2ac49
--- /dev/null
+++ b/app/workers/mails/reminders/notification_delivery_job.rb
@@ -0,0 +1,48 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+class Mails::Reminders::NotificationDeliveryJob < Mails::DeliverJob
+  include Notifications::WithMarkedNotifications
+
+  def perform(notification)
+    @notification = notification
+    super(notification.recipient)
+  end
+
+  private
+
+  def notification_marked_attribute
+    :mail_alert_sent
+  end
+
+  def render_mail
+    with_marked_notifications([@notification.id]) do
+      ::Reminders::NotificationMailer.reminder_notification(@notification)
+    end
+  end
+end
diff --git a/app/workers/reminders/schedule_reminder_job.rb b/app/workers/reminders/schedule_reminder_job.rb
new file mode 100644
index 000000000000..4cfa72007308
--- /dev/null
+++ b/app/workers/reminders/schedule_reminder_job.rb
@@ -0,0 +1,74 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module Reminders
+  class ScheduleReminderJob < ApplicationJob
+    queue_with_priority :notification
+
+    def self.schedule(reminder)
+      set(wait_until: reminder.remind_at).perform_later(reminder)
+    end
+
+    def perform(reminder)
+      return if reminder.unread_notifications?
+
+      create_notification_service = create_notification_from_reminder(reminder)
+
+      create_notification_service.on_success do |service_result|
+        notification = service_result.result
+        ReminderNotification.create!(reminder:, notification:)
+        dispatch_immediate_email_notification(notification)
+      end
+
+      create_notification_service.on_failure do |service_result|
+        Rails.logger.error do
+          "Failed to create notification for reminder #{reminder.id}: #{service_result.message}"
+        end
+      end
+    end
+
+    private
+
+    def create_notification_from_reminder(reminder)
+      Notifications::CreateService
+        .new(user: reminder.creator)
+        .call(
+          recipient_id: reminder.creator_id,
+          resource: reminder.remindable,
+          reason: :reminder
+        )
+    end
+
+    def dispatch_immediate_email_notification(notification)
+      recipient = notification.recipient
+      return unless recipient.pref.immediate_reminders[:personal_reminder]
+
+      Mails::Reminders::NotificationDeliveryJob.perform_later(notification)
+    end
+  end
+end
diff --git a/config/constants/settings/definition.rb b/config/constants/settings/definition.rb
index 8c7c30a1bd65..081b92e5a2a5 100644
--- a/config/constants/settings/definition.rb
+++ b/config/constants/settings/definition.rb
@@ -463,7 +463,7 @@ class Definition
       },
       enterprise_plan: {
         description: "Default EE selected plan",
-        default: "enterprise-on-premises---euro---1-year",
+        default: "enterprise-on-premises---basic---euro---1-year",
         writable: false
       },
       feeds_enabled: {
diff --git a/config/initializers/feature_decisions.rb b/config/initializers/feature_decisions.rb
index 546662ab0263..5a969cf8e5cd 100644
--- a/config/initializers/feature_decisions.rb
+++ b/config/initializers/feature_decisions.rb
@@ -47,6 +47,13 @@
                                   description: "Allows to generate a PDF document from a work package description. " \
                                                "See #45896 for details."
 
+OpenProject::FeatureDecisions.add :recurring_meetings,
+                                  description: "Differentiate between one-time and recurring meetings."
+
+OpenProject::FeatureDecisions.add :generate_work_package_subjects,
+                                  description: "Allows the configuration for work package types to have " \
+                                               "automatically generated work package subjects."
+
 # TODO: Remove once the feature flag primerized_work_package_activities is removed altogether
 OpenProject::FeatureDecisions.define_singleton_method(:primerized_work_package_activities_active?) do
   Rails.env.production? ||
@@ -56,3 +63,8 @@
 
 OpenProject::FeatureDecisions.add :stages_and_gates,
                                   description: "Enables the under construction feature of stages and gates."
+
+OpenProject::FeatureDecisions.add :oidc_token_exchange,
+                                  description: "Enables the under construction OAuth2 token exchange, allowing " \
+                                               "users to interact with storage providers without consenting " \
+                                               "in OAuth screens before first use."
diff --git a/config/initializers/menus.rb b/config/initializers/menus.rb
index b8a026f54822..7b8402e4669e 100644
--- a/config/initializers/menus.rb
+++ b/config/initializers/menus.rb
@@ -624,23 +624,28 @@
             allow_deeplink: true
 
   project_menu_items = {
-    general: :label_information_plural,
-    project_custom_fields: :label_project_attributes_plural,
-    modules: :label_module_plural,
-    types: :label_work_package_types,
-    custom_fields: :label_custom_field_plural,
-    versions: :label_version_plural,
-    categories: :label_work_package_category_plural,
-    repository: :label_repository,
-    time_entry_activities: :enumeration_activities,
-    storage: :label_required_disk_storage
+    general: { caption: :label_information_plural },
+    life_cycle_steps: {
+      caption: :label_life_cycle_step_plural,
+      action: :index,
+      if: ->(*) { OpenProject::FeatureDecisions.stages_and_gates_active? }
+    },
+    project_custom_fields: { caption: :label_project_attributes_plural },
+    modules: { caption: :label_module_plural },
+    types: { caption: :label_work_package_types },
+    custom_fields: { caption: :label_custom_field_plural },
+    versions: { caption: :label_version_plural },
+    categories: { caption: :label_work_package_category_plural },
+    repository: { caption: :label_repository },
+    time_entry_activities: { caption: :enumeration_activities },
+    storage: { caption: :label_required_disk_storage }
   }
 
-  project_menu_items.each do |key, caption|
+  project_menu_items.each do |key, options|
     menu.push :"settings_#{key}",
-              { controller: "/projects/settings/#{key}", action: "show" },
-              caption:,
-              parent: :settings
+              { controller: "/projects/settings/#{key}", action: "show" }.merge(options.slice(:action)),
+              parent: :settings,
+              **options.except(:action)
   end
 end
 
diff --git a/config/initializers/permissions.rb b/config/initializers/permissions.rb
index 762f8dc862f0..9b6ce3a8e1ce 100644
--- a/config/initializers/permissions.rb
+++ b/config/initializers/permissions.rb
@@ -133,6 +133,26 @@
                      permissible_on: :project,
                      require: :member
 
+      map.permission :view_project_stages_and_gates,
+                     {},
+                     permissible_on: :project,
+                     dependencies: :view_project
+
+      map.permission :edit_project_stages_and_gates,
+                     {},
+                     permissible_on: :project,
+                     require: :member,
+                     dependencies: :view_project_stages_and_gates,
+                     contract_actions: { projects: %i[update] }
+
+      map.permission :select_project_life_cycle,
+                     {
+                       "projects/settings/life_cycle_steps": %i[index toggle enable_all disable_all]
+                     },
+                     permissible_on: :project,
+                     require: :member,
+                     visible: -> { OpenProject::FeatureDecisions.stages_and_gates_active? }
+
       map.permission :manage_members,
                      {
                        members: %i[index new create update destroy destroy_by_principal autocomplete_for_member menu],
@@ -225,7 +245,8 @@
                        "work_packages/activities_tab": %i[index update_streams update_sorting update_filter],
                        "work_packages/menus": %i[show],
                        "work_packages/hover_card": %i[show],
-                       work_package_relations_tab: %i[index]
+                       work_package_relations_tab: %i[index],
+                       "work_packages/reminders": %i[modal_body create update destroy]
                      },
                      permissible_on: %i[work_package project],
                      contract_actions: { work_packages: %i[read] }
diff --git a/config/initializers/replace_references_service.rb b/config/initializers/replace_references_service.rb
new file mode 100644
index 000000000000..e04b0ca16cb2
--- /dev/null
+++ b/config/initializers/replace_references_service.rb
@@ -0,0 +1,53 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+Rails.application.reloader.to_prepare do
+  Principals::ReplaceReferencesService.add_replacements(
+    {
+      "AuthProvider" => :creator_id,
+      "Attachment" => :author_id,
+      "Budget" => :author_id,
+      "Changeset" => :user_id,
+      "Comment" => :author_id,
+      "CostEntry" => %i[logged_by_id user_id],
+      "CostQuery" => :user_id,
+      "::Doorkeeper::Application" => :owner_id,
+      "MeetingAgenda" => :author_id,
+      "MeetingAgendaItem" => %i[author_id presenter_id],
+      "MeetingMinutes" => :author_id,
+      "MeetingParticipant" => :user_id,
+      "Message" => :author_id,
+      "News" => :author_id,
+      "::Notification" => :actor_id,
+      "::Query" => :user_id,
+      "TimeEntry" => %i[logged_by_id user_id],
+      "WikiPage" => :author_id,
+      "WorkPackage" => %i[author_id assigned_to_id responsible_id]
+    }
+  )
+end
diff --git a/config/locales/crowdin/af.yml b/config/locales/crowdin/af.yml
index 8c1d2a759438..b1dd6a7072da 100644
--- a/config/locales/crowdin/af.yml
+++ b/config/locales/crowdin/af.yml
@@ -343,6 +343,9 @@ af:
         text: "This action will not delete any project the list contains. Are you sure you want to delete this project list?"
     settings:
       change_identifier: Change identifier
+      actions:
+        label_enable_all: "Enable all"
+        label_disable_all: "Disable all"
       activities:
         no_results_title_text: There are currently no activities available.
       forums:
@@ -353,18 +356,26 @@ af:
         no_results_content_text: Create a new work package category
       custom_fields:
         no_results_title_text: There are currently no custom fields available.
+      life_cycle:
+        header:
+          title: "Project lifecycle"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "Neither stages nor gates are currently defined."
+        section_header: "Stages and gates"
+        step:
+          use_in_project: "Use %{step} in this project"
+        filter:
+          label: "Search project stage or gate"
       project_custom_fields:
         header:
           title: "Project attributes"
-          description: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
+          description_html: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
         filter:
           label: "Search project attribute"
         actions:
           label_enable_single: "Active in this project, click to disable"
           label_disable_single: "Inactive in this project, click to enable"
           remove_from_project: "Remove from project"
-          label_enable_all: "Enable all"
-          label_disable_all: "Disable all"
         is_required_blank_slate:
           heading: Required in all projects
           description: This project attribute is activated in all projects since the "Required in all projects" option is checked. It cannot be deactivated for individual projects.
@@ -377,6 +388,10 @@ af:
         no_results_content_text: Create a new version
       storage:
         no_results_title_text: There is no additional recorded disk space consumed by this project.
+  project_stage:
+    working_days_count:
+      one: "Duration: %{count} working day"
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "The modified list has been saved as a new list"
@@ -497,8 +512,12 @@ af:
     groups:
       member_in_these_groups: "This user is currently a member of the following groups:"
       no_results_title_text: This user is currently not a member in any group.
+      summary_with_more: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary: Member of %{names}.
     memberships:
       no_results_title_text: This user is currently not a member of a project.
+    open_profile: "Open profile"
   page:
     text: "Teks"
   placeholder_users:
@@ -569,18 +588,27 @@ af:
       no_results_title_text: There are currently no types.
       no_results_content_text: Create a new type
     edit:
-      settings: "Instellings"
-      form_configuration: "Vorm konfigurasie"
+      form_configuration:
+        tab: "Form configuration"
       more_info_text_html: >
         Enterprise edition allows you to customize form configuration with these additional add-ons: <br> <ul class="%{list_styling_class}"> <li><b>Add new attribute groups</b></li> <li><b>Rename attribute groups</b></li> <li><b>Add a table of related work packages</b></li> </ul>
-      projects: "Projekte"
-      enabled_projects: "Enabled projects"
-      edit_query: "Edit table"
-      query_group_placeholder: "Give the table a name"
-      reset: "Reset to defaults"
-      type_color_text: |
-        The selected color distinguishes different types
-        in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      projects:
+        tab: "Projects"
+        enabled_projects: "Enabled projects"
+      settings:
+        tab: "Settings"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Subject configuration"
+        manually_editable_subjects:
+          label: "Manually editable subjects"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automatically generated subjects"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Subject pattern"
+          caption: "Search for an attribute or add text. To create a space between elements add it as a text."
   versions:
     overview:
       work_packages_in_archived_projects: "The version is shared with archived projects which still have work packages assigned to this version. These are counted, but will not appear in the linked views."
@@ -643,6 +671,10 @@ af:
     label_add_x: "Add %{x}"
     label_edit_x: "Edit %{x}"
     label_add_description: "Add description"
+    lag:
+      subject: "Lag"
+      title: "Lag (in days)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
       label_relates_singular: "related to"
       label_relates_plural: "related to"
@@ -847,6 +879,9 @@ af:
         lag: "Lag"
         from: "Werkspakket"
         to: "Verwante werk pakket"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Time"
       repository:
         url: "Bronadres"
       role:
@@ -935,6 +970,7 @@ af:
       messages:
         accepted: "must be accepted."
         after: "must be after %{date}."
+        after_today: "must be in the future."
         after_or_equal_to: "must be after or equal to %{date}."
         before: "must be before %{date}."
         before_or_equal_to: "must be before or equal to %{date}."
@@ -981,6 +1017,7 @@ af:
         not_an_integer: "is not an integer."
         not_an_iso_date: "is not a valid date. Required format: YYYY-MM-DD."
         not_same_project: "doesn't belong to the same project."
+        datetime_must_be_in_future: "must be in the future."
         odd: "must be odd."
         regex_match_failed: "does not match the regular expression %{expression}."
         regex_invalid: "could not be validated with the associated regular expression."
@@ -1094,16 +1131,38 @@ af:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "start date must be before the end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "is incomplete."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1320,6 +1379,8 @@ af:
         other: "Notifications"
       placeholder_user: "Placeholder user"
       project: "Projek"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         one: "Project list"
         other: "Project lists"
@@ -1423,6 +1484,7 @@ af:
     login: "Username"
     mail: "E-pos"
     name: "Naam"
+    note: "Note"
     password: "Wagwoord"
     priority: "Prioriteit"
     project: "Projek"
@@ -1519,6 +1581,7 @@ af:
   button_print: "Print"
   button_quote: "Haal aan"
   button_remove: Remove
+  button_remove_reminder: "Remove reminder"
   button_rename: "Hernoem"
   button_replace: "Replace"
   button_revoke: "Revoke"
@@ -1529,6 +1592,7 @@ af:
   button_save_as: "Save as"
   button_apply_changes: "Apply changes"
   button_save_back: "Save and back"
+  button_set_reminder: "Set reminder"
   button_show: "Wys"
   button_sort: "Rangskik"
   button_submit: "Dien in"
@@ -1734,12 +1798,12 @@ af:
   direction: lnr
   ee:
     upsale:
+      title: "Enterprise add-on"
+      link_title: "More information"
       form_configuration:
         description: "Customize the form configuration with these additional add-ons:"
         add_groups: "Add new attribute groups"
         rename_groups: "Rename attributes groups"
-      project_filters:
-        description_html: "Filtering and sorting on custom fields is an Enterprise edition add-on."
   enumeration_activities: "Time tracking activities"
   enumeration_work_package_priorities: "Werkspakket prioriteite"
   enumeration_reported_project_statuses: "Gerapporteerde projekstatus"
@@ -1772,6 +1836,7 @@ af:
   error_pdf_export_too_many_columns: "Too many columns selected for the PDF export. Please reduce the number of columns."
   error_pdf_failed_to_export: "The PDF export could not be saved: %{error}"
   error_token_authenticity: "Unable to verify Cross-Site Request Forgery token. Did you try to submit data on multiple browsers or tabs? Please close all tabs and try again."
+  error_reminder_not_found: "The reminder was not found or was already notified about."
   error_work_package_not_found_in_project: "Die werkspakket is nie gekry nie of behoort nie aan hierdie projek nie"
   error_work_package_id_not_found: "The work package was not found."
   error_must_be_project_member: "moet projeklid wees"
@@ -2065,6 +2130,7 @@ af:
       responsible: "Accountable"
       shared: "Shared"
       watched: "Dophouer"
+      reminder: "Reminder"
     facets:
       unread: "Unread"
       unread_title: "Show unread"
@@ -2232,8 +2298,10 @@ af:
   label_default: "Verstek"
   label_delete_user: "Delete user"
   label_delete_project: "Delete project"
+  label_delete: "Delete"
   label_deleted: "geskrap"
   label_deleted_custom_field: "(pasgemaakte veld geskrap)"
+  label_deleted_custom_item: "(deleted item)"
   label_deleted_custom_option: "(deleted option)"
   label_empty_element: "(empty)"
   label_missing_or_hidden_custom_option: "(missing value or lacking permissions to access)"
@@ -2270,7 +2338,6 @@ af:
   label_enterprise_active_users: "%{current}/%{limit} booked active users"
   label_enterprise_edition: "Enterprise edition"
   label_enterprise_support: "Enterprise support"
-  label_enterprise_addon: "Enterprise add-on"
   label_environment: "Omgewing"
   label_estimates_and_progress: "Estimates and progress"
   label_equals: "is"
@@ -2455,6 +2522,7 @@ af:
   label_none_parentheses: "(none)"
   label_not_contains: "bevat nie"
   label_not_equals: "is nie"
+  label_life_cycle_step_plural: "Project lifecycle"
   label_on: "on"
   label_operator_all: "is not empty"
   label_operator_none: "is empty"
@@ -2556,6 +2624,7 @@ af:
   label_reporting: "Reporting"
   label_reporting_plural: "Reportings"
   label_repository: "Repository"
+  label_repository_remove: "Remove repository"
   label_repository_root: "Repository root"
   label_repository_plural: "Repositories"
   label_required: "required"
@@ -2618,6 +2687,7 @@ af:
   label_this_month: "vandeesmaand"
   label_this_week: "vandeesweek"
   label_this_year: "vandeesjaar"
+  label_time: "Time"
   label_time_entry_plural: "Tyd gespandeer"
   label_time_entry_activity_plural: "Spent time activities"
   label_title: "Titel"
@@ -2653,6 +2723,7 @@ af:
   label_user_settings: "User settings"
   label_users_settings: "Users settings"
   label_version_new: "New version"
+  label_version_edit: "Edit version"
   label_version_plural: "Weergawes"
   label_version_sharing_descendants: "With subprojects"
   label_version_sharing_hierarchy: "With project hierarchy"
@@ -2790,8 +2861,13 @@ af:
         prefix: "Received because of the notification setting: %{reason}"
         date_alert_start_date: "Date alert"
         date_alert_due_date: "Date alert"
+        reminder: "Reminder"
       see_all: "See all"
       updated_at: "Updated at %{timestamp} by %{user}"
+    reminder_notifications:
+      subject: "Reminder: %{note}"
+      heading: "You have a new reminder"
+      note: "Note: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "You may %{allowed_actions} this work package. This can change depending on your project role and permissions."
@@ -2958,6 +3034,7 @@ af:
   notice_successful_connection: "Successful connection."
   notice_successful_create: "Successful creation."
   notice_successful_delete: "Successful deletion."
+  notice_successful_cancel: "Successful cancellation."
   notice_successful_update: "Successful update."
   notice_successful_update_custom_fields_added_to_project: |
     Successful update. The custom fields of the activated types are automatically activated
@@ -3035,6 +3112,7 @@ af:
   permission_edit_own_time_entries: "Edit own time logs"
   permission_edit_project: "Edit project"
   permission_edit_project_attributes: "Edit project attributes"
+  permission_edit_project_stages_and_gates: "Edit project stages and gates"
   permission_edit_reportings: "Edit reportings"
   permission_edit_time_entries: "Edit time logs for other users"
   permission_edit_timelines: "Edit timelines"
@@ -3064,9 +3142,12 @@ af:
   permission_search_project: "Search project"
   permission_select_custom_fields: "Select custom fields"
   permission_select_project_custom_fields: "Select project attributes"
+  permission_select_project_life_cycle: "Select project stages and gates"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "Select project modules"
   permission_share_work_packages: "Share work packages"
   permission_manage_types: "Select types"
+  permission_manage_own_reminders: "Create own reminders"
   permission_view_project: "View projects"
   permission_view_changesets: "View repository revisions in OpenProject"
   permission_view_commit_author_statistics: "View commit author statistics"
@@ -3087,6 +3168,7 @@ af:
   permission_work_package_assigned_explanation: "Work packages can be assigned to users and groups in possession of this role in the respective project"
   permission_view_project_activity: "View project activity"
   permission_view_project_attributes: "View project attributes"
+  permission_view_project_stages_and_gates: "View project stages and gates"
   permission_save_bcf_queries: "Save BCF queries"
   permission_manage_public_bcf_queries: "Manage public BCF queries"
   permission_edit_attribute_help_texts: "Edit attribute help texts"
@@ -3767,6 +3849,12 @@ af:
       edit_description: "Can view, comment and edit this work package."
       view: "Bekyk"
       view_description: "Can view this work package."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Why are you setting this reminder?"
+      success_creation_message: "Reminder set successfully. You will receive a notification for this work package at the chosen time."
+      success_update_message: "Reminder updated successfully."
+      success_deletion_message: "Reminder deleted successfully."
   sharing:
     count:
       zero: "0 users"
diff --git a/config/locales/crowdin/ar.yml b/config/locales/crowdin/ar.yml
index 4c81047060ed..0b568426d675 100644
--- a/config/locales/crowdin/ar.yml
+++ b/config/locales/crowdin/ar.yml
@@ -343,6 +343,9 @@ ar:
         text: "This action will not delete any project the list contains. Are you sure you want to delete this project list?"
     settings:
       change_identifier: Change identifier
+      actions:
+        label_enable_all: "Enable all"
+        label_disable_all: "Disable all"
       activities:
         no_results_title_text: لا يوجد حالياً أنشطة متاحة.
       forums:
@@ -353,18 +356,26 @@ ar:
         no_results_content_text: إنشاء فئة حزمة عمل جديدة
       custom_fields:
         no_results_title_text: لا تتوفر حالياً أية حقول متاحة.
+      life_cycle:
+        header:
+          title: "Project lifecycle"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "Neither stages nor gates are currently defined."
+        section_header: "Stages and gates"
+        step:
+          use_in_project: "Use %{step} in this project"
+        filter:
+          label: "Search project stage or gate"
       project_custom_fields:
         header:
           title: "Project attributes"
-          description: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
+          description_html: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
         filter:
           label: "Search project attribute"
         actions:
           label_enable_single: "Active in this project, click to disable"
           label_disable_single: "Inactive in this project, click to enable"
           remove_from_project: "Remove from project"
-          label_enable_all: "Enable all"
-          label_disable_all: "Disable all"
         is_required_blank_slate:
           heading: Required in all projects
           description: This project attribute is activated in all projects since the "Required in all projects" option is checked. It cannot be deactivated for individual projects.
@@ -377,6 +388,14 @@ ar:
         no_results_content_text: إنشاء إصدار جديد
       storage:
         no_results_title_text: There is no additional recorded disk space consumed by this project.
+  project_stage:
+    working_days_count:
+      zero: "Duration: %{count} working days"
+      one: "Duration: %{count} working day"
+      two: "Duration: %{count} working days"
+      few: "Duration: %{count} working days"
+      many: "Duration: %{count} working days"
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "The modified list has been saved as a new list"
@@ -521,8 +540,12 @@ ar:
     groups:
       member_in_these_groups: "This user is currently a member of the following groups:"
       no_results_title_text: This user is currently not a member in any group.
+      summary_with_more: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary: Member of %{names}.
     memberships:
       no_results_title_text: هذا المستخدم حالياً ليس عضواً في المشروع.
+    open_profile: "Open profile"
   page:
     text: "النص"
   placeholder_users:
@@ -597,18 +620,27 @@ ar:
       no_results_title_text: لا يوجد حالياً أي أنواع.
       no_results_content_text: إنشاء نوع جديد
     edit:
-      settings: "إعدادات"
-      form_configuration: "تشكيل النموذج"
+      form_configuration:
+        tab: "Form configuration"
       more_info_text_html: >
         Enterprise edition allows you to customize form configuration with these additional add-ons: <br> <ul class="%{list_styling_class}"> <li><b>Add new attribute groups</b></li> <li><b>Rename attribute groups</b></li> <li><b>Add a table of related work packages</b></li> </ul>
-      projects: "المشاريع"
-      enabled_projects: "المشاريع الممكنة"
-      edit_query: "Edit table"
-      query_group_placeholder: "Give the table a name"
-      reset: "Reset to defaults"
-      type_color_text: |
-        The selected color distinguishes different types
-        in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      projects:
+        tab: "Projects"
+        enabled_projects: "Enabled projects"
+      settings:
+        tab: "Settings"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Subject configuration"
+        manually_editable_subjects:
+          label: "Manually editable subjects"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automatically generated subjects"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Subject pattern"
+          caption: "Search for an attribute or add text. To create a space between elements add it as a text."
   versions:
     overview:
       work_packages_in_archived_projects: "The version is shared with archived projects which still have work packages assigned to this version. These are counted, but will not appear in the linked views."
@@ -675,6 +707,10 @@ ar:
     label_add_x: "Add %{x}"
     label_edit_x: "Edit %{x}"
     label_add_description: "Add description"
+    lag:
+      subject: "Lag"
+      title: "Lag (in days)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
       label_relates_singular: "related to"
       label_relates_plural: "related to"
@@ -879,6 +915,9 @@ ar:
         lag: "Lag"
         from: "مجموعة العمل"
         to: "مجموعة عمل ذات صلة"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Time"
       repository:
         url: "الرابط"
       role:
@@ -967,6 +1006,7 @@ ar:
       messages:
         accepted: "يجب أن تقبل."
         after: "يجب أن يكون بعد %{date}."
+        after_today: "must be in the future."
         after_or_equal_to: "يجب أن يكون بعد أو ما يعادل %{date}."
         before: "يجب أن يكون قبل %{date}."
         before_or_equal_to: "يجب أن يكون قبل أو يساوي %{date}."
@@ -1013,6 +1053,7 @@ ar:
         not_an_integer: "ليس عدداً صحيحاً."
         not_an_iso_date: "ليس تاريخًا صالحًا. الشكل المطلوب: YYYY-MM-DD."
         not_same_project: "لا ينتمي إلى نفس المشروع."
+        datetime_must_be_in_future: "must be in the future."
         odd: "يجب أن يكون فردي."
         regex_match_failed: "does not match the regular expression %{expression}."
         regex_invalid: "could not be validated with the associated regular expression."
@@ -1126,16 +1167,38 @@ ar:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "start date must be before the end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "is incomplete."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1364,6 +1427,8 @@ ar:
         other: "Notifications"
       placeholder_user: "Placeholder user"
       project: "مشروع"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         zero: "Project lists"
         one: "Project list"
@@ -1495,6 +1560,7 @@ ar:
     login: "Username"
     mail: "البريد الإكتروني"
     name: "الاسم"
+    note: "Note"
     password: "كلمة المرور"
     priority: "الأولوية"
     project: "مشروع"
@@ -1591,6 +1657,7 @@ ar:
   button_print: "طباعة"
   button_quote: "اقتباس"
   button_remove: إزالة
+  button_remove_reminder: "Remove reminder"
   button_rename: "اعادة التّسمية"
   button_replace: "Replace"
   button_revoke: "Revoke"
@@ -1601,6 +1668,7 @@ ar:
   button_save_as: "احفظ بشكل"
   button_apply_changes: "Apply changes"
   button_save_back: "حفظ والعودة"
+  button_set_reminder: "Set reminder"
   button_show: "إظهار"
   button_sort: "فرز"
   button_submit: "إرسال"
@@ -1878,12 +1946,12 @@ ar:
   direction: ltr
   ee:
     upsale:
+      title: "Enterprise add-on"
+      link_title: "More information"
       form_configuration:
         description: "Customize the form configuration with these additional add-ons:"
         add_groups: "Add new attribute groups"
         rename_groups: "Rename attributes groups"
-      project_filters:
-        description_html: "Filtering and sorting on custom fields is an Enterprise edition add-on."
   enumeration_activities: "Time tracking activities"
   enumeration_work_package_priorities: "أولويات مجموعة العمل"
   enumeration_reported_project_statuses: "حالة للمشروع المبلغ عنه"
@@ -1916,6 +1984,7 @@ ar:
   error_pdf_export_too_many_columns: "تم تحديد عدد كبير جداً من الأعمدة لتصدير PDF. الرجاء تقليل عدد الأعمدة."
   error_pdf_failed_to_export: "The PDF export could not be saved: %{error}"
   error_token_authenticity: "Unable to verify Cross-Site Request Forgery token. Did you try to submit data on multiple browsers or tabs? Please close all tabs and try again."
+  error_reminder_not_found: "The reminder was not found or was already notified about."
   error_work_package_not_found_in_project: "مجموعة العمل غير موجودة, أو أنها لا تخص هذا المشروع"
   error_work_package_id_not_found: "The work package was not found."
   error_must_be_project_member: "يجب أن تكون عضو في المشروع"
@@ -2209,6 +2278,7 @@ ar:
       responsible: "Accountable"
       shared: "Shared"
       watched: "المشاهد"
+      reminder: "Reminder"
     facets:
       unread: "Unread"
       unread_title: "Show unread"
@@ -2376,8 +2446,10 @@ ar:
   label_default: "الافتراضي"
   label_delete_user: "Delete user"
   label_delete_project: "Delete project"
+  label_delete: "Delete"
   label_deleted: "محذوف"
   label_deleted_custom_field: "(حذف حقل مخصص)"
+  label_deleted_custom_item: "(deleted item)"
   label_deleted_custom_option: "(deleted option)"
   label_empty_element: "(فارغ)"
   label_missing_or_hidden_custom_option: "(missing value or lacking permissions to access)"
@@ -2414,7 +2486,6 @@ ar:
   label_enterprise_active_users: "%{current}/%{limit} booked active users"
   label_enterprise_edition: "Enterprise edition"
   label_enterprise_support: "Enterprise support"
-  label_enterprise_addon: "Enterprise add-on"
   label_environment: "بيئة"
   label_estimates_and_progress: "Estimates and progress"
   label_equals: "يكون"
@@ -2599,6 +2670,7 @@ ar:
   label_none_parentheses: "(بلا)"
   label_not_contains: "لا يحتوي على"
   label_not_equals: "ليس"
+  label_life_cycle_step_plural: "Project lifecycle"
   label_on: "في"
   label_operator_all: "is not empty"
   label_operator_none: "is empty"
@@ -2700,6 +2772,7 @@ ar:
   label_reporting: "تقرير"
   label_reporting_plural: "تقارير"
   label_repository: "مستودع البيانات"
+  label_repository_remove: "Remove repository"
   label_repository_root: "مستودع الإحصائيات"
   label_repository_plural: "مستودعات البيانات"
   label_required: "مطلوب"
@@ -2762,6 +2835,7 @@ ar:
   label_this_month: "هذا الشهر"
   label_this_week: "هذا الأسبوع"
   label_this_year: "هذه السنة"
+  label_time: "Time"
   label_time_entry_plural: "الوقت المستهلك"
   label_time_entry_activity_plural: "Spent time activities"
   label_title: "العنوان"
@@ -2797,6 +2871,7 @@ ar:
   label_user_settings: "User settings"
   label_users_settings: "Users settings"
   label_version_new: "إصدار جديد"
+  label_version_edit: "Edit version"
   label_version_plural: "الإصدارات"
   label_version_sharing_descendants: "مع المشاريع الفرعية"
   label_version_sharing_hierarchy: "مع التسلسل الهرمي للمشروع"
@@ -2938,8 +3013,13 @@ ar:
         prefix: "Received because of the notification setting: %{reason}"
         date_alert_start_date: "Date alert"
         date_alert_due_date: "Date alert"
+        reminder: "Reminder"
       see_all: "See all"
       updated_at: "Updated at %{timestamp} by %{user}"
+    reminder_notifications:
+      subject: "Reminder: %{note}"
+      heading: "You have a new reminder"
+      note: "Note: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "You may %{allowed_actions} this work package. This can change depending on your project role and permissions."
@@ -3106,6 +3186,7 @@ ar:
   notice_successful_connection: "اتصال ناجح."
   notice_successful_create: "إنشاء ناجح."
   notice_successful_delete: "حذف ناجح."
+  notice_successful_cancel: "Successful cancellation."
   notice_successful_update: "تحديث ناجح."
   notice_successful_update_custom_fields_added_to_project: |
     Successful update. The custom fields of the activated types are automatically activated
@@ -3187,6 +3268,7 @@ ar:
   permission_edit_own_time_entries: "تحرير سجلات الوقت الخاصة"
   permission_edit_project: "تحرير المشروع"
   permission_edit_project_attributes: "Edit project attributes"
+  permission_edit_project_stages_and_gates: "Edit project stages and gates"
   permission_edit_reportings: "تحرير التقرير"
   permission_edit_time_entries: "تحرير سجلات الوقت للمستخدمين الآخرين"
   permission_edit_timelines: "تحرير الجداول الزمنية"
@@ -3216,9 +3298,12 @@ ar:
   permission_search_project: "Search project"
   permission_select_custom_fields: "Select custom fields"
   permission_select_project_custom_fields: "Select project attributes"
+  permission_select_project_life_cycle: "Select project stages and gates"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "حدد وحدات المشروع"
   permission_share_work_packages: "Share work packages"
   permission_manage_types: "حدد أنواع"
+  permission_manage_own_reminders: "Create own reminders"
   permission_view_project: "View projects"
   permission_view_changesets: "عرض مستودع التنقيحات في أوبينبروجيكت"
   permission_view_commit_author_statistics: "عرض إحصائيات المؤلِّف المنفّذة"
@@ -3239,6 +3324,7 @@ ar:
   permission_work_package_assigned_explanation: "Work packages can be assigned to users and groups in possession of this role in the respective project"
   permission_view_project_activity: "View project activity"
   permission_view_project_attributes: "View project attributes"
+  permission_view_project_stages_and_gates: "View project stages and gates"
   permission_save_bcf_queries: "Save BCF queries"
   permission_manage_public_bcf_queries: "Manage public BCF queries"
   permission_edit_attribute_help_texts: "Edit attribute help texts"
@@ -3921,6 +4007,12 @@ ar:
       edit_description: "Can view, comment and edit this work package."
       view: "عرض"
       view_description: "Can view this work package."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Why are you setting this reminder?"
+      success_creation_message: "Reminder set successfully. You will receive a notification for this work package at the chosen time."
+      success_update_message: "Reminder updated successfully."
+      success_deletion_message: "Reminder deleted successfully."
   sharing:
     count:
       zero: "0 users"
diff --git a/config/locales/crowdin/az.yml b/config/locales/crowdin/az.yml
index 77e01e965930..b7ad61f7ed5a 100644
--- a/config/locales/crowdin/az.yml
+++ b/config/locales/crowdin/az.yml
@@ -343,6 +343,9 @@ az:
         text: "This action will not delete any project the list contains. Are you sure you want to delete this project list?"
     settings:
       change_identifier: Change identifier
+      actions:
+        label_enable_all: "Enable all"
+        label_disable_all: "Disable all"
       activities:
         no_results_title_text: There are currently no activities available.
       forums:
@@ -353,18 +356,26 @@ az:
         no_results_content_text: Create a new work package category
       custom_fields:
         no_results_title_text: There are currently no custom fields available.
+      life_cycle:
+        header:
+          title: "Project lifecycle"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "Neither stages nor gates are currently defined."
+        section_header: "Stages and gates"
+        step:
+          use_in_project: "Use %{step} in this project"
+        filter:
+          label: "Search project stage or gate"
       project_custom_fields:
         header:
           title: "Project attributes"
-          description: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
+          description_html: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
         filter:
           label: "Search project attribute"
         actions:
           label_enable_single: "Active in this project, click to disable"
           label_disable_single: "Inactive in this project, click to enable"
           remove_from_project: "Remove from project"
-          label_enable_all: "Enable all"
-          label_disable_all: "Disable all"
         is_required_blank_slate:
           heading: Required in all projects
           description: This project attribute is activated in all projects since the "Required in all projects" option is checked. It cannot be deactivated for individual projects.
@@ -377,6 +388,10 @@ az:
         no_results_content_text: Create a new version
       storage:
         no_results_title_text: There is no additional recorded disk space consumed by this project.
+  project_stage:
+    working_days_count:
+      one: "Duration: %{count} working day"
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "The modified list has been saved as a new list"
@@ -497,8 +512,12 @@ az:
     groups:
       member_in_these_groups: "This user is currently a member of the following groups:"
       no_results_title_text: This user is currently not a member in any group.
+      summary_with_more: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary: Member of %{names}.
     memberships:
       no_results_title_text: This user is currently not a member of a project.
+    open_profile: "Open profile"
   page:
     text: "Text"
   placeholder_users:
@@ -569,18 +588,27 @@ az:
       no_results_title_text: There are currently no types.
       no_results_content_text: Create a new type
     edit:
-      settings: "Settings"
-      form_configuration: "Form configuration"
+      form_configuration:
+        tab: "Form configuration"
       more_info_text_html: >
         Enterprise edition allows you to customize form configuration with these additional add-ons: <br> <ul class="%{list_styling_class}"> <li><b>Add new attribute groups</b></li> <li><b>Rename attribute groups</b></li> <li><b>Add a table of related work packages</b></li> </ul>
-      projects: "Projects"
-      enabled_projects: "Enabled projects"
-      edit_query: "Edit table"
-      query_group_placeholder: "Give the table a name"
-      reset: "Reset to defaults"
-      type_color_text: |
-        The selected color distinguishes different types
-        in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      projects:
+        tab: "Projects"
+        enabled_projects: "Enabled projects"
+      settings:
+        tab: "Settings"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Subject configuration"
+        manually_editable_subjects:
+          label: "Manually editable subjects"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automatically generated subjects"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Subject pattern"
+          caption: "Search for an attribute or add text. To create a space between elements add it as a text."
   versions:
     overview:
       work_packages_in_archived_projects: "The version is shared with archived projects which still have work packages assigned to this version. These are counted, but will not appear in the linked views."
@@ -643,6 +671,10 @@ az:
     label_add_x: "Add %{x}"
     label_edit_x: "Edit %{x}"
     label_add_description: "Add description"
+    lag:
+      subject: "Lag"
+      title: "Lag (in days)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
       label_relates_singular: "related to"
       label_relates_plural: "related to"
@@ -847,6 +879,9 @@ az:
         lag: "Lag"
         from: "Work package"
         to: "Related work package"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Time"
       repository:
         url: "URL"
       role:
@@ -935,6 +970,7 @@ az:
       messages:
         accepted: "must be accepted."
         after: "must be after %{date}."
+        after_today: "must be in the future."
         after_or_equal_to: "must be after or equal to %{date}."
         before: "must be before %{date}."
         before_or_equal_to: "must be before or equal to %{date}."
@@ -981,6 +1017,7 @@ az:
         not_an_integer: "is not an integer."
         not_an_iso_date: "is not a valid date. Required format: YYYY-MM-DD."
         not_same_project: "doesn't belong to the same project."
+        datetime_must_be_in_future: "must be in the future."
         odd: "must be odd."
         regex_match_failed: "does not match the regular expression %{expression}."
         regex_invalid: "could not be validated with the associated regular expression."
@@ -1094,16 +1131,38 @@ az:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "start date must be before the end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "is incomplete."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1320,6 +1379,8 @@ az:
         other: "Notifications"
       placeholder_user: "Placeholder user"
       project: "Project"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         one: "Project list"
         other: "Project lists"
@@ -1423,6 +1484,7 @@ az:
     login: "Username"
     mail: "Email"
     name: "Name"
+    note: "Note"
     password: "Password"
     priority: "Priority"
     project: "Project"
@@ -1519,6 +1581,7 @@ az:
   button_print: "Print"
   button_quote: "Sitat"
   button_remove: Remove
+  button_remove_reminder: "Remove reminder"
   button_rename: "Rename"
   button_replace: "Replace"
   button_revoke: "Revoke"
@@ -1529,6 +1592,7 @@ az:
   button_save_as: "Fərqli saxla"
   button_apply_changes: "Apply changes"
   button_save_back: "Save and back"
+  button_set_reminder: "Set reminder"
   button_show: "Show"
   button_sort: "Sort"
   button_submit: "Submit"
@@ -1734,12 +1798,12 @@ az:
   direction: ltr
   ee:
     upsale:
+      title: "Enterprise add-on"
+      link_title: "More information"
       form_configuration:
         description: "Customize the form configuration with these additional add-ons:"
         add_groups: "Add new attribute groups"
         rename_groups: "Rename attributes groups"
-      project_filters:
-        description_html: "Filtering and sorting on custom fields is an Enterprise edition add-on."
   enumeration_activities: "Time tracking activities"
   enumeration_work_package_priorities: "Work package priorities"
   enumeration_reported_project_statuses: "Reported project status"
@@ -1772,6 +1836,7 @@ az:
   error_pdf_export_too_many_columns: "Too many columns selected for the PDF export. Please reduce the number of columns."
   error_pdf_failed_to_export: "The PDF export could not be saved: %{error}"
   error_token_authenticity: "Unable to verify Cross-Site Request Forgery token. Did you try to submit data on multiple browsers or tabs? Please close all tabs and try again."
+  error_reminder_not_found: "The reminder was not found or was already notified about."
   error_work_package_not_found_in_project: "The work package was not found or does not belong to this project"
   error_work_package_id_not_found: "The work package was not found."
   error_must_be_project_member: "must be project member"
@@ -2065,6 +2130,7 @@ az:
       responsible: "Accountable"
       shared: "Shared"
       watched: "Watcher"
+      reminder: "Reminder"
     facets:
       unread: "Unread"
       unread_title: "Show unread"
@@ -2232,8 +2298,10 @@ az:
   label_default: "Default"
   label_delete_user: "Delete user"
   label_delete_project: "Delete project"
+  label_delete: "Delete"
   label_deleted: "deleted"
   label_deleted_custom_field: "(deleted custom field)"
+  label_deleted_custom_item: "(deleted item)"
   label_deleted_custom_option: "(deleted option)"
   label_empty_element: "(empty)"
   label_missing_or_hidden_custom_option: "(missing value or lacking permissions to access)"
@@ -2270,7 +2338,6 @@ az:
   label_enterprise_active_users: "%{current}/%{limit} booked active users"
   label_enterprise_edition: "Enterprise edition"
   label_enterprise_support: "Enterprise support"
-  label_enterprise_addon: "Enterprise add-on"
   label_environment: "Environment"
   label_estimates_and_progress: "Estimates and progress"
   label_equals: "is"
@@ -2455,6 +2522,7 @@ az:
   label_none_parentheses: "(none)"
   label_not_contains: "doesn't contain"
   label_not_equals: "is not"
+  label_life_cycle_step_plural: "Project lifecycle"
   label_on: "on"
   label_operator_all: "is not empty"
   label_operator_none: "is empty"
@@ -2556,6 +2624,7 @@ az:
   label_reporting: "Reporting"
   label_reporting_plural: "Reportings"
   label_repository: "Repository"
+  label_repository_remove: "Remove repository"
   label_repository_root: "Repository root"
   label_repository_plural: "Repositories"
   label_required: "required"
@@ -2618,6 +2687,7 @@ az:
   label_this_month: "this month"
   label_this_week: "this week"
   label_this_year: "this year"
+  label_time: "Time"
   label_time_entry_plural: "Spent time"
   label_time_entry_activity_plural: "Spent time activities"
   label_title: "Title"
@@ -2653,6 +2723,7 @@ az:
   label_user_settings: "User settings"
   label_users_settings: "Users settings"
   label_version_new: "New version"
+  label_version_edit: "Edit version"
   label_version_plural: "Versions"
   label_version_sharing_descendants: "With subprojects"
   label_version_sharing_hierarchy: "With project hierarchy"
@@ -2790,8 +2861,13 @@ az:
         prefix: "Received because of the notification setting: %{reason}"
         date_alert_start_date: "Date alert"
         date_alert_due_date: "Date alert"
+        reminder: "Reminder"
       see_all: "See all"
       updated_at: "Updated at %{timestamp} by %{user}"
+    reminder_notifications:
+      subject: "Reminder: %{note}"
+      heading: "You have a new reminder"
+      note: "Note: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "You may %{allowed_actions} this work package. This can change depending on your project role and permissions."
@@ -2958,6 +3034,7 @@ az:
   notice_successful_connection: "Successful connection."
   notice_successful_create: "Successful creation."
   notice_successful_delete: "Successful deletion."
+  notice_successful_cancel: "Successful cancellation."
   notice_successful_update: "Successful update."
   notice_successful_update_custom_fields_added_to_project: |
     Successful update. The custom fields of the activated types are automatically activated
@@ -3035,6 +3112,7 @@ az:
   permission_edit_own_time_entries: "Edit own time logs"
   permission_edit_project: "Edit project"
   permission_edit_project_attributes: "Edit project attributes"
+  permission_edit_project_stages_and_gates: "Edit project stages and gates"
   permission_edit_reportings: "Edit reportings"
   permission_edit_time_entries: "Edit time logs for other users"
   permission_edit_timelines: "Edit timelines"
@@ -3064,9 +3142,12 @@ az:
   permission_search_project: "Search project"
   permission_select_custom_fields: "Select custom fields"
   permission_select_project_custom_fields: "Select project attributes"
+  permission_select_project_life_cycle: "Select project stages and gates"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "Select project modules"
   permission_share_work_packages: "Share work packages"
   permission_manage_types: "Select types"
+  permission_manage_own_reminders: "Create own reminders"
   permission_view_project: "View projects"
   permission_view_changesets: "View repository revisions in OpenProject"
   permission_view_commit_author_statistics: "View commit author statistics"
@@ -3087,6 +3168,7 @@ az:
   permission_work_package_assigned_explanation: "Work packages can be assigned to users and groups in possession of this role in the respective project"
   permission_view_project_activity: "View project activity"
   permission_view_project_attributes: "View project attributes"
+  permission_view_project_stages_and_gates: "View project stages and gates"
   permission_save_bcf_queries: "Save BCF queries"
   permission_manage_public_bcf_queries: "Manage public BCF queries"
   permission_edit_attribute_help_texts: "Edit attribute help texts"
@@ -3767,6 +3849,12 @@ az:
       edit_description: "Can view, comment and edit this work package."
       view: "View"
       view_description: "Can view this work package."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Why are you setting this reminder?"
+      success_creation_message: "Reminder set successfully. You will receive a notification for this work package at the chosen time."
+      success_update_message: "Reminder updated successfully."
+      success_deletion_message: "Reminder deleted successfully."
   sharing:
     count:
       zero: "0 users"
diff --git a/config/locales/crowdin/be.yml b/config/locales/crowdin/be.yml
index 7f809684391a..d8bbbec4791a 100644
--- a/config/locales/crowdin/be.yml
+++ b/config/locales/crowdin/be.yml
@@ -343,6 +343,9 @@ be:
         text: "This action will not delete any project the list contains. Are you sure you want to delete this project list?"
     settings:
       change_identifier: Change identifier
+      actions:
+        label_enable_all: "Enable all"
+        label_disable_all: "Disable all"
       activities:
         no_results_title_text: There are currently no activities available.
       forums:
@@ -353,18 +356,26 @@ be:
         no_results_content_text: Create a new work package category
       custom_fields:
         no_results_title_text: There are currently no custom fields available.
+      life_cycle:
+        header:
+          title: "Project lifecycle"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "Neither stages nor gates are currently defined."
+        section_header: "Stages and gates"
+        step:
+          use_in_project: "Use %{step} in this project"
+        filter:
+          label: "Search project stage or gate"
       project_custom_fields:
         header:
           title: "Project attributes"
-          description: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
+          description_html: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
         filter:
           label: "Search project attribute"
         actions:
           label_enable_single: "Active in this project, click to disable"
           label_disable_single: "Inactive in this project, click to enable"
           remove_from_project: "Remove from project"
-          label_enable_all: "Enable all"
-          label_disable_all: "Disable all"
         is_required_blank_slate:
           heading: Required in all projects
           description: This project attribute is activated in all projects since the "Required in all projects" option is checked. It cannot be deactivated for individual projects.
@@ -377,6 +388,12 @@ be:
         no_results_content_text: Create a new version
       storage:
         no_results_title_text: There is no additional recorded disk space consumed by this project.
+  project_stage:
+    working_days_count:
+      one: "Duration: %{count} working day"
+      few: "Duration: %{count} working days"
+      many: "Duration: %{count} working days"
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "The modified list has been saved as a new list"
@@ -509,8 +526,12 @@ be:
     groups:
       member_in_these_groups: "This user is currently a member of the following groups:"
       no_results_title_text: This user is currently not a member in any group.
+      summary_with_more: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary: Member of %{names}.
     memberships:
       no_results_title_text: This user is currently not a member of a project.
+    open_profile: "Open profile"
   page:
     text: "Text"
   placeholder_users:
@@ -583,18 +604,27 @@ be:
       no_results_title_text: There are currently no types.
       no_results_content_text: Create a new type
     edit:
-      settings: "Settings"
-      form_configuration: "Form configuration"
+      form_configuration:
+        tab: "Form configuration"
       more_info_text_html: >
         Enterprise edition allows you to customize form configuration with these additional add-ons: <br> <ul class="%{list_styling_class}"> <li><b>Add new attribute groups</b></li> <li><b>Rename attribute groups</b></li> <li><b>Add a table of related work packages</b></li> </ul>
-      projects: "Projects"
-      enabled_projects: "Enabled projects"
-      edit_query: "Edit table"
-      query_group_placeholder: "Give the table a name"
-      reset: "Reset to defaults"
-      type_color_text: |
-        The selected color distinguishes different types
-        in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      projects:
+        tab: "Projects"
+        enabled_projects: "Enabled projects"
+      settings:
+        tab: "Settings"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Subject configuration"
+        manually_editable_subjects:
+          label: "Manually editable subjects"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automatically generated subjects"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Subject pattern"
+          caption: "Search for an attribute or add text. To create a space between elements add it as a text."
   versions:
     overview:
       work_packages_in_archived_projects: "The version is shared with archived projects which still have work packages assigned to this version. These are counted, but will not appear in the linked views."
@@ -659,6 +689,10 @@ be:
     label_add_x: "Add %{x}"
     label_edit_x: "Edit %{x}"
     label_add_description: "Add description"
+    lag:
+      subject: "Lag"
+      title: "Lag (in days)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
       label_relates_singular: "related to"
       label_relates_plural: "related to"
@@ -863,6 +897,9 @@ be:
         lag: "Lag"
         from: "Work package"
         to: "Related work package"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Time"
       repository:
         url: "URL"
       role:
@@ -951,6 +988,7 @@ be:
       messages:
         accepted: "must be accepted."
         after: "must be after %{date}."
+        after_today: "must be in the future."
         after_or_equal_to: "must be after or equal to %{date}."
         before: "must be before %{date}."
         before_or_equal_to: "must be before or equal to %{date}."
@@ -997,6 +1035,7 @@ be:
         not_an_integer: "is not an integer."
         not_an_iso_date: "is not a valid date. Required format: YYYY-MM-DD."
         not_same_project: "doesn't belong to the same project."
+        datetime_must_be_in_future: "must be in the future."
         odd: "must be odd."
         regex_match_failed: "does not match the regular expression %{expression}."
         regex_invalid: "could not be validated with the associated regular expression."
@@ -1110,16 +1149,38 @@ be:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "start date must be before the end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "is incomplete."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1342,6 +1403,8 @@ be:
         other: "Notifications"
       placeholder_user: "Placeholder user"
       project: "Project"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         one: "Project list"
         few: "Project lists"
@@ -1459,6 +1522,7 @@ be:
     login: "Username"
     mail: "Email"
     name: "Імя"
+    note: "Note"
     password: "Password"
     priority: "Priority"
     project: "Project"
@@ -1555,6 +1619,7 @@ be:
   button_print: "Print"
   button_quote: "Quote"
   button_remove: Remove
+  button_remove_reminder: "Remove reminder"
   button_rename: "Rename"
   button_replace: "Replace"
   button_revoke: "Revoke"
@@ -1565,6 +1630,7 @@ be:
   button_save_as: "Save as"
   button_apply_changes: "Apply changes"
   button_save_back: "Save and back"
+  button_set_reminder: "Set reminder"
   button_show: "Show"
   button_sort: "Sort"
   button_submit: "Submit"
@@ -1806,12 +1872,12 @@ be:
   direction: ltr
   ee:
     upsale:
+      title: "Enterprise add-on"
+      link_title: "More information"
       form_configuration:
         description: "Customize the form configuration with these additional add-ons:"
         add_groups: "Add new attribute groups"
         rename_groups: "Rename attributes groups"
-      project_filters:
-        description_html: "Filtering and sorting on custom fields is an Enterprise edition add-on."
   enumeration_activities: "Time tracking activities"
   enumeration_work_package_priorities: "Work package priorities"
   enumeration_reported_project_statuses: "Reported project status"
@@ -1844,6 +1910,7 @@ be:
   error_pdf_export_too_many_columns: "Too many columns selected for the PDF export. Please reduce the number of columns."
   error_pdf_failed_to_export: "The PDF export could not be saved: %{error}"
   error_token_authenticity: "Unable to verify Cross-Site Request Forgery token. Did you try to submit data on multiple browsers or tabs? Please close all tabs and try again."
+  error_reminder_not_found: "The reminder was not found or was already notified about."
   error_work_package_not_found_in_project: "The work package was not found or does not belong to this project"
   error_work_package_id_not_found: "The work package was not found."
   error_must_be_project_member: "must be project member"
@@ -2137,6 +2204,7 @@ be:
       responsible: "Accountable"
       shared: "Shared"
       watched: "Watcher"
+      reminder: "Reminder"
     facets:
       unread: "Unread"
       unread_title: "Show unread"
@@ -2304,8 +2372,10 @@ be:
   label_default: "Default"
   label_delete_user: "Delete user"
   label_delete_project: "Delete project"
+  label_delete: "Delete"
   label_deleted: "deleted"
   label_deleted_custom_field: "(deleted custom field)"
+  label_deleted_custom_item: "(deleted item)"
   label_deleted_custom_option: "(deleted option)"
   label_empty_element: "(empty)"
   label_missing_or_hidden_custom_option: "(missing value or lacking permissions to access)"
@@ -2342,7 +2412,6 @@ be:
   label_enterprise_active_users: "%{current}/%{limit} booked active users"
   label_enterprise_edition: "Enterprise edition"
   label_enterprise_support: "Enterprise support"
-  label_enterprise_addon: "Enterprise add-on"
   label_environment: "Environment"
   label_estimates_and_progress: "Estimates and progress"
   label_equals: "is"
@@ -2527,6 +2596,7 @@ be:
   label_none_parentheses: "(none)"
   label_not_contains: "doesn't contain"
   label_not_equals: "is not"
+  label_life_cycle_step_plural: "Project lifecycle"
   label_on: "on"
   label_operator_all: "is not empty"
   label_operator_none: "is empty"
@@ -2628,6 +2698,7 @@ be:
   label_reporting: "Reporting"
   label_reporting_plural: "Reportings"
   label_repository: "Repository"
+  label_repository_remove: "Remove repository"
   label_repository_root: "Repository root"
   label_repository_plural: "Repositories"
   label_required: "required"
@@ -2690,6 +2761,7 @@ be:
   label_this_month: "this month"
   label_this_week: "this week"
   label_this_year: "this year"
+  label_time: "Time"
   label_time_entry_plural: "Spent time"
   label_time_entry_activity_plural: "Spent time activities"
   label_title: "Title"
@@ -2725,6 +2797,7 @@ be:
   label_user_settings: "User settings"
   label_users_settings: "Users settings"
   label_version_new: "New version"
+  label_version_edit: "Edit version"
   label_version_plural: "Versions"
   label_version_sharing_descendants: "With subprojects"
   label_version_sharing_hierarchy: "With project hierarchy"
@@ -2864,8 +2937,13 @@ be:
         prefix: "Received because of the notification setting: %{reason}"
         date_alert_start_date: "Date alert"
         date_alert_due_date: "Date alert"
+        reminder: "Reminder"
       see_all: "See all"
       updated_at: "Updated at %{timestamp} by %{user}"
+    reminder_notifications:
+      subject: "Reminder: %{note}"
+      heading: "You have a new reminder"
+      note: "Note: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "You may %{allowed_actions} this work package. This can change depending on your project role and permissions."
@@ -3032,6 +3110,7 @@ be:
   notice_successful_connection: "Successful connection."
   notice_successful_create: "Successful creation."
   notice_successful_delete: "Successful deletion."
+  notice_successful_cancel: "Successful cancellation."
   notice_successful_update: "Successful update."
   notice_successful_update_custom_fields_added_to_project: |
     Successful update. The custom fields of the activated types are automatically activated
@@ -3111,6 +3190,7 @@ be:
   permission_edit_own_time_entries: "Edit own time logs"
   permission_edit_project: "Edit project"
   permission_edit_project_attributes: "Edit project attributes"
+  permission_edit_project_stages_and_gates: "Edit project stages and gates"
   permission_edit_reportings: "Edit reportings"
   permission_edit_time_entries: "Edit time logs for other users"
   permission_edit_timelines: "Edit timelines"
@@ -3140,9 +3220,12 @@ be:
   permission_search_project: "Search project"
   permission_select_custom_fields: "Select custom fields"
   permission_select_project_custom_fields: "Select project attributes"
+  permission_select_project_life_cycle: "Select project stages and gates"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "Select project modules"
   permission_share_work_packages: "Share work packages"
   permission_manage_types: "Select types"
+  permission_manage_own_reminders: "Create own reminders"
   permission_view_project: "View projects"
   permission_view_changesets: "View repository revisions in OpenProject"
   permission_view_commit_author_statistics: "View commit author statistics"
@@ -3163,6 +3246,7 @@ be:
   permission_work_package_assigned_explanation: "Work packages can be assigned to users and groups in possession of this role in the respective project"
   permission_view_project_activity: "View project activity"
   permission_view_project_attributes: "View project attributes"
+  permission_view_project_stages_and_gates: "View project stages and gates"
   permission_save_bcf_queries: "Save BCF queries"
   permission_manage_public_bcf_queries: "Manage public BCF queries"
   permission_edit_attribute_help_texts: "Edit attribute help texts"
@@ -3845,6 +3929,12 @@ be:
       edit_description: "Can view, comment and edit this work package."
       view: "View"
       view_description: "Can view this work package."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Why are you setting this reminder?"
+      success_creation_message: "Reminder set successfully. You will receive a notification for this work package at the chosen time."
+      success_update_message: "Reminder updated successfully."
+      success_deletion_message: "Reminder deleted successfully."
   sharing:
     count:
       zero: "0 users"
diff --git a/config/locales/crowdin/bg.yml b/config/locales/crowdin/bg.yml
index 052632b902eb..becf6e80710b 100644
--- a/config/locales/crowdin/bg.yml
+++ b/config/locales/crowdin/bg.yml
@@ -343,6 +343,9 @@ bg:
         text: "Това действие няма да изтрие нито един проект, който списъкът съдържа. Сигурни ли сте, че искате да изтриете този списък с проекти?"
     settings:
       change_identifier: Промяна на идентификатора
+      actions:
+        label_enable_all: "Enable all"
+        label_disable_all: "Disable all"
       activities:
         no_results_title_text: В момента има няма дейности на разположение.
       forums:
@@ -353,18 +356,26 @@ bg:
         no_results_content_text: Създаване на нова категория работни пакети
       custom_fields:
         no_results_title_text: В момента няма налични потребителски полета.
+      life_cycle:
+        header:
+          title: "Project lifecycle"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "Neither stages nor gates are currently defined."
+        section_header: "Stages and gates"
+        step:
+          use_in_project: "Use %{step} in this project"
+        filter:
+          label: "Search project stage or gate"
       project_custom_fields:
         header:
           title: "Атрибути на проекта"
-          description: 'Тези атрибути на проекта ще бъдат показани във вашата <a href=%{overview_url} target="_blank">страница за преглед на проекта</a> в съответните им раздели. Можете да активирате или деактивирате отделните атрибути. Атрибутите и разделите на проекта се определят в <a href=%{admin_settings_url} target="_blank">настройките за администриране</a> от администратора на инстанцията. '
+          description_html: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
         filter:
           label: "Намерете атрибут на проекта"
         actions:
           label_enable_single: "Активен в този проект, щракнете за да деактивирате"
           label_disable_single: "Неактивен в този проект, щракнете, за да разрешите"
           remove_from_project: "Remove from project"
-          label_enable_all: "Разрешете всички"
-          label_disable_all: "Disable all"
         is_required_blank_slate:
           heading: Required in all projects
           description: This project attribute is activated in all projects since the "Required in all projects" option is checked. It cannot be deactivated for individual projects.
@@ -377,6 +388,10 @@ bg:
         no_results_content_text: Създаване на нова версия
       storage:
         no_results_title_text: There is no additional recorded disk space consumed by this project.
+  project_stage:
+    working_days_count:
+      one: "Duration: %{count} working day"
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "The modified list has been saved as a new list"
@@ -497,8 +512,12 @@ bg:
     groups:
       member_in_these_groups: "В момента този потребител е член на следните групи:"
       no_results_title_text: В момента този потребител не е член на нито една група.
+      summary_with_more: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary: Member of %{names}.
     memberships:
       no_results_title_text: Този потребител в момента не е член на проекта.
+    open_profile: "Open profile"
   page:
     text: "Текст"
   placeholder_users:
@@ -569,18 +588,27 @@ bg:
       no_results_title_text: В момента няма типове.
       no_results_content_text: Създаване на нов тип
     edit:
-      settings: "Настройки"
-      form_configuration: "Конфигурация на формата"
+      form_configuration:
+        tab: "Form configuration"
       more_info_text_html: >
         Enterprise edition allows you to customize form configuration with these additional add-ons: <br> <ul class="%{list_styling_class}"> <li><b>Add new attribute groups</b></li> <li><b>Rename attribute groups</b></li> <li><b>Add a table of related work packages</b></li> </ul>
-      projects: "Проекти"
-      enabled_projects: "Активирани проекти"
-      edit_query: "Редактиране на таблица"
-      query_group_placeholder: "Дайте име на таблицата"
-      reset: "Възстановяване по подразбиране"
-      type_color_text: |
-        The selected color distinguishes different types
-        in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      projects:
+        tab: "Projects"
+        enabled_projects: "Enabled projects"
+      settings:
+        tab: "Settings"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Subject configuration"
+        manually_editable_subjects:
+          label: "Manually editable subjects"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automatically generated subjects"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Subject pattern"
+          caption: "Search for an attribute or add text. To create a space between elements add it as a text."
   versions:
     overview:
       work_packages_in_archived_projects: "The version is shared with archived projects which still have work packages assigned to this version. These are counted, but will not appear in the linked views."
@@ -643,6 +671,10 @@ bg:
     label_add_x: "Add %{x}"
     label_edit_x: "Edit %{x}"
     label_add_description: "Add description"
+    lag:
+      subject: "Lag"
+      title: "Lag (in days)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
       label_relates_singular: "related to"
       label_relates_plural: "related to"
@@ -847,6 +879,9 @@ bg:
         lag: "Lag"
         from: "Работен пакет"
         to: "Свързани работени пакети"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Time"
       repository:
         url: "URL АДРЕС"
       role:
@@ -935,6 +970,7 @@ bg:
       messages:
         accepted: "трябва да бъде одобрено."
         after: "трябва да бъде след %{date}."
+        after_today: "must be in the future."
         after_or_equal_to: "трябва да бъде след или равно на %{date}."
         before: "трябва да бъде преди %{date}."
         before_or_equal_to: "трябва да бъде преди или е равно на %{date}."
@@ -981,6 +1017,7 @@ bg:
         not_an_integer: "не е цяло число."
         not_an_iso_date: "не е валидна дата. Изискван формат: ГГГГ-ММ-ДД."
         not_same_project: "не принадлежат към един и същ проект."
+        datetime_must_be_in_future: "must be in the future."
         odd: "трябва да бъде нечетен."
         regex_match_failed: "не съответства на регулярния израз %{expression}."
         regex_invalid: "не може да бъде валидиран със съответния регулярен израз."
@@ -1094,16 +1131,38 @@ bg:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "start date must be before the end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "is incomplete."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1320,6 +1379,8 @@ bg:
         other: "Notifications"
       placeholder_user: "Потребител на заместител"
       project: "Проект"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         one: "Project list"
         other: "Project lists"
@@ -1423,6 +1484,7 @@ bg:
     login: "Username"
     mail: "E-mail"
     name: "Име"
+    note: "Note"
     password: "Парола"
     priority: "Приоритет"
     project: "Проект"
@@ -1519,6 +1581,7 @@ bg:
   button_print: "Отпечатване"
   button_quote: "Цитат"
   button_remove: Премахване
+  button_remove_reminder: "Remove reminder"
   button_rename: "Преименуване"
   button_replace: "Замени"
   button_revoke: "Отмени"
@@ -1529,6 +1592,7 @@ bg:
   button_save_as: "Запиши като"
   button_apply_changes: "Приложи промените"
   button_save_back: "Записване и обратно"
+  button_set_reminder: "Set reminder"
   button_show: "Покажи"
   button_sort: "Сортиране"
   button_submit: "Изпрати"
@@ -1734,12 +1798,12 @@ bg:
   direction: отляво надясно
   ee:
     upsale:
+      title: "Enterprise add-on"
+      link_title: "More information"
       form_configuration:
         description: "Customize the form configuration with these additional add-ons:"
         add_groups: "Добавяне на нови групи атрибути"
         rename_groups: "Преименуване на групи атрибути"
-      project_filters:
-        description_html: "Filtering and sorting on custom fields is an Enterprise edition add-on."
   enumeration_activities: "Дейности за проследяване на времето"
   enumeration_work_package_priorities: "Приоритети на работни пакети"
   enumeration_reported_project_statuses: "Докладвани статуси на проект"
@@ -1772,6 +1836,7 @@ bg:
   error_pdf_export_too_many_columns: "Too many columns selected for the PDF export. Please reduce the number of columns."
   error_pdf_failed_to_export: "The PDF export could not be saved: %{error}"
   error_token_authenticity: "Unable to verify Cross-Site Request Forgery token. Did you try to submit data on multiple browsers or tabs? Please close all tabs and try again."
+  error_reminder_not_found: "The reminder was not found or was already notified about."
   error_work_package_not_found_in_project: "Работен пакет не е намерен или не принадлежи на този проект"
   error_work_package_id_not_found: "The work package was not found."
   error_must_be_project_member: "трябва да бъде член проекта"
@@ -2065,6 +2130,7 @@ bg:
       responsible: "Accountable"
       shared: "Shared"
       watched: "Наблюдател"
+      reminder: "Reminder"
     facets:
       unread: "Unread"
       unread_title: "Show unread"
@@ -2232,8 +2298,10 @@ bg:
   label_default: "По подразбиране"
   label_delete_user: "Изтриване на потребител"
   label_delete_project: "Изтриване на проект"
+  label_delete: "Delete"
   label_deleted: "изтрит"
   label_deleted_custom_field: "(изтрито потребителско поле)"
+  label_deleted_custom_item: "(deleted item)"
   label_deleted_custom_option: "(deleted option)"
   label_empty_element: "(празно)"
   label_missing_or_hidden_custom_option: "(missing value or lacking permissions to access)"
@@ -2270,7 +2338,6 @@ bg:
   label_enterprise_active_users: "%{current}/%{limit} резервирани активни потребители"
   label_enterprise_edition: "Enterprise edition"
   label_enterprise_support: "Поддръжка за големи предприятия"
-  label_enterprise_addon: "Добавка за големи предприятия"
   label_environment: "Среда"
   label_estimates_and_progress: "Оценки и напредък"
   label_equals: "е"
@@ -2455,6 +2522,7 @@ bg:
   label_none_parentheses: "(none)"
   label_not_contains: "doesn't contain"
   label_not_equals: "is not"
+  label_life_cycle_step_plural: "Project lifecycle"
   label_on: "на"
   label_operator_all: "is not empty"
   label_operator_none: "is empty"
@@ -2556,6 +2624,7 @@ bg:
   label_reporting: "Докладване"
   label_reporting_plural: "Докладване"
   label_repository: "Хранилище"
+  label_repository_remove: "Remove repository"
   label_repository_root: "Корен на хранилище"
   label_repository_plural: "Хранилища"
   label_required: "required"
@@ -2618,6 +2687,7 @@ bg:
   label_this_month: "този месец"
   label_this_week: "тази седмица"
   label_this_year: "тази година"
+  label_time: "Time"
   label_time_entry_plural: "Отработено време"
   label_time_entry_activity_plural: "Прекарано време"
   label_title: "Заглавие"
@@ -2653,6 +2723,7 @@ bg:
   label_user_settings: "Потребителски настройки"
   label_users_settings: "Потребителски настройки"
   label_version_new: "Нова версия"
+  label_version_edit: "Edit version"
   label_version_plural: "Версии"
   label_version_sharing_descendants: "С подпроектите"
   label_version_sharing_hierarchy: "С проектна йерархия"
@@ -2790,8 +2861,13 @@ bg:
         prefix: "Received because of the notification setting: %{reason}"
         date_alert_start_date: "Date alert"
         date_alert_due_date: "Date alert"
+        reminder: "Reminder"
       see_all: "See all"
       updated_at: "Updated at %{timestamp} by %{user}"
+    reminder_notifications:
+      subject: "Reminder: %{note}"
+      heading: "You have a new reminder"
+      note: "Note: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "You may %{allowed_actions} this work package. This can change depending on your project role and permissions."
@@ -2958,6 +3034,7 @@ bg:
   notice_successful_connection: "Успешна връзка."
   notice_successful_create: "Успешно създаване."
   notice_successful_delete: "Успешно изтриване."
+  notice_successful_cancel: "Successful cancellation."
   notice_successful_update: "Успешно обновяване."
   notice_successful_update_custom_fields_added_to_project: |
     Успешна актуализация. Потребителските полета на активираните типове се активират автоматично
@@ -3035,6 +3112,7 @@ bg:
   permission_edit_own_time_entries: "Edit own time logs"
   permission_edit_project: "Edit project"
   permission_edit_project_attributes: "Edit project attributes"
+  permission_edit_project_stages_and_gates: "Edit project stages and gates"
   permission_edit_reportings: "Edit reportings"
   permission_edit_time_entries: "Edit time logs for other users"
   permission_edit_timelines: "Edit timelines"
@@ -3064,9 +3142,12 @@ bg:
   permission_search_project: "Търесене на проект"
   permission_select_custom_fields: "Изберете потребителски полета"
   permission_select_project_custom_fields: "Избор атрибути на проекта"
+  permission_select_project_life_cycle: "Select project stages and gates"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "Избор модули на проекта"
   permission_share_work_packages: "Споделяне на работни пакети"
   permission_manage_types: "Изберете видове"
+  permission_manage_own_reminders: "Create own reminders"
   permission_view_project: "Преглед на проекти"
   permission_view_changesets: "Преглед на ревизиите на хранилището в OpenProject"
   permission_view_commit_author_statistics: "Преглед статистиката за авторите на ангажименти"
@@ -3087,6 +3168,7 @@ bg:
   permission_work_package_assigned_explanation: "Работните пакети могат да бъдат възлагани на потребители и групи, които притежават тази роля в съответния проект."
   permission_view_project_activity: "Преглед на дейностите по проекта"
   permission_view_project_attributes: "View project attributes"
+  permission_view_project_stages_and_gates: "View project stages and gates"
   permission_save_bcf_queries: "Запазване на заявките на BCF"
   permission_manage_public_bcf_queries: "Управление на публични запитвания за BCF"
   permission_edit_attribute_help_texts: "Редактиране помощните текстове на атрибутите"
@@ -3767,6 +3849,12 @@ bg:
       edit_description: "Can view, comment and edit this work package."
       view: "Изглед"
       view_description: "Can view this work package."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Why are you setting this reminder?"
+      success_creation_message: "Reminder set successfully. You will receive a notification for this work package at the chosen time."
+      success_update_message: "Reminder updated successfully."
+      success_deletion_message: "Reminder deleted successfully."
   sharing:
     count:
       zero: "0 users"
diff --git a/config/locales/crowdin/ca.yml b/config/locales/crowdin/ca.yml
index 9112effdbea5..24a42596d703 100644
--- a/config/locales/crowdin/ca.yml
+++ b/config/locales/crowdin/ca.yml
@@ -340,6 +340,9 @@ ca:
         text: "This action will not delete any project the list contains. Are you sure you want to delete this project list?"
     settings:
       change_identifier: Canvia l'identificador
+      actions:
+        label_enable_all: "Enable all"
+        label_disable_all: "Disable all"
       activities:
         no_results_title_text: Actualment no hi ha activitats disponibles.
       forums:
@@ -350,18 +353,26 @@ ca:
         no_results_content_text: Crear una nova categoria de paquet de treball
       custom_fields:
         no_results_title_text: Actualment no hi ha cap camp personalitzat disponible.
+      life_cycle:
+        header:
+          title: "Project lifecycle"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "Neither stages nor gates are currently defined."
+        section_header: "Stages and gates"
+        step:
+          use_in_project: "Use %{step} in this project"
+        filter:
+          label: "Search project stage or gate"
       project_custom_fields:
         header:
           title: "Atributs de projecte"
-          description: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
+          description_html: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
         filter:
           label: "Search project attribute"
         actions:
           label_enable_single: "Active in this project, click to disable"
           label_disable_single: "Inactive in this project, click to enable"
           remove_from_project: "Remove from project"
-          label_enable_all: "Enable all"
-          label_disable_all: "Disable all"
         is_required_blank_slate:
           heading: Required in all projects
           description: This project attribute is activated in all projects since the "Required in all projects" option is checked. It cannot be deactivated for individual projects.
@@ -374,6 +385,10 @@ ca:
         no_results_content_text: Crear una nova versió
       storage:
         no_results_title_text: No hi ha espai addicional de disc gravat consumit per aquest projecte.
+  project_stage:
+    working_days_count:
+      one: "Duration: %{count} working day"
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "The modified list has been saved as a new list"
@@ -494,8 +509,12 @@ ca:
     groups:
       member_in_these_groups: "Aquest usuari és actualment membre dels següents grups:"
       no_results_title_text: Aquest usuari no és actualment membre de cap grup.
+      summary_with_more: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary: Member of %{names}.
     memberships:
       no_results_title_text: Aquest usuari no és actualment membre de cap projecte.
+    open_profile: "Open profile"
   page:
     text: "Text"
   placeholder_users:
@@ -566,17 +585,27 @@ ca:
       no_results_title_text: Actualment no hi ha cap tipus.
       no_results_content_text: Crear un nou tipus
     edit:
-      settings: "Configuració"
-      form_configuration: "Configuració del formulari"
+      form_configuration:
+        tab: "Form configuration"
       more_info_text_html: >
         L'edició Enterprise et permet personalitzar la configuració de formularis amb aquests add-ons extra: <br> <ul class="%{list_styling_class}"><ul class="%{list_styling_class}"> <li><b>Afegeix nous grups d'atributs</b></li> <li><b>Canvia el nom dels grups d'atributs</b></li> <li><b>Afegeix una taula de paquets de treball relacionats</b></li> </ul>
-      projects: "Projectes"
-      enabled_projects: "Projectes habilitats"
-      edit_query: "Edita la taula"
-      query_group_placeholder: "Anomena la taula"
-      reset: "Restableix als valors per defecte"
-      type_color_text: |
-        El color seleccionat distingeix direfents tipus als diagrames Gantt o a les taules de paquets de treballs. Així doncs recomanem de fer servir un color fort.
+      projects:
+        tab: "Projects"
+        enabled_projects: "Enabled projects"
+      settings:
+        tab: "Settings"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Subject configuration"
+        manually_editable_subjects:
+          label: "Manually editable subjects"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automatically generated subjects"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Subject pattern"
+          caption: "Search for an attribute or add text. To create a space between elements add it as a text."
   versions:
     overview:
       work_packages_in_archived_projects: "La versió es comparteix amb projectes arxivats que encara tenen paquets de treball assignats a aquesta versió. Es comptabilitzen, però no apareixeran a les vistes enllaçades."
@@ -639,6 +668,10 @@ ca:
     label_add_x: "Add %{x}"
     label_edit_x: "Edit %{x}"
     label_add_description: "Add description"
+    lag:
+      subject: "Lag"
+      title: "Lag (in days)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
       label_relates_singular: "related to"
       label_relates_plural: "related to"
@@ -843,6 +876,9 @@ ca:
         lag: "Retard"
         from: "Paquet de treball"
         to: "Paquet de treball relacionat"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Time"
       repository:
         url: "URL"
       role:
@@ -931,6 +967,7 @@ ca:
       messages:
         accepted: "hauran de ser acceptats."
         after: "ha de ser després de %{date}."
+        after_today: "must be in the future."
         after_or_equal_to: "ha de ser igual o després de %{date}."
         before: "ha de ser abans de %{date}."
         before_or_equal_to: "ha de ser igual o abans de %{date}."
@@ -977,6 +1014,7 @@ ca:
         not_an_integer: "no és un enter."
         not_an_iso_date: "no és una data vàlida. Format requerit: AAAA-MM-DD."
         not_same_project: "no pertany al mateix projecte."
+        datetime_must_be_in_future: "must be in the future."
         odd: "ha de ser senar."
         regex_match_failed: "no coincideix amb l'expressió regular %{expression}."
         regex_invalid: "no s'ha pogut validar amb l'expressió regular associada."
@@ -1090,16 +1128,38 @@ ca:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "start date must be before the end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "is incomplete."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1316,6 +1376,8 @@ ca:
         other: "Notificacions"
       placeholder_user: "Usuari de marcador de posició"
       project: "Projecte"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         one: "Project list"
         other: "Llistes de projectes"
@@ -1419,6 +1481,7 @@ ca:
     login: "Nom d'usuari"
     mail: "Correu electrònic"
     name: "Nom"
+    note: "Note"
     password: "Contrasenya"
     priority: "Prioritat"
     project: "Projecte"
@@ -1515,6 +1578,7 @@ ca:
   button_print: "Imprimir"
   button_quote: "Citar"
   button_remove: Suprimir
+  button_remove_reminder: "Remove reminder"
   button_rename: "Renombrar"
   button_replace: "Substitueix"
   button_revoke: "Revoca"
@@ -1525,6 +1589,7 @@ ca:
   button_save_as: "Desa com a"
   button_apply_changes: "Aplicar canvis"
   button_save_back: "Desar i tornar"
+  button_set_reminder: "Set reminder"
   button_show: "Mostra"
   button_sort: "Ordena"
   button_submit: "Enviar"
@@ -1730,12 +1795,12 @@ ca:
   direction: dta. a esq.
   ee:
     upsale:
+      title: "Enterprise add-on"
+      link_title: "More information"
       form_configuration:
         description: "Personalitza la configuració del formulari amb aquestes extensions addicionals:"
         add_groups: "Afegir un nou atribut de grups"
         rename_groups: "Reanomena els atributs de grups"
-      project_filters:
-        description_html: "Filtrar i ordenar camps personalitzats és una extensió de l'edició Enterprise."
   enumeration_activities: "Activitats de rastrejament del temps"
   enumeration_work_package_priorities: "Prioritats dels paquets de treball"
   enumeration_reported_project_statuses: "Estats de projecte notificats"
@@ -1768,6 +1833,7 @@ ca:
   error_pdf_export_too_many_columns: "Masses columnes seleccionades per a l'exportació PDF. Si us plau, redueix el nombre de columnes."
   error_pdf_failed_to_export: "No s'ha pogut guardar l'exportació PDF: %{error}"
   error_token_authenticity: "No s'ha pogut verificar el token de \"Cross-Site Request Forgery\". Has provat de sotmetre les dades en múltiples navegadors o pestanyes? Si us plau, tanca totes les pestanyes i prova-ho de nou."
+  error_reminder_not_found: "The reminder was not found or was already notified about."
   error_work_package_not_found_in_project: "El paquet de treball no s'ha trobat o no pertany a aquest projecte"
   error_work_package_id_not_found: "The work package was not found."
   error_must_be_project_member: "ha de ser membre del projecte"
@@ -2061,6 +2127,7 @@ ca:
       responsible: "Responsable"
       shared: "Compartida"
       watched: "Observador"
+      reminder: "Reminder"
     facets:
       unread: "Sense llegir"
       unread_title: "Mostrar no llegits"
@@ -2228,8 +2295,10 @@ ca:
   label_default: "Per defecte"
   label_delete_user: "Eliminar usuari"
   label_delete_project: "Eliminar projecte"
+  label_delete: "Delete"
   label_deleted: "suprimit"
   label_deleted_custom_field: "(camp personalitzat suprimit)"
+  label_deleted_custom_item: "(deleted item)"
   label_deleted_custom_option: "(opció eliminada)"
   label_empty_element: "(buit)"
   label_missing_or_hidden_custom_option: "(valor absent o manca de permisos per accedir)"
@@ -2266,7 +2335,6 @@ ca:
   label_enterprise_active_users: "%{current}/%{limit} usuaris actius registrats"
   label_enterprise_edition: "Edició Enterprise."
   label_enterprise_support: "Suport Enterprise"
-  label_enterprise_addon: "Enterprise add-on"
   label_environment: "Entorn"
   label_estimates_and_progress: "Estimates and progress"
   label_equals: "és"
@@ -2451,6 +2519,7 @@ ca:
   label_none_parentheses: "(cap)"
   label_not_contains: "no conté"
   label_not_equals: "no és"
+  label_life_cycle_step_plural: "Project lifecycle"
   label_on: "en"
   label_operator_all: "no està buit"
   label_operator_none: "està buit"
@@ -2552,6 +2621,7 @@ ca:
   label_reporting: "Informar"
   label_reporting_plural: "Informes"
   label_repository: "Repositori"
+  label_repository_remove: "Remove repository"
   label_repository_root: "Arrel del repositori"
   label_repository_plural: "Repositoris"
   label_required: "requerit"
@@ -2614,6 +2684,7 @@ ca:
   label_this_month: "aquest més"
   label_this_week: "aquesta setmana"
   label_this_year: "aquest any"
+  label_time: "Time"
   label_time_entry_plural: "Temps utilitzat"
   label_time_entry_activity_plural: "Spent time activities"
   label_title: "Títol"
@@ -2649,6 +2720,7 @@ ca:
   label_user_settings: "Configuració de l'usuari"
   label_users_settings: "Configuració d'usuaris"
   label_version_new: "Nova versió"
+  label_version_edit: "Edit version"
   label_version_plural: "Versions"
   label_version_sharing_descendants: "Amb subprojectes"
   label_version_sharing_hierarchy: "Amb la jerarquia de projecte"
@@ -2786,8 +2858,13 @@ ca:
         prefix: "Rebut a causa de la configuració de notificacions: %{reason}"
         date_alert_start_date: "Alerta per dates"
         date_alert_due_date: "Alerta per dates"
+        reminder: "Reminder"
       see_all: "Veure tot"
       updated_at: "Actualitzat a les %{timestamp} per %{user}"
+    reminder_notifications:
+      subject: "Reminder: %{note}"
+      heading: "You have a new reminder"
+      note: "Note: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "You may %{allowed_actions} this work package. This can change depending on your project role and permissions."
@@ -2951,6 +3028,7 @@ ca:
   notice_successful_connection: "S'ha connectat correctament."
   notice_successful_create: "Creat correctament."
   notice_successful_delete: "Esborrat correctament."
+  notice_successful_cancel: "Successful cancellation."
   notice_successful_update: "S'ha modificat correctament."
   notice_successful_update_custom_fields_added_to_project: |
     Actualitzat correctament. Els camps personalitzats dels estils activats s'activen automàticament en el formulari del paquet de treball. <a href="%{url}" target="_blank">Veure més</a>.
@@ -3027,6 +3105,7 @@ ca:
   permission_edit_own_time_entries: "Editar els registres de temps propis"
   permission_edit_project: "Editar projecte"
   permission_edit_project_attributes: "Edit project attributes"
+  permission_edit_project_stages_and_gates: "Edit project stages and gates"
   permission_edit_reportings: "Editar informes"
   permission_edit_time_entries: "Edita els temps registrats per altres usuaris"
   permission_edit_timelines: "Editar les línies de temps"
@@ -3056,9 +3135,12 @@ ca:
   permission_search_project: "Search project"
   permission_select_custom_fields: "Selecciona camps personalitzats"
   permission_select_project_custom_fields: "Select project attributes"
+  permission_select_project_life_cycle: "Select project stages and gates"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "Selecciona els mòduls del projecte"
   permission_share_work_packages: "Share work packages"
   permission_manage_types: "Seleccioneu tipus"
+  permission_manage_own_reminders: "Create own reminders"
   permission_view_project: "Veure projectes"
   permission_view_changesets: "Veure les revisions del repositori a OpenProject"
   permission_view_commit_author_statistics: "Veure les estadístiques de commits de l'autor"
@@ -3079,6 +3161,7 @@ ca:
   permission_work_package_assigned_explanation: "Els paquets de treball es poden assignar als usuaris i als grups que tinguin aquest rol en el seu respectiu projecte"
   permission_view_project_activity: "View project activity"
   permission_view_project_attributes: "View project attributes"
+  permission_view_project_stages_and_gates: "View project stages and gates"
   permission_save_bcf_queries: "Save BCF queries"
   permission_manage_public_bcf_queries: "Manage public BCF queries"
   permission_edit_attribute_help_texts: "Edit attribute help texts"
@@ -3757,6 +3840,12 @@ ca:
       edit_description: "Can view, comment and edit this work package."
       view: "Mostra"
       view_description: "Can view this work package."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Why are you setting this reminder?"
+      success_creation_message: "Reminder set successfully. You will receive a notification for this work package at the chosen time."
+      success_update_message: "Reminder updated successfully."
+      success_deletion_message: "Reminder deleted successfully."
   sharing:
     count:
       zero: "0 users"
diff --git a/config/locales/crowdin/ckb-IR.yml b/config/locales/crowdin/ckb-IR.yml
index 800a2d9d9933..d5f2860f12a0 100644
--- a/config/locales/crowdin/ckb-IR.yml
+++ b/config/locales/crowdin/ckb-IR.yml
@@ -343,6 +343,9 @@ ckb-IR:
         text: "This action will not delete any project the list contains. Are you sure you want to delete this project list?"
     settings:
       change_identifier: Change identifier
+      actions:
+        label_enable_all: "Enable all"
+        label_disable_all: "Disable all"
       activities:
         no_results_title_text: There are currently no activities available.
       forums:
@@ -353,18 +356,26 @@ ckb-IR:
         no_results_content_text: Create a new work package category
       custom_fields:
         no_results_title_text: There are currently no custom fields available.
+      life_cycle:
+        header:
+          title: "Project lifecycle"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "Neither stages nor gates are currently defined."
+        section_header: "Stages and gates"
+        step:
+          use_in_project: "Use %{step} in this project"
+        filter:
+          label: "Search project stage or gate"
       project_custom_fields:
         header:
           title: "Project attributes"
-          description: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
+          description_html: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
         filter:
           label: "Search project attribute"
         actions:
           label_enable_single: "Active in this project, click to disable"
           label_disable_single: "Inactive in this project, click to enable"
           remove_from_project: "Remove from project"
-          label_enable_all: "Enable all"
-          label_disable_all: "Disable all"
         is_required_blank_slate:
           heading: Required in all projects
           description: This project attribute is activated in all projects since the "Required in all projects" option is checked. It cannot be deactivated for individual projects.
@@ -377,6 +388,10 @@ ckb-IR:
         no_results_content_text: Create a new version
       storage:
         no_results_title_text: There is no additional recorded disk space consumed by this project.
+  project_stage:
+    working_days_count:
+      one: "Duration: %{count} working day"
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "The modified list has been saved as a new list"
@@ -497,8 +512,12 @@ ckb-IR:
     groups:
       member_in_these_groups: "This user is currently a member of the following groups:"
       no_results_title_text: This user is currently not a member in any group.
+      summary_with_more: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary: Member of %{names}.
     memberships:
       no_results_title_text: This user is currently not a member of a project.
+    open_profile: "Open profile"
   page:
     text: "Text"
   placeholder_users:
@@ -569,18 +588,27 @@ ckb-IR:
       no_results_title_text: There are currently no types.
       no_results_content_text: Create a new type
     edit:
-      settings: "Settings"
-      form_configuration: "Form configuration"
+      form_configuration:
+        tab: "Form configuration"
       more_info_text_html: >
         Enterprise edition allows you to customize form configuration with these additional add-ons: <br> <ul class="%{list_styling_class}"> <li><b>Add new attribute groups</b></li> <li><b>Rename attribute groups</b></li> <li><b>Add a table of related work packages</b></li> </ul>
-      projects: "Projects"
-      enabled_projects: "Enabled projects"
-      edit_query: "Edit table"
-      query_group_placeholder: "Give the table a name"
-      reset: "Reset to defaults"
-      type_color_text: |
-        The selected color distinguishes different types
-        in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      projects:
+        tab: "Projects"
+        enabled_projects: "Enabled projects"
+      settings:
+        tab: "Settings"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Subject configuration"
+        manually_editable_subjects:
+          label: "Manually editable subjects"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automatically generated subjects"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Subject pattern"
+          caption: "Search for an attribute or add text. To create a space between elements add it as a text."
   versions:
     overview:
       work_packages_in_archived_projects: "The version is shared with archived projects which still have work packages assigned to this version. These are counted, but will not appear in the linked views."
@@ -643,6 +671,10 @@ ckb-IR:
     label_add_x: "Add %{x}"
     label_edit_x: "Edit %{x}"
     label_add_description: "Add description"
+    lag:
+      subject: "Lag"
+      title: "Lag (in days)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
       label_relates_singular: "related to"
       label_relates_plural: "related to"
@@ -847,6 +879,9 @@ ckb-IR:
         lag: "Lag"
         from: "Work package"
         to: "Related work package"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Time"
       repository:
         url: "URL"
       role:
@@ -935,6 +970,7 @@ ckb-IR:
       messages:
         accepted: "must be accepted."
         after: "must be after %{date}."
+        after_today: "must be in the future."
         after_or_equal_to: "must be after or equal to %{date}."
         before: "must be before %{date}."
         before_or_equal_to: "must be before or equal to %{date}."
@@ -981,6 +1017,7 @@ ckb-IR:
         not_an_integer: "is not an integer."
         not_an_iso_date: "is not a valid date. Required format: YYYY-MM-DD."
         not_same_project: "doesn't belong to the same project."
+        datetime_must_be_in_future: "must be in the future."
         odd: "must be odd."
         regex_match_failed: "does not match the regular expression %{expression}."
         regex_invalid: "could not be validated with the associated regular expression."
@@ -1094,16 +1131,38 @@ ckb-IR:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "start date must be before the end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "is incomplete."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1320,6 +1379,8 @@ ckb-IR:
         other: "Notifications"
       placeholder_user: "Placeholder user"
       project: "Project"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         one: "Project list"
         other: "Project lists"
@@ -1423,6 +1484,7 @@ ckb-IR:
     login: "Username"
     mail: "Email"
     name: "Name"
+    note: "Note"
     password: "Password"
     priority: "Priority"
     project: "Project"
@@ -1519,6 +1581,7 @@ ckb-IR:
   button_print: "Print"
   button_quote: "Quote"
   button_remove: Remove
+  button_remove_reminder: "Remove reminder"
   button_rename: "Rename"
   button_replace: "Replace"
   button_revoke: "Revoke"
@@ -1529,6 +1592,7 @@ ckb-IR:
   button_save_as: "Save as"
   button_apply_changes: "Apply changes"
   button_save_back: "Save and back"
+  button_set_reminder: "Set reminder"
   button_show: "Show"
   button_sort: "Sort"
   button_submit: "Submit"
@@ -1734,12 +1798,12 @@ ckb-IR:
   direction: ltr
   ee:
     upsale:
+      title: "Enterprise add-on"
+      link_title: "More information"
       form_configuration:
         description: "Customize the form configuration with these additional add-ons:"
         add_groups: "Add new attribute groups"
         rename_groups: "Rename attributes groups"
-      project_filters:
-        description_html: "Filtering and sorting on custom fields is an Enterprise edition add-on."
   enumeration_activities: "Time tracking activities"
   enumeration_work_package_priorities: "Work package priorities"
   enumeration_reported_project_statuses: "Reported project status"
@@ -1772,6 +1836,7 @@ ckb-IR:
   error_pdf_export_too_many_columns: "Too many columns selected for the PDF export. Please reduce the number of columns."
   error_pdf_failed_to_export: "The PDF export could not be saved: %{error}"
   error_token_authenticity: "Unable to verify Cross-Site Request Forgery token. Did you try to submit data on multiple browsers or tabs? Please close all tabs and try again."
+  error_reminder_not_found: "The reminder was not found or was already notified about."
   error_work_package_not_found_in_project: "The work package was not found or does not belong to this project"
   error_work_package_id_not_found: "The work package was not found."
   error_must_be_project_member: "must be project member"
@@ -2065,6 +2130,7 @@ ckb-IR:
       responsible: "Accountable"
       shared: "Shared"
       watched: "Watcher"
+      reminder: "Reminder"
     facets:
       unread: "Unread"
       unread_title: "Show unread"
@@ -2232,8 +2298,10 @@ ckb-IR:
   label_default: "Default"
   label_delete_user: "Delete user"
   label_delete_project: "Delete project"
+  label_delete: "Delete"
   label_deleted: "deleted"
   label_deleted_custom_field: "(deleted custom field)"
+  label_deleted_custom_item: "(deleted item)"
   label_deleted_custom_option: "(deleted option)"
   label_empty_element: "(empty)"
   label_missing_or_hidden_custom_option: "(missing value or lacking permissions to access)"
@@ -2270,7 +2338,6 @@ ckb-IR:
   label_enterprise_active_users: "%{current}/%{limit} booked active users"
   label_enterprise_edition: "Enterprise edition"
   label_enterprise_support: "Enterprise support"
-  label_enterprise_addon: "Enterprise add-on"
   label_environment: "Environment"
   label_estimates_and_progress: "Estimates and progress"
   label_equals: "is"
@@ -2455,6 +2522,7 @@ ckb-IR:
   label_none_parentheses: "(none)"
   label_not_contains: "doesn't contain"
   label_not_equals: "is not"
+  label_life_cycle_step_plural: "Project lifecycle"
   label_on: "on"
   label_operator_all: "is not empty"
   label_operator_none: "is empty"
@@ -2556,6 +2624,7 @@ ckb-IR:
   label_reporting: "Reporting"
   label_reporting_plural: "Reportings"
   label_repository: "Repository"
+  label_repository_remove: "Remove repository"
   label_repository_root: "Repository root"
   label_repository_plural: "Repositories"
   label_required: "required"
@@ -2618,6 +2687,7 @@ ckb-IR:
   label_this_month: "this month"
   label_this_week: "this week"
   label_this_year: "this year"
+  label_time: "Time"
   label_time_entry_plural: "Spent time"
   label_time_entry_activity_plural: "Spent time activities"
   label_title: "Title"
@@ -2653,6 +2723,7 @@ ckb-IR:
   label_user_settings: "User settings"
   label_users_settings: "Users settings"
   label_version_new: "New version"
+  label_version_edit: "Edit version"
   label_version_plural: "Versions"
   label_version_sharing_descendants: "With subprojects"
   label_version_sharing_hierarchy: "With project hierarchy"
@@ -2790,8 +2861,13 @@ ckb-IR:
         prefix: "Received because of the notification setting: %{reason}"
         date_alert_start_date: "Date alert"
         date_alert_due_date: "Date alert"
+        reminder: "Reminder"
       see_all: "See all"
       updated_at: "Updated at %{timestamp} by %{user}"
+    reminder_notifications:
+      subject: "Reminder: %{note}"
+      heading: "You have a new reminder"
+      note: "Note: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "You may %{allowed_actions} this work package. This can change depending on your project role and permissions."
@@ -2958,6 +3034,7 @@ ckb-IR:
   notice_successful_connection: "Successful connection."
   notice_successful_create: "Successful creation."
   notice_successful_delete: "Successful deletion."
+  notice_successful_cancel: "Successful cancellation."
   notice_successful_update: "Successful update."
   notice_successful_update_custom_fields_added_to_project: |
     Successful update. The custom fields of the activated types are automatically activated
@@ -3035,6 +3112,7 @@ ckb-IR:
   permission_edit_own_time_entries: "Edit own time logs"
   permission_edit_project: "Edit project"
   permission_edit_project_attributes: "Edit project attributes"
+  permission_edit_project_stages_and_gates: "Edit project stages and gates"
   permission_edit_reportings: "Edit reportings"
   permission_edit_time_entries: "Edit time logs for other users"
   permission_edit_timelines: "Edit timelines"
@@ -3064,9 +3142,12 @@ ckb-IR:
   permission_search_project: "Search project"
   permission_select_custom_fields: "Select custom fields"
   permission_select_project_custom_fields: "Select project attributes"
+  permission_select_project_life_cycle: "Select project stages and gates"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "Select project modules"
   permission_share_work_packages: "Share work packages"
   permission_manage_types: "Select types"
+  permission_manage_own_reminders: "Create own reminders"
   permission_view_project: "View projects"
   permission_view_changesets: "View repository revisions in OpenProject"
   permission_view_commit_author_statistics: "View commit author statistics"
@@ -3087,6 +3168,7 @@ ckb-IR:
   permission_work_package_assigned_explanation: "Work packages can be assigned to users and groups in possession of this role in the respective project"
   permission_view_project_activity: "View project activity"
   permission_view_project_attributes: "View project attributes"
+  permission_view_project_stages_and_gates: "View project stages and gates"
   permission_save_bcf_queries: "Save BCF queries"
   permission_manage_public_bcf_queries: "Manage public BCF queries"
   permission_edit_attribute_help_texts: "Edit attribute help texts"
@@ -3767,6 +3849,12 @@ ckb-IR:
       edit_description: "Can view, comment and edit this work package."
       view: "View"
       view_description: "Can view this work package."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Why are you setting this reminder?"
+      success_creation_message: "Reminder set successfully. You will receive a notification for this work package at the chosen time."
+      success_update_message: "Reminder updated successfully."
+      success_deletion_message: "Reminder deleted successfully."
   sharing:
     count:
       zero: "0 users"
diff --git a/config/locales/crowdin/cs.seeders.yml b/config/locales/crowdin/cs.seeders.yml
index bbf4cc05ebb4..bc5f4bc9d0ae 100644
--- a/config/locales/crowdin/cs.seeders.yml
+++ b/config/locales/crowdin/cs.seeders.yml
@@ -36,15 +36,15 @@ cs:
           name: Černá
       life_cycle_colors:
         item_0:
-          name: PM2 Orange
+          name: PM2 oranžová
         item_1:
-          name: PM2 Purple
+          name: PM2 fialová
         item_2:
-          name: PM2 Red
+          name: PM2 Červená
         item_3:
           name: PM2 Magenta
         item_4:
-          name: PM2 Green Yellow
+          name: PM2 Zelená Žlutá
       document_categories:
         item_0:
           name: Dokumentace
@@ -79,23 +79,23 @@ cs:
         item_0:
           name: Manažer zaměstnanců a projektů
         item_1:
-          name: Standard global role
+          name: Standardní globální role
     standard:
       life_cycles:
         item_0:
-          name: Initiating
+          name: Zahájení
         item_1:
-          name: Ready for Planning
+          name: Připraveno k plánování
         item_2:
-          name: Planning
+          name: Plánování
         item_3:
-          name: Ready for Executing
+          name: Připraveno k provedení
         item_4:
-          name: Executing
+          name: Provádění
         item_5:
-          name: Ready for Closing
+          name: Připraveno k uzavření
         item_6:
-          name: Closing
+          name: Uzavření
       priorities:
         item_0:
           name: Nízká
diff --git a/config/locales/crowdin/cs.yml b/config/locales/crowdin/cs.yml
index ba2eeaa00bc8..4fabc9c6a96a 100644
--- a/config/locales/crowdin/cs.yml
+++ b/config/locales/crowdin/cs.yml
@@ -26,14 +26,14 @@ cs:
       no_results_title_text: V tomto časovém rámci nebyla pro projekt žádná aktivita.
     work_packages:
       activity_tab:
-        no_results_title_text: No activity to display
-        no_results_description_text: "Choose \"Show everything\" to show all activity and comments"
+        no_results_title_text: Žádná aktivita k zobrazení
+        no_results_description_text: "Vyberte \"Zobrazit vše\" pro zobrazení všech aktivit a komentářů"
         label_activity_show_all: "Zobrazit vše"
         label_activity_show_only_comments: "Zobrazit pouze komentáře"
         label_activity_show_only_changes: "Zobrazit pouze změny"
         label_sort_asc: "Nejnovější v dolní části"
         label_sort_desc: "Nejnovější nahoře"
-        label_type_to_comment: "Add a comment. Type @ to notify people."
+        label_type_to_comment: "Přidejte komentář. Zadejte @ pro označení lidí."
         label_submit_comment: "Odeslat komentář"
         changed_on: "změněno dne"
         created_on: "toto vytvořil/a dne"
@@ -227,7 +227,7 @@ cs:
             title: "Váš seznam položek je prázdný"
             description: "Start by adding items to the custom field of type hierarchy. Each item can be used to create a hierarchy bellow it. To navigate and create sub-items inside a hierarchy click on the created item."
           item:
-            title: This item doesn't have any hierarchy level below
+            title: Tato položka nemá žádnou úroveň hierarchie níže
             description: Add items to this list to create sub-items inside another one
         placeholder:
           label: "Štítek položky"
@@ -251,7 +251,7 @@ cs:
     reorder_confirmation: "Varování: Aktuální pořadí dostupných hodnot bude ztraceno. Pokračovat?"
     instructions:
       is_required: "Označit vlastní pole jako povinné. Bude povinné vyplnit pole při vytváření nových nebo aktualizaci existujících zdrojů."
-      is_required_for_project: "Check to enable this attribute and make it required in all projects. It cannot be deactived for individual projects."
+      is_required_for_project: "Zaškrtnutím tento atribut povolíte a bude vyžadován ve všech projektech. U jednotlivých projektů jej nelze zrušit."
       is_for_all: "Označit vlastní pole jako dostupné ve všech existujících a nových projektech."
       multi_select: "Allows the user to assign multiple values to this custom field."
       searchable: "Zahrnout hodnoty polí při použití globální funkce vyhledávání."
@@ -269,18 +269,18 @@ cs:
     errors:
       int?: "musí být celé číslo"
       filled?: "musí být vyplněno"
-      greater_or_equal_zero: "must be greater or equal to 0."
-      not_found: "not found."
+      greater_or_equal_zero: "musí být větší nebo rovno 0."
+      not_found: "nenalezeno"
       rules:
         item:
-          root_item: "cannot be a root item."
-          not_persisted: "must be an already existing item."
+          root_item: "nemůže být kořenová položka."
+          not_persisted: "musí být již existující položka."
         label:
-          not_unique: "must be unique within the same hierarchy level."
+          not_unique: "musí být v rámci stejné hierarchie jedinečné."
         short:
-          not_unique: "must be unique within the same hierarchy level."
+          not_unique: ""
         parent:
-          not_descendant: "must be a descendant of the hierarchy root."
+          not_descendant: "musí být potomkem kořenu hierarchie."
     rules:
       depth: "Hloubka"
       item: "Položka"
@@ -313,7 +313,7 @@ cs:
       work_package_attachments: "Pracovní balíčky: přílohy"
       work_package_categories: "Pracovní balíčky: kategorie"
       work_package_file_links: "Pracovní balíčky: odkazy na soubory"
-      work_package_shares: "Work packages: shares"
+      work_package_shares: "Pracovní balíčky: sdílení "
     delete:
       scheduled: "Odstranění bylo naplánováno a je dokončeno na pozadí. Výsledek vám bude oznámen."
       schedule_failed: "Projekt nelze odstranit: %{errors}"
@@ -343,6 +343,9 @@ cs:
         text: "Tato akce neodstraní žádný projekt, který seznam obsahuje. Opravdu chcete tento seznam projektů smazat?"
     settings:
       change_identifier: Změnit identifikátor
+      actions:
+        label_enable_all: "Povolit vše"
+        label_disable_all: "Zakázat vše"
       activities:
         no_results_title_text: V současné době nejsou k dispozici žádné aktivity.
       forums:
@@ -353,18 +356,26 @@ cs:
         no_results_content_text: Vytvořit novou kategorii pracovního balíčku
       custom_fields:
         no_results_title_text: V současné době nejsou k dispozici žádná vlastní pole.
+      life_cycle:
+        header:
+          title: "Životní cyklus projektu"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "V současné době nejsou definovány žádné fáze ani brány."
+        section_header: "Etapy a brány"
+        step:
+          use_in_project: "Použít %{step} v tomto projektu"
+        filter:
+          label: "Hledat fázi projektu nebo brány"
       project_custom_fields:
         header:
           title: "Atributy projektu"
-          description: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
+          description_html: 'Tyto atributy projektu se zobrazí ve vaší <a href=%{overview_url} target="_blank">stránce přehledu projektu</a> v příslušných sekcích. Můžete povolit nebo zakázat jednotlivé atributy. Atributy a sekce projektu jsou definovány v <a href=%{admin_settings_url} target="_blank">nastavení správy</a> správcem instance. '
         filter:
           label: "Hledat atribut projektu"
         actions:
           label_enable_single: "Aktivní v tomto projektu, kliknutím vypnete"
           label_disable_single: "Neaktivní v tomto projektu, klikněte pro povolení"
-          remove_from_project: "Remove from project"
-          label_enable_all: "Povolit vše"
-          label_disable_all: "Zakázat vše"
+          remove_from_project: "Odstranit z projektu"
         is_required_blank_slate:
           heading: Povinné u všech projektů
           description: This project attribute is activated in all projects since the "Required in all projects" option is checked. It cannot be deactivated for individual projects.
@@ -377,21 +388,27 @@ cs:
         no_results_content_text: Vytvořit novou verzi
       storage:
         no_results_title_text: Neexistuje žádné další diskové místo využívané tímto projektem.
+  project_stage:
+    working_days_count:
+      one: "Doba trvání: %{count} pracovní den"
+      few: "Duration: %{count} working days"
+      many: "Duration: %{count} working days"
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "Upravený seznam byl uložen jako nový seznam."
       failure: "Upravený seznam nelze uložit: %{errors}"
     update:
-      success: "The modified list has been saved"
+      success: "Upravený seznam byl uložen"
       failure: "Upravený seznam nelze uložit: %{errors}"
     publish:
       success: "Seznam byl zveřejněn"
-      failure: "The list cannot be made public: %{errors}"
+      failure: "Seznam nelze zveřejnit: %{errors}"
     unpublish:
-      success: "The list has been made private"
-      failure: "The list cannot be made private: %{errors}"
+      success: "Seznam byl vytvořen jako soukromý"
+      failure: "Seznam nemůže být soukromý: %{errors}"
     can_be_saved: "Seznam upraven:"
-    can_be_saved_as: "The modifications can only be saved in a new list:"
+    can_be_saved_as: "Změny lze uložit pouze v novém seznamu:"
   members:
     index:
       no_results_title_text: Momentálně nejsou žádní členové součástí tohoto projektu.
@@ -411,12 +428,12 @@ cs:
       groups: "Skupiny"
     delete_member_dialog:
       title: "Odebrat člena"
-      will_remove_the_users_role: "This will remove the user’s role from this project."
+      will_remove_the_users_role: "Tímto odstraníte uživatelovu roli z tohoto projektu."
       will_remove_the_groups_role: "This will remove the group role from this project."
       however_work_packages_shared_with_user_html:
-        one: "However, %{shared_work_packages_link} has also been shared with this user."
-        few: "However, %{shared_work_packages_link} have also been shared with this user."
-        many: "However, %{shared_work_packages_link} have also been shared with this user."
+        one: "%{shared_work_packages_link} byl však také sdílen s tímto uživatelem."
+        few: "%{shared_work_packages_link} byl však také sdílen s tímto uživatelem."
+        many: "%{shared_work_packages_link} byl však také sdílen s tímto uživatelem."
         other: "However, %{shared_work_packages_link} have also been shared with this user."
       however_work_packages_shared_with_group_html:
         one: "However, %{shared_work_packages_link} has also been shared with this group."
@@ -457,7 +474,7 @@ cs:
         other: "Only %{shared_work_packages_link} have been shared with %{shared_role_name} permissions."
       revoke_all_or_with_role: "Would you like to revoke access to all shared work packages, or only those with %{shared_role_name} permissions?"
       will_not_affect_inherited_shares: "(To nemá vliv na pracovní balíčky sdílené s jejich skupinou)."
-      cannot_remove_inherited: "The work packages shares shared via groups cannot be removed."
+      cannot_remove_inherited: "Pracovní balíčky sdílené prostřednictvím skupin nelze odstranit."
       cannot_remove_inherited_with_role: "The work packages shares with role %{shared_role_name} are shared via groups and cannot be removed."
       cannot_remove_inherited_note_admin_html: "You can either revoke the share to the group or remove this specific member from the group in the %{administration_settings_link}."
       cannot_remove_inherited_note_non_admin: "You can either revoke the share to the group or contact your administrator to remove this specific member from the group."
@@ -466,11 +483,11 @@ cs:
   my:
     access_token:
       create_dialog:
-        header: The %{type} token has been generated
+        header: '%{type} token byl vygenerován'
         warning: Note that this is the only time you will see this token, make sure to copy it now.
       errors:
         token_name_blank: "Zadejte prosím název tokenu API"
-        token_name_in_use: "This API token name is already in use, please select a different one"
+        token_name_in_use: "Tento název tokenu API je již používán, vyberte prosím jiný"
       new_access_token_dialog_title: "Vytvořit nový API token"
       new_access_token_dialog_show_button_text: "API token"
       new_access_token_dialog_text_field_placeholder_text: "Můj API token"
@@ -479,8 +496,8 @@ cs:
       new_access_token_dialog_text: "This token will allow third-party applications to communicate with your instance. To differentiate the new API token, please give it a name."
       new_access_token_dialog_attention_text: "Treat API tokens like passwords. Anyone with this link will have access to information from this instance, share it only with trusted users."
       failed_to_reset_token: "Nepodařilo se obnovit přístupový token: %{error}"
-      failed_to_create_token: "Failed to create access token: %{error}"
-      failed_to_revoke_token: "Failed to revoke access token: %{error}"
+      failed_to_create_token: "Nepodařilo se vytvořit přístupový token: %{error}"
+      failed_to_revoke_token: "Nepodařilo se odvolat přístupový token: %{error}"
       notice_reset_token: "Byl vygenerován nový %{type} token. Váš přístupový token je:"
       token_value_warning: "Poznámka: Toto je jedinkrát, kdy uvidíte tento token, ujistěte se, že jste si hozkopírovali."
       no_results_title_text: V současné době nejsou k dispozici žádné přístupové tokeny.
@@ -509,8 +526,12 @@ cs:
     groups:
       member_in_these_groups: "Tento uživatel je v současné době členem následujících skupin:"
       no_results_title_text: Tento uživatel není v současné době členem žádné skupiny.
+      summary_with_more: Člen %{names} a %{count_link}.
+      more: "%{count} další..."
+      summary: Člen %{names}.
     memberships:
       no_results_title_text: Tento uživatel není v současné době členem projektu.
+    open_profile: "Otevřít profil"
   page:
     text: "Text"
   placeholder_users:
@@ -538,10 +559,10 @@ cs:
     react_with: "Reagujte pomocí %{reaction}"
     and_user: "a %{user}"
     and_others:
-      one: and 1 other
-      few: and %{count} others
-      many: and %{count} others
-      other: and %{count} others
+      one: a 1 další
+      few: a %{count} dalšich
+      many: a %{count} dalšich
+      other: a %{count} dalšich
     reaction_by: "%{reaction} od"
   reportings:
     index:
@@ -583,18 +604,27 @@ cs:
       no_results_title_text: V současné době neexistují žádné typy.
       no_results_content_text: Vytvořit nový typ
     edit:
-      settings: "Nastavení"
-      form_configuration: "Konfigurace formuláře"
+      form_configuration:
+        tab: "Konfigurace formuláře"
       more_info_text_html: >
         Enterprise Edice umožňuje přizpůsobit konfiguraci formuláře s těmito dalšími funkcemi: <br> <ul class="%{list_styling_class}"> <li><b>Přidat nové skupiny atributů</b></li> <li><b>Přejmenovat skupiny atributů</b></li> </ul>
-      projects: "Projekty"
-      enabled_projects: "Povolit projekty"
-      edit_query: "Upravit tabulku"
-      query_group_placeholder: "Pojmenovat tabulku"
-      reset: "Obnovit výchozí nastavení"
-      type_color_text: |
-        Vybraná barva rozlišuje různé typy
-        v Ganttových grafech nebo tabulkách pracovních balíčků. Proto se doporučuje použít kontrastní barvu.
+      projects:
+        tab: "Projekty"
+        enabled_projects: "Povolit projekty"
+      settings:
+        tab: "Nastavení"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Konfigurace objektu"
+        manually_editable_subjects:
+          label: "Ručně upravitelné předměty"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automaticky generované předměty"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Vzor předmětu"
+          caption: "Vyhledejte atribut nebo přidejte text. Pro vytvoření mezery mezi prvky jej přidejte jako text."
   versions:
     overview:
       work_packages_in_archived_projects: "Verze je sdílena s archivovanými projekty, které mají stále pracovní balíčky přiřazené k této verzi. Ty jsou započítány, ale nebudou se objevovat v odkazovaných zobrazeních."
@@ -652,64 +682,68 @@ cs:
           no_results_title_text: V současné době nejsou k dispozici žádné verze.
   work_package_relations_tab:
     index:
-      action_bar_title: "Add relations to other work packages to create a link between them."
-      no_results_title_text: There are currently no relations available.
-      blankslate_heading: "No relations"
-      blankslate_description: "This work package does not have any relations yet."
-    label_add_x: "Add %{x}"
-    label_edit_x: "Edit %{x}"
-    label_add_description: "Add description"
+      action_bar_title: "Přidejte vztahy k jiným pracovním balíčkům a vytvořte mezi nimi vazbu."
+      no_results_title_text: V současné době nejsou k dispozici žádné vztahy.
+      blankslate_heading: "Žádné vztahy"
+      blankslate_description: "Tento pracovní balíček ještě nemá žádné vztahy."
+    label_add_x: "Přidat %{x}"
+    label_edit_x: "Upravit %{x}"
+    label_add_description: "Přidat popis"
+    lag:
+      subject: "Zpožďování"
+      title: "Zpoždění (ve dnech)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
-      label_relates_singular: "related to"
-      label_relates_plural: "related to"
-      label_relates_to_singular: "related to"
-      label_relates_to_plural: "related to"
-      relates_description: "Creates a visible link between the two work packages with no additional effect"
-      relates_to_description: "Creates a visible link between the two work packages with no additional effect"
-      label_precedes_singular: "successor (after)"
-      label_precedes_plural: "successors (after)"
-      precedes_description: "The related work package necessarily needs to start after this one finishes"
-      label_follows_singular: "predecessor (before)"
-      label_follows_plural: "predecessors (before)"
+      label_relates_singular: "související s"
+      label_relates_plural: "související s"
+      label_relates_to_singular: "související s"
+      label_relates_to_plural: "související s"
+      relates_description: "Vytvoří viditelný odkaz mezi oběma pracovními balíčky bez dodatečného efektu"
+      relates_to_description: "Vytvoří viditelný odkaz mezi oběma pracovními balíčky bez dodatečného efektu"
+      label_precedes_singular: "následník (po)"
+      label_precedes_plural: "následník (po)"
+      precedes_description: "Související pracovní balíček musí být nutně zahájen po dokončení tohoto balíčku."
+      label_follows_singular: "předchůdce (před)"
+      label_follows_plural: ""
       follows_description: "The related work package necessarily needs to finish before this one can start"
-      label_child_singular: "child"
-      label_child_plural: "children"
+      label_child_singular: "dítě"
+      label_child_plural: "Potomci"
       child_description: "Makes the related work package a sub-item of the current (parent) work package"
-      label_blocks_singular: "blocks"
-      label_blocks_plural: "blocks"
-      blocks_description: "The related work package cannot be closed until this one is closed first"
-      label_blocked_singular: "blocked by"
-      label_blocked_plural: "blocked by"
-      label_blocked_by_singular: "blocked by"
-      label_blocked__by_plural: "blocked by"
-      blocked_description: "This work package cannot be closed until the related one is closed first"
-      blocked_by_description: "This work package cannot be closed until the related one is closed first"
-      label_duplicates_singular: "duplicates"
-      label_duplicates_plural: "duplicates"
-      duplicates_description: "This is a copy of the related work package"
-      label_duplicated_singular: "duplicated by"
-      label_duplicated_plural: "duplicated by"
-      label_duplicated_by_singular: "duplicated by"
-      label_duplicated_by_plural: "duplicated by"
-      duplicated_by_description: "The related work package is a copy of this"
-      duplicated_description: "The related work package is a copy of this"
-      label_includes_singular: "includes"
-      label_includes_plural: "includes"
+      label_blocks_singular: "bloky"
+      label_blocks_plural: "bloky"
+      blocks_description: "Tento pracovní balíček nelze uzavřít, dokud není nejprve uzavřen související balíček"
+      label_blocked_singular: "blokováno"
+      label_blocked_plural: "blokováno"
+      label_blocked_by_singular: "blokováno"
+      label_blocked__by_plural: "blokováno"
+      blocked_description: "Tento pracovní balíček nelze uzavřít, dokud není nejprve uzavřen související balíček"
+      blocked_by_description: ""
+      label_duplicates_singular: "duplikáty"
+      label_duplicates_plural: "duplikáty"
+      duplicates_description: "Toto je kopie souvisejícího pracovního balíčku"
+      label_duplicated_singular: "duplikován"
+      label_duplicated_plural: "duplikován"
+      label_duplicated_by_singular: "duplikován"
+      label_duplicated_by_plural: "duplikován"
+      duplicated_by_description: "Související pracovní balíček je kopií tohoto"
+      duplicated_description: "Související pracovní balíček je kopií tohoto"
+      label_includes_singular: "zahrnuje"
+      label_includes_plural: "zahrnuje"
       includes_description: "Marks the related work package as including this one with no additional effect"
-      label_partof_singular: "part of"
-      label_partof_plural: "part of"
-      label_part_of_singular: "part of"
-      label_part_of_plural: "part of"
+      label_partof_singular: "část"
+      label_partof_plural: "část"
+      label_part_of_singular: "část"
+      label_part_of_plural: "část"
       partof_description: "Marks the related work package as being part of this one with no additional effect"
       part_of_description: "Marks the related work package as being part of this one with no additional effect"
-      label_requires_singular: "requires"
-      label_requires_plural: "requires"
+      label_requires_singular: "vyžaduje"
+      label_requires_plural: "vyžaduje"
       requires_description: "Marks the related work package as a requirement to this one"
-      label_required_singular: "required by"
-      label_required_plural: "required by"
+      label_required_singular: "vyžadováno"
+      label_required_plural: "vyžadováno"
       required_description: "Marks this work package as being a requirement to the related one"
-      label_parent_singular: "parent"
-      label_parent_plural: "parent"
+      label_parent_singular: "nadřazený"
+      label_parent_plural: "nadřazený"
   label_invitation: Pozvánka
   account:
     delete: "Odstranit účet"
@@ -863,6 +897,9 @@ cs:
         lag: "Lag"
         from: "Pracovní balíček"
         to: "Související pracovní balíček"
+      reminder:
+        remind_at_date: "Datum"
+        remind_at_time: "Čas"
       repository:
         url: "URL"
       role:
@@ -951,13 +988,14 @@ cs:
       messages:
         accepted: "musí být přijato."
         after: "musí být po %{date}."
+        after_today: "musí být v budoucnosti."
         after_or_equal_to: "musí být po nebo rovno %{date}."
         before: "musí být před %{date}."
         before_or_equal_to: "musí být před nebo rovno %{date}."
         blank: "nemůže být prázdné."
         blank_nested: "musí mít nastavenou vlastnost '%{property}'."
         cannot_delete_mapping: "je povinné. Nelze odstranit."
-        is_for_all_cannot_modify: "is for all projects and can therefore not be modified."
+        is_for_all_cannot_modify: "je pro všechny projekty, a proto je nelze měnit."
         cant_link_a_work_package_with_a_descendant: "Pracovní balíček nemůže být propojen s jedním z jeho podúkolů."
         circular_dependency: "Tento vztah by vytvořil kruhovou závislost."
         confirmation: "neshoduje se s %{attribute}."
@@ -997,6 +1035,7 @@ cs:
         not_an_integer: "není celé číslo."
         not_an_iso_date: "není platné datum. Požadovaný formát: RRRR-MM-DD."
         not_same_project: "nepatří do stejného projektu."
+        datetime_must_be_in_future: "musí být v budoucnosti."
         odd: "musí být liché."
         regex_match_failed: "neodpovídá regulárnímu výrazu %{expression}."
         regex_invalid: "nelze ověřit s přidruženým regulárním výrazem."
@@ -1110,16 +1149,38 @@ cs:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "Datum zahájení musí být před datem ukončení."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "je neúplný."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1218,10 +1279,10 @@ cs:
             assigned_to:
               format: "%{message}"
             done_ratio:
-              does_not_match_work_and_remaining_work: "does not match Work and Remaining work"
+              does_not_match_work_and_remaining_work: "neodpovídá práci a zbývající práci"
               cannot_be_set_when_work_is_zero: "nelze nastavit, když je práce 0h"
-              must_be_set_when_remaining_work_is_set: "required when Remaining work is set."
-              must_be_set_when_work_and_remaining_work_are_set: "required when Work and Remaining work are set."
+              must_be_set_when_remaining_work_is_set: "je vyžadováno, pokud je nastavena zbývající práce."
+              must_be_set_when_work_and_remaining_work_are_set: "je vyžadováno, když je nastavena práce a zbývající práce."
               inclusion: "musí být mezi 0 a 100."
             due_date:
               not_start_date: "není v počátečním datu, i když je to nutné pro milníky."
@@ -1252,14 +1313,14 @@ cs:
             estimated_hours:
               not_a_number: "není platná doba trvání."
               cant_be_inferior_to_remaining_work: "nemůže být nižší než Zbývající práce."
-              must_be_set_when_remaining_work_and_percent_complete_are_set: "required when Remaining work and % Complete are set."
+              must_be_set_when_remaining_work_and_percent_complete_are_set: "je vyžadováno, pokud je nastavena zbývající práce a % Dokončeno."
             remaining_hours:
               not_a_number: "není platná doba trvání."
               cant_exceed_work: "nemůže být vyšší než Práce."
               must_be_set_when_work_is_set: "vyžadováno, když je nastavena Práce."
-              must_be_set_when_work_and_percent_complete_are_set: "required when Work and % Complete are set."
+              must_be_set_when_work_and_percent_complete_are_set: "je vyžadováno, když je nastavena práce a % Dokončit."
               must_be_set_to_zero_hours_when_work_is_set_and_percent_complete_is_100p: >-
-                must be 0h when Work is set and % Complete is 100%.
+                musí být 0h, když je nastavena práce a % Dokončeno je 100%.
               must_be_empty_when_work_is_empty_and_percent_complete_is_100p: >-
                 must be empty when Work is empty and % Complete is 100%.
           readonly_status: "Pracovní balíček je ve stavu jen pro čtení, takže jeho atributy nelze změnit."
@@ -1342,6 +1403,8 @@ cs:
         other: "Notifikace"
       placeholder_user: "Placeholder uživatel"
       project: "Projekt"
+      project/gate_definition: "Brána"
+      project/stage_definition: "Fáze"
       project_query:
         one: "Seznam projektů"
         few: "Project lists"
@@ -1355,7 +1418,7 @@ cs:
         other: "Role"
       status: "Stav pracovního balíčku"
       token/api:
-        one: Access token
+        one: Přístupový token
         few: Access tokens
         many: Access tokens
         other: Access tokens
@@ -1459,6 +1522,7 @@ cs:
     login: "Uživatelské jméno"
     mail: "E-mail"
     name: "Název"
+    note: "Poznámka"
     password: "Heslo"
     priority: "Priorita"
     project: "Projekt"
@@ -1509,9 +1573,9 @@ cs:
   button_actions: "Akce"
   button_add: "Přidat"
   button_add_comment: "Přidat komentář"
-  button_add_item_above: "Add item above"
-  button_add_item_below: "Add item below"
-  button_add_sub_item: "Add sub-item"
+  button_add_item_above: "Přidat položku výše"
+  button_add_item_below: "Přidat položku níže"
+  button_add_sub_item: "Přidat podpoložku"
   button_add_member: Přidat člena
   button_add_watcher: "Přidat sledující"
   button_annotate: "Komentovat"
@@ -1555,6 +1619,7 @@ cs:
   button_print: "Tisk"
   button_quote: "Citovat"
   button_remove: Odstranit
+  button_remove_reminder: "Odstranit připomenutí"
   button_rename: "Přejmenovat"
   button_replace: "Nahradit"
   button_revoke: "Revoke"
@@ -1565,6 +1630,7 @@ cs:
   button_save_as: "Uložit jako"
   button_apply_changes: "Použít změny"
   button_save_back: "Uložit a odejít"
+  button_set_reminder: "Nastavit připomenutí"
   button_show: "Zobrazit"
   button_sort: "Řadit"
   button_submit: "Potvrdit"
@@ -1806,12 +1872,12 @@ cs:
   direction: zleva doprava
   ee:
     upsale:
+      title: "Doplňky Enterprise Edice"
+      link_title: "Více informací"
       form_configuration:
         description: "Přizpůsobte si konfiguraci formuláře s těmito doplňky:"
         add_groups: "Přidat nové skupiny atributů"
         rename_groups: "Přejmenovat skupiny atributů"
-      project_filters:
-        description_html: "Filtrování a třídění na vlastních polích je doplněk edice Enterprise."
   enumeration_activities: "Sledování času"
   enumeration_work_package_priorities: "Priority pracovního balíčku"
   enumeration_reported_project_statuses: "Nahlášený stav projektu"
@@ -1844,6 +1910,7 @@ cs:
   error_pdf_export_too_many_columns: "Příliš mnoho sloupců vybraných pro PDF export. Snižte počet sloupců."
   error_pdf_failed_to_export: "PDF export nelze uložit: %{error}"
   error_token_authenticity: "Nelze ověřit token Cross-Site Request Forgy. Pokusili jste se odeslat data na více prohlížečích nebo kartách? Prosím zavřete všechny panely a zkuste to znovu."
+  error_reminder_not_found: "Připomínka nebyla nalezena nebo již byla oznámena."
   error_work_package_not_found_in_project: "Pracovný balíček nebyl nalezen, nebo nepatří k tomuto projektu"
   error_work_package_id_not_found: "Pracovní balíček nebyl nalezen."
   error_must_be_project_member: "musí být členem projektu"
@@ -1909,16 +1976,16 @@ cs:
           options:
             table:
               label: "Tabulka"
-              caption: "Export the work packages list in a table with the desired columns."
+              caption: "Export seznamu pracovních balíčků do tabulky s požadovanými sloupci."
             report:
               label: "Report"
               caption: "Export the work package on a detailed report of all work packages in the list."
             gantt:
               label: "Ganttův diagram"
-              caption: "Export the work packages list in a Gantt diagram view."
+              caption: "Export seznamu pracovních balíčků v zobrazení Ganttova diagramu."
         include_images:
           label: "Včetně obrázků"
-          caption: "Exclude images to reduce the size of the PDF export."
+          caption: "Vyloučit obrázky pro zmenšení velikosti exportu PDF."
         gantt_zoom_levels:
           label: "Úrovně přiblížení"
           caption: "Select what is the zoom level for dates displayed in the chart."
@@ -1928,7 +1995,7 @@ cs:
             months: "Měsíce"
             quarters: "Čtvrtletí"
         column_width:
-          label: "Table column width"
+          label: "Šířka sloupce tabulky"
           options:
             narrow: "Úzký"
             medium: "Střední"
@@ -1938,10 +2005,10 @@ cs:
           label: "Velikost papíru"
           caption: "Depending on the chart size more than one page might be exported."
         long_text_fields:
-          input_caption: "By default all long text fields are selected."
-          input_label: "Add long text fields"
-          input_placeholder: "Search for long text fields"
-          drag_area_label: "Manage long text fields"
+          input_caption: "Ve výchozím nastavení jsou vybrána všechna dlouhá textová pole."
+          input_label: "Přidat dlouhá textová pole"
+          input_placeholder: "Hledat dlouhá textová pole"
+          drag_area_label: "Správa dlouhých textových polí"
       xls:
         include_relations:
           label: "Zahrnout vztahy"
@@ -1949,7 +2016,7 @@ cs:
         include_descriptions:
           label: "Zahrnout popisy"
           caption: "This option will add a description column in raw format."
-    your_work_packages_export: "Work packages are being exported"
+    your_work_packages_export: "Pracovní balíčky jsou exportovány"
     succeeded: "Export dokončen"
     failed: "Při pokusu o export pracovních balíčků došlo k chybě: %{message}"
     format:
@@ -1972,22 +2039,22 @@ cs:
       hours: h
       days: d
   pdf_generator:
-    page_nr_footer: "Page %{page} of %{total}"
+    page_nr_footer: "Strana %{page} z %{total}"
     dialog:
-      title: Generate PDF
-      submit: Generate
+      title: Generovat PDF
+      submit: Generovat
       header_right:
-        label: Header right
+        label: Záhlaví vpravo
         caption: Text to be displayed in the right of the header
       footer_center:
-        label: Footer center
+        label: Střed zápatí
         caption: Text to be displayed in the center of the footer
       hyphenation:
-        label: Hyphenation
+        label: Dělení slov
         caption: Break words between lines to improve text justification and readability.
       paper_size:
-        label: Paper size
-        caption: The size of the paper to use for the PDF.
+        label: Velikost papíru
+        caption: Velikost papíru, který se má použít pro PDF.
   extraction:
     available:
       pdftotext: "Pdftotext k dispozici (volitelné)"
@@ -2040,15 +2107,15 @@ cs:
       progress_mode_changed_to_status_based: "Výpočet průběhu byl aktualizován"
       status_changed: "Stav '%{status_name}'"
       system_update: "Aktualizace systému OpenProject:"
-      work_package_duplicate_closed: "Duplicate work package updated:"
-      total_percent_complete_mode_changed_to_work_weighted_average: "Calculation of % Complete totals now weighted by Work."
-      total_percent_complete_mode_changed_to_simple_average: "Calculation of % Complete totals now based on a simple average of only % Complete values."
+      work_package_duplicate_closed: "Aktualizován duplikát pracovního balíčku:"
+      total_percent_complete_mode_changed_to_work_weighted_average: "Výpočet % úplných celků nyní vážený Prací."
+      total_percent_complete_mode_changed_to_simple_average: "Výpočet % úplných celků nyní na základě jednoduchého průměru pouze % úplných hodnot."
     cause_descriptions:
       work_package_predecessor_changed_times: podle změn na předchůdce %{link}
       work_package_parent_changed_times: podle změn na nadřazený %{link}
       work_package_children_changed_times: podle změn na potomka %{link}
       work_package_related_changed_times: podle změn na související %{link}
-      work_package_duplicate_closed: The status was automatically updated by the duplicated work package %{link}
+      work_package_duplicate_closed: Stav byl automaticky aktualizován duplicitním pracovním balíčkem %{link}
       unaccessable_work_package_changed: prostřednictvím změn souvisejícího pracovního balíčku
       working_days_changed:
         changed: "podle změn na pracovní dny (%{changes})"
@@ -2058,7 +2125,7 @@ cs:
         dates:
           working: "%{date} je pracovní "
           non_working: "%{date} je nepracovní "
-      progress_mode_changed_to_status_based: Progress calculation mode set to status-based
+      progress_mode_changed_to_status_based: Režim výpočtu průběhu nastaven na základě stavu
       status_excluded_from_totals_set_to_false_message: nyní zahrnuty v součtech hierarchie
       status_excluded_from_totals_set_to_true_message: nyní vyloučen z součtů hierarchie
       status_percent_complete_changed: "% Complete changed from %{old_value}% to %{new_value}%"
@@ -2072,9 +2139,9 @@ cs:
         totals_removed_from_childless_work_packages: >-
           Work and progress totals automatically removed for non-parent work packages with <a href="%{href}" target="_blank">version update</a>. This is a maintenance task and can be safely ignored.
       total_percent_complete_mode_changed_to_work_weighted_average: >-
-        Child work packages without Work are ignored.
+        Podřízené pracovní balíčky bez položky Práce jsou ignorovány.
       total_percent_complete_mode_changed_to_simple_average: >-
-        Work values of child work packages are ignored.
+        Pracovní hodnoty podřízených pracovních balíčků jsou ignorovány.
   links:
     configuration_guide: "Konfigurační manuál"
     get_in_touch: "Máte otázky? Spojte se s námi."
@@ -2137,6 +2204,7 @@ cs:
       responsible: "Odpovědný"
       shared: "Sdíleno"
       watched: "Sledující"
+      reminder: "Připomínka"
     facets:
       unread: "Nepřečtené"
       unread_title: "Zobrazit nepřečtené"
@@ -2174,7 +2242,7 @@ cs:
   label_additional_workflow_transitions_for_assignee: "Povolené dodatečné přechody, pokud je uživatel přiřazený"
   label_additional_workflow_transitions_for_author: "Povolené dodatečné přechody, pokud je uživatel autor"
   label_administration: "Administrace"
-  label_interface_colors: "Interface colors"
+  label_interface_colors: "Barvy rozhraní"
   label_interface_colors_description: "These colors control how the application looks. If you modify them the theme will automatically be changed to Custom theme, but we can’t assure the compliance of the accessibility contrast minimums (WCAG 2.1). "
   label_age: "Věk"
   label_ago: "dnů před"
@@ -2194,7 +2262,7 @@ cs:
   label_ical_access_key_generation_hint: "Automaticky vygenerováno při odebírání kalendáře."
   label_ical_access_key_latest: "poslední"
   label_ical_access_key_revoke: "Revoke"
-  label_add_column: "Add column"
+  label_add_column: "Přidat sloupec"
   label_applied_status: "Přiřazený stav"
   label_archive_project: "Archivovat projekt"
   label_ascending: "Vzestupně"
@@ -2221,7 +2289,7 @@ cs:
   label_api_doc: "API dokumentace"
   label_backup: "Záloha"
   label_backup_code: "Záložní kód"
-  label_basic_details: "Basic details"
+  label_basic_details: "Základní údaje"
   label_between: "mezi"
   label_blocked_by: "zablokoval"
   label_blocks: "bloky"
@@ -2240,7 +2308,7 @@ cs:
   label_calendars_and_dates: "Kalendáře a data"
   label_calendar_show: "Zobrazit kalendář"
   label_category: "Kategorie"
-  label_completed: Completed
+  label_completed: Dokončeno
   label_consent_settings: "Souhlas uživatele"
   label_wiki_menu_item: Položka Wiki menu
   label_select_main_menu_item: Vyberte novou hlavní položku nabídky
@@ -2283,7 +2351,7 @@ cs:
   label_copy_project: "Kopírovat projekt"
   label_core_version: "Verze jádra"
   label_core_build: "Build jádra"
-  label_created_by: "Created by %{user}"
+  label_created_by: "Vytvořil %{user}"
   label_current_status: "Aktuální stav"
   label_current_version: "Aktuální verze"
   label_custom_field_add_no_type: "Přidat toto pole k typu pracovního balíčku"
@@ -2304,8 +2372,10 @@ cs:
   label_default: "Výchozí"
   label_delete_user: "Odstranit uživatele"
   label_delete_project: "Odstranit projekt"
+  label_delete: "Smazat"
   label_deleted: "Smazáno"
   label_deleted_custom_field: "(odstraněno vlastní pole)"
+  label_deleted_custom_item: "(smazaná položka)"
   label_deleted_custom_option: "(deleted option)"
   label_empty_element: "(prázdný)"
   label_missing_or_hidden_custom_option: "(chybí hodnota nebo chybí oprávnění k přístupu)"
@@ -2342,11 +2412,10 @@ cs:
   label_enterprise_active_users: "%{current}/%{limit} rezervováno aktivních uživatelů"
   label_enterprise_edition: "Enterprise Edice"
   label_enterprise_support: "Podpora pro Enterprise edici"
-  label_enterprise_addon: "Doplňky Enterprise Edice"
   label_environment: "Prostředí"
   label_estimates_and_progress: "Odhady a posup"
   label_equals: "je"
-  label_equals_with_descendants: "is any with descendants"
+  label_equals_with_descendants: "je libovolný s potomky"
   label_everywhere: "všude"
   label_example: "Příklad"
   label_experimental: "Experimentální"
@@ -2367,7 +2436,7 @@ cs:
   label_file_plural: "Soubory"
   label_filter: "Filtry"
   label_filter_add: "Přidat filtr"
-  label_filter_by: "Filter by"
+  label_filter_by: "Filtrovat podle"
   label_filter_plural: "Filtry"
   label_filters_toggle: "Zobrazit/skrýt filtry"
   label_float: "Desetinné číslo"
@@ -2390,7 +2459,7 @@ cs:
   label_here: zde
   label_hide: "Skrýt"
   label_history: "Historie"
-  label_hierarchy: "Hierarchy"
+  label_hierarchy: "Hierarchie"
   label_hierarchy_leaf: "Úroveň hierarchie"
   label_home: "Domů"
   label_subject_or_id: "Předmět nebo ID"
@@ -2402,7 +2471,7 @@ cs:
   label_inactive: "Neaktivní"
   label_incoming_emails: "Příchozí e-maily"
   label_includes: "zahrnuje"
-  label_incomplete: Incomplete
+  label_incomplete: Nedokončené
   label_include_sub_projects: Zahrnout všechny podprojekty
   label_index_by_date: "Index dle data"
   label_index_by_title: "Index dle názvu"
@@ -2413,14 +2482,14 @@ cs:
   label_internal: "Interní"
   label_introduction_video: "Seznamovací video"
   label_invite_user: "Pozvat uživatele"
-  label_item: "Item"
-  label_item_plural: "Items"
+  label_item: "Položka"
+  label_item_plural: "Položky"
   label_share: "Sdílet"
   label_share_project_list: "Sdílet seznam projektů"
   label_share_work_package: "Sdílet pracovní balíček"
   label_show_all_registered_users: "Zobrazit registrované uživatele"
-  label_show_less: "Show less"
-  label_show_more: "Show more"
+  label_show_less: "Zobrazit méně"
+  label_show_more: "Zobrazit více"
   label_journal: "Deník"
   label_journal_diff: "Popis porovnání"
   label_language: "Jazyk"
@@ -2456,7 +2525,7 @@ cs:
   label_custom_favicon: "Vlastní favicon"
   label_custom_touch_icon: "Vlastní ikona dotyku"
   label_logout: "Odhlásit se"
-  label_mapping_for: "Mapping for: %{attribute}"
+  label_mapping_for: "Mapování pro: %{attribute}"
   label_main_menu: "Boční Menu"
   label_manage: "Spravovat"
   label_manage_groups: "Spravovat skupiny"
@@ -2491,10 +2560,10 @@ cs:
   label_months_from: "měsíců od"
   label_more: "Více"
   label_more_than_ago: "před více jak (dny)"
-  label_move_column_left: "Move column left"
-  label_move_column_right: "Move column right"
+  label_move_column_left: "Přesunout sloupec vlevo"
+  label_move_column_right: "Přesunout sloupec vpravo"
   label_move_work_package: "Přesunout pracovní balíček"
-  label_my_account: "Account settings"
+  label_my_account: "Nastavení účtu"
   label_my_activity: "Moje aktivita"
   label_my_account_data: "Data mého účtu"
   label_my_avatar: "Můj avatar"
@@ -2521,12 +2590,13 @@ cs:
   label_no_parent_page: "Žádná nadřazená stránka"
   label_nothing_display: "Nic k zobrazení"
   label_nobody: "nikdo"
-  label_not_configured: "Not configured"
+  label_not_configured: "Není konfigurováno"
   label_not_found: "nenalezeno"
   label_none: "žádný"
   label_none_parentheses: "(žádný)"
   label_not_contains: "neobsahuje"
   label_not_equals: "není"
+  label_life_cycle_step_plural: "Životní cyklus projektu"
   label_on: "zapnuto"
   label_operator_all: "není prázdný"
   label_operator_none: "je prázdný"
@@ -2574,7 +2644,7 @@ cs:
   label_product_version: "Verze produktu"
   label_profile: "Profil"
   label_percent_complete: "% Dokončeno"
-  label_progress_tracking: "Progress tracking"
+  label_progress_tracking: "Sledování průběhu"
   label_project: "Projekt"
   label_project_activity: "Aktivita projektu"
   label_project_attribute_plural: "Atributy projektu"
@@ -2584,7 +2654,7 @@ cs:
   label_project_latest: "Nejnovější projekty"
   label_project_default_type: "Povolit prázdný typ"
   label_project_hierarchy: "Hierarchie projektu"
-  label_project_mappings: "Projects"
+  label_project_mappings: "Projekty"
   label_project_new: "Nový projekt"
   label_project_plural: "Projekty"
   label_project_list_plural: "Seznamy projektů"
@@ -2594,7 +2664,7 @@ cs:
   label_project_attributes_settings: ""
   label_project_storage_plural: "Úložiště souborů"
   label_project_storage_project_folder: "Úložiště souborů: Složky projektů"
-  label_projects_disk_usage_information: "%{count} projects using %{used_disk_space} disk space"
+  label_projects_disk_usage_information: "%{count} projekty využívající diskový prostor %{used_disk_space}"
   label_project_view_all: "Zobrazit všechny projekty - seznam"
   label_project_show_details: "Zobrazit detail projektu"
   label_project_hide_details: "Skrýt detail projektu"
@@ -2611,13 +2681,13 @@ cs:
   label_related_work_packages: "Související pracovní balíčky"
   label_relates: "související s"
   label_relates_to: "související s"
-  label_relation: "Relation"
-  label_relation_actions: "Relation actions"
+  label_relation: "Vztah"
+  label_relation_actions: "akce k Vztahu"
   label_relation_delete: "Odstranit vztah"
   label_relation_new: "Nový vztah"
   label_release_notes: "Poznámky k verzi"
   label_remaining_work: "Zbývající práce"
-  label_remove_column: "Remove column"
+  label_remove_column: "Odstranit sloupec"
   label_remove_columns: "Odstranit vybrané sloupce"
   label_renamed: "přejmenováno"
   label_reply_plural: "odpovědi"
@@ -2628,6 +2698,7 @@ cs:
   label_reporting: "Hlášení"
   label_reporting_plural: "Hlášení"
   label_repository: "Repozitář"
+  label_repository_remove: "Odstranit repozitář?"
   label_repository_root: "Kořen repositáře"
   label_repository_plural: "Repozitáře"
   label_required: "vyžadováno"
@@ -2646,8 +2717,8 @@ cs:
   label_role_plural: "Role"
   label_role_search: "Přiřadit roli novým členům"
   label_scm: "SCM"
-  label_scroll_left: "Scroll left"
-  label_scroll_right: "Scroll right"
+  label_scroll_left: "Rolovat vlevo"
+  label_scroll_right: "Rolovat vpravo"
   label_search: "Vyhledávání"
   label_search_by_name: "Hledat podle názvu"
   label_send_information: "Poslat nové přihlašovací údaje uživateli"
@@ -2658,10 +2729,10 @@ cs:
   label_show_completed_versions: "Zobrazit dokončené verze"
   label_columns: "Sloupce"
   label_sort: "Řadit"
-  label_sort_ascending: "Sort ascending"
+  label_sort_ascending: "Seřadit vzestupně"
   label_sort_by: "Seřadit podle %{value}"
   label_sorted_by: "seřazeno dle %{value}"
-  label_sort_descending: "Sort descending"
+  label_sort_descending: "Seřadit sestupně"
   label_sort_higher: "Přesunout výš"
   label_sort_highest: "Přesunout nahoru"
   label_sort_lower: "Přesunout níž"
@@ -2690,6 +2761,7 @@ cs:
   label_this_month: "tento měsíc"
   label_this_week: "tento týden"
   label_this_year: "tento rok"
+  label_time: "Čas"
   label_time_entry_plural: "Strávený čas"
   label_time_entry_activity_plural: "Aktivity strávený čas"
   label_title: "Název"
@@ -2725,6 +2797,7 @@ cs:
   label_user_settings: "Uživatelská nastavení"
   label_users_settings: "Uživatelská nastavení"
   label_version_new: "Nová verze"
+  label_version_edit: "Upravit verzi"
   label_version_plural: "Verze"
   label_version_sharing_descendants: "S podprojekty"
   label_version_sharing_hierarchy: "S hierarchií projektu"
@@ -2771,7 +2844,7 @@ cs:
   label_work_package_tracking: "Sledování pracovních balíčků"
   label_work_package_view_all: "Zobrazit všechny pracovní balíčky"
   label_workflow: "Pracovní postup"
-  label_workflow_copy: "Copy workflow"
+  label_workflow_copy: "Kopírovat workflow"
   label_workflow_plural: "Pracovní postupy"
   label_workflow_summary: "Souhrn"
   label_working_days_and_hours: "Pracovní dny a hodiny"
@@ -2864,8 +2937,13 @@ cs:
         prefix: "Obdrženo z důvodu nastavení notifikací: %{reason}"
         date_alert_start_date: "Upozornění na datum"
         date_alert_due_date: "Upozornění na datum"
+        reminder: "Připomínka"
       see_all: "Zobrazit vše"
       updated_at: "Aktualizováno v %{timestamp} uživatelem %{user}"
+    reminder_notifications:
+      subject: "Připomínka: %{note}"
+      heading: "Máte novou připomínku"
+      note: "Poznámka: \"%{note}\""
     sharing:
       work_packages:
         allowed_actions: "Můžete %{allowed_actions} tento pracovní balíček. To se může změnit v závislosti na roli a oprávnění vašeho projektu."
@@ -2895,7 +2973,7 @@ cs:
         email_notification_settings: "Nastavení e-mailových oznámení o úložišti"
         see_storage_settings: "Zobrazit nastavení úložiště"
         healthy:
-          subject: 'Storage "%{name}" is now healthy!'
+          subject: 'Úložiště "%{name}" je nyní zdravé!'
           solved_at: "vyřešeno v"
           summary: "The problem with your %{storage_name} storage integration is now solved"
         unhealthy:
@@ -3014,7 +3092,7 @@ cs:
   notice_locking_conflict_reload_page: "Prosím obnovte stránku, zkontrolujte změny a znovu aplikujte aktualizace."
   notice_locking_conflict_warning: "This page has been updated by someone else. To not lose your edits, copy them locally and reload to view the updated version."
   notice_locking_conflict_danger: "Could not save your changes because of conflicting modifications. To not lose your edits, copy them locally and reload to view the updated version."
-  notice_locking_conflict_action_button: "Discard changes and reload"
+  notice_locking_conflict_action_button: "Zrušit změny a znovu načíst"
   notice_member_added: '%{name} přidán do projektu.'
   notice_members_added: '%{number} uživatelů přidáno do projektu.'
   notice_member_removed: "%{user} odebrán z projektu."
@@ -3031,6 +3109,7 @@ cs:
   notice_successful_connection: "Úspěšné připojení."
   notice_successful_create: "Úspěšné vytvoření."
   notice_successful_delete: "Úspěšné odstranění."
+  notice_successful_cancel: "Úspěšné zrušení."
   notice_successful_update: "Úspěšná aktualizace."
   notice_successful_update_custom_fields_added_to_project: |
     Úspěšná aktualizace. Vlastní pole aktivovaných typů jsou automaticky aktivována
@@ -3110,6 +3189,7 @@ cs:
   permission_edit_own_time_entries: "Upravit vlastní časové záznamy"
   permission_edit_project: "Upravit projekt"
   permission_edit_project_attributes: "Úprava atributů projektu"
+  permission_edit_project_stages_and_gates: "Upravit etapy a brány projektu"
   permission_edit_reportings: "Upravit přehledy"
   permission_edit_time_entries: "Upravit časové záznamy pro ostatní uživatele"
   permission_edit_timelines: "Úpravy časové osy"
@@ -3139,9 +3219,12 @@ cs:
   permission_search_project: "Hledat projekt"
   permission_select_custom_fields: "Vybrat vlastní pole"
   permission_select_project_custom_fields: "Vyberte atributy projektu"
+  permission_select_project_life_cycle: "Vyberte etapy a brány projektu"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "Vyberte moduly projektu"
   permission_share_work_packages: "Sdílet pracovní balíčky"
   permission_manage_types: "Vyberte typy"
+  permission_manage_own_reminders: "Vytvořit vlastní připomenutí"
   permission_view_project: "Zobrazit projekty"
   permission_view_changesets: "Zobrazit revize repozitáře v OpenProject"
   permission_view_commit_author_statistics: "Zobrazit statistiky autora commitu"
@@ -3155,13 +3238,14 @@ cs:
   permission_view_shared_work_packages: "Zobrazit sdílení pracovních balíčků"
   permission_view_time_entries: "Zobrazit strávený čas"
   permission_view_timelines: "Zobrazit časové osy"
-  permission_view_user_email: "View users' mail addresses"
+  permission_view_user_email: "Zobrazit e-mailové adresy uživatelů"
   permission_view_wiki_edits: "Zobrazit historii wiki"
   permission_view_wiki_pages: "Zobrazit wiki"
   permission_work_package_assigned: "Staňte se řešitelem/odpovědným"
   permission_work_package_assigned_explanation: "Pracovní balíčky mohou být přiřazeny uživatelům a skupinám, které tuto roli vlastní v příslušném projektu"
   permission_view_project_activity: "Zobrazit aktivitu projektu"
   permission_view_project_attributes: "Zobrazit atributy projektu"
+  permission_view_project_stages_and_gates: "Zobrazit fáze a brány projektu"
   permission_save_bcf_queries: "Uložit dotazy BCF"
   permission_manage_public_bcf_queries: "Spravovat veřejné dotazy BCF."
   permission_edit_attribute_help_texts: "Upravit text nápovědy atributu"
@@ -3359,7 +3443,7 @@ cs:
   setting_app_subtitle: "Podtitulek aplikace"
   setting_app_title: "Název aplikace"
   setting_attachment_max_size: "Maximální velikost příloh"
-  setting_show_work_package_attachments: "Show attachments in the files tab by default"
+  setting_show_work_package_attachments: "Ve výchozím nastavení zobrazit přílohy na kartě souborů"
   setting_antivirus_scan_mode: "Režim skenování"
   setting_antivirus_scan_action: "Akce s infikovaným souborem"
   setting_autofetch_changesets: "Automaticky načíst změny repozitáře"
@@ -3386,9 +3470,9 @@ cs:
   setting_default_language: "Výchozí jazyk"
   setting_default_projects_modules: "Výchozí zapnutné moduly pro nový projekt"
   setting_default_projects_public: "Nové projekty nastavovat jako veřejné"
-  setting_disable_password_login: "Disable password authentication"
+  setting_disable_password_login: "Zakázat ověřování hesla"
   setting_diff_max_lines_displayed: "Maximální počet zobrazených řádků rozdílu"
-  setting_omniauth_direct_login_provider: "Direct login SSO provider"
+  setting_omniauth_direct_login_provider: "Poskytovatel přímého přihlášení SSO"
   setting_display_subprojects_work_packages: "Automaticky zobrazit úkoly podprojektu v hlavním projektu"
   setting_duration_format: "Formát doby trvání"
   setting_duration_format_hours_only: "Pouze hodiny"
@@ -3408,7 +3492,7 @@ cs:
   setting_hours_per_day_explanation: >-
     This defines what is considered a "day" when displaying duration in days and hours (for example, if a day is 8 hours, 32 hours would be 4 days).
   setting_invitation_expiration_days: "Platnost aktivačního e-mailu vyprší po"
-  setting_work_package_done_ratio: "Progress calculation mode"
+  setting_work_package_done_ratio: "Režim výpočtu průběhu"
   setting_work_package_done_ratio_field: "Na základě práce"
   setting_work_package_done_ratio_field_caption_html: >-
     <i>% Complete</i> can be freely set to any value. If you optionally enter a value for <i>Work</i>, <i>Remaining work</i> will automatically be derived.
@@ -3435,13 +3519,13 @@ cs:
   setting_password_min_length: "Minimální délka"
   setting_password_min_adhered_rules: "Minimální počet požadovaných tříd"
   setting_per_page_options: "Objektů na stránku"
-  setting_percent_complete_on_status_closed: "% Complete when status is closed"
-  setting_percent_complete_on_status_closed_no_change: "No change"
+  setting_percent_complete_on_status_closed: "% Dokončeno, když je stav uzavřen"
+  setting_percent_complete_on_status_closed_no_change: "Žádná změna"
   setting_percent_complete_on_status_closed_no_change_caption_html: >-
     The value of <i>% Complete</i> will not change even when a work package is closed.
-  setting_percent_complete_on_status_closed_set_100p: "Automatically set to 100%"
+  setting_percent_complete_on_status_closed_set_100p: "Automaticky nastaveno na 100%"
   setting_percent_complete_on_status_closed_set_100p_caption: >-
-    A closed work package is considered complete.
+    Uzavřený pracovní balíček je považován za dokončený.
   setting_plain_text_mail: "Prostý text (ne HTML)"
   setting_protocol: "Protokol"
   setting_project_gantt_query: "Gantt Zobrazení projektového portfolia"
@@ -3466,10 +3550,10 @@ cs:
   setting_sys_api_description: "Webová služba pro správu repositářů poskytuje integraci a uživatelskou autorizaci pro přístup k repositářům."
   setting_time_format: "Čas"
   setting_total_percent_complete_mode: "Calculation of % Complete hierarchy totals"
-  setting_total_percent_complete_mode_work_weighted_average: "Weighted by work"
+  setting_total_percent_complete_mode_work_weighted_average: "Váženo prací"
   setting_total_percent_complete_mode_work_weighted_average_caption_html: >-
     The <i>total % Complete</i> will be weighted against the <i>Work</i> of each work package in the hierarchy. Work packages without <i>Work</i> will be ignored.
-  setting_total_percent_complete_mode_simple_average: "Simple average"
+  setting_total_percent_complete_mode_simple_average: "Jednoduchý průměr"
   setting_total_percent_complete_mode_simple_average_caption_html: >-
     <i>Work</i> is ignored and the <i>total % Complete</i> will be a simple average of <i>% Complete</i> values of work packages in the hierarchy.
   setting_accessibility_mode_for_anonymous: "Povolit režim usnadnění pro anonymní uživatele"
@@ -3485,7 +3569,7 @@ cs:
   setting_working_days: "Pracovní dny"
   settings:
     authentication:
-      single_sign_on: "Single Sign-On"
+      single_sign_on: "Single Sign On"
       omniauth_direct_login_hint_html: >
         If this option is active, login requests will redirect to the configured omniauth provider. The login dropdown and sign-in page will be disabled. <br/> <strong>Note:</strong> Unless you also disable password logins, with this option enabled, users can still log in internally by visiting the <code>%{internal_path}</code> login page.
     attachments:
@@ -3546,9 +3630,9 @@ cs:
       label_new_section: "Sekce"
       label_edit_section: "Upravit název"
       label_section_actions: "Akce v sekci"
-      heading_description: "These project attributes appear in the overview page of each project. You can add new attributes, group them into sections and re-order them as you please. These attributes can be enabled or disabled but not re-ordered at a project level."
-      label_project_custom_field_actions: "Project attribute actions"
-      label_no_project_custom_fields: "No project attributes defined in this section"
+      heading_description: "Tyto atributy projektu se zobrazí na stránce s přehledem každého projektu. Můžete přidat nové atributy, seskupit je do sekcí a změnit jejich pořadí podle libosti. Tyto atributy mohou být povoleny nebo zakázány, ale nemohou být přeřazeny na úrovni projektu."
+      label_project_custom_field_actions: "Akce atributů projektu"
+      label_no_project_custom_fields: "V této sekci nejsou definovány žádné atributy projektu"
       edit:
         description: "Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis."
       new:
@@ -3818,24 +3902,24 @@ cs:
       label_note: "Poznámka:"
       modal:
         work_based_help_text: "Each field is automatically calculated from the two others when possible."
-        status_based_help_text: "% Complete is set by work package status."
+        status_based_help_text: "% Dokončeno je nastaveno podle stavu pracovního balíčku."
         migration_warning_text: "In work-based progress calculation mode, % Complete cannot be manually set and is tied to Work. The existing value has been kept but cannot be edited. Please input Work first."
       derivation_hints:
         done_ratio:
-          cleared_because_remaining_work_is_empty: "Cleared because Remaining work is empty."
-          cleared_because_work_is_0h: "Cleared because Work is 0h."
+          cleared_because_remaining_work_is_empty: "Vymazáno, protože zbývající práce je prázdná."
+          cleared_because_work_is_0h: "Vymazáno, protože práce je 0h."
           derived: "Derived from Work and Remaining work."
         estimated_hours:
           cleared_because_remaining_work_is_empty: "Cleared because Remaining work is empty."
           derived: "Derived from Remaining work and % Complete."
           same_as_remaining_work: "Set to same value as Remaining work."
         remaining_hours:
-          cleared_because_work_is_empty: "Cleared because Work is empty."
+          cleared_because_work_is_empty: "Vymazáno, protože položka Práce je prázdná."
           cleared_because_percent_complete_is_empty: "Cleared because % Complete is empty."
           decreased_by_delta_like_work: "Decreased by %{delta}, matching the reduction in Work."
-          derived: "Derived from Work and % Complete."
+          derived: "Odvozeno od práce a % dokončení."
           increased_by_delta_like_work: "Increased by %{delta}, matching the increase in Work."
-          same_as_work: "Set to same value as Work."
+          same_as_work: "Nastavit na stejnou hodnotu jako práce."
     permissions:
       comment: "Komentář"
       comment_description: "Může zobrazit a komentovat tento pracovní balíček."
@@ -3843,6 +3927,12 @@ cs:
       edit_description: "Může zobrazovat, komentovat a upravovat tento pracovní balíček."
       view: "Zobrazit"
       view_description: "Může zobrazit tento pracovní balíček."
+    reminders:
+      label_remind_at: "Datum"
+      note_placeholder: "Proč nastavujete toto připomenutí?"
+      success_creation_message: "Připomínka byla úspěšně nastavena. Obdržíte oznámení pro tento pracovní balíček ve zvoleném čase."
+      success_update_message: "Připomínka byla úspěšně aktualizována."
+      success_deletion_message: "Připomínka byla úspěšně odstraněna."
   sharing:
     count:
       zero: "0 uživatelů"
@@ -3857,7 +3947,7 @@ cs:
       group: "Skupina"
       role: "Role"
       type: "Typ"
-    denied: "You don't have permissions to share %{entities}."
+    denied: "Nemáte oprávnění ke sdílení %{entities}."
     label_search: "Hledat uživatele pro pozvání"
     label_search_placeholder: "Hledat podle uživatele nebo e-mailové adresy"
     label_toggle_all: "Přepnout všechny sdílené"
@@ -3865,7 +3955,7 @@ cs:
     share: "Sdílet"
     text_empty_search_description: "Neexistují žádní uživatelé s aktuálními kritérii filtru."
     text_empty_search_header: "Nenašli jsme žádné odpovídající výsledky."
-    text_empty_state_description: "The %{entity} has not been shared with anyone yet."
+    text_empty_state_description: "%{entity} ještě nebyl sdílen s nikým."
     text_empty_state_header: "Není sdíleno"
     text_user_limit_reached: "Adding additional users will exceed the current limit. Please contact an administrator to increase the user limit to ensure external users are able to access this %{entity}."
     text_user_limit_reached_admins: 'Adding additional users will exceed the current limit. Please <a href="%{upgrade_url}">upgrade your plan</a> to be able to add more users.'
@@ -3873,7 +3963,7 @@ cs:
       Adding additional users will exceed the current limit. Please contact an administrator to increase the user limit to ensure external users are able to access this %{entity}.
     warning_user_limit_reached_admin: >
       Adding additional users will exceed the current limit. Please <a href="%{upgrade_url}">upgrade your plan</a> to be able to ensure external users are able to access this %{entity}.
-    warning_no_selected_user: "Please select users to share this %{entity} with"
+    warning_no_selected_user: "Vyberte uživatele pro sdílení tohoto %{entity} s"
     warning_locked_user: "Uživatel %{user} je uzamčen a nemůže být s ním sdíleno"
     user_details:
       locked: "Uzamčený uživatel"
@@ -3887,29 +3977,29 @@ cs:
       additional_privileges_group: "Může mít dodatečná oprávnění (jako člen skupiny)"
       additional_privileges_project_or_group: "Může mít dodatečná oprávnění (jako člen skupiny)"
     project_queries:
-      publishing_denied: "You do not have permission to make project lists public."
+      publishing_denied: "Nemáte oprávnění zveřejňovat seznamy projektů."
       access_warning: "Users will only see the projects they have access to. Sharing project lists does not impact individual project permissions."
       user_details:
         owner: "Vlastník seznamu"
-        can_view_because_public: "Can already view because list is shared with everyone"
-        can_manage_public_lists: "Can edit due to global permissions"
+        can_view_because_public: "Již může zobrazit, protože seznam je sdílen se všemi"
+        can_manage_public_lists: "Lze upravit z důvodu globálních oprávnění"
       public_flag:
-        label: "Share with everyone at %{instance_name}"
+        label: "Sdílet se všemi na %{instance_name}"
         caption: "Everyone can view this project list. Those with global edit permissions can modify it."
       blank_state:
         public:
           header: "Sdíleno se všemi"
-          description: "Everyone can view this project list. You can also add individual users with extra permissions."
+          description: "Každý může zobrazit tento seznam projektů. Můžete také přidat jednotlivé uživatele s extra oprávněním."
         private:
-          header: "Not shared: Private"
-          description: "This project list has not been shared with anyone yet. Only you can access this list."
+          header: "Není sdíleno: Soukromé"
+          description: "Tento seznam projektů zatím nebyl sdílen s nikým. Pouze vy můžete přistupovat k tomuto seznamu."
       permissions:
         view: "Zobrazit"
-        view_description: "Can view this project list."
+        view_description: "Může zobrazit tento seznam projektů."
         edit: "Upravit"
-        edit_description: "Can view, share and edit this project list."
+        edit_description: "Může zobrazovat, sdílet a upravovat tento seznam projektů."
       upsale:
-        message: "Sharing project lists with individual users is an enterprise add-on."
+        message: "Sdílení seznamů projektů s jednotlivými uživateli je enterprise doplňek."
   working_days:
     info: >
       Days that are not selected are skipped when scheduling work packages (and not included in the day count). These can be overridden at a work-package level.
@@ -4026,16 +4116,16 @@ cs:
     close_warning: "Ignorovat toto upozornění."
   oauth:
     application:
-      builtin: Built-in instance application
-      confidential: Confidential
+      builtin: Vestavěná aplikace
+      confidential: Důvěrné
       singular: "OAuth aplikace"
       plural: "OAuth aplikace"
       named: "OAuth aplikace '%{name}'"
       new: "Nová OAuth aplikace"
-      non_confidential: Non confidential
+      non_confidential: Nedůvěrné
       default_scopes: "(Výchozí rozsahy)"
       instructions:
-        enabled: "Enable this application, allowing users to perform authorization grants with it."
+        enabled: "Povolte tuto aplikaci, která umožňuje uživatelům provádět autorizaci."
         name: "Název vaší aplikace. Bude zobrazen ostatním uživatelům po autorizaci."
         redirect_uri_html: >
           Povolené adresy URL oprávněných uživatelů mohou být přesměrovány na jeden záznam na řádek. <br/> Pokud registrujete aplikaci pro stolní počítač, použijte následující URL.
@@ -4045,8 +4135,8 @@ cs:
         register_intro: "Pokud vytváříte klientskou aplikaci OAuth API pro OpenProject, můžete ji zaregistrovat pomocí tohoto formuláře pro všechny uživatele."
         default_scopes: ""
     header:
-      builtin_applications: Built-in OAuth applications
-      other_applications: Other OAuth applications
+      builtin_applications: Vestavěná aplikace
+      other_applications: Nová OAuth aplikace
     empty_application_lists: No OAuth applications have been registered.
     client_id: "ID klienta"
     client_secret_notice: >
diff --git a/config/locales/crowdin/da.yml b/config/locales/crowdin/da.yml
index a6b83711c98c..eb3e590c04e0 100644
--- a/config/locales/crowdin/da.yml
+++ b/config/locales/crowdin/da.yml
@@ -341,6 +341,9 @@ da:
         text: "This action will not delete any project the list contains. Are you sure you want to delete this project list?"
     settings:
       change_identifier: Change identifier
+      actions:
+        label_enable_all: "Enable all"
+        label_disable_all: "Disable all"
       activities:
         no_results_title_text: Der er i øjeblikket ingen aktiviteter.
       forums:
@@ -351,18 +354,26 @@ da:
         no_results_content_text: Opret en ny arbejdspakke kategori
       custom_fields:
         no_results_title_text: Der er i øjeblikket ingen brugerdefinerede felter tilgængelige.
+      life_cycle:
+        header:
+          title: "Project lifecycle"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "Neither stages nor gates are currently defined."
+        section_header: "Stages and gates"
+        step:
+          use_in_project: "Use %{step} in this project"
+        filter:
+          label: "Search project stage or gate"
       project_custom_fields:
         header:
           title: "Project attributes"
-          description: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
+          description_html: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
         filter:
           label: "Search project attribute"
         actions:
           label_enable_single: "Active in this project, click to disable"
           label_disable_single: "Inactive in this project, click to enable"
           remove_from_project: "Remove from project"
-          label_enable_all: "Enable all"
-          label_disable_all: "Disable all"
         is_required_blank_slate:
           heading: Required in all projects
           description: This project attribute is activated in all projects since the "Required in all projects" option is checked. It cannot be deactivated for individual projects.
@@ -375,6 +386,10 @@ da:
         no_results_content_text: Create a new version
       storage:
         no_results_title_text: There is no additional recorded disk space consumed by this project.
+  project_stage:
+    working_days_count:
+      one: "Duration: %{count} working day"
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "The modified list has been saved as a new list"
@@ -495,8 +510,12 @@ da:
     groups:
       member_in_these_groups: "This user is currently a member of the following groups:"
       no_results_title_text: This user is currently not a member in any group.
+      summary_with_more: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary: Member of %{names}.
     memberships:
       no_results_title_text: This user is currently not a member of a project.
+    open_profile: "Open profile"
   page:
     text: "Tekst"
   placeholder_users:
@@ -567,18 +586,27 @@ da:
       no_results_title_text: There are currently no types.
       no_results_content_text: Create a new type
     edit:
-      settings: "Indstillinger"
-      form_configuration: "Form configuration"
+      form_configuration:
+        tab: "Form configuration"
       more_info_text_html: >
         Enterprise edition allows you to customize form configuration with these additional add-ons: <br> <ul class="%{list_styling_class}"> <li><b>Add new attribute groups</b></li> <li><b>Rename attribute groups</b></li> <li><b>Add a table of related work packages</b></li> </ul>
-      projects: "Projekter"
-      enabled_projects: "Enabled projects"
-      edit_query: "Edit table"
-      query_group_placeholder: "Give the table a name"
-      reset: "Reset to defaults"
-      type_color_text: |
-        The selected color distinguishes different types
-        in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      projects:
+        tab: "Projects"
+        enabled_projects: "Enabled projects"
+      settings:
+        tab: "Settings"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Subject configuration"
+        manually_editable_subjects:
+          label: "Manually editable subjects"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automatically generated subjects"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Subject pattern"
+          caption: "Search for an attribute or add text. To create a space between elements add it as a text."
   versions:
     overview:
       work_packages_in_archived_projects: "The version is shared with archived projects which still have work packages assigned to this version. These are counted, but will not appear in the linked views."
@@ -641,6 +669,10 @@ da:
     label_add_x: "Add %{x}"
     label_edit_x: "Edit %{x}"
     label_add_description: "Add description"
+    lag:
+      subject: "Lag"
+      title: "Lag (in days)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
       label_relates_singular: "related to"
       label_relates_plural: "related to"
@@ -845,6 +877,9 @@ da:
         lag: "Lag"
         from: "Arbejdspakke"
         to: "Sammenhørende arbejdspakker"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Time"
       repository:
         url: "Webadresse"
       role:
@@ -933,6 +968,7 @@ da:
       messages:
         accepted: "skal accepteres."
         after: "skal være senere end %{date}."
+        after_today: "must be in the future."
         after_or_equal_to: "skal være tidligst %{date}."
         before: "skal være før %{date}."
         before_or_equal_to: "skal være senest %{date}."
@@ -979,6 +1015,7 @@ da:
         not_an_integer: "er ikke et heltal."
         not_an_iso_date: "is not a valid date. Required format: YYYY-MM-DD."
         not_same_project: "hører ikke til samme projekt."
+        datetime_must_be_in_future: "must be in the future."
         odd: "skal være ulige."
         regex_match_failed: "does not match the regular expression %{expression}."
         regex_invalid: "could not be validated with the associated regular expression."
@@ -1092,16 +1129,38 @@ da:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "start date must be before the end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "is incomplete."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1318,6 +1377,8 @@ da:
         other: "Notifications"
       placeholder_user: "Pladsholder bruger"
       project: "Projekt"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         one: "Project list"
         other: "Project lists"
@@ -1421,6 +1482,7 @@ da:
     login: "Username"
     mail: "E-mail"
     name: "Navn"
+    note: "Note"
     password: "Adgangskode"
     priority: "Prioritet"
     project: "Projekt"
@@ -1517,6 +1579,7 @@ da:
   button_print: "Print"
   button_quote: "Citer"
   button_remove: Fjern
+  button_remove_reminder: "Remove reminder"
   button_rename: "Omdøb"
   button_replace: "Replace"
   button_revoke: "Revoke"
@@ -1527,6 +1590,7 @@ da:
   button_save_as: "Gem som"
   button_apply_changes: "Apply changes"
   button_save_back: "Save and back"
+  button_set_reminder: "Set reminder"
   button_show: "Vis"
   button_sort: "Sorter"
   button_submit: "Indsend"
@@ -1732,12 +1796,12 @@ da:
   direction: Fra venstre mod højre
   ee:
     upsale:
+      title: "Enterprise add-on"
+      link_title: "More information"
       form_configuration:
         description: "Customize the form configuration with these additional add-ons:"
         add_groups: "Add new attribute groups"
         rename_groups: "Rename attributes groups"
-      project_filters:
-        description_html: "Filtering and sorting on custom fields is an Enterprise edition add-on."
   enumeration_activities: "Time tracking activities"
   enumeration_work_package_priorities: "Prioritering af arbejdspakker"
   enumeration_reported_project_statuses: "Rapporteret projektstatus"
@@ -1770,6 +1834,7 @@ da:
   error_pdf_export_too_many_columns: "Too many columns selected for the PDF export. Please reduce the number of columns."
   error_pdf_failed_to_export: "The PDF export could not be saved: %{error}"
   error_token_authenticity: "Unable to verify Cross-Site Request Forgery token. Did you try to submit data on multiple browsers or tabs? Please close all tabs and try again."
+  error_reminder_not_found: "The reminder was not found or was already notified about."
   error_work_package_not_found_in_project: "Arbejdspakken er ikke fundet, eller den hører ikke til dette projekt"
   error_work_package_id_not_found: "The work package was not found."
   error_must_be_project_member: "skal være et medlem af projektet"
@@ -2063,6 +2128,7 @@ da:
       responsible: "Accountable"
       shared: "Shared"
       watched: "Tilsynsførende"
+      reminder: "Reminder"
     facets:
       unread: "Unread"
       unread_title: "Show unread"
@@ -2230,8 +2296,10 @@ da:
   label_default: "Forhåndsvalgt"
   label_delete_user: "Delete user"
   label_delete_project: "Delete project"
+  label_delete: "Delete"
   label_deleted: "slettet"
   label_deleted_custom_field: "(slettet selvvalgt felt)"
+  label_deleted_custom_item: "(deleted item)"
   label_deleted_custom_option: "(deleted option)"
   label_empty_element: "(tom)"
   label_missing_or_hidden_custom_option: "(missing value or lacking permissions to access)"
@@ -2268,7 +2336,6 @@ da:
   label_enterprise_active_users: "%{current}/%{limit} booked active users"
   label_enterprise_edition: "Enterprise edition"
   label_enterprise_support: "Enterprise support"
-  label_enterprise_addon: "Enterprise add-on"
   label_environment: "Miljø"
   label_estimates_and_progress: "Estimates and progress"
   label_equals: "er"
@@ -2453,6 +2520,7 @@ da:
   label_none_parentheses: "(ingen)"
   label_not_contains: "indeholder ikke"
   label_not_equals: "er ikke"
+  label_life_cycle_step_plural: "Project lifecycle"
   label_on: "på"
   label_operator_all: "is not empty"
   label_operator_none: "is empty"
@@ -2554,6 +2622,7 @@ da:
   label_reporting: "Rapporterer"
   label_reporting_plural: "Rapporter"
   label_repository: "Projektarkiv"
+  label_repository_remove: "Remove repository"
   label_repository_root: "Repositorie topniveau"
   label_repository_plural: "Projektarkiver"
   label_required: "required"
@@ -2616,6 +2685,7 @@ da:
   label_this_month: "denne måned"
   label_this_week: "denne uge"
   label_this_year: "dette år"
+  label_time: "Time"
   label_time_entry_plural: "Anvendt tid"
   label_time_entry_activity_plural: "Spent time activities"
   label_title: "Titel"
@@ -2651,6 +2721,7 @@ da:
   label_user_settings: "User settings"
   label_users_settings: "Users settings"
   label_version_new: "Ny version"
+  label_version_edit: "Edit version"
   label_version_plural: "Versioner"
   label_version_sharing_descendants: "Med underprojekter"
   label_version_sharing_hierarchy: "Med projekthierarkiet"
@@ -2788,8 +2859,13 @@ da:
         prefix: "Received because of the notification setting: %{reason}"
         date_alert_start_date: "Date alert"
         date_alert_due_date: "Date alert"
+        reminder: "Reminder"
       see_all: "See all"
       updated_at: "Updated at %{timestamp} by %{user}"
+    reminder_notifications:
+      subject: "Reminder: %{note}"
+      heading: "You have a new reminder"
+      note: "Note: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "You may %{allowed_actions} this work package. This can change depending on your project role and permissions."
@@ -2956,6 +3032,7 @@ da:
   notice_successful_connection: "Forbindelse gennemført."
   notice_successful_create: "Oprettelse gennemført."
   notice_successful_delete: "Sletning gennemført."
+  notice_successful_cancel: "Successful cancellation."
   notice_successful_update: "Opdatering gennemført."
   notice_successful_update_custom_fields_added_to_project: |
     Successful update. The custom fields of the activated types are automatically activated
@@ -3033,6 +3110,7 @@ da:
   permission_edit_own_time_entries: "Rediger egne tidsregistringer"
   permission_edit_project: "Rediger projekt"
   permission_edit_project_attributes: "Edit project attributes"
+  permission_edit_project_stages_and_gates: "Edit project stages and gates"
   permission_edit_reportings: "Rediger rapporteringer"
   permission_edit_time_entries: "Edit time logs for other users"
   permission_edit_timelines: "Rediger tidslinjer"
@@ -3062,9 +3140,12 @@ da:
   permission_search_project: "Search project"
   permission_select_custom_fields: "Select custom fields"
   permission_select_project_custom_fields: "Select project attributes"
+  permission_select_project_life_cycle: "Select project stages and gates"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "Vælg projektmoduler"
   permission_share_work_packages: "Share work packages"
   permission_manage_types: "Vælg typer"
+  permission_manage_own_reminders: "Create own reminders"
   permission_view_project: "View projects"
   permission_view_changesets: "View repository revisions in OpenProject"
   permission_view_commit_author_statistics: "Vis statistik for tilknyttet forfatter"
@@ -3085,6 +3166,7 @@ da:
   permission_work_package_assigned_explanation: "Work packages can be assigned to users and groups in possession of this role in the respective project"
   permission_view_project_activity: "View project activity"
   permission_view_project_attributes: "View project attributes"
+  permission_view_project_stages_and_gates: "View project stages and gates"
   permission_save_bcf_queries: "Save BCF queries"
   permission_manage_public_bcf_queries: "Manage public BCF queries"
   permission_edit_attribute_help_texts: "Edit attribute help texts"
@@ -3763,6 +3845,12 @@ da:
       edit_description: "Can view, comment and edit this work package."
       view: "Se"
       view_description: "Can view this work package."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Why are you setting this reminder?"
+      success_creation_message: "Reminder set successfully. You will receive a notification for this work package at the chosen time."
+      success_update_message: "Reminder updated successfully."
+      success_deletion_message: "Reminder deleted successfully."
   sharing:
     count:
       zero: "0 users"
diff --git a/config/locales/crowdin/de.yml b/config/locales/crowdin/de.yml
index d680e311be28..d0789e7c0eb9 100644
--- a/config/locales/crowdin/de.yml
+++ b/config/locales/crowdin/de.yml
@@ -340,6 +340,9 @@ de:
         text: "Diese Aktion löscht keine Projekte, die in der Liste enthalten sind. Sind Sie sicher, dass Sie diese Projektliste löschen möchten?"
     settings:
       change_identifier: Kennung ändern
+      actions:
+        label_enable_all: "Alles aktivieren"
+        label_disable_all: "Alles deaktivieren"
       activities:
         no_results_title_text: Zur Zeit stehen keine Aktivitäten zur Verfügung.
       forums:
@@ -350,18 +353,26 @@ de:
         no_results_content_text: Neue Arbeitspaket-Kategorie erstellen
       custom_fields:
         no_results_title_text: Derzeit stehen keine benutzerdefinierten Felder zur Verfügung.
+      life_cycle:
+        header:
+          title: "Projektlebenszyklus"
+          description_html: 'Diese Stages und -Gates des Projektlebenszyklus werden auf Ihrer <a href=%{overview_url} target="_blank">Projektübersichtsseite</a> angezeigt und werden in den <a href=%{admin_settings_url} target="_blank">Administrationseinstellungen</a> vom Administrator der Instanz definiert. Sie können einzelne Attribute aktivieren oder deaktivieren.'
+        non_defined: "Keine Stages oder Gates definiert."
+        section_header: "Stages und Gates"
+        step:
+          use_in_project: "%{step} in diesem Projekt verwenden"
+        filter:
+          label: "Stage oder Gate suchen"
       project_custom_fields:
         header:
           title: "Projektattribute"
-          description: 'Diese Projektattribute werden auf Ihrer <a href=%{overview_url} target="_blank">Projektübersichtsseite</a> in den jeweiligen Abschnitten angezeigt. Sie können einzelne Attribute aktivieren oder deaktivieren. Projektattribute und -abschnitte werden in den <a href=%{admin_settings_url} target="_blank">Administrationseinstellungen</a> durch den Administrator der Instanz definiert. '
+          description_html: 'Diese Projektattribute werden auf Ihrer <a href=%{overview_url} target="_blank">Projektübersichtsseite</a> in den jeweiligen Abschnitten angezeigt. Sie können einzelne Attribute aktivieren oder deaktivieren. Projektattribute und -abschnitte werden in den <a href=%{admin_settings_url} target="_blank">Administrationseinstellungen</a> durch den Administrator der Instanz definiert. '
         filter:
           label: "Projektattribut suchen"
         actions:
           label_enable_single: "In diesem Projekt aktiv, zum Deaktivieren anklicken"
           label_disable_single: "In diesem Projekt inaktiv, zum Aktivieren anklicken"
           remove_from_project: "Aus dem Projekt entfernen"
-          label_enable_all: "Alles aktivieren"
-          label_disable_all: "Alles deaktivieren"
         is_required_blank_slate:
           heading: In allen Projekten erforderlich
           description: Dieses Projekt-Attribut ist in allen Projekten aktiviert, da die Option "Benötigt in allen Projekten" aktiviert ist. Es kann nicht für einzelne Projekte deaktiviert werden.
@@ -374,6 +385,10 @@ de:
         no_results_content_text: Neue Version erstellen
       storage:
         no_results_title_text: Durch dieses Projekt wird kein zusätzlicher erfasster Speicherplatz verbraucht.
+  project_stage:
+    working_days_count:
+      one: "Dauer: %{count} Arbeitstag"
+      other: "Dauer: %{count} Arbeitstage"
   lists:
     create:
       success: "Die geänderte Liste wurde als neue Liste gespeichert"
@@ -494,8 +509,12 @@ de:
     groups:
       member_in_these_groups: "Dieser Benutzer ist Mitglied der folgenden Gruppen:"
       no_results_title_text: Dieser Benutzer ist derzeit kein Mitglied in einer Gruppe.
+      summary_with_more: Mitglied von %{names} und %{count_link}.
+      more: "%{count} weitere"
+      summary: Mitglied von %{names}.
     memberships:
       no_results_title_text: Dieser Nutzer ist derzeit in keinem Projekt Mitglied.
+    open_profile: "Profil öffnen"
   page:
     text: "Text"
   placeholder_users:
@@ -562,18 +581,27 @@ de:
       no_results_title_text: Derzeit gibt es keine Typen.
       no_results_content_text: Neuen Typ erstellen
     edit:
-      settings: "Einstellungen"
-      form_configuration: "Formularkonfiguration"
+      form_configuration:
+        tab: "Form-Konfiguration"
       more_info_text_html: >
         Mit der Enterprise Edition können Sie die Formularkonfiguration mit diesen zusätzlichen Add-ons anpassen: <br> <ul class="%{list_styling_class}"> <li><b>Neue Attributgruppen hinzufügen</b></li> <li><b>Attributgruppen umbenennen</b></li> </li> <li><b>Eine Tabelle mit verwandten Arbeitspaketen hinzufügen</b></li> </ul>
-      projects: "Projekte"
-      enabled_projects: "Aktivierte Projekte"
-      edit_query: "Tabelle bearbeiten"
-      query_group_placeholder: "Benennen Sie die Tabelle"
-      reset: "Auf Standardwerte zurücksetzen"
-      type_color_text: |
-        Die ausgewählte Farbe unterscheidet verschiedene Typen
-        in Gantt-Diagrammen oder Arbeitspakettabellen. Es wird daher empfohlen, eine kontrastreiche Farbe zu verwenden.
+      projects:
+        tab: "Projekte"
+        enabled_projects: "Aktivierte Projekte"
+      settings:
+        tab: "Einstellungen"
+        type_color_text: "Die ausgewählte Farbe unterscheidet verschiedene Typen\nin Gantt-Diagrammen und Arbeitspakettabellen. Es wird daher empfohlen, gut unterscheidbare Farben zu verwenden."
+      subject_configuration:
+        tab: "Thema konfigurieren"
+        manually_editable_subjects:
+          label: "Manuell bearbeitbare Themen"
+          caption: "Benutzer können die Themen der Arbeitspakete ohne Einschränkungen manuell eingeben und bearbeiten."
+        automatically_generated_subjects:
+          label: "Automatisch generierte Themen"
+          caption: "Definieren Sie ein Schema aus referenzierten Attributen und Freitext für die automatische Generierung von Arbeitspaketthemen. Nutzer können diese nicht manuell editieren."
+        pattern:
+          label: "Thema-Schema"
+          caption: "Suchen Sie nach einem Attribut oder fügen Sie Text hinzu. Um ein Leerzeichen zwischen Elementen zu erstellen, fügen Sie es als Text hinzu."
   versions:
     overview:
       work_packages_in_archived_projects: "Die Version wird mit archivierten Projekten geteilt, die immer noch Arbeitspakete auf diese Version zugewiesen haben. Die Arbeitspakete werden beim Zählen berücksichtigt, erscheinen aber nicht in den verknüpften Ansichten."
@@ -636,6 +664,10 @@ de:
     label_add_x: "%{x} hinzufügen"
     label_edit_x: "%{x} editieren"
     label_add_description: "Beschreibung hinzufügen"
+    lag:
+      subject: "Verzögerung"
+      title: "Verzögerung (in Tagen)"
+      caption: "Die minimale Anzahl von Arbeitstagen zwischen den zwei Arbeitspaketen."
     relations:
       label_relates_singular: "Beziehung mit"
       label_relates_plural: "Beziehungen mit"
@@ -840,6 +872,9 @@ de:
         lag: "Verzögerung"
         from: "Arbeitspaket"
         to: "Zugehöriges Arbeitspaket"
+      reminder:
+        remind_at_date: "Datum"
+        remind_at_time: "Zeit"
       repository:
         url: "URL"
       role:
@@ -928,6 +963,7 @@ de:
       messages:
         accepted: "muss akzeptiert werden."
         after: "muss nach %{date} sein."
+        after_today: "muss in der Zukunft liegen."
         after_or_equal_to: "muss nach oder gleich %{date} sein."
         before: "muss vor %{date} sein."
         before_or_equal_to: "muss vor oder gleich %{date} sein."
@@ -974,6 +1010,7 @@ de:
         not_an_integer: "ist keine ganzzahlige Zahl."
         not_an_iso_date: "ist kein gültiges Datum - Erwartetes Format: YYY-MM-DD."
         not_same_project: "gehört nicht zum selben Projekt."
+        datetime_must_be_in_future: "muss in der Zukunft liegen."
         odd: "muss ungerade sein."
         regex_match_failed: "stimmt nicht mit dem regulären Ausdruck %{expression} überein."
         regex_invalid: "konnte nicht mit dem zugehörigen regulären Ausdruck überprüft werden."
@@ -1087,16 +1124,38 @@ de:
           attributes:
             type:
               must_be_a_stage_or_gate: "muss entweder ein Project::StageDefinition oder Project::GateDefinition sein"
+              type_and_class_name_mismatch: "muss mit dem instanziierten Klassennamen übereinstimmen"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "muss eine Project::GateDefinition sein"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "muss eine Project::StageDefinition sein"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "muss entweder ein Project::Stage oder Project::Gate sein"
               must_be_a_stage: "muss ein Project::Stage sein"
               must_be_a_gate: "muss ein Project::Gate sein"
+              type_and_class_name_mismatch: "muss mit dem instanziierten Klassennamen übereinstimmen"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Einem Project::Gate kann kein `end_date` zugewiesen werden"
+              end_date_not_allowed: "Kann einem Project::Gate kein Enddatum zuweisen"
+            type:
+              type_and_class_name_mismatch: "muss ein Project::Gate sein"
+            date:
+              non_continuous_dates: "kann nicht vor dem Enddatum des vorherigen %{step} liegen."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "Startdatum muss vor dem Enddatum liegen."
+              non_continuous_dates: "kann nicht vor dem vorherigen Enddatum von %{step} liegen."
+              incomplete: "ist unvollständig."
+            type:
+              type_and_class_name_mismatch: "muss ein Project::Stage sein"
         query:
           attributes:
             project:
@@ -1313,6 +1372,8 @@ de:
         other: "Benachrichtigungen"
       placeholder_user: "Platzhalter-Benutzer"
       project: "Projekt"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         one: "Projektlisten"
         other: "Projektlisten"
@@ -1416,6 +1477,7 @@ de:
     login: "Benutzername"
     mail: "E-Mail"
     name: "Name"
+    note: "Anmerkung"
     password: "Kennwort"
     priority: "Priorität"
     project: "Projekt"
@@ -1512,6 +1574,7 @@ de:
   button_print: "Drucken"
   button_quote: "Zitieren"
   button_remove: Entfernen
+  button_remove_reminder: "Erinnerung entfernen"
   button_rename: "Umbenennen"
   button_replace: "Ersetzen"
   button_revoke: "Widerrufen"
@@ -1522,6 +1585,7 @@ de:
   button_save_as: "Speichern unter"
   button_apply_changes: "Änderungen anwenden"
   button_save_back: "Speichern und zurück"
+  button_set_reminder: "Erinnerung einrichten"
   button_show: "Anzeigen"
   button_sort: "Sortierung"
   button_submit: "OK"
@@ -1727,12 +1791,12 @@ de:
   direction: ltr
   ee:
     upsale:
+      title: "Enterprise Add-on"
+      link_title: "Weitere Informationen"
       form_configuration:
         description: "Anpassen der Form-Konfiguration mit diesen zusätzlichen Add-ons:"
         add_groups: "Neue Attributgruppen hinzufügen"
         rename_groups: "Attributgruppen umbenennen"
-      project_filters:
-        description_html: "Filtern und Sortieren auf benutzerdefinierten Feldern ist ein Add-on der Enterprise Edition."
   enumeration_activities: "Aktivitäten für Zeiterfassung"
   enumeration_work_package_priorities: "Arbeitspaket-Prioritäten"
   enumeration_reported_project_statuses: "Gemeldeter Projekt-Status"
@@ -1765,6 +1829,7 @@ de:
   error_pdf_export_too_many_columns: "Zu viele Spalten für PDF-Export ausgewählt. Bitte reduzieren Sie die Anzahl der ausgewählten Spalten."
   error_pdf_failed_to_export: "Der PDF-Export konnte nicht gespeichert werden: %{error}"
   error_token_authenticity: "Das Cross-Site Request Forgery Token konnte nicht verfiziert werden. Wenn Sie versucht haben, Daten auf mehreren Tabs oder Browsern abzuspeichern, schließen sie diese und laden diese Seite erneut um den Vorgang zu wiederholen."
+  error_reminder_not_found: "Die Erinnerung wurde nicht gefunden oder wurde bereits benachrichtigt."
   error_work_package_not_found_in_project: "Das Arbeitspaket wurde nicht gefunden oder gehört nicht zu diesem Projekt."
   error_work_package_id_not_found: "Das Arbeitspaket wurde nicht gefunden."
   error_must_be_project_member: "muss Mitglied des Projekts sein"
@@ -2058,6 +2123,7 @@ de:
       responsible: "Verantwortlich"
       shared: "Geteilt"
       watched: "Beobachter"
+      reminder: "Erinnerung"
     facets:
       unread: "Ungelesen"
       unread_title: "Ungelesene anzeigen"
@@ -2225,8 +2291,10 @@ de:
   label_default: "Standard"
   label_delete_user: "Benutzer löschen"
   label_delete_project: "Projekt löschen"
+  label_delete: "Löschen"
   label_deleted: "gelöscht"
   label_deleted_custom_field: "(gelöschtes benutzerdefiniertes Feld)"
+  label_deleted_custom_item: "(gelöschter Eintrag)"
   label_deleted_custom_option: "(gelöschte Option)"
   label_empty_element: "(leer)"
   label_missing_or_hidden_custom_option: "(Fehlender Wert oder fehlende Zugriffsberechtigungen)"
@@ -2263,7 +2331,6 @@ de:
   label_enterprise_active_users: "%{current}/%{limit} gebuchte aktive Nutzer"
   label_enterprise_edition: "Enterprise Edition"
   label_enterprise_support: "Enterprise Support"
-  label_enterprise_addon: "Enterprise Add-on"
   label_environment: "Umgebung"
   label_estimates_and_progress: "Schätzungen und Fortschritt"
   label_equals: "ist"
@@ -2448,6 +2515,7 @@ de:
   label_none_parentheses: "(keiner)"
   label_not_contains: "enthält nicht"
   label_not_equals: "ist nicht"
+  label_life_cycle_step_plural: "Projektlebenszyklus"
   label_on: "am"
   label_operator_all: "ist nicht leer"
   label_operator_none: "ist leer"
@@ -2549,6 +2617,7 @@ de:
   label_reporting: "Statusbericht"
   label_reporting_plural: "Statusberichte"
   label_repository: "Projektarchiv"
+  label_repository_remove: "Projektarchiv entfernen"
   label_repository_root: "Stammverzeichnis des Projektarchivs"
   label_repository_plural: "Projektarchive"
   label_required: "benötigt von"
@@ -2611,6 +2680,7 @@ de:
   label_this_month: "aktueller Monat"
   label_this_week: "aktuelle Woche"
   label_this_year: "aktuelles Jahr"
+  label_time: "Zeit"
   label_time_entry_plural: "Aufgewendete Zeit"
   label_time_entry_activity_plural: "Zeitbuchung-Aktivität"
   label_title: "Titel"
@@ -2646,6 +2716,7 @@ de:
   label_user_settings: "Benutzereinstellungen"
   label_users_settings: "Benutzereinstellungen"
   label_version_new: "Neue Version"
+  label_version_edit: "Version bearbeiten"
   label_version_plural: "Versionen"
   label_version_sharing_descendants: "Mit Unterprojekten"
   label_version_sharing_hierarchy: "Mit Projekthierarchie"
@@ -2783,8 +2854,13 @@ de:
         prefix: "Erhalten aufgrund Benachrichtigungseinstellung: %{reason}"
         date_alert_start_date: "Datums-Erinnerung"
         date_alert_due_date: "Datums-Erinnerung"
+        reminder: "Erinnerung"
       see_all: "Alle anzeigen"
       updated_at: "Aktualisiert %{timestamp} von %{user} "
+    reminder_notifications:
+      subject: "Erinnerung: %{note}"
+      heading: "Sie haben eine neue Erinnerung"
+      note: "Anmerkung: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "Sie haben auf diesem Arbeitspakte folgende Berechtigungen: %{allowed_actions}. Dies kann sich je nach Ihrer Projektrolle und Berechtigungen ändern."
@@ -2951,6 +3027,7 @@ de:
   notice_successful_connection: "Verbindung erfolgreich."
   notice_successful_create: "Erfolgreich angelegt."
   notice_successful_delete: "Erfolgreich gelöscht."
+  notice_successful_cancel: "Erfolgreiche Absage."
   notice_successful_update: "Erfolgreich aktualisiert."
   notice_successful_update_custom_fields_added_to_project: |
     Erfolgreich aktualisiert. Die benutzerdefinierten Felder der aktivierten Typen werden automatisch
@@ -3028,6 +3105,7 @@ de:
   permission_edit_own_time_entries: "Selbstgebuchte Aufwände bearbeiten"
   permission_edit_project: "Projekt bearbeiten"
   permission_edit_project_attributes: "Projektattribute bearbeiten"
+  permission_edit_project_stages_and_gates: "Projekt-Stages und Gates bearbeiten"
   permission_edit_reportings: "Statusberichte bearbeiten"
   permission_edit_time_entries: "Zeitaufwand für andere Benutzer bearbeiten"
   permission_edit_timelines: "Zeitplan-Reporte bearbeiten"
@@ -3057,9 +3135,12 @@ de:
   permission_search_project: "Projekt suchen"
   permission_select_custom_fields: "Benutzerdefinierte Felder verwalten"
   permission_select_project_custom_fields: "Projektattribute auswählen"
+  permission_select_project_life_cycle: "Projekt-Stages und Gates wählen"
+  permission_select_project_life_cycle_explanation: "(De-)Aktivieren der Stages und Gates in einem Projekt. Erlaubt dem Nutzer die Auswahl des passenden Lebenszyklus-Modells da definierte, aber inaktive Stages und Gates weder auf der Projekt-Übersichtsseite noch in der Projektliste sichtbar sind."
   permission_select_project_modules: "Projektmodule auswählen"
   permission_share_work_packages: "Arbeitspakete teilen"
   permission_manage_types: "Typen auswählen"
+  permission_manage_own_reminders: "Eigene Erinnerungen erstellen"
   permission_view_project: "Projekt anzeigen"
   permission_view_changesets: "Revisionen des Projektarchivs in OpenProject ansehen"
   permission_view_commit_author_statistics: "Commit Autor Statistiken ansehen"
@@ -3080,6 +3161,7 @@ de:
   permission_work_package_assigned_explanation: "Arbeitspakete können Benutzern und Gruppen im Besitz dieser Rolle in dem jeweiligen Projekt zugeordnet werden"
   permission_view_project_activity: "Projektaktivität anzeigen"
   permission_view_project_attributes: "Projektattribute ansehen"
+  permission_view_project_stages_and_gates: "Projekt-Stages und Gates sehen"
   permission_save_bcf_queries: "BCF-Abfragen speichern"
   permission_manage_public_bcf_queries: "Öffentliche BCF-Abfragen verwalten"
   permission_edit_attribute_help_texts: "Attribut-Hilfetxt bearbeiten"
@@ -3759,6 +3841,12 @@ de:
       edit_description: "Kann dieses Arbeitspaket ansehen, kommentieren und editieren."
       view: "Ansicht"
       view_description: "Kann dieses Arbeitspaket ansehen."
+    reminders:
+      label_remind_at: "Datum"
+      note_placeholder: "Warum richten Sie diese Erinnerung ein?"
+      success_creation_message: "Erinnerung erfolgreich eingerichtet. Sie erhalten zum ausgewählten Zeitpunkt eine Benachrichtigung für dieses Arbeitspaket."
+      success_update_message: "Erinnerung aktualisiert erfolgreich."
+      success_deletion_message: "Erinnerung erfolgreich gelöscht."
   sharing:
     count:
       zero: "0 Benutzer"
diff --git a/config/locales/crowdin/el.yml b/config/locales/crowdin/el.yml
index d8a070164568..a4a958b8adc4 100644
--- a/config/locales/crowdin/el.yml
+++ b/config/locales/crowdin/el.yml
@@ -339,6 +339,9 @@ el:
         text: "This action will not delete any project the list contains. Are you sure you want to delete this project list?"
     settings:
       change_identifier: Αλλαγή αναγνωριστικού
+      actions:
+        label_enable_all: "Enable all"
+        label_disable_all: "Disable all"
       activities:
         no_results_title_text: Προς το παρόν δεν υπάρχουν διαθέσιμες δραστηριότητες.
       forums:
@@ -349,18 +352,26 @@ el:
         no_results_content_text: Δημιουργήστε μια νέα κατηγορία πακέτου εργασίας
       custom_fields:
         no_results_title_text: Προς το παρόν δεν υπάρχουν διαθέσιμα προσαρμοσμένα πεδία.
+      life_cycle:
+        header:
+          title: "Project lifecycle"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "Neither stages nor gates are currently defined."
+        section_header: "Stages and gates"
+        step:
+          use_in_project: "Use %{step} in this project"
+        filter:
+          label: "Search project stage or gate"
       project_custom_fields:
         header:
           title: "Project attributes"
-          description: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
+          description_html: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
         filter:
           label: "Search project attribute"
         actions:
           label_enable_single: "Active in this project, click to disable"
           label_disable_single: "Inactive in this project, click to enable"
           remove_from_project: "Remove from project"
-          label_enable_all: "Enable all"
-          label_disable_all: "Disable all"
         is_required_blank_slate:
           heading: Required in all projects
           description: This project attribute is activated in all projects since the "Required in all projects" option is checked. It cannot be deactivated for individual projects.
@@ -373,6 +384,10 @@ el:
         no_results_content_text: Δημιουργήστε μια νέα έκδοση
       storage:
         no_results_title_text: There is no additional recorded disk space consumed by this project.
+  project_stage:
+    working_days_count:
+      one: "Duration: %{count} working day"
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "The modified list has been saved as a new list"
@@ -493,8 +508,12 @@ el:
     groups:
       member_in_these_groups: "Αυτός ο χρήστης είναι μέλος των παρακάτω ομάδων:"
       no_results_title_text: Αυτός ο χρήστης, προς το παρόν, δεν είναι μέλος κάποιας ομάδας.
+      summary_with_more: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary: Member of %{names}.
     memberships:
       no_results_title_text: Αυτός ο χρήστης δεν είναι προς το παρόν μέλος κάποιου έργου.
+    open_profile: "Open profile"
   page:
     text: "Κείμενο"
   placeholder_users:
@@ -565,18 +584,27 @@ el:
       no_results_title_text: Αυτή τη στιγμή δεν υπάρχουν τύποι.
       no_results_content_text: Δημιουργήστε έναν νέο τύπο
     edit:
-      settings: "Ρυθμίσεις"
-      form_configuration: "Διαμόρφωση φόρμας"
+      form_configuration:
+        tab: "Form configuration"
       more_info_text_html: >
         Enterprise edition allows you to customize form configuration with these additional add-ons: <br> <ul class="%{list_styling_class}"> <li><b>Add new attribute groups</b></li> <li><b>Rename attribute groups</b></li> <li><b>Add a table of related work packages</b></li> </ul>
-      projects: "Έργα"
-      enabled_projects: "Ενεργοποιημένα έργα"
-      edit_query: "Επεξεργασία πίνακα"
-      query_group_placeholder: "Δώστε το όνομα του πίνακα"
-      reset: "Επαναφορά στα προεπιλεγμένα"
-      type_color_text: |
-        The selected color distinguishes different types
-        in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      projects:
+        tab: "Projects"
+        enabled_projects: "Enabled projects"
+      settings:
+        tab: "Settings"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Subject configuration"
+        manually_editable_subjects:
+          label: "Manually editable subjects"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automatically generated subjects"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Subject pattern"
+          caption: "Search for an attribute or add text. To create a space between elements add it as a text."
   versions:
     overview:
       work_packages_in_archived_projects: "The version is shared with archived projects which still have work packages assigned to this version. These are counted, but will not appear in the linked views."
@@ -639,6 +667,10 @@ el:
     label_add_x: "Add %{x}"
     label_edit_x: "Edit %{x}"
     label_add_description: "Add description"
+    lag:
+      subject: "Lag"
+      title: "Lag (in days)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
       label_relates_singular: "related to"
       label_relates_plural: "related to"
@@ -843,6 +875,9 @@ el:
         lag: "Lag"
         from: "Εργασία"
         to: "Σχετικές εργασίες"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Time"
       repository:
         url: "URL"
       role:
@@ -931,6 +966,7 @@ el:
       messages:
         accepted: "πρέπει να γίνει αποδεκτό."
         after: "πρέπει να είναι μετά από %{date}."
+        after_today: "must be in the future."
         after_or_equal_to: "πρέπει να είναι μετά ή ίσο με %{date}."
         before: "πρέπει να είναι πριν από %{date}."
         before_or_equal_to: "πρέπει να είναι πριν ή ίσο με %{date}."
@@ -977,6 +1013,7 @@ el:
         not_an_integer: "δεν είναι ακέραιος αριθμός."
         not_an_iso_date: "δεν είναι έγκυρη ημερομηνία. Απαιτούμενη μορφοποίηση: ΕΕΕΕ-ΜΜ-ΗΗ."
         not_same_project: "δεν ανήκει στο ίδιο έργο."
+        datetime_must_be_in_future: "must be in the future."
         odd: "πρέπει να είναι μονός."
         regex_match_failed: "does not match the regular expression %{expression}."
         regex_invalid: "δεν ήταν δυνατή η επικύρωση με τη συσχετιζόμενη κανονική έκφραση."
@@ -1090,16 +1127,38 @@ el:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "start date must be before the end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "is incomplete."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1316,6 +1375,8 @@ el:
         other: "Notifications"
       placeholder_user: "Placeholder χρήστης"
       project: "Έργο"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         one: "Project list"
         other: "Project lists"
@@ -1419,6 +1480,7 @@ el:
     login: "Όνομα χρήστη"
     mail: "Email"
     name: "Όνομα"
+    note: "Note"
     password: "Κωδικός"
     priority: "Προτεραιότητα"
     project: "Έργο"
@@ -1515,6 +1577,7 @@ el:
   button_print: "Εκτύπωση"
   button_quote: "Παράθεση"
   button_remove: Αφαίρεση
+  button_remove_reminder: "Remove reminder"
   button_rename: "Μετονομασία"
   button_replace: "Αντικατάσταση"
   button_revoke: "Ανάκληση"
@@ -1525,6 +1588,7 @@ el:
   button_save_as: "Αποθήκευση ως"
   button_apply_changes: "Apply changes"
   button_save_back: "Αποθήκευση και επιστροφή"
+  button_set_reminder: "Set reminder"
   button_show: "Εμφάνιση"
   button_sort: "Ταξινόμηση"
   button_submit: "Υποβολή"
@@ -1730,12 +1794,12 @@ el:
   direction: ltr
   ee:
     upsale:
+      title: "Enterprise add-on"
+      link_title: "More information"
       form_configuration:
         description: "Customize the form configuration with these additional add-ons:"
         add_groups: "Προσθήκη καινούργιων ομάδων χαρακτηριστικών"
         rename_groups: "Μετονομασία ομάδων χαρακτηριστικών"
-      project_filters:
-        description_html: "Filtering and sorting on custom fields is an Enterprise edition add-on."
   enumeration_activities: "Δραστηριότητες καταγραφής χρόνου"
   enumeration_work_package_priorities: "Προτεραιότητες πακέτου εργασίας"
   enumeration_reported_project_statuses: "Αναφερόμενη κατάσταση έργου"
@@ -1768,6 +1832,7 @@ el:
   error_pdf_export_too_many_columns: "Επιλέχθηκαν πάρα πολλές στήλες για εξαγωγή σε PDF. Παρακαλούμε μειώστε τον αριθμό των στηλών."
   error_pdf_failed_to_export: "Η εξαγωγή σε PDF δεν ήταν δυνατό να αποθηκευτεί: %{error}"
   error_token_authenticity: "Δεν ήταν δυνατή η επαλήθευση του Cross-Site Request Forgery token. Προσπαθήσατε να υποβάλετε δεδομένα σε πολλαπλούς περιηγητές ή καρτέλες; Παρακαλούμε κλείστε όλες τις καρτέλες και δοκιμάστε ξανά."
+  error_reminder_not_found: "The reminder was not found or was already notified about."
   error_work_package_not_found_in_project: "Το πακέτο εργασίας δεν βρέθηκε ή δεν ανοίκει σε αυτό το έργο"
   error_work_package_id_not_found: "The work package was not found."
   error_must_be_project_member: "πρέπει να είναι μέλος έργου"
@@ -2061,6 +2126,7 @@ el:
       responsible: "Υπόλογος"
       shared: "Shared"
       watched: "Παρατηρητής"
+      reminder: "Reminder"
     facets:
       unread: "Unread"
       unread_title: "Show unread"
@@ -2228,8 +2294,10 @@ el:
   label_default: "Προεπιλογή"
   label_delete_user: "Διαγραφή Χρήστη"
   label_delete_project: "Διαγραφή έργου"
+  label_delete: "Delete"
   label_deleted: "διαγραμμένο"
   label_deleted_custom_field: "(διαγραμμένο προσαρμοσμένο πεδίο)"
+  label_deleted_custom_item: "(deleted item)"
   label_deleted_custom_option: "(διαγραμμένη επιλογή)"
   label_empty_element: "(άδειο)"
   label_missing_or_hidden_custom_option: "(missing value or lacking permissions to access)"
@@ -2266,7 +2334,6 @@ el:
   label_enterprise_active_users: "%{current}/%{limit} κλεισμένοι ενεργοί χρήστες"
   label_enterprise_edition: "Enterprise edition"
   label_enterprise_support: "Enterprise support"
-  label_enterprise_addon: "Enterprise add-on"
   label_environment: "Περιβάλλον"
   label_estimates_and_progress: "Estimates and progress"
   label_equals: "είναι"
@@ -2451,6 +2518,7 @@ el:
   label_none_parentheses: "(κανένα)"
   label_not_contains: "δεν περιέχει"
   label_not_equals: "δεν είναι"
+  label_life_cycle_step_plural: "Project lifecycle"
   label_on: "σε"
   label_operator_all: "is not empty"
   label_operator_none: "is empty"
@@ -2552,6 +2620,7 @@ el:
   label_reporting: "Αναφορά"
   label_reporting_plural: "Αναφορές"
   label_repository: "Αποθετήριο"
+  label_repository_remove: "Remove repository"
   label_repository_root: "Ρίζα αποθετηρίου"
   label_repository_plural: "Αποθετήρια"
   label_required: "απαιτείται"
@@ -2614,6 +2683,7 @@ el:
   label_this_month: "αυτό το μήνα"
   label_this_week: "αυτή την εβδομάδα"
   label_this_year: "αυτό το έτος"
+  label_time: "Time"
   label_time_entry_plural: "Χρόνος που δαπανήθηκε"
   label_time_entry_activity_plural: "Spent time activities"
   label_title: "Τίτλος"
@@ -2649,6 +2719,7 @@ el:
   label_user_settings: "Ρυθμίσεις χρήστη"
   label_users_settings: "Users settings"
   label_version_new: "Νέα έκδοση"
+  label_version_edit: "Edit version"
   label_version_plural: "Εκδόσεις"
   label_version_sharing_descendants: "Με υποέργα"
   label_version_sharing_hierarchy: "Με ιεραρχία έργου"
@@ -2786,8 +2857,13 @@ el:
         prefix: "Received because of the notification setting: %{reason}"
         date_alert_start_date: "Date alert"
         date_alert_due_date: "Date alert"
+        reminder: "Reminder"
       see_all: "See all"
       updated_at: "Updated at %{timestamp} by %{user}"
+    reminder_notifications:
+      subject: "Reminder: %{note}"
+      heading: "You have a new reminder"
+      note: "Note: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "You may %{allowed_actions} this work package. This can change depending on your project role and permissions."
@@ -2953,6 +3029,7 @@ el:
   notice_successful_connection: "Επιτυχής σύνδεση."
   notice_successful_create: "Επιτυχής δημιουργία."
   notice_successful_delete: "Επιτυχής διαγραφή."
+  notice_successful_cancel: "Successful cancellation."
   notice_successful_update: "Επιτυχής ενημέρωση."
   notice_successful_update_custom_fields_added_to_project: |
     Successful update. The custom fields of the activated types are automatically activated
@@ -3030,6 +3107,7 @@ el:
   permission_edit_own_time_entries: "Επεξεργασία των δικών μου καταγραφών χρόνου"
   permission_edit_project: "Επεξεργασία του έργου"
   permission_edit_project_attributes: "Edit project attributes"
+  permission_edit_project_stages_and_gates: "Edit project stages and gates"
   permission_edit_reportings: "Επεξεργασία αναφορών"
   permission_edit_time_entries: "Edit time logs for other users"
   permission_edit_timelines: "Επεξεργασία χρονοδιαγραμμάτων"
@@ -3059,9 +3137,12 @@ el:
   permission_search_project: "Search project"
   permission_select_custom_fields: "Select custom fields"
   permission_select_project_custom_fields: "Select project attributes"
+  permission_select_project_life_cycle: "Select project stages and gates"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "Επιλογή ενοτήτων έργου"
   permission_share_work_packages: "Share work packages"
   permission_manage_types: "Επιλέξτε τύπους"
+  permission_manage_own_reminders: "Create own reminders"
   permission_view_project: "View projects"
   permission_view_changesets: "Προβολή αποθετηρίου των αναθεωρήσεων στο OpenProject"
   permission_view_commit_author_statistics: "Εμφάνιση στατιστικών συγγραφέων δέσμευσης"
@@ -3082,6 +3163,7 @@ el:
   permission_work_package_assigned_explanation: "Τα πακέτα εργασίας μπορούν να ανατεθούν σε χρήστες και ομάδες που έχουν αυτό το ρόλο στο αντίστοιχο έργο"
   permission_view_project_activity: "View project activity"
   permission_view_project_attributes: "View project attributes"
+  permission_view_project_stages_and_gates: "View project stages and gates"
   permission_save_bcf_queries: "Save BCF queries"
   permission_manage_public_bcf_queries: "Manage public BCF queries"
   permission_edit_attribute_help_texts: "Edit attribute help texts"
@@ -3761,6 +3843,12 @@ el:
       edit_description: "Can view, comment and edit this work package."
       view: "Προβολή"
       view_description: "Can view this work package."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Why are you setting this reminder?"
+      success_creation_message: "Reminder set successfully. You will receive a notification for this work package at the chosen time."
+      success_update_message: "Reminder updated successfully."
+      success_deletion_message: "Reminder deleted successfully."
   sharing:
     count:
       zero: "0 users"
diff --git a/config/locales/crowdin/eo.yml b/config/locales/crowdin/eo.yml
index c5294abe4c06..dec919b3ffd8 100644
--- a/config/locales/crowdin/eo.yml
+++ b/config/locales/crowdin/eo.yml
@@ -343,6 +343,9 @@ eo:
         text: "This action will not delete any project the list contains. Are you sure you want to delete this project list?"
     settings:
       change_identifier: Change identifier
+      actions:
+        label_enable_all: "Enable all"
+        label_disable_all: "Disable all"
       activities:
         no_results_title_text: Aktuale estas neniu disponebla aktiveco.
       forums:
@@ -353,18 +356,26 @@ eo:
         no_results_content_text: Create a new work package category
       custom_fields:
         no_results_title_text: There are currently no custom fields available.
+      life_cycle:
+        header:
+          title: "Project lifecycle"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "Neither stages nor gates are currently defined."
+        section_header: "Stages and gates"
+        step:
+          use_in_project: "Use %{step} in this project"
+        filter:
+          label: "Search project stage or gate"
       project_custom_fields:
         header:
           title: "Project attributes"
-          description: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
+          description_html: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
         filter:
           label: "Search project attribute"
         actions:
           label_enable_single: "Active in this project, click to disable"
           label_disable_single: "Inactive in this project, click to enable"
           remove_from_project: "Remove from project"
-          label_enable_all: "Enable all"
-          label_disable_all: "Disable all"
         is_required_blank_slate:
           heading: Required in all projects
           description: This project attribute is activated in all projects since the "Required in all projects" option is checked. It cannot be deactivated for individual projects.
@@ -377,6 +388,10 @@ eo:
         no_results_content_text: Krei novan version
       storage:
         no_results_title_text: There is no additional recorded disk space consumed by this project.
+  project_stage:
+    working_days_count:
+      one: "Duration: %{count} working day"
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "The modified list has been saved as a new list"
@@ -497,8 +512,12 @@ eo:
     groups:
       member_in_these_groups: "This user is currently a member of the following groups:"
       no_results_title_text: This user is currently not a member in any group.
+      summary_with_more: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary: Member of %{names}.
     memberships:
       no_results_title_text: Tiu ĉi uzanto ne estas nuna membro de la projekto.
+    open_profile: "Open profile"
   page:
     text: "Teksto"
   placeholder_users:
@@ -569,18 +588,27 @@ eo:
       no_results_title_text: Nun estas neniu tipo.
       no_results_content_text: Krei novan tipon
     edit:
-      settings: "Agordoj"
-      form_configuration: "Formulara agordo"
+      form_configuration:
+        tab: "Form configuration"
       more_info_text_html: >
         Enterprise edition allows you to customize form configuration with these additional add-ons: <br> <ul class="%{list_styling_class}"> <li><b>Add new attribute groups</b></li> <li><b>Rename attribute groups</b></li> <li><b>Add a table of related work packages</b></li> </ul>
-      projects: "Projektoj"
-      enabled_projects: "Ŝaltitaj projektoj"
-      edit_query: "Redakti tabelon"
-      query_group_placeholder: "Nomigi la tabelon"
-      reset: "Restarigi la defaŭltojn"
-      type_color_text: |
-        The selected color distinguishes different types
-        in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      projects:
+        tab: "Projects"
+        enabled_projects: "Enabled projects"
+      settings:
+        tab: "Settings"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Subject configuration"
+        manually_editable_subjects:
+          label: "Manually editable subjects"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automatically generated subjects"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Subject pattern"
+          caption: "Search for an attribute or add text. To create a space between elements add it as a text."
   versions:
     overview:
       work_packages_in_archived_projects: "The version is shared with archived projects which still have work packages assigned to this version. These are counted, but will not appear in the linked views."
@@ -643,6 +671,10 @@ eo:
     label_add_x: "Add %{x}"
     label_edit_x: "Edit %{x}"
     label_add_description: "Add description"
+    lag:
+      subject: "Lag"
+      title: "Lag (in days)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
       label_relates_singular: "related to"
       label_relates_plural: "related to"
@@ -847,6 +879,9 @@ eo:
         lag: "Lag"
         from: "Laborpakaĵo"
         to: "Rilata laborpakaĵo"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Time"
       repository:
         url: "URL"
       role:
@@ -935,6 +970,7 @@ eo:
       messages:
         accepted: "devas esti akceptita."
         after: "devas esti post la %{date}."
+        after_today: "must be in the future."
         after_or_equal_to: "devas esti post aŭ egale al %{date}."
         before: "devas esti antaŭ la %{date}."
         before_or_equal_to: "devas esti antaŭ aŭ egale al %{date}."
@@ -981,6 +1017,7 @@ eo:
         not_an_integer: "ĝi ne estas entjero."
         not_an_iso_date: "Ĝi ne estas valida dato. Deviga datumo estas: JJJJ-MM-TT."
         not_same_project: "doesn't belong to the same project."
+        datetime_must_be_in_future: "must be in the future."
         odd: "devas esti nepara."
         regex_match_failed: "does not match the regular expression %{expression}."
         regex_invalid: "could not be validated with the associated regular expression."
@@ -1094,16 +1131,38 @@ eo:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "start date must be before the end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "is incomplete."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1320,6 +1379,8 @@ eo:
         other: "Notifications"
       placeholder_user: "Placeholder user"
       project: "Projekto"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         one: "Project list"
         other: "Project lists"
@@ -1423,6 +1484,7 @@ eo:
     login: "Uzantnomo"
     mail: "Retpoŝto"
     name: "Nomo"
+    note: "Note"
     password: "Pasvorto"
     priority: "Prioritato"
     project: "Projekto"
@@ -1519,6 +1581,7 @@ eo:
   button_print: "Printi"
   button_quote: "Citi"
   button_remove: Forigi
+  button_remove_reminder: "Remove reminder"
   button_rename: "Alinomi"
   button_replace: "Anstataŭigi"
   button_revoke: "Eksvalidigi"
@@ -1529,6 +1592,7 @@ eo:
   button_save_as: "Konservi kiel"
   button_apply_changes: "Apply changes"
   button_save_back: "Konservi kaj retroiri"
+  button_set_reminder: "Set reminder"
   button_show: "Montri"
   button_sort: "Ordigi"
   button_submit: "Sendi"
@@ -1734,12 +1798,12 @@ eo:
   direction: ltr
   ee:
     upsale:
+      title: "Enterprise add-on"
+      link_title: "More information"
       form_configuration:
         description: "Customize the form configuration with these additional add-ons:"
         add_groups: "Add new attribute groups"
         rename_groups: "Rename attributes groups"
-      project_filters:
-        description_html: "Filtering and sorting on custom fields is an Enterprise edition add-on."
   enumeration_activities: "Time tracking activities"
   enumeration_work_package_priorities: "Work package priorities"
   enumeration_reported_project_statuses: "Reported project status"
@@ -1772,6 +1836,7 @@ eo:
   error_pdf_export_too_many_columns: "Too many columns selected for the PDF export. Please reduce the number of columns."
   error_pdf_failed_to_export: "The PDF export could not be saved: %{error}"
   error_token_authenticity: "Unable to verify Cross-Site Request Forgery token. Did you try to submit data on multiple browsers or tabs? Please close all tabs and try again."
+  error_reminder_not_found: "The reminder was not found or was already notified about."
   error_work_package_not_found_in_project: "The work package was not found or does not belong to this project"
   error_work_package_id_not_found: "The work package was not found."
   error_must_be_project_member: "vi devas esti membro de la projekto."
@@ -2065,6 +2130,7 @@ eo:
       responsible: "Respondeculo"
       shared: "Shared"
       watched: "Atentanto"
+      reminder: "Reminder"
     facets:
       unread: "Unread"
       unread_title: "Show unread"
@@ -2232,8 +2298,10 @@ eo:
   label_default: "Defaŭlte"
   label_delete_user: "Forigi uzanton"
   label_delete_project: "Forigi projekton"
+  label_delete: "Delete"
   label_deleted: "forigita"
   label_deleted_custom_field: "(propra kampo forigita)"
+  label_deleted_custom_item: "(deleted item)"
   label_deleted_custom_option: "(deleted option)"
   label_empty_element: "(empty)"
   label_missing_or_hidden_custom_option: "(missing value or lacking permissions to access)"
@@ -2270,7 +2338,6 @@ eo:
   label_enterprise_active_users: "%{current}/%{limit} rezervitaj aktivaj uzantoj"
   label_enterprise_edition: "Enterprise edition"
   label_enterprise_support: "Enterprise support"
-  label_enterprise_addon: "Enterprise add-on"
   label_environment: "Medio"
   label_estimates_and_progress: "Estimates and progress"
   label_equals: "estas"
@@ -2455,6 +2522,7 @@ eo:
   label_none_parentheses: "(neniu)"
   label_not_contains: "ne enhavas"
   label_not_equals: "ne estas"
+  label_life_cycle_step_plural: "Project lifecycle"
   label_on: "en"
   label_operator_all: "is not empty"
   label_operator_none: "is empty"
@@ -2556,6 +2624,7 @@ eo:
   label_reporting: "Reporting"
   label_reporting_plural: "Reportings"
   label_repository: "Deponejo"
+  label_repository_remove: "Remove repository"
   label_repository_root: "Repository root"
   label_repository_plural: "Repositories"
   label_required: "required"
@@ -2618,6 +2687,7 @@ eo:
   label_this_month: "tiu ĉi monato"
   label_this_week: "tiu ĉi semajno"
   label_this_year: "tiu ĉi jaro"
+  label_time: "Time"
   label_time_entry_plural: "Uzata tempo"
   label_time_entry_activity_plural: "Spent time activities"
   label_title: "Titolo"
@@ -2653,6 +2723,7 @@ eo:
   label_user_settings: "Agordoj de uzanto"
   label_users_settings: "Users settings"
   label_version_new: "New version"
+  label_version_edit: "Edit version"
   label_version_plural: "Versioj"
   label_version_sharing_descendants: "With subprojects"
   label_version_sharing_hierarchy: "With project hierarchy"
@@ -2790,8 +2861,13 @@ eo:
         prefix: "Received because of the notification setting: %{reason}"
         date_alert_start_date: "Date alert"
         date_alert_due_date: "Date alert"
+        reminder: "Reminder"
       see_all: "See all"
       updated_at: "Updated at %{timestamp} by %{user}"
+    reminder_notifications:
+      subject: "Reminder: %{note}"
+      heading: "You have a new reminder"
+      note: "Note: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "You may %{allowed_actions} this work package. This can change depending on your project role and permissions."
@@ -2958,6 +3034,7 @@ eo:
   notice_successful_connection: "Successful connection."
   notice_successful_create: "Successful creation."
   notice_successful_delete: "Successful deletion."
+  notice_successful_cancel: "Successful cancellation."
   notice_successful_update: "Successful update."
   notice_successful_update_custom_fields_added_to_project: |
     Successful update. The custom fields of the activated types are automatically activated
@@ -3035,6 +3112,7 @@ eo:
   permission_edit_own_time_entries: "Edit own time logs"
   permission_edit_project: "Edit project"
   permission_edit_project_attributes: "Edit project attributes"
+  permission_edit_project_stages_and_gates: "Edit project stages and gates"
   permission_edit_reportings: "Edit reportings"
   permission_edit_time_entries: "Edit time logs for other users"
   permission_edit_timelines: "Edit timelines"
@@ -3064,9 +3142,12 @@ eo:
   permission_search_project: "Search project"
   permission_select_custom_fields: "Select custom fields"
   permission_select_project_custom_fields: "Select project attributes"
+  permission_select_project_life_cycle: "Select project stages and gates"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "Select project modules"
   permission_share_work_packages: "Share work packages"
   permission_manage_types: "Select types"
+  permission_manage_own_reminders: "Create own reminders"
   permission_view_project: "View projects"
   permission_view_changesets: "View repository revisions in OpenProject"
   permission_view_commit_author_statistics: "View commit author statistics"
@@ -3087,6 +3168,7 @@ eo:
   permission_work_package_assigned_explanation: "Work packages can be assigned to users and groups in possession of this role in the respective project"
   permission_view_project_activity: "View project activity"
   permission_view_project_attributes: "View project attributes"
+  permission_view_project_stages_and_gates: "View project stages and gates"
   permission_save_bcf_queries: "Save BCF queries"
   permission_manage_public_bcf_queries: "Manage public BCF queries"
   permission_edit_attribute_help_texts: "Edit attribute help texts"
@@ -3767,6 +3849,12 @@ eo:
       edit_description: "Can view, comment and edit this work package."
       view: "Montri"
       view_description: "Can view this work package."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Why are you setting this reminder?"
+      success_creation_message: "Reminder set successfully. You will receive a notification for this work package at the chosen time."
+      success_update_message: "Reminder updated successfully."
+      success_deletion_message: "Reminder deleted successfully."
   sharing:
     count:
       zero: "0 users"
diff --git a/config/locales/crowdin/es.yml b/config/locales/crowdin/es.yml
index 54bc1d4b461b..9fb25b665683 100644
--- a/config/locales/crowdin/es.yml
+++ b/config/locales/crowdin/es.yml
@@ -340,6 +340,9 @@ es:
         text: "Esta acción no eliminará ningún proyecto que contenga la lista. ¿Seguro que desea eliminar esta lista de proyectos?"
     settings:
       change_identifier: Cambiar identificador
+      actions:
+        label_enable_all: "Activar todo"
+        label_disable_all: "Desactivar todo"
       activities:
         no_results_title_text: Actualmente no hay actividades disponibles.
       forums:
@@ -350,18 +353,26 @@ es:
         no_results_content_text: Crear una nueva categoria de paquete de trabajo
       custom_fields:
         no_results_title_text: Actualmente no hay campos personalizados disponibles.
+      life_cycle:
+        header:
+          title: "Ciclo de vida del proyecto"
+          description_html: 'Estas etapas y puertas del ciclo de vida del proyecto se mostrarán en su <a href=%{overview_url} target="_blank">página de resumen del proyecto</a> y están definidas en los <a href=%{admin_settings_url} target="_blank">ajustes de administración</a> por el administrador de la instancia. Puede activar o desactivar atributos individuales.'
+        non_defined: "Actualmente no están definidas ni las etapas ni las puertas."
+        section_header: "Etapas y puertas"
+        step:
+          use_in_project: "Usar %{step} en este proyecto"
+        filter:
+          label: "Buscar etapa o puerta del proyecto"
       project_custom_fields:
         header:
           title: "Atributos del proyecto"
-          description: 'Estos atributos del proyecto se mostrarán en su <a href=%{overview_url} target="_blank">página de resumen del proyecto</a> bajo sus respectivas secciones. Puede activar o desactivar atributos individuales. Los atributos y secciones del proyecto son definidos en los <a href=%{admin_settings_url} target="_blank">ajustes de administración</a> por el administrador de la instancia. '
+          description_html: 'Estos atributos del proyecto se mostrarán en su <a href=%{overview_url} target="_blank">página de resumen del proyecto</a> bajo sus respectivas secciones. Puede activar o desactivar atributos individuales. Los atributos y secciones del proyecto son definidos en los <a href=%{admin_settings_url} target="_blank">ajustes de administración</a> por el administrador de la instancia. '
         filter:
           label: "Buscar atributo de proyecto"
         actions:
           label_enable_single: "Activo en este proyecto, pulse para desactivarlo"
           label_disable_single: "Inactivo en este proyecto, pulse para activarlo"
           remove_from_project: "Quitar del proyecto"
-          label_enable_all: "Activar todo"
-          label_disable_all: "Desactivar todo"
         is_required_blank_slate:
           heading: Obligatorio en todos los proyectos
           description: Este atributo del proyecto está activado en todos los proyectos, ya que la opción «Obligatorio en todos los proyectos» está marcada. No puede desactivarse para proyectos individuales.
@@ -374,6 +385,10 @@ es:
         no_results_content_text: Crear un nueva versión
       storage:
         no_results_title_text: No se ha registrado el uso de espacio en disco adicional por este proyecto.
+  project_stage:
+    working_days_count:
+      one: "Duración: %{count} día laborable"
+      other: "Duración: %{count} días laborables"
   lists:
     create:
       success: "La lista modificada se ha guardado como una nueva lista"
@@ -494,8 +509,12 @@ es:
     groups:
       member_in_these_groups: "Este usuario es miembro actualmente de los grupos siguientes:"
       no_results_title_text: Este usuario no es miembro actualmente de ningún grupo.
+      summary_with_more: Miembro de %{names} y %{count_link}.
+      more: "%{count} más"
+      summary: Miembro de %{names}.
     memberships:
       no_results_title_text: El usuario no es actualmente un miembro del proyecto.
+    open_profile: "Abrir perfil"
   page:
     text: "Texto"
   placeholder_users:
@@ -566,18 +585,27 @@ es:
       no_results_title_text: Actualmente no existen tipos.
       no_results_content_text: Crear un nuevo tipo
     edit:
-      settings: "Configuración"
-      form_configuration: "Configuración del formulario"
+      form_configuration:
+        tab: "Configuración del formulario"
       more_info_text_html: >
         Enterprise te permite personalizar el formulario de configuración con estas extensiones adicionales: <br><ul class="%{list_styling_class}"><li><b>Añade nuevos grupos de atributo</b></li> <li><b>Renombra grupos de atributo</b></li> <li><b>Añada tablas de paquetes de trabajo relacionados</b></li> </ul>
-      projects: "Proyectos"
-      enabled_projects: "Proyectos habilitados"
-      edit_query: "Editar tabla"
-      query_group_placeholder: "Asigne un nombre a la tabla"
-      reset: "Restablecer valores predeterminados"
-      type_color_text: |
-        El color seleccionado distingue distintos tipos
-        en los diagramas de Gantt o en las tablas de paquetes de trabajo. Por lo tanto, se recomienda usar un color intenso.
+      projects:
+        tab: "Proyectos"
+        enabled_projects: "Proyectos habilitados"
+      settings:
+        tab: "Ajustes"
+        type_color_text: El color seleccionado distingue distintos tipos en los diagramas de Gantt o en las tablas de paquetes de trabajo. Por lo tanto, se recomienda usar un color intenso.
+      subject_configuration:
+        tab: "Configuración del asunto"
+        manually_editable_subjects:
+          label: "Asuntos editables manualmente"
+          caption: "Los usuarios pueden introducir y editar manualmente los asuntos de los paquetes de trabajo sin restricciones."
+        automatically_generated_subjects:
+          label: "Asuntos generados automáticamente"
+          caption: "Defina un patrón utilizando atributos referenciados y texto para generar automáticamente asuntos de paquetes de trabajo. Los usuarios no podrán editar manualmente los asuntos."
+        pattern:
+          label: "Patrón del asunto"
+          caption: "Busque un atributo o añada un texto. Para crear un espacio entre elementos, añádalo como texto."
   versions:
     overview:
       work_packages_in_archived_projects: "La versión se comparte con proyectos archivados que aún tienen paquetes de trabajo asignados a esta versión. Estos se contabilizan, pero no aparecerán en las vistas vinculadas."
@@ -640,6 +668,10 @@ es:
     label_add_x: "Añadir %{x}"
     label_edit_x: "Editar %{x}"
     label_add_description: "Añadir descripción"
+    lag:
+      subject: "Retraso"
+      title: "Retraso (en días)"
+      caption: "El número mínimo de días laborables que debe haber entre los dos paquetes de trabajo."
     relations:
       label_relates_singular: "relacionado con"
       label_relates_plural: "relacionado con"
@@ -655,7 +687,7 @@ es:
       follows_description: "El paquete de trabajo relacionado tiene que terminar necesariamente antes de que este pueda empezar"
       label_child_singular: "secundario"
       label_child_plural: "secundarios"
-      child_description: "Makes the related work package a sub-item of the current (parent) work package"
+      child_description: "Hace que el paquete de trabajo relacionado sea un subelemento del paquete de trabajo actual (principal)"
       label_blocks_singular: "bloques"
       label_blocks_plural: "bloques"
       blocks_description: "El paquete de trabajo relacionado no puede cerrarse hasta que este se cierre primero"
@@ -844,6 +876,9 @@ es:
         lag: "Retraso"
         from: "Paquete de trabajo"
         to: "Paquete de trabajo relacionado"
+      reminder:
+        remind_at_date: "Fecha"
+        remind_at_time: "Hora"
       repository:
         url: "URL"
       role:
@@ -932,6 +967,7 @@ es:
       messages:
         accepted: "debe ser aceptado."
         after: "debe ser después de %{date}."
+        after_today: "debe ser en el futuro."
         after_or_equal_to: "debe ser después de o igual a %{date}."
         before: "debe ser antes de %{date}."
         before_or_equal_to: "debe ser antes o igual a %{date}."
@@ -978,6 +1014,7 @@ es:
         not_an_integer: "No es un entero."
         not_an_iso_date: "no es una fecha válida. Requiere formato: AAAA-MM-DD."
         not_same_project: "no pertenecen a un mismo proyecto."
+        datetime_must_be_in_future: "debe ser en el futuro."
         odd: "debe ser impar."
         regex_match_failed: "no coincide con la expresión regular %{expression}."
         regex_invalid: "no se pudo validar con la expresión regular asociada."
@@ -1091,16 +1128,38 @@ es:
           attributes:
             type:
               must_be_a_stage_or_gate: "debe ser Project::StageDefinition o Project::GateDefinition"
+              type_and_class_name_mismatch: "debe coincidir con el nombre de la clase instanciada"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "debe ser una Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "debe ser una Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "debe ser Project::Stage o Project::Gate"
               must_be_a_stage: "debe ser un Project::Stage"
               must_be_a_gate: "debe ser un Project::Gate"
+              type_and_class_name_mismatch: "debe coincidir con el nombre de la clase instanciada"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "No se puede asignar `end_date` a un Project::Gate"
+              end_date_not_allowed: "No se puede asignar la fecha de finalización a un Project::Gate"
+            type:
+              type_and_class_name_mismatch: "debe ser un Project::Gate"
+            date:
+              non_continuous_dates: "no puede ser anterior a la fecha de finalización anterior de %{step}."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "la fecha de inicio tiene que ser anterior a la fecha de fin."
+              non_continuous_dates: "no puede ser anterior a la fecha de finalización anterior de %{step}."
+              incomplete: "está incompleto."
+            type:
+              type_and_class_name_mismatch: "debe ser un Project::Stage"
         query:
           attributes:
             project:
@@ -1317,6 +1376,8 @@ es:
         other: "Notificaciones"
       placeholder_user: "Usuario de marcador de posición"
       project: "Proyecto"
+      project/gate_definition: "Puerta"
+      project/stage_definition: "Etapa"
       project_query:
         one: "Lista de proyectos"
         other: "Listas de proyectos"
@@ -1420,6 +1481,7 @@ es:
     login: "Nombre usuario"
     mail: "Correo electrónico"
     name: "Nombre"
+    note: "Nota"
     password: "Contraseña"
     priority: "Prioridad"
     project: "Proyecto"
@@ -1516,6 +1578,7 @@ es:
   button_print: "Imprimir"
   button_quote: "Comentario"
   button_remove: Eliminar
+  button_remove_reminder: "Eliminar recordatorio"
   button_rename: "Cambiar el nombre"
   button_replace: "Sustituir"
   button_revoke: "Revocar"
@@ -1526,6 +1589,7 @@ es:
   button_save_as: "Guardar como"
   button_apply_changes: "Aplicar cambios"
   button_save_back: "Guardar y volver"
+  button_set_reminder: "Establecer recordatorio"
   button_show: "Mostrar"
   button_sort: "Ordenar"
   button_submit: "Enviar"
@@ -1731,12 +1795,12 @@ es:
   direction: iad (ltr)
   ee:
     upsale:
+      title: "Extensión Enterprise"
+      link_title: "Más información"
       form_configuration:
         description: "Personalice la configuración del formulario con estas extensiones:"
         add_groups: "Añadir nuevos grupos de atributos"
         rename_groups: "Cambiar nombre de grupos de atributos"
-      project_filters:
-        description_html: "Filtrar y ordenar en campos personalizados es una extensión de Enterprise."
   enumeration_activities: "Actividades de seguimiento del tiempo"
   enumeration_work_package_priorities: "Prioridades del paquete de trabajo"
   enumeration_reported_project_statuses: "Estatus del proyecto reportado"
@@ -1769,6 +1833,7 @@ es:
   error_pdf_export_too_many_columns: "Demasiadas columnas seleccionadas para la exportación de PDF. Reduzca el número de columnas."
   error_pdf_failed_to_export: "No se ha podido guardar la exportación PDF: %{error}"
   error_token_authenticity: "No se puede verificar el token de falsificación de solicitud entre sitios. ¿Intentó enviar datos en varios navegadores o pestañas? Cierre de todas las pestañas y vuelva a intentarlo."
+  error_reminder_not_found: "No se ha encontrado el recordatorio o ya se ha notificado."
   error_work_package_not_found_in_project: "El paquete de trabajo no se ha encontrado o no pertenece a este proyecto"
   error_work_package_id_not_found: "No se ha encontrado el paquete de trabajo."
   error_must_be_project_member: "debe ser miembro del proyecto"
@@ -2062,6 +2127,7 @@ es:
       responsible: "Responsable"
       shared: "Compartido"
       watched: "Observador"
+      reminder: "Recordatorio"
     facets:
       unread: "No leídas"
       unread_title: "Mostrar no leídos"
@@ -2229,8 +2295,10 @@ es:
   label_default: "Por defecto"
   label_delete_user: "Eliminar usuario"
   label_delete_project: "Eliminar proyecto"
+  label_delete: "Eliminar"
   label_deleted: "borrado"
   label_deleted_custom_field: "(campo personalizado borrado)"
+  label_deleted_custom_item: "(elemento eliminado)"
   label_deleted_custom_option: "(opción eliminada)"
   label_empty_element: "(vacío)"
   label_missing_or_hidden_custom_option: "(faltan valores o permisos de acceso)"
@@ -2267,7 +2335,6 @@ es:
   label_enterprise_active_users: "%{current}/%{limit} usuarios activos que han reservado"
   label_enterprise_edition: "Enterprise"
   label_enterprise_support: "Soporte empresarial"
-  label_enterprise_addon: "Extensión Enterprise"
   label_environment: "Entorno"
   label_estimates_and_progress: "Estimaciones y progreso"
   label_equals: "es"
@@ -2452,6 +2519,7 @@ es:
   label_none_parentheses: "(ninguno)"
   label_not_contains: "no contiene"
   label_not_equals: "no es"
+  label_life_cycle_step_plural: "Ciclo de vida del proyecto"
   label_on: "en"
   label_operator_all: "no está vacío"
   label_operator_none: "está vacío"
@@ -2553,6 +2621,7 @@ es:
   label_reporting: "Presentación de informe"
   label_reporting_plural: "Presentacion de Informes"
   label_repository: "Repositorio"
+  label_repository_remove: "Eliminar el repositorio"
   label_repository_root: "Raiz del repositorio"
   label_repository_plural: "Repositorios"
   label_required: "requerido"
@@ -2615,6 +2684,7 @@ es:
   label_this_month: "este mes"
   label_this_week: "esta semana"
   label_this_year: "este año"
+  label_time: "Hora"
   label_time_entry_plural: "Tiempo invertido"
   label_time_entry_activity_plural: "Actividades de tiempo invertido"
   label_title: "Título"
@@ -2650,6 +2720,7 @@ es:
   label_user_settings: "Configuración de usuario"
   label_users_settings: "Ajustes de usuario"
   label_version_new: "Nueva versión"
+  label_version_edit: "Editar versión"
   label_version_plural: "Versiones"
   label_version_sharing_descendants: "Con subproyectos"
   label_version_sharing_hierarchy: "Con la jerarquía del proyecto"
@@ -2787,8 +2858,13 @@ es:
         prefix: "Recibido por la configuración de notificaciones: %{reason}"
         date_alert_start_date: "Alerta de fecha"
         date_alert_due_date: "Alerta de fecha"
+        reminder: "Recordatorio"
       see_all: "Ver todo"
       updated_at: "Actualizado a las %{timestamp} por %{user}"
+    reminder_notifications:
+      subject: "Recordatorio: %{note}"
+      heading: "Tiene un nuevo recordatorio"
+      note: "Nota: «%{note}»"
     sharing:
       work_packages:
         allowed_actions: "Puede %{allowed_actions} este paquete de trabajo. Esto puede cambiar dependiendo del rol y los permisos de su proyecto."
@@ -2955,6 +3031,7 @@ es:
   notice_successful_connection: "Conexión exitosa."
   notice_successful_create: "Creación exitosa."
   notice_successful_delete: "Eliminado con éxito."
+  notice_successful_cancel: "Cancelación exitosa."
   notice_successful_update: "Actualización correcta."
   notice_successful_update_custom_fields_added_to_project: |
     Actualización correcta. Los campos personalizados de los tipos ya activados se activan automáticamente en el formulario de paquete de trabajo. <a href="%{url}" target="_blank">Ver más</a>.
@@ -3031,6 +3108,7 @@ es:
   permission_edit_own_time_entries: "Editar registros de tiempo propios"
   permission_edit_project: "Editar proyecto"
   permission_edit_project_attributes: "Editar atributos del proyecto"
+  permission_edit_project_stages_and_gates: "Editar etapas y puertas del proyecto"
   permission_edit_reportings: "Editar reportes"
   permission_edit_time_entries: "Editar registros de tiempo para otros usuarios"
   permission_edit_timelines: "Editar cronogramas"
@@ -3060,9 +3138,12 @@ es:
   permission_search_project: "Buscar proyecto"
   permission_select_custom_fields: "Seleccionar campos personalizados"
   permission_select_project_custom_fields: "Seleccione los atributos del proyecto"
+  permission_select_project_life_cycle: "Seleccionar etapas y puertas del proyecto"
+  permission_select_project_life_cycle_explanation: "Activar/desactivar las etapas y puertas de un proyecto. Permite al usuario seleccionar el ciclo de vida apropiado para el proyecto, ya que las etapas y puertas inactivas no serán visibles en la página de resumen del proyecto ni en la lista de proyectos."
   permission_select_project_modules: "Seleccionar módulos de proyecto"
   permission_share_work_packages: "Compartir paquetes de trabajo"
   permission_manage_types: "Seleccionar Tipos"
+  permission_manage_own_reminders: "Crear recordatorios propios"
   permission_view_project: "Ver proyectos"
   permission_view_changesets: "Ver las revisiones del repositorio en OpenProject"
   permission_view_commit_author_statistics: "Ver estadísticas del commit del autor"
@@ -3083,6 +3164,7 @@ es:
   permission_work_package_assigned_explanation: "Los paquetes de trabajo se pueden asignar a usuarios y grupos con este papel en los proyectos correspondientes"
   permission_view_project_activity: "Ver la actividad del proyecto"
   permission_view_project_attributes: "Ver atributos del proyecto"
+  permission_view_project_stages_and_gates: "Ver las etapas y puertas del proyecto"
   permission_save_bcf_queries: "Guardar consultas BCF"
   permission_manage_public_bcf_queries: "Administrar consultas BCF públicas"
   permission_edit_attribute_help_texts: "Editar textos de ayuda de atributos"
@@ -3762,6 +3844,12 @@ es:
       edit_description: "Puede ver, comentar y editar este paquete de trabajo."
       view: "Ver"
       view_description: "Puede ver este paquete de trabajo."
+    reminders:
+      label_remind_at: "Fecha"
+      note_placeholder: "¿Por qué establece este recordatorio?"
+      success_creation_message: "Recordatorio establecido con éxito. Recibirá una notificación para este paquete de trabajo a la hora elegida."
+      success_update_message: "Recordatorio actualizado con éxito."
+      success_deletion_message: "Recordatorio eliminado correctamente."
   sharing:
     count:
       zero: "0 usuarios"
diff --git a/config/locales/crowdin/et.yml b/config/locales/crowdin/et.yml
index cb16377c42b9..36b9fb3de8f8 100644
--- a/config/locales/crowdin/et.yml
+++ b/config/locales/crowdin/et.yml
@@ -343,6 +343,9 @@ et:
         text: "This action will not delete any project the list contains. Are you sure you want to delete this project list?"
     settings:
       change_identifier: Change identifier
+      actions:
+        label_enable_all: "Enable all"
+        label_disable_all: "Disable all"
       activities:
         no_results_title_text: There are currently no activities available.
       forums:
@@ -353,18 +356,26 @@ et:
         no_results_content_text: Create a new work package category
       custom_fields:
         no_results_title_text: There are currently no custom fields available.
+      life_cycle:
+        header:
+          title: "Project lifecycle"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "Neither stages nor gates are currently defined."
+        section_header: "Stages and gates"
+        step:
+          use_in_project: "Use %{step} in this project"
+        filter:
+          label: "Search project stage or gate"
       project_custom_fields:
         header:
           title: "Project attributes"
-          description: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
+          description_html: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
         filter:
           label: "Search project attribute"
         actions:
           label_enable_single: "Active in this project, click to disable"
           label_disable_single: "Inactive in this project, click to enable"
           remove_from_project: "Remove from project"
-          label_enable_all: "Enable all"
-          label_disable_all: "Disable all"
         is_required_blank_slate:
           heading: Required in all projects
           description: This project attribute is activated in all projects since the "Required in all projects" option is checked. It cannot be deactivated for individual projects.
@@ -377,6 +388,10 @@ et:
         no_results_content_text: Create a new version
       storage:
         no_results_title_text: There is no additional recorded disk space consumed by this project.
+  project_stage:
+    working_days_count:
+      one: "Duration: %{count} working day"
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "The modified list has been saved as a new list"
@@ -497,8 +512,12 @@ et:
     groups:
       member_in_these_groups: "This user is currently a member of the following groups:"
       no_results_title_text: This user is currently not a member in any group.
+      summary_with_more: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary: Member of %{names}.
     memberships:
       no_results_title_text: This user is currently not a member of a project.
+    open_profile: "Open profile"
   page:
     text: "Tekst"
   placeholder_users:
@@ -569,18 +588,27 @@ et:
       no_results_title_text: There are currently no types.
       no_results_content_text: Create a new type
     edit:
-      settings: "Seaded"
-      form_configuration: "Vormi seadistamine"
+      form_configuration:
+        tab: "Form configuration"
       more_info_text_html: >
         Enterprise edition allows you to customize form configuration with these additional add-ons: <br> <ul class="%{list_styling_class}"> <li><b>Add new attribute groups</b></li> <li><b>Rename attribute groups</b></li> <li><b>Add a table of related work packages</b></li> </ul>
-      projects: "Projektid"
-      enabled_projects: "Lubatud projektid"
-      edit_query: "Muuda tabelit"
-      query_group_placeholder: "Anna tabelile nimi"
-      reset: "Taasta vaikesätted"
-      type_color_text: |
-        The selected color distinguishes different types
-        in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      projects:
+        tab: "Projects"
+        enabled_projects: "Enabled projects"
+      settings:
+        tab: "Settings"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Subject configuration"
+        manually_editable_subjects:
+          label: "Manually editable subjects"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automatically generated subjects"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Subject pattern"
+          caption: "Search for an attribute or add text. To create a space between elements add it as a text."
   versions:
     overview:
       work_packages_in_archived_projects: "The version is shared with archived projects which still have work packages assigned to this version. These are counted, but will not appear in the linked views."
@@ -643,6 +671,10 @@ et:
     label_add_x: "Add %{x}"
     label_edit_x: "Edit %{x}"
     label_add_description: "Add description"
+    lag:
+      subject: "Lag"
+      title: "Lag (in days)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
       label_relates_singular: "related to"
       label_relates_plural: "related to"
@@ -847,6 +879,9 @@ et:
         lag: "Lag"
         from: "Teema"
         to: "Seotud teema"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Time"
       repository:
         url: "URL"
       role:
@@ -935,6 +970,7 @@ et:
       messages:
         accepted: "must be accepted."
         after: "must be after %{date}."
+        after_today: "must be in the future."
         after_or_equal_to: "must be after or equal to %{date}."
         before: "must be before %{date}."
         before_or_equal_to: "must be before or equal to %{date}."
@@ -981,6 +1017,7 @@ et:
         not_an_integer: "pole täisarv."
         not_an_iso_date: "is not a valid date. Required format: YYYY-MM-DD."
         not_same_project: "doesn't belong to the same project."
+        datetime_must_be_in_future: "must be in the future."
         odd: "peab olema paaritu arv."
         regex_match_failed: "does not match the regular expression %{expression}."
         regex_invalid: "could not be validated with the associated regular expression."
@@ -1094,16 +1131,38 @@ et:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "start date must be before the end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "is incomplete."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1320,6 +1379,8 @@ et:
         other: "Notifications"
       placeholder_user: "Placeholder user"
       project: "Projekt"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         one: "Project list"
         other: "Project lists"
@@ -1423,6 +1484,7 @@ et:
     login: "Kasutajanimi"
     mail: "E-posti aadress"
     name: "Nimi"
+    note: "Note"
     password: "Parool"
     priority: "Prioriteet"
     project: "Projekt"
@@ -1519,6 +1581,7 @@ et:
   button_print: "Prindi"
   button_quote: "Tsiteeri"
   button_remove: Eemalda
+  button_remove_reminder: "Remove reminder"
   button_rename: "Nimeta ümber"
   button_replace: "Asenda"
   button_revoke: "Võta tagasi"
@@ -1529,6 +1592,7 @@ et:
   button_save_as: "Salvesta kui"
   button_apply_changes: "Apply changes"
   button_save_back: "Salvesta ja mine tagasi"
+  button_set_reminder: "Set reminder"
   button_show: "Kuva"
   button_sort: "Sorteeri"
   button_submit: "Sisesta"
@@ -1734,12 +1798,12 @@ et:
   direction: vasakult paremale
   ee:
     upsale:
+      title: "Enterprise add-on"
+      link_title: "More information"
       form_configuration:
         description: "Customize the form configuration with these additional add-ons:"
         add_groups: "Add new attribute groups"
         rename_groups: "Rename attributes groups"
-      project_filters:
-        description_html: "Filtering and sorting on custom fields is an Enterprise edition add-on."
   enumeration_activities: "Time tracking activities"
   enumeration_work_package_priorities: "Teemade prioriteedid"
   enumeration_reported_project_statuses: "Esitatud projekti olek"
@@ -1772,6 +1836,7 @@ et:
   error_pdf_export_too_many_columns: "Too many columns selected for the PDF export. Please reduce the number of columns."
   error_pdf_failed_to_export: "The PDF export could not be saved: %{error}"
   error_token_authenticity: "Unable to verify Cross-Site Request Forgery token. Did you try to submit data on multiple browsers or tabs? Please close all tabs and try again."
+  error_reminder_not_found: "The reminder was not found or was already notified about."
   error_work_package_not_found_in_project: "Teemat ei leitud või see ei kuulu siia projekti"
   error_work_package_id_not_found: "The work package was not found."
   error_must_be_project_member: "peab olema projekti liige"
@@ -2065,6 +2130,7 @@ et:
       responsible: "Accountable"
       shared: "Shared"
       watched: "Jälgija"
+      reminder: "Reminder"
     facets:
       unread: "Unread"
       unread_title: "Show unread"
@@ -2232,8 +2298,10 @@ et:
   label_default: "Vaikimisi"
   label_delete_user: "Kustuta kasutaja"
   label_delete_project: "Kustuta projekt"
+  label_delete: "Delete"
   label_deleted: "kustutatud"
   label_deleted_custom_field: "(kustutatud lisaväli)"
+  label_deleted_custom_item: "(deleted item)"
   label_deleted_custom_option: "(deleted option)"
   label_empty_element: "(tühi)"
   label_missing_or_hidden_custom_option: "(missing value or lacking permissions to access)"
@@ -2270,7 +2338,6 @@ et:
   label_enterprise_active_users: "%{current}/%{limit} booked active users"
   label_enterprise_edition: "Enterprise edition"
   label_enterprise_support: "Enterprise support"
-  label_enterprise_addon: "Enterprise add-on"
   label_environment: "Keskkond"
   label_estimates_and_progress: "Estimates and progress"
   label_equals: "võrdub"
@@ -2455,6 +2522,7 @@ et:
   label_none_parentheses: "(pole)"
   label_not_contains: "ei sisalda"
   label_not_equals: "ei ole"
+  label_life_cycle_step_plural: "Project lifecycle"
   label_on: "on"
   label_operator_all: "is not empty"
   label_operator_none: "is empty"
@@ -2556,6 +2624,7 @@ et:
   label_reporting: "Aruandlus"
   label_reporting_plural: "Aruandlused"
   label_repository: "Hoidla"
+  label_repository_remove: "Remove repository"
   label_repository_root: "Repository root"
   label_repository_plural: "Hoidlad"
   label_required: "required"
@@ -2618,6 +2687,7 @@ et:
   label_this_month: "sel kuul"
   label_this_week: "sel nädalal"
   label_this_year: "sel aastal"
+  label_time: "Time"
   label_time_entry_plural: "Kulutatud aeg"
   label_time_entry_activity_plural: "Spent time activities"
   label_title: "Pealkiri"
@@ -2653,6 +2723,7 @@ et:
   label_user_settings: "User settings"
   label_users_settings: "Users settings"
   label_version_new: "Uus versioon"
+  label_version_edit: "Edit version"
   label_version_plural: "Versioonid"
   label_version_sharing_descendants: "Alamprojektidega"
   label_version_sharing_hierarchy: "Projektihierarhiaga"
@@ -2790,8 +2861,13 @@ et:
         prefix: "Received because of the notification setting: %{reason}"
         date_alert_start_date: "Date alert"
         date_alert_due_date: "Date alert"
+        reminder: "Reminder"
       see_all: "See all"
       updated_at: "Updated at %{timestamp} by %{user}"
+    reminder_notifications:
+      subject: "Reminder: %{note}"
+      heading: "You have a new reminder"
+      note: "Note: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "You may %{allowed_actions} this work package. This can change depending on your project role and permissions."
@@ -2958,6 +3034,7 @@ et:
   notice_successful_connection: "Ühenduse loomine õnnestus."
   notice_successful_create: "Loomine õnnestus."
   notice_successful_delete: "Kustutamine õnnestus."
+  notice_successful_cancel: "Successful cancellation."
   notice_successful_update: "Uuendamine õnnestus."
   notice_successful_update_custom_fields_added_to_project: |
     Successful update. The custom fields of the activated types are automatically activated
@@ -3035,6 +3112,7 @@ et:
   permission_edit_own_time_entries: "Muuta enda ajalogisid"
   permission_edit_project: "Muuta projekti"
   permission_edit_project_attributes: "Edit project attributes"
+  permission_edit_project_stages_and_gates: "Edit project stages and gates"
   permission_edit_reportings: "Muuta teadaandeid"
   permission_edit_time_entries: "Edit time logs for other users"
   permission_edit_timelines: "Muuta ajakavasid"
@@ -3064,9 +3142,12 @@ et:
   permission_search_project: "Search project"
   permission_select_custom_fields: "Select custom fields"
   permission_select_project_custom_fields: "Select project attributes"
+  permission_select_project_life_cycle: "Select project stages and gates"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "Vali projekti mooduleid"
   permission_share_work_packages: "Share work packages"
   permission_manage_types: "Muuta tüüpe"
+  permission_manage_own_reminders: "Create own reminders"
   permission_view_project: "View projects"
   permission_view_changesets: "View repository revisions in OpenProject"
   permission_view_commit_author_statistics: "Kuvada sissekandestatistikat autorite kohta"
@@ -3087,6 +3168,7 @@ et:
   permission_work_package_assigned_explanation: "Work packages can be assigned to users and groups in possession of this role in the respective project"
   permission_view_project_activity: "View project activity"
   permission_view_project_attributes: "View project attributes"
+  permission_view_project_stages_and_gates: "View project stages and gates"
   permission_save_bcf_queries: "Save BCF queries"
   permission_manage_public_bcf_queries: "Manage public BCF queries"
   permission_edit_attribute_help_texts: "Edit attribute help texts"
@@ -3767,6 +3849,12 @@ et:
       edit_description: "Can view, comment and edit this work package."
       view: "Kuva"
       view_description: "Can view this work package."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Why are you setting this reminder?"
+      success_creation_message: "Reminder set successfully. You will receive a notification for this work package at the chosen time."
+      success_update_message: "Reminder updated successfully."
+      success_deletion_message: "Reminder deleted successfully."
   sharing:
     count:
       zero: "0 users"
diff --git a/config/locales/crowdin/eu.yml b/config/locales/crowdin/eu.yml
index 388935a1012a..138cc416429b 100644
--- a/config/locales/crowdin/eu.yml
+++ b/config/locales/crowdin/eu.yml
@@ -343,6 +343,9 @@ eu:
         text: "This action will not delete any project the list contains. Are you sure you want to delete this project list?"
     settings:
       change_identifier: Change identifier
+      actions:
+        label_enable_all: "Enable all"
+        label_disable_all: "Disable all"
       activities:
         no_results_title_text: There are currently no activities available.
       forums:
@@ -353,18 +356,26 @@ eu:
         no_results_content_text: Create a new work package category
       custom_fields:
         no_results_title_text: There are currently no custom fields available.
+      life_cycle:
+        header:
+          title: "Project lifecycle"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "Neither stages nor gates are currently defined."
+        section_header: "Stages and gates"
+        step:
+          use_in_project: "Use %{step} in this project"
+        filter:
+          label: "Search project stage or gate"
       project_custom_fields:
         header:
           title: "Project attributes"
-          description: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
+          description_html: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
         filter:
           label: "Search project attribute"
         actions:
           label_enable_single: "Active in this project, click to disable"
           label_disable_single: "Inactive in this project, click to enable"
           remove_from_project: "Remove from project"
-          label_enable_all: "Enable all"
-          label_disable_all: "Disable all"
         is_required_blank_slate:
           heading: Required in all projects
           description: This project attribute is activated in all projects since the "Required in all projects" option is checked. It cannot be deactivated for individual projects.
@@ -377,6 +388,10 @@ eu:
         no_results_content_text: Create a new version
       storage:
         no_results_title_text: There is no additional recorded disk space consumed by this project.
+  project_stage:
+    working_days_count:
+      one: "Duration: %{count} working day"
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "The modified list has been saved as a new list"
@@ -497,8 +512,12 @@ eu:
     groups:
       member_in_these_groups: "This user is currently a member of the following groups:"
       no_results_title_text: This user is currently not a member in any group.
+      summary_with_more: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary: Member of %{names}.
     memberships:
       no_results_title_text: This user is currently not a member of a project.
+    open_profile: "Open profile"
   page:
     text: "Text"
   placeholder_users:
@@ -569,18 +588,27 @@ eu:
       no_results_title_text: There are currently no types.
       no_results_content_text: Create a new type
     edit:
-      settings: "Settings"
-      form_configuration: "Form configuration"
+      form_configuration:
+        tab: "Form configuration"
       more_info_text_html: >
         Enterprise edition allows you to customize form configuration with these additional add-ons: <br> <ul class="%{list_styling_class}"> <li><b>Add new attribute groups</b></li> <li><b>Rename attribute groups</b></li> <li><b>Add a table of related work packages</b></li> </ul>
-      projects: "Projects"
-      enabled_projects: "Enabled projects"
-      edit_query: "Edit table"
-      query_group_placeholder: "Give the table a name"
-      reset: "Reset to defaults"
-      type_color_text: |
-        The selected color distinguishes different types
-        in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      projects:
+        tab: "Projects"
+        enabled_projects: "Enabled projects"
+      settings:
+        tab: "Settings"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Subject configuration"
+        manually_editable_subjects:
+          label: "Manually editable subjects"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automatically generated subjects"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Subject pattern"
+          caption: "Search for an attribute or add text. To create a space between elements add it as a text."
   versions:
     overview:
       work_packages_in_archived_projects: "The version is shared with archived projects which still have work packages assigned to this version. These are counted, but will not appear in the linked views."
@@ -643,6 +671,10 @@ eu:
     label_add_x: "Add %{x}"
     label_edit_x: "Edit %{x}"
     label_add_description: "Add description"
+    lag:
+      subject: "Lag"
+      title: "Lag (in days)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
       label_relates_singular: "related to"
       label_relates_plural: "related to"
@@ -847,6 +879,9 @@ eu:
         lag: "Lag"
         from: "Work package"
         to: "Related work package"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Time"
       repository:
         url: "URL"
       role:
@@ -935,6 +970,7 @@ eu:
       messages:
         accepted: "must be accepted."
         after: "must be after %{date}."
+        after_today: "must be in the future."
         after_or_equal_to: "must be after or equal to %{date}."
         before: "must be before %{date}."
         before_or_equal_to: "must be before or equal to %{date}."
@@ -981,6 +1017,7 @@ eu:
         not_an_integer: "is not an integer."
         not_an_iso_date: "is not a valid date. Required format: YYYY-MM-DD."
         not_same_project: "doesn't belong to the same project."
+        datetime_must_be_in_future: "must be in the future."
         odd: "must be odd."
         regex_match_failed: "does not match the regular expression %{expression}."
         regex_invalid: "could not be validated with the associated regular expression."
@@ -1094,16 +1131,38 @@ eu:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "start date must be before the end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "is incomplete."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1320,6 +1379,8 @@ eu:
         other: "Notifications"
       placeholder_user: "Placeholder user"
       project: "Project"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         one: "Project list"
         other: "Project lists"
@@ -1423,6 +1484,7 @@ eu:
     login: "Username"
     mail: "Email"
     name: "Name"
+    note: "Note"
     password: "Password"
     priority: "Priority"
     project: "Project"
@@ -1519,6 +1581,7 @@ eu:
   button_print: "Print"
   button_quote: "Quote"
   button_remove: Remove
+  button_remove_reminder: "Remove reminder"
   button_rename: "Rename"
   button_replace: "Replace"
   button_revoke: "Revoke"
@@ -1529,6 +1592,7 @@ eu:
   button_save_as: "Save as"
   button_apply_changes: "Apply changes"
   button_save_back: "Save and back"
+  button_set_reminder: "Set reminder"
   button_show: "Show"
   button_sort: "Sort"
   button_submit: "Submit"
@@ -1734,12 +1798,12 @@ eu:
   direction: ltr
   ee:
     upsale:
+      title: "Enterprise add-on"
+      link_title: "More information"
       form_configuration:
         description: "Customize the form configuration with these additional add-ons:"
         add_groups: "Add new attribute groups"
         rename_groups: "Rename attributes groups"
-      project_filters:
-        description_html: "Filtering and sorting on custom fields is an Enterprise edition add-on."
   enumeration_activities: "Time tracking activities"
   enumeration_work_package_priorities: "Work package priorities"
   enumeration_reported_project_statuses: "Reported project status"
@@ -1772,6 +1836,7 @@ eu:
   error_pdf_export_too_many_columns: "Too many columns selected for the PDF export. Please reduce the number of columns."
   error_pdf_failed_to_export: "The PDF export could not be saved: %{error}"
   error_token_authenticity: "Unable to verify Cross-Site Request Forgery token. Did you try to submit data on multiple browsers or tabs? Please close all tabs and try again."
+  error_reminder_not_found: "The reminder was not found or was already notified about."
   error_work_package_not_found_in_project: "The work package was not found or does not belong to this project"
   error_work_package_id_not_found: "The work package was not found."
   error_must_be_project_member: "must be project member"
@@ -2065,6 +2130,7 @@ eu:
       responsible: "Accountable"
       shared: "Shared"
       watched: "Watcher"
+      reminder: "Reminder"
     facets:
       unread: "Unread"
       unread_title: "Show unread"
@@ -2232,8 +2298,10 @@ eu:
   label_default: "Default"
   label_delete_user: "Delete user"
   label_delete_project: "Delete project"
+  label_delete: "Delete"
   label_deleted: "deleted"
   label_deleted_custom_field: "(deleted custom field)"
+  label_deleted_custom_item: "(deleted item)"
   label_deleted_custom_option: "(deleted option)"
   label_empty_element: "(empty)"
   label_missing_or_hidden_custom_option: "(missing value or lacking permissions to access)"
@@ -2270,7 +2338,6 @@ eu:
   label_enterprise_active_users: "%{current}/%{limit} booked active users"
   label_enterprise_edition: "Enterprise edition"
   label_enterprise_support: "Enterprise support"
-  label_enterprise_addon: "Enterprise add-on"
   label_environment: "Environment"
   label_estimates_and_progress: "Estimates and progress"
   label_equals: "is"
@@ -2455,6 +2522,7 @@ eu:
   label_none_parentheses: "(none)"
   label_not_contains: "doesn't contain"
   label_not_equals: "is not"
+  label_life_cycle_step_plural: "Project lifecycle"
   label_on: "on"
   label_operator_all: "is not empty"
   label_operator_none: "is empty"
@@ -2556,6 +2624,7 @@ eu:
   label_reporting: "Reporting"
   label_reporting_plural: "Reportings"
   label_repository: "Repository"
+  label_repository_remove: "Remove repository"
   label_repository_root: "Repository root"
   label_repository_plural: "Repositories"
   label_required: "required"
@@ -2618,6 +2687,7 @@ eu:
   label_this_month: "this month"
   label_this_week: "this week"
   label_this_year: "this year"
+  label_time: "Time"
   label_time_entry_plural: "Spent time"
   label_time_entry_activity_plural: "Spent time activities"
   label_title: "Title"
@@ -2653,6 +2723,7 @@ eu:
   label_user_settings: "User settings"
   label_users_settings: "Users settings"
   label_version_new: "New version"
+  label_version_edit: "Edit version"
   label_version_plural: "Bertsioak"
   label_version_sharing_descendants: "With subprojects"
   label_version_sharing_hierarchy: "With project hierarchy"
@@ -2790,8 +2861,13 @@ eu:
         prefix: "Received because of the notification setting: %{reason}"
         date_alert_start_date: "Date alert"
         date_alert_due_date: "Date alert"
+        reminder: "Reminder"
       see_all: "See all"
       updated_at: "Updated at %{timestamp} by %{user}"
+    reminder_notifications:
+      subject: "Reminder: %{note}"
+      heading: "You have a new reminder"
+      note: "Note: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "You may %{allowed_actions} this work package. This can change depending on your project role and permissions."
@@ -2958,6 +3034,7 @@ eu:
   notice_successful_connection: "Successful connection."
   notice_successful_create: "Successful creation."
   notice_successful_delete: "Successful deletion."
+  notice_successful_cancel: "Successful cancellation."
   notice_successful_update: "Successful update."
   notice_successful_update_custom_fields_added_to_project: |
     Successful update. The custom fields of the activated types are automatically activated
@@ -3035,6 +3112,7 @@ eu:
   permission_edit_own_time_entries: "Edit own time logs"
   permission_edit_project: "Edit project"
   permission_edit_project_attributes: "Edit project attributes"
+  permission_edit_project_stages_and_gates: "Edit project stages and gates"
   permission_edit_reportings: "Edit reportings"
   permission_edit_time_entries: "Edit time logs for other users"
   permission_edit_timelines: "Edit timelines"
@@ -3064,9 +3142,12 @@ eu:
   permission_search_project: "Search project"
   permission_select_custom_fields: "Select custom fields"
   permission_select_project_custom_fields: "Select project attributes"
+  permission_select_project_life_cycle: "Select project stages and gates"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "Select project modules"
   permission_share_work_packages: "Share work packages"
   permission_manage_types: "Select types"
+  permission_manage_own_reminders: "Create own reminders"
   permission_view_project: "View projects"
   permission_view_changesets: "View repository revisions in OpenProject"
   permission_view_commit_author_statistics: "View commit author statistics"
@@ -3087,6 +3168,7 @@ eu:
   permission_work_package_assigned_explanation: "Work packages can be assigned to users and groups in possession of this role in the respective project"
   permission_view_project_activity: "View project activity"
   permission_view_project_attributes: "View project attributes"
+  permission_view_project_stages_and_gates: "View project stages and gates"
   permission_save_bcf_queries: "Save BCF queries"
   permission_manage_public_bcf_queries: "Manage public BCF queries"
   permission_edit_attribute_help_texts: "Edit attribute help texts"
@@ -3767,6 +3849,12 @@ eu:
       edit_description: "Can view, comment and edit this work package."
       view: "View"
       view_description: "Can view this work package."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Why are you setting this reminder?"
+      success_creation_message: "Reminder set successfully. You will receive a notification for this work package at the chosen time."
+      success_update_message: "Reminder updated successfully."
+      success_deletion_message: "Reminder deleted successfully."
   sharing:
     count:
       zero: "0 users"
diff --git a/config/locales/crowdin/fa.yml b/config/locales/crowdin/fa.yml
index 43b0469888dd..f146d472cbaa 100644
--- a/config/locales/crowdin/fa.yml
+++ b/config/locales/crowdin/fa.yml
@@ -343,6 +343,9 @@ fa:
         text: "This action will not delete any project the list contains. Are you sure you want to delete this project list?"
     settings:
       change_identifier: تغییر شناسه
+      actions:
+        label_enable_all: "Enable all"
+        label_disable_all: "Disable all"
       activities:
         no_results_title_text: There are currently no activities available.
       forums:
@@ -353,18 +356,26 @@ fa:
         no_results_content_text: Create a new work package category
       custom_fields:
         no_results_title_text: There are currently no custom fields available.
+      life_cycle:
+        header:
+          title: "Project lifecycle"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "Neither stages nor gates are currently defined."
+        section_header: "Stages and gates"
+        step:
+          use_in_project: "Use %{step} in this project"
+        filter:
+          label: "Search project stage or gate"
       project_custom_fields:
         header:
           title: "Project attributes"
-          description: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
+          description_html: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
         filter:
           label: "Search project attribute"
         actions:
           label_enable_single: "Active in this project, click to disable"
           label_disable_single: "Inactive in this project, click to enable"
           remove_from_project: "Remove from project"
-          label_enable_all: "فعال کردن همه"
-          label_disable_all: "Disable all"
         is_required_blank_slate:
           heading: Required in all projects
           description: This project attribute is activated in all projects since the "Required in all projects" option is checked. It cannot be deactivated for individual projects.
@@ -377,6 +388,10 @@ fa:
         no_results_content_text: Create a new version
       storage:
         no_results_title_text: هیچ فضای دیسک ضبط شده اضافی مصرف شده توسط این پروژه وجود ندارد.
+  project_stage:
+    working_days_count:
+      one: "Duration: %{count} working day"
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "The modified list has been saved as a new list"
@@ -497,8 +512,12 @@ fa:
     groups:
       member_in_these_groups: "This user is currently a member of the following groups:"
       no_results_title_text: This user is currently not a member in any group.
+      summary_with_more: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary: Member of %{names}.
     memberships:
       no_results_title_text: This user is currently not a member of a project.
+    open_profile: "Open profile"
   page:
     text: "متن"
   placeholder_users:
@@ -569,18 +588,27 @@ fa:
       no_results_title_text: There are currently no types.
       no_results_content_text: Create a new type
     edit:
-      settings: "تنظیمات"
-      form_configuration: "Form configuration"
+      form_configuration:
+        tab: "Form configuration"
       more_info_text_html: >
         Enterprise edition allows you to customize form configuration with these additional add-ons: <br> <ul class="%{list_styling_class}"> <li><b>Add new attribute groups</b></li> <li><b>Rename attribute groups</b></li> <li><b>Add a table of related work packages</b></li> </ul>
-      projects: "پروژه‌ها"
-      enabled_projects: "Enabled projects"
-      edit_query: "Edit table"
-      query_group_placeholder: "Give the table a name"
-      reset: "Reset to defaults"
-      type_color_text: |
-        The selected color distinguishes different types
-        in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      projects:
+        tab: "Projects"
+        enabled_projects: "Enabled projects"
+      settings:
+        tab: "Settings"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Subject configuration"
+        manually_editable_subjects:
+          label: "Manually editable subjects"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automatically generated subjects"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Subject pattern"
+          caption: "Search for an attribute or add text. To create a space between elements add it as a text."
   versions:
     overview:
       work_packages_in_archived_projects: "The version is shared with archived projects which still have work packages assigned to this version. These are counted, but will not appear in the linked views."
@@ -643,6 +671,10 @@ fa:
     label_add_x: "Add %{x}"
     label_edit_x: "Edit %{x}"
     label_add_description: "Add description"
+    lag:
+      subject: "Lag"
+      title: "Lag (in days)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
       label_relates_singular: "related to"
       label_relates_plural: "related to"
@@ -847,6 +879,9 @@ fa:
         lag: "Lag"
         from: "بسته کاری"
         to: "بسته کاری وابسته"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Time"
       repository:
         url: "نشانی اینترنت"
       role:
@@ -935,6 +970,7 @@ fa:
       messages:
         accepted: "must be accepted."
         after: "must be after %{date}."
+        after_today: "must be in the future."
         after_or_equal_to: "must be after or equal to %{date}."
         before: "must be before %{date}."
         before_or_equal_to: "must be before or equal to %{date}."
@@ -981,6 +1017,7 @@ fa:
         not_an_integer: "is not an integer."
         not_an_iso_date: "is not a valid date. Required format: YYYY-MM-DD."
         not_same_project: "doesn't belong to the same project."
+        datetime_must_be_in_future: "must be in the future."
         odd: "must be odd."
         regex_match_failed: "does not match the regular expression %{expression}."
         regex_invalid: "could not be validated with the associated regular expression."
@@ -1094,16 +1131,38 @@ fa:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "start date must be before the end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "is incomplete."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1320,6 +1379,8 @@ fa:
         other: "Notifications"
       placeholder_user: "Placeholder user"
       project: "پروژه"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         one: "Project list"
         other: "Project lists"
@@ -1423,6 +1484,7 @@ fa:
     login: "نام كاربري"
     mail: "Email"
     name: "نام"
+    note: "Note"
     password: "کلمه عبور"
     priority: "اولويت"
     project: "پروژه"
@@ -1519,6 +1581,7 @@ fa:
   button_print: "چاپ کردن"
   button_quote: "نقل قول"
   button_remove: Remove
+  button_remove_reminder: "Remove reminder"
   button_rename: "تغییر نام"
   button_replace: "Replace"
   button_revoke: "Revoke"
@@ -1529,6 +1592,7 @@ fa:
   button_save_as: "ذخیره به عنوان"
   button_apply_changes: "Apply changes"
   button_save_back: "Save and back"
+  button_set_reminder: "Set reminder"
   button_show: "نمایش"
   button_sort: "مرتب‌سازی"
   button_submit: "ثبت کردن"
@@ -1734,12 +1798,12 @@ fa:
   direction: ltr
   ee:
     upsale:
+      title: "Enterprise add-on"
+      link_title: "More information"
       form_configuration:
         description: "Customize the form configuration with these additional add-ons:"
         add_groups: "Add new attribute groups"
         rename_groups: "Rename attributes groups"
-      project_filters:
-        description_html: "Filtering and sorting on custom fields is an Enterprise edition add-on."
   enumeration_activities: "Time tracking activities"
   enumeration_work_package_priorities: "Work package priorities"
   enumeration_reported_project_statuses: "Reported project status"
@@ -1772,6 +1836,7 @@ fa:
   error_pdf_export_too_many_columns: "Too many columns selected for the PDF export. Please reduce the number of columns."
   error_pdf_failed_to_export: "The PDF export could not be saved: %{error}"
   error_token_authenticity: "Unable to verify Cross-Site Request Forgery token. Did you try to submit data on multiple browsers or tabs? Please close all tabs and try again."
+  error_reminder_not_found: "The reminder was not found or was already notified about."
   error_work_package_not_found_in_project: "The work package was not found or does not belong to this project"
   error_work_package_id_not_found: "The work package was not found."
   error_must_be_project_member: "must be project member"
@@ -2065,6 +2130,7 @@ fa:
       responsible: "Accountable"
       shared: "Shared"
       watched: "ناظر"
+      reminder: "Reminder"
     facets:
       unread: "Unread"
       unread_title: "Show unread"
@@ -2232,8 +2298,10 @@ fa:
   label_default: "پیش‌فرض"
   label_delete_user: "حذف کاربر"
   label_delete_project: "Delete project"
+  label_delete: "Delete"
   label_deleted: "deleted"
   label_deleted_custom_field: "(deleted custom field)"
+  label_deleted_custom_item: "(deleted item)"
   label_deleted_custom_option: "(deleted option)"
   label_empty_element: "(empty)"
   label_missing_or_hidden_custom_option: "(missing value or lacking permissions to access)"
@@ -2270,7 +2338,6 @@ fa:
   label_enterprise_active_users: "%{current}/%{limit} booked active users"
   label_enterprise_edition: "Enterprise edition"
   label_enterprise_support: "Enterprise support"
-  label_enterprise_addon: "Enterprise add-on"
   label_environment: "Environment"
   label_estimates_and_progress: "Estimates and progress"
   label_equals: "is"
@@ -2455,6 +2522,7 @@ fa:
   label_none_parentheses: "(هیچ)"
   label_not_contains: "حاوی این مقدار نیست"
   label_not_equals: "نیست"
+  label_life_cycle_step_plural: "Project lifecycle"
   label_on: "برخط"
   label_operator_all: "is not empty"
   label_operator_none: "is empty"
@@ -2556,6 +2624,7 @@ fa:
   label_reporting: "Reporting"
   label_reporting_plural: "Reportings"
   label_repository: "Repository"
+  label_repository_remove: "Remove repository"
   label_repository_root: "Repository root"
   label_repository_plural: "Repositories"
   label_required: "required"
@@ -2618,6 +2687,7 @@ fa:
   label_this_month: "this month"
   label_this_week: "this week"
   label_this_year: "this year"
+  label_time: "Time"
   label_time_entry_plural: "زمان صرف شده"
   label_time_entry_activity_plural: "Spent time activities"
   label_title: "عنوان"
@@ -2653,6 +2723,7 @@ fa:
   label_user_settings: "User settings"
   label_users_settings: "Users settings"
   label_version_new: "New version"
+  label_version_edit: "Edit version"
   label_version_plural: "نسخه ها"
   label_version_sharing_descendants: "With subprojects"
   label_version_sharing_hierarchy: "With project hierarchy"
@@ -2790,8 +2861,13 @@ fa:
         prefix: "Received because of the notification setting: %{reason}"
         date_alert_start_date: "Date alert"
         date_alert_due_date: "Date alert"
+        reminder: "Reminder"
       see_all: "See all"
       updated_at: "Updated at %{timestamp} by %{user}"
+    reminder_notifications:
+      subject: "Reminder: %{note}"
+      heading: "You have a new reminder"
+      note: "Note: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "You may %{allowed_actions} this work package. This can change depending on your project role and permissions."
@@ -2958,6 +3034,7 @@ fa:
   notice_successful_connection: "Successful connection."
   notice_successful_create: "Successful creation."
   notice_successful_delete: "Successful deletion."
+  notice_successful_cancel: "Successful cancellation."
   notice_successful_update: "Successful update."
   notice_successful_update_custom_fields_added_to_project: |
     Successful update. The custom fields of the activated types are automatically activated
@@ -3035,6 +3112,7 @@ fa:
   permission_edit_own_time_entries: "Edit own time logs"
   permission_edit_project: "Edit project"
   permission_edit_project_attributes: "Edit project attributes"
+  permission_edit_project_stages_and_gates: "Edit project stages and gates"
   permission_edit_reportings: "Edit reportings"
   permission_edit_time_entries: "Edit time logs for other users"
   permission_edit_timelines: "Edit timelines"
@@ -3064,9 +3142,12 @@ fa:
   permission_search_project: "Search project"
   permission_select_custom_fields: "Select custom fields"
   permission_select_project_custom_fields: "Select project attributes"
+  permission_select_project_life_cycle: "Select project stages and gates"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "Select project modules"
   permission_share_work_packages: "Share work packages"
   permission_manage_types: "Select types"
+  permission_manage_own_reminders: "Create own reminders"
   permission_view_project: "View projects"
   permission_view_changesets: "View repository revisions in OpenProject"
   permission_view_commit_author_statistics: "View commit author statistics"
@@ -3087,6 +3168,7 @@ fa:
   permission_work_package_assigned_explanation: "Work packages can be assigned to users and groups in possession of this role in the respective project"
   permission_view_project_activity: "View project activity"
   permission_view_project_attributes: "View project attributes"
+  permission_view_project_stages_and_gates: "View project stages and gates"
   permission_save_bcf_queries: "Save BCF queries"
   permission_manage_public_bcf_queries: "Manage public BCF queries"
   permission_edit_attribute_help_texts: "Edit attribute help texts"
@@ -3767,6 +3849,12 @@ fa:
       edit_description: "Can view, comment and edit this work package."
       view: "مشاهده"
       view_description: "Can view this work package."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Why are you setting this reminder?"
+      success_creation_message: "Reminder set successfully. You will receive a notification for this work package at the chosen time."
+      success_update_message: "Reminder updated successfully."
+      success_deletion_message: "Reminder deleted successfully."
   sharing:
     count:
       zero: "0 users"
diff --git a/config/locales/crowdin/fi.yml b/config/locales/crowdin/fi.yml
index 5e674d6c12ef..cb14a7c3212d 100644
--- a/config/locales/crowdin/fi.yml
+++ b/config/locales/crowdin/fi.yml
@@ -343,6 +343,9 @@ fi:
         text: "This action will not delete any project the list contains. Are you sure you want to delete this project list?"
     settings:
       change_identifier: Change identifier
+      actions:
+        label_enable_all: "Enable all"
+        label_disable_all: "Disable all"
       activities:
         no_results_title_text: Ei tapahtumia.
       forums:
@@ -353,18 +356,26 @@ fi:
         no_results_content_text: Lisää uusi tehtäväluokka
       custom_fields:
         no_results_title_text: Tällä hetkellä ei ole mukautettuja kenttiä.
+      life_cycle:
+        header:
+          title: "Project lifecycle"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "Neither stages nor gates are currently defined."
+        section_header: "Stages and gates"
+        step:
+          use_in_project: "Use %{step} in this project"
+        filter:
+          label: "Search project stage or gate"
       project_custom_fields:
         header:
           title: "Project attributes"
-          description: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
+          description_html: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
         filter:
           label: "Search project attribute"
         actions:
           label_enable_single: "Active in this project, click to disable"
           label_disable_single: "Inactive in this project, click to enable"
           remove_from_project: "Remove from project"
-          label_enable_all: "Enable all"
-          label_disable_all: "Disable all"
         is_required_blank_slate:
           heading: Required in all projects
           description: This project attribute is activated in all projects since the "Required in all projects" option is checked. It cannot be deactivated for individual projects.
@@ -377,6 +388,10 @@ fi:
         no_results_content_text: Luo uusi versio
       storage:
         no_results_title_text: There is no additional recorded disk space consumed by this project.
+  project_stage:
+    working_days_count:
+      one: "Duration: %{count} working day"
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "The modified list has been saved as a new list"
@@ -497,8 +512,12 @@ fi:
     groups:
       member_in_these_groups: "This user is currently a member of the following groups:"
       no_results_title_text: This user is currently not a member in any group.
+      summary_with_more: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary: Member of %{names}.
     memberships:
       no_results_title_text: Tämä käyttäjä ei ole projektin jäsen.
+    open_profile: "Open profile"
   page:
     text: "Teksti"
   placeholder_users:
@@ -569,18 +588,27 @@ fi:
       no_results_title_text: Ei tyyppejä tällä hetkellä.
       no_results_content_text: Lisää uusi tyyppi
     edit:
-      settings: "Asetukset"
-      form_configuration: "Lomakkeen muokkaus"
+      form_configuration:
+        tab: "Form configuration"
       more_info_text_html: >
         Enterprise edition allows you to customize form configuration with these additional add-ons: <br> <ul class="%{list_styling_class}"> <li><b>Add new attribute groups</b></li> <li><b>Rename attribute groups</b></li> <li><b>Add a table of related work packages</b></li> </ul>
-      projects: "Projektit"
-      enabled_projects: "Enabled projects"
-      edit_query: "Muokkaa taulukkoa"
-      query_group_placeholder: "Anna taulukolle nimi"
-      reset: "Reset to defaults"
-      type_color_text: |
-        The selected color distinguishes different types
-        in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      projects:
+        tab: "Projects"
+        enabled_projects: "Enabled projects"
+      settings:
+        tab: "Settings"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Subject configuration"
+        manually_editable_subjects:
+          label: "Manually editable subjects"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automatically generated subjects"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Subject pattern"
+          caption: "Search for an attribute or add text. To create a space between elements add it as a text."
   versions:
     overview:
       work_packages_in_archived_projects: "The version is shared with archived projects which still have work packages assigned to this version. These are counted, but will not appear in the linked views."
@@ -643,6 +671,10 @@ fi:
     label_add_x: "Add %{x}"
     label_edit_x: "Edit %{x}"
     label_add_description: "Add description"
+    lag:
+      subject: "Lag"
+      title: "Lag (in days)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
       label_relates_singular: "related to"
       label_relates_plural: "related to"
@@ -847,6 +879,9 @@ fi:
         lag: "Lag"
         from: "Tehtävä"
         to: "Liittyy tehtävään"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Time"
       repository:
         url: "URL"
       role:
@@ -935,6 +970,7 @@ fi:
       messages:
         accepted: "täytyy olla hyväksytty."
         after: "on oltava myöhemmin kuin %{date}."
+        after_today: "must be in the future."
         after_or_equal_to: "on oltava %{date} tai myöhempi."
         before: "on oltava ennen %{date}."
         before_or_equal_to: "on oltava %{date} tai sitä ennen."
@@ -981,6 +1017,7 @@ fi:
         not_an_integer: "ei ole kokonaisluku."
         not_an_iso_date: "ei ole kelvollinen päivämäärä. Vaadittava muoto: VVVV-KK-PP."
         not_same_project: "ei kuulu samaan projektiin."
+        datetime_must_be_in_future: "must be in the future."
         odd: "täytyy olla pariton."
         regex_match_failed: "does not match the regular expression %{expression}."
         regex_invalid: "could not be validated with the associated regular expression."
@@ -1094,16 +1131,38 @@ fi:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "start date must be before the end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "is incomplete."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1320,6 +1379,8 @@ fi:
         other: "Notifications"
       placeholder_user: "Placeholder user"
       project: "Projekti"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         one: "Project list"
         other: "Project lists"
@@ -1423,6 +1484,7 @@ fi:
     login: "Käyttäjätunnus"
     mail: "Sähköposti"
     name: "Nimi"
+    note: "Note"
     password: "Salasana"
     priority: "Prioriteetti"
     project: "Projekti"
@@ -1519,6 +1581,7 @@ fi:
   button_print: "Tulosta"
   button_quote: "Siteeraa"
   button_remove: Poista
+  button_remove_reminder: "Remove reminder"
   button_rename: "Nimeä uudelleen"
   button_replace: "Korvaa"
   button_revoke: "Revoke"
@@ -1529,6 +1592,7 @@ fi:
   button_save_as: "Tallenna nimellä"
   button_apply_changes: "Apply changes"
   button_save_back: "Tallenna ja palaa"
+  button_set_reminder: "Set reminder"
   button_show: "Näytä"
   button_sort: "Järjestä"
   button_submit: "Lähetä"
@@ -1734,12 +1798,12 @@ fi:
   direction: ltr
   ee:
     upsale:
+      title: "Enterprise add-on"
+      link_title: "More information"
       form_configuration:
         description: "Customize the form configuration with these additional add-ons:"
         add_groups: "Add new attribute groups"
         rename_groups: "Rename attributes groups"
-      project_filters:
-        description_html: "Filtering and sorting on custom fields is an Enterprise edition add-on."
   enumeration_activities: "Ajanseurannan tapahtumat"
   enumeration_work_package_priorities: "Work package priorities"
   enumeration_reported_project_statuses: "Reported project status"
@@ -1772,6 +1836,7 @@ fi:
   error_pdf_export_too_many_columns: "Liikaa sarakkeita valittuina PDF-vientiin. Pienennä sarakkeiden määrää."
   error_pdf_failed_to_export: "The PDF export could not be saved: %{error}"
   error_token_authenticity: "Unable to verify Cross-Site Request Forgery token. Did you try to submit data on multiple browsers or tabs? Please close all tabs and try again."
+  error_reminder_not_found: "The reminder was not found or was already notified about."
   error_work_package_not_found_in_project: "Toimia paketti ei löydy tai ei kuulu tähän projektiin"
   error_work_package_id_not_found: "The work package was not found."
   error_must_be_project_member: "on oltava projekti jäsen"
@@ -2065,6 +2130,7 @@ fi:
       responsible: "Vastuuhenkilö"
       shared: "Shared"
       watched: "Seuraajat"
+      reminder: "Reminder"
     facets:
       unread: "Unread"
       unread_title: "Show unread"
@@ -2232,8 +2298,10 @@ fi:
   label_default: "Oletus"
   label_delete_user: "Poista käyttäjä"
   label_delete_project: "Poista projekti"
+  label_delete: "Delete"
   label_deleted: "poistettu"
   label_deleted_custom_field: "(poistettu mukautettu kenttä)"
+  label_deleted_custom_item: "(deleted item)"
   label_deleted_custom_option: "(deleted option)"
   label_empty_element: "(tyhjä)"
   label_missing_or_hidden_custom_option: "(missing value or lacking permissions to access)"
@@ -2270,7 +2338,6 @@ fi:
   label_enterprise_active_users: "%{current}/%{limit} booked active users"
   label_enterprise_edition: "Enterprise edition"
   label_enterprise_support: "Enterprise support"
-  label_enterprise_addon: "Enterprise add-on"
   label_environment: "Ympäristö"
   label_estimates_and_progress: "Estimates and progress"
   label_equals: "on"
@@ -2455,6 +2522,7 @@ fi:
   label_none_parentheses: "(none)"
   label_not_contains: "ei sisällä"
   label_not_equals: "ei ole"
+  label_life_cycle_step_plural: "Project lifecycle"
   label_on: "päälle"
   label_operator_all: "is not empty"
   label_operator_none: "is empty"
@@ -2556,6 +2624,7 @@ fi:
   label_reporting: "Raportoidaan"
   label_reporting_plural: "Raportit"
   label_repository: "Tietovarasto"
+  label_repository_remove: "Remove repository"
   label_repository_root: "Repository root"
   label_repository_plural: "Tietovarastot"
   label_required: "Required"
@@ -2618,6 +2687,7 @@ fi:
   label_this_month: "tässä kuussa"
   label_this_week: "tällä viikolla"
   label_this_year: "tänä vuonna"
+  label_time: "Time"
   label_time_entry_plural: "Käytetty aika"
   label_time_entry_activity_plural: "Spent time activities"
   label_title: "Otsikko"
@@ -2653,6 +2723,7 @@ fi:
   label_user_settings: "Käyttäjäasetukset"
   label_users_settings: "Users settings"
   label_version_new: "Uusi versio"
+  label_version_edit: "Edit version"
   label_version_plural: "Versiot"
   label_version_sharing_descendants: "Aliprojektien kanssa"
   label_version_sharing_hierarchy: "Projektihierarkian kanssa"
@@ -2790,8 +2861,13 @@ fi:
         prefix: "Received because of the notification setting: %{reason}"
         date_alert_start_date: "Date alert"
         date_alert_due_date: "Date alert"
+        reminder: "Reminder"
       see_all: "See all"
       updated_at: "Updated at %{timestamp} by %{user}"
+    reminder_notifications:
+      subject: "Reminder: %{note}"
+      heading: "You have a new reminder"
+      note: "Note: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "You may %{allowed_actions} this work package. This can change depending on your project role and permissions."
@@ -2958,6 +3034,7 @@ fi:
   notice_successful_connection: "Yhteyden muodostus onnistui."
   notice_successful_create: "Luonti onnistui."
   notice_successful_delete: "Poisto onnistui."
+  notice_successful_cancel: "Successful cancellation."
   notice_successful_update: "Päivitys onnistui."
   notice_successful_update_custom_fields_added_to_project: |
     Successful update. The custom fields of the activated types are automatically activated
@@ -3035,6 +3112,7 @@ fi:
   permission_edit_own_time_entries: "Muokka omia aikamerkintöjä"
   permission_edit_project: "Muokkaa projektia"
   permission_edit_project_attributes: "Edit project attributes"
+  permission_edit_project_stages_and_gates: "Edit project stages and gates"
   permission_edit_reportings: "Muokkaa raportointeja"
   permission_edit_time_entries: "Edit time logs for other users"
   permission_edit_timelines: "Muokkaa aikajanoja"
@@ -3064,9 +3142,12 @@ fi:
   permission_search_project: "Search project"
   permission_select_custom_fields: "Select custom fields"
   permission_select_project_custom_fields: "Select project attributes"
+  permission_select_project_life_cycle: "Select project stages and gates"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "Valitse projektin modulit"
   permission_share_work_packages: "Share work packages"
   permission_manage_types: "Valitse tyypit"
+  permission_manage_own_reminders: "Create own reminders"
   permission_view_project: "View projects"
   permission_view_changesets: "Näytä muutosryhmät"
   permission_view_commit_author_statistics: "Tarkastele tilastoja tekijöistä"
@@ -3087,6 +3168,7 @@ fi:
   permission_work_package_assigned_explanation: "Toimia paketti voidaan määrittää käyttäjät ja ryhmät hallussaan tämä rooli kunkin projekti"
   permission_view_project_activity: "View project activity"
   permission_view_project_attributes: "View project attributes"
+  permission_view_project_stages_and_gates: "View project stages and gates"
   permission_save_bcf_queries: "Save BCF queries"
   permission_manage_public_bcf_queries: "Manage public BCF queries"
   permission_edit_attribute_help_texts: "Edit attribute help texts"
@@ -3767,6 +3849,12 @@ fi:
       edit_description: "Can view, comment and edit this work package."
       view: "Näytä"
       view_description: "Can view this work package."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Why are you setting this reminder?"
+      success_creation_message: "Reminder set successfully. You will receive a notification for this work package at the chosen time."
+      success_update_message: "Reminder updated successfully."
+      success_deletion_message: "Reminder deleted successfully."
   sharing:
     count:
       zero: "0 users"
diff --git a/config/locales/crowdin/fil.yml b/config/locales/crowdin/fil.yml
index 721910969134..a468cd040b9b 100644
--- a/config/locales/crowdin/fil.yml
+++ b/config/locales/crowdin/fil.yml
@@ -343,6 +343,9 @@ fil:
         text: "This action will not delete any project the list contains. Are you sure you want to delete this project list?"
     settings:
       change_identifier: Change identifier
+      actions:
+        label_enable_all: "Enable all"
+        label_disable_all: "Disable all"
       activities:
         no_results_title_text: Sa kasalukuyan ay walang mga aktibidad na available.
       forums:
@@ -353,18 +356,26 @@ fil:
         no_results_content_text: Gumawa ng bagong work package na kategorya
       custom_fields:
         no_results_title_text: Sa kasalukuyan ay walang mga custom field na available.
+      life_cycle:
+        header:
+          title: "Project lifecycle"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "Neither stages nor gates are currently defined."
+        section_header: "Stages and gates"
+        step:
+          use_in_project: "Use %{step} in this project"
+        filter:
+          label: "Search project stage or gate"
       project_custom_fields:
         header:
           title: "Project attributes"
-          description: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
+          description_html: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
         filter:
           label: "Search project attribute"
         actions:
           label_enable_single: "Active in this project, click to disable"
           label_disable_single: "Inactive in this project, click to enable"
           remove_from_project: "Remove from project"
-          label_enable_all: "Enable all"
-          label_disable_all: "Disable all"
         is_required_blank_slate:
           heading: Required in all projects
           description: This project attribute is activated in all projects since the "Required in all projects" option is checked. It cannot be deactivated for individual projects.
@@ -377,6 +388,10 @@ fil:
         no_results_content_text: Gumawa ng bagong bersyon
       storage:
         no_results_title_text: There is no additional recorded disk space consumed by this project.
+  project_stage:
+    working_days_count:
+      one: "Duration: %{count} working day"
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "The modified list has been saved as a new list"
@@ -497,8 +512,12 @@ fil:
     groups:
       member_in_these_groups: "This user is currently a member of the following groups:"
       no_results_title_text: This user is currently not a member in any group.
+      summary_with_more: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary: Member of %{names}.
     memberships:
       no_results_title_text: Ang user na ito ay kasalukuyang hindi myembro ng proyekto.
+    open_profile: "Open profile"
   page:
     text: "Teksto"
   placeholder_users:
@@ -569,18 +588,27 @@ fil:
       no_results_title_text: Sa kasalukuyan ay walang mga uri.
       no_results_content_text: Gumawa ng bagong uri
     edit:
-      settings: "Mga setting"
-      form_configuration: "Form kompigurasyon"
+      form_configuration:
+        tab: "Form configuration"
       more_info_text_html: >
         Enterprise edition allows you to customize form configuration with these additional add-ons: <br> <ul class="%{list_styling_class}"> <li><b>Add new attribute groups</b></li> <li><b>Rename attribute groups</b></li> <li><b>Add a table of related work packages</b></li> </ul>
-      projects: "Mga proyekto"
-      enabled_projects: "Paganahin ang mga proyekto"
-      edit_query: "Edit table"
-      query_group_placeholder: "Give the table a name"
-      reset: "I-reset sa mga default"
-      type_color_text: |
-        The selected color distinguishes different types
-        in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      projects:
+        tab: "Projects"
+        enabled_projects: "Enabled projects"
+      settings:
+        tab: "Settings"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Subject configuration"
+        manually_editable_subjects:
+          label: "Manually editable subjects"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automatically generated subjects"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Subject pattern"
+          caption: "Search for an attribute or add text. To create a space between elements add it as a text."
   versions:
     overview:
       work_packages_in_archived_projects: "The version is shared with archived projects which still have work packages assigned to this version. These are counted, but will not appear in the linked views."
@@ -643,6 +671,10 @@ fil:
     label_add_x: "Add %{x}"
     label_edit_x: "Edit %{x}"
     label_add_description: "Add description"
+    lag:
+      subject: "Lag"
+      title: "Lag (in days)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
       label_relates_singular: "related to"
       label_relates_plural: "related to"
@@ -847,6 +879,9 @@ fil:
         lag: "Lag"
         from: "Work package"
         to: "Ang kaugnayan sa pakete na ginagawa"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Time"
       repository:
         url: "Ang URL"
       role:
@@ -935,6 +970,7 @@ fil:
       messages:
         accepted: "kailangang tanggapin."
         after: "dapat ay matapos %{date}."
+        after_today: "must be in the future."
         after_or_equal_to: "dapat ay matapos o katumbas sa %{date}."
         before: "dapat ay bago ang %{date}."
         before_or_equal_to: "dapat ay bago o katumbas sa %{date}."
@@ -981,6 +1017,7 @@ fil:
         not_an_integer: "ay hindi integer."
         not_an_iso_date: "ay hindi balido ang petsa. Ang kinakailangan format: YYYY-MM-DD."
         not_same_project: "ay hindi nabibilang sa parehong proyekto."
+        datetime_must_be_in_future: "must be in the future."
         odd: "dapat ay kakaiba."
         regex_match_failed: "does not match the regular expression %{expression}."
         regex_invalid: "hindi pwedeng mapatunayan sa nauugnay na mga regular na ekspresyon."
@@ -1094,16 +1131,38 @@ fil:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "start date must be before the end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "is incomplete."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1320,6 +1379,8 @@ fil:
         other: "Notifications"
       placeholder_user: "Placeholder user"
       project: "Proyekto"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         one: "Project list"
         other: "Project lists"
@@ -1423,6 +1484,7 @@ fil:
     login: "Username"
     mail: "Email"
     name: "Pangalan"
+    note: "Note"
     password: "Password"
     priority: "Ang prayoridad"
     project: "Proyekto"
@@ -1519,6 +1581,7 @@ fil:
   button_print: "I-print"
   button_quote: "Quote"
   button_remove: Tanggalin
+  button_remove_reminder: "Remove reminder"
   button_rename: "Baguhin ang pangalan"
   button_replace: "Palitan"
   button_revoke: "Revoke"
@@ -1529,6 +1592,7 @@ fil:
   button_save_as: "I-save bilang"
   button_apply_changes: "Apply changes"
   button_save_back: "I-save at bumalik"
+  button_set_reminder: "Set reminder"
   button_show: "Ipakita"
   button_sort: "Ayusin"
   button_submit: "Sumite"
@@ -1734,12 +1798,12 @@ fil:
   direction: ltr
   ee:
     upsale:
+      title: "Enterprise add-on"
+      link_title: "More information"
       form_configuration:
         description: "Customize the form configuration with these additional add-ons:"
         add_groups: "Magdgdag ng mga bagong attribute na grupo"
         rename_groups: "Palitan ng pangalan ang mga grupong attribute"
-      project_filters:
-        description_html: "Filtering and sorting on custom fields is an Enterprise edition add-on."
   enumeration_activities: "Time tracking activities"
   enumeration_work_package_priorities: "Ang mga prioridad ng work package"
   enumeration_reported_project_statuses: "Estado ng inuulat na proyekto"
@@ -1772,6 +1836,7 @@ fil:
   error_pdf_export_too_many_columns: "Masyadong maraming hanay ang napili para sa PDF export. Mangyaring bawasan ang mga bilang ng hanay."
   error_pdf_failed_to_export: "The PDF export could not be saved: %{error}"
   error_token_authenticity: "Unable to verify Cross-Site Request Forgery token. Did you try to submit data on multiple browsers or tabs? Please close all tabs and try again."
+  error_reminder_not_found: "The reminder was not found or was already notified about."
   error_work_package_not_found_in_project: "Ang work package ay hindi natagpuan o hindi kabilang sa proyektong ito"
   error_work_package_id_not_found: "The work package was not found."
   error_must_be_project_member: "dapat ay miyembro ng proyekto"
@@ -2065,6 +2130,7 @@ fil:
       responsible: "Accountable"
       shared: "Shared"
       watched: "Tagapagmasid"
+      reminder: "Reminder"
     facets:
       unread: "Unread"
       unread_title: "Show unread"
@@ -2232,8 +2298,10 @@ fil:
   label_default: "Default"
   label_delete_user: "Burahin ang gumagamit"
   label_delete_project: "Burahin ang proyekto"
+  label_delete: "Delete"
   label_deleted: "binura"
   label_deleted_custom_field: "(binurang custom field)"
+  label_deleted_custom_item: "(deleted item)"
   label_deleted_custom_option: "(deleted option)"
   label_empty_element: "(walang laman)"
   label_missing_or_hidden_custom_option: "(missing value or lacking permissions to access)"
@@ -2270,7 +2338,6 @@ fil:
   label_enterprise_active_users: "%{current}/%{limit} booked active users"
   label_enterprise_edition: "Enterprise edition"
   label_enterprise_support: "Enterprise support"
-  label_enterprise_addon: "Enterprise add-on"
   label_environment: "Kalikasan"
   label_estimates_and_progress: "Estimates and progress"
   label_equals: "ay"
@@ -2455,6 +2522,7 @@ fil:
   label_none_parentheses: "(wala)"
   label_not_contains: "hindi naglalaman"
   label_not_equals: "ay hindi"
+  label_life_cycle_step_plural: "Project lifecycle"
   label_on: "sa"
   label_operator_all: "is not empty"
   label_operator_none: "is empty"
@@ -2556,6 +2624,7 @@ fil:
   label_reporting: "Inuulat"
   label_reporting_plural: "Mga inuulat"
   label_repository: "Repositoryo"
+  label_repository_remove: "Remove repository"
   label_repository_root: "Repository root"
   label_repository_plural: "Mga repositoryo"
   label_required: "kailangan"
@@ -2618,6 +2687,7 @@ fil:
   label_this_month: "ngayong buwan"
   label_this_week: "ngayong semana"
   label_this_year: "ngayong taon"
+  label_time: "Time"
   label_time_entry_plural: "Nauubos na oras"
   label_time_entry_activity_plural: "Spent time activities"
   label_title: "Pamagat"
@@ -2653,6 +2723,7 @@ fil:
   label_user_settings: "User settings"
   label_users_settings: "Users settings"
   label_version_new: "Bagong bersyon"
+  label_version_edit: "Edit version"
   label_version_plural: "Mga bersyon"
   label_version_sharing_descendants: "Kasama ang mga subproject"
   label_version_sharing_hierarchy: "Sa proyektong hierarchy"
@@ -2790,8 +2861,13 @@ fil:
         prefix: "Received because of the notification setting: %{reason}"
         date_alert_start_date: "Date alert"
         date_alert_due_date: "Date alert"
+        reminder: "Reminder"
       see_all: "See all"
       updated_at: "Updated at %{timestamp} by %{user}"
+    reminder_notifications:
+      subject: "Reminder: %{note}"
+      heading: "You have a new reminder"
+      note: "Note: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "You may %{allowed_actions} this work package. This can change depending on your project role and permissions."
@@ -2958,6 +3034,7 @@ fil:
   notice_successful_connection: "Matagumpay na ikonekta."
   notice_successful_create: "Matagumpay pagkalikha."
   notice_successful_delete: "Matagumpay ang pagtanggal."
+  notice_successful_cancel: "Successful cancellation."
   notice_successful_update: "Matagumpay nai-update."
   notice_successful_update_custom_fields_added_to_project: |
     Successful update. The custom fields of the activated types are automatically activated
@@ -3035,6 +3112,7 @@ fil:
   permission_edit_own_time_entries: "I-edit ang mga log ng oras"
   permission_edit_project: "I-edit ang proyekto"
   permission_edit_project_attributes: "Edit project attributes"
+  permission_edit_project_stages_and_gates: "Edit project stages and gates"
   permission_edit_reportings: "I- edit ang mga ulat"
   permission_edit_time_entries: "Edit time logs for other users"
   permission_edit_timelines: "I-edit ang mga timeline"
@@ -3064,9 +3142,12 @@ fil:
   permission_search_project: "Search project"
   permission_select_custom_fields: "Select custom fields"
   permission_select_project_custom_fields: "Select project attributes"
+  permission_select_project_life_cycle: "Select project stages and gates"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "Piliin ang mga proyektong modyul"
   permission_share_work_packages: "Share work packages"
   permission_manage_types: "Pumili ng mga uri"
+  permission_manage_own_reminders: "Create own reminders"
   permission_view_project: "View projects"
   permission_view_changesets: "Tingnan ang mga repository revision ng OpenProject"
   permission_view_commit_author_statistics: "Tanawin ang commit"
@@ -3087,6 +3168,7 @@ fil:
   permission_work_package_assigned_explanation: "Ang mga work package ay maaring nakatalaga sa mga gumagamit at grupo sa possesyon ng tungkulin na ito sa nakatalagang proyekto"
   permission_view_project_activity: "View project activity"
   permission_view_project_attributes: "View project attributes"
+  permission_view_project_stages_and_gates: "View project stages and gates"
   permission_save_bcf_queries: "Save BCF queries"
   permission_manage_public_bcf_queries: "Manage public BCF queries"
   permission_edit_attribute_help_texts: "Edit attribute help texts"
@@ -3765,6 +3847,12 @@ fil:
       edit_description: "Can view, comment and edit this work package."
       view: "Tingnan"
       view_description: "Can view this work package."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Why are you setting this reminder?"
+      success_creation_message: "Reminder set successfully. You will receive a notification for this work package at the chosen time."
+      success_update_message: "Reminder updated successfully."
+      success_deletion_message: "Reminder deleted successfully."
   sharing:
     count:
       zero: "0 users"
diff --git a/config/locales/crowdin/fr.yml b/config/locales/crowdin/fr.yml
index 1345cab44503..b5ce2b1a57e5 100644
--- a/config/locales/crowdin/fr.yml
+++ b/config/locales/crowdin/fr.yml
@@ -343,6 +343,9 @@ fr:
         text: "Cette action ne supprimera aucun projet contenu dans la liste. Voulez-vous vraiment supprimer cette liste de projets ?"
     settings:
       change_identifier: Changer l'identifiant
+      actions:
+        label_enable_all: "Activer tout"
+        label_disable_all: "Désactiver tout"
       activities:
         no_results_title_text: Aucune activité disponible pour le moment.
       forums:
@@ -353,18 +356,26 @@ fr:
         no_results_content_text: Créer une nouvelle catégorie de lots de travaux
       custom_fields:
         no_results_title_text: Il n'y a actuellement aucun champ personnalisé disponible.
+      life_cycle:
+        header:
+          title: "Cycle de vie du projet"
+          description_html: 'Ces étapes et portes du cycle de vie du projet seront affichés dans votre <a href=%{overview_url} target="_blank">page d''aperçu du projet</a> et sont définis dans les <a href=%{admin_settings_url} target="_blank">paramètres d''administration</a> par l''administrateur de l''instance. Vous pouvez activer ou désactiver des attributs individuels.'
+        non_defined: "Ni les étapes ni les portes ne sont actuellement définies."
+        section_header: "Étapes et portes"
+        step:
+          use_in_project: "Utiliser %{step} dans ce projet"
+        filter:
+          label: "Recherche d'une étape ou d'une porte de projet"
       project_custom_fields:
         header:
           title: "Attributs du projet"
-          description: 'Ces attributs de projet seront affichés dans votre <a href=%{overview_url} target="_blank">page d''aperçu du projet</a> sous leurs sections respectives. Vous pouvez activer ou désactiver des attributs individuels. Les attributs et les sections du projet sont définis dans les <a href=%{admin_settings_url} target="_blank">paramètres d''administration</a> par l''administrateur de l''instance. '
+          description_html: 'Ces attributs de projet seront affichés dans votre <a href=%{overview_url} target="_blank">page d''aperçu du projet</a> sous leurs sections respectives. Vous pouvez activer ou désactiver des attributs individuels. Les attributs et les sections du projet sont définis dans les <a href=%{admin_settings_url} target="_blank">paramètres d''administration</a> par l''administrateur de l''instance. '
         filter:
           label: "Rechercher un attribut de projet"
         actions:
           label_enable_single: "Actif dans ce projet, cliquez pour le désactiver"
           label_disable_single: "Inactif dans ce projet, cliquez pour l'activer"
           remove_from_project: "Supprimer du projet"
-          label_enable_all: "Activer tout"
-          label_disable_all: "Désactiver tout"
         is_required_blank_slate:
           heading: Requis dans tous les projets
           description: Cet attribut de projet est activé dans tous les projets, car l'option « Requis dans tous les projets » est cochée. Il ne peut pas être désactivé pour des projets individuels.
@@ -377,6 +388,10 @@ fr:
         no_results_content_text: Créer une nouvelle version
       storage:
         no_results_title_text: Il n'y a pas d'espace disque supplémentaire utilisé par ce projet.
+  project_stage:
+    working_days_count:
+      one: "Durée : %{count} jour ouvrable"
+      other: "Durée : %{count} jours ouvrables"
   lists:
     create:
       success: "La liste modifiée a été enregistrée en tant que nouvelle liste"
@@ -497,8 +512,12 @@ fr:
     groups:
       member_in_these_groups: "Cet utilisateur est actuellement membre des groupes suivants :"
       no_results_title_text: Cet utilisateur n'est actuellement membre d'aucun groupe.
+      summary_with_more: Membre de %{names} et %{count_link}.
+      more: "%{count} de plus"
+      summary: Membre de %{names}.
     memberships:
       no_results_title_text: Cet utilisateur n'est membre d'aucun projet pour le moment.
+    open_profile: "Ouvrir le profil"
   page:
     text: "Texte"
   placeholder_users:
@@ -567,18 +586,27 @@ fr:
       no_results_title_text: Il n'y a actuellement aucun type.
       no_results_content_text: Créer un nouveau type
     edit:
-      settings: "Paramètres"
-      form_configuration: "Configuration du formulaire"
+      form_configuration:
+        tab: "Configuration du formulaire"
       more_info_text_html: >
         L'édition Entreprise vous permet de personnaliser la configuration du formulaire avec ces add-ons supplémentaires : <br> <ul class="%{list_styling_class}"> <li><b>Ajouter de nouveaux groupes d'attributs</b></li> <li><b>Renommer les groupes d'attributs</b></li> <li><b>Ajouter une table des lots de travaux connexes</b></li> </ul>
-      projects: "Projets"
-      enabled_projects: "Projets activés"
-      edit_query: "Modifier le tableau"
-      query_group_placeholder: "Donner un nom au tableau"
-      reset: "Rétablir les valeurs par défaut"
-      type_color_text: |
-        La couleur sélectionnée distingue différents types
-        dans les graphiques de Gantt ou les tables des lots de travaux. Il est donc recommandé d'utiliser une couleur forte.
+      projects:
+        tab: "Projets"
+        enabled_projects: "Projets activés"
+      settings:
+        tab: "Paramètres"
+        type_color_text: La couleur sélectionnée distingue les différents types dans les graphiques de Gantt ou les tableaux des lots de travaux. Il est donc recommandé d'utiliser une couleur forte.
+      subject_configuration:
+        tab: "Configuration du sujet"
+        manually_editable_subjects:
+          label: "Sujets modifiables manuellement"
+          caption: "Les utilisateurs peuvent saisir et modifier manuellement les sujets des lots de travaux sans restrictions."
+        automatically_generated_subjects:
+          label: "Sujets générés automatiquement"
+          caption: "Définissez un modèle utilisant des attributs et du texte référencés pour générer automatiquement des sujets de lots de travaux. Les utilisateurs ne pourront pas modifier manuellement les sujets."
+        pattern:
+          label: "Modèle de sujet"
+          caption: "Recherchez un attribut ou ajoutez du texte. Pour créer un espace entre les éléments, ajoutez-le en tant que texte."
   versions:
     overview:
       work_packages_in_archived_projects: "La version est partagée avec les projets archivés qui ont encore des lots de travaux assignés à cette version. Ils sont comptés, mais n'apparaîtront pas dans les vues liées."
@@ -641,6 +669,10 @@ fr:
     label_add_x: "Ajouter %{x}"
     label_edit_x: "Modifier %{x}"
     label_add_description: "Ajouter une description"
+    lag:
+      subject: "Délai"
+      title: "Délai (en jours)"
+      caption: "Le nombre minimum de jours ouvrables à respecter entre les deux lots de travaux."
     relations:
       label_relates_singular: "lié à"
       label_relates_plural: "liés à"
@@ -656,7 +688,7 @@ fr:
       follows_description: "Le lot de travaux lié doit nécessairement se terminer avant que celui-ci puisse commencer"
       label_child_singular: "enfant"
       label_child_plural: "enfants"
-      child_description: "Makes the related work package a sub-item of the current (parent) work package"
+      child_description: "Fait du lot de travaux lié un sous-élément du lot de travaux actuel (parent)"
       label_blocks_singular: "blocs"
       label_blocks_plural: "blocs"
       blocks_description: "Le lot de travaux associé ne peut pas être fermé avant que celui-ci soit fermé en premier"
@@ -845,6 +877,9 @@ fr:
         lag: "Délai"
         from: "Lot de travaux"
         to: "Lot de travaux associé"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Heure "
       repository:
         url: "URL"
       role:
@@ -933,6 +968,7 @@ fr:
       messages:
         accepted: "doi(ven)t être accepté(e)(s)."
         after: "doit être après %{date}."
+        after_today: "doit se situer dans le futur."
         after_or_equal_to: "Doit être après ou égal à %{date}."
         before: "doit être antérieur(e) à %{date}."
         before_or_equal_to: "doit être antérieur(e) ou égal(e) à %{date}."
@@ -979,6 +1015,7 @@ fr:
         not_an_integer: "n'est pas un entier."
         not_an_iso_date: "n’est pas une date valide. Format requis : AAAA-MM-JJ."
         not_same_project: "n'appartient pas au même projet."
+        datetime_must_be_in_future: "doit se situer dans le futur."
         odd: "doit être impair."
         regex_match_failed: "ne correspond pas à l'expression régulière %{expression}."
         regex_invalid: "n’a pas pu être validé avec l’expression régulière associée."
@@ -1092,16 +1129,38 @@ fr:
           attributes:
             type:
               must_be_a_stage_or_gate: "doit être soit Project::StageDefinition soit Project::GateDefinition"
+              type_and_class_name_mismatch: "doit correspondre au nom de la classe instanciée"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "doit être un Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "doit être un Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "doit être soit Project::Stage soit Project::Gate"
               must_be_a_stage: "doit être un Project::Stage"
               must_be_a_gate: "doit être un Project::Gate"
+              type_and_class_name_mismatch: "doit correspondre au nom de la classe instanciée"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Impossible d'affecter `end_date` à un Project::Gate"
+              end_date_not_allowed: "Impossible d'assigner une date de fin à un Project::Gate"
+            type:
+              type_and_class_name_mismatch: "doit être un Project::Gate"
+            date:
+              non_continuous_dates: "ne peut pas être antérieure à la date de fin (%{step} précédente)."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "la date de début doit être antérieure à la date de fin."
+              non_continuous_dates: "ne peut pas être antérieure à la date de fin (%{step} précédente)."
+              incomplete: "est incomplet."
+            type:
+              type_and_class_name_mismatch: "doit être un Project::Stage"
         query:
           attributes:
             project:
@@ -1318,6 +1377,8 @@ fr:
         other: "Notifications"
       placeholder_user: "Utilisateur de remplacement"
       project: "Projet"
+      project/gate_definition: "Porte"
+      project/stage_definition: "Étape"
       project_query:
         one: "Liste de projets"
         other: "Listes de projets"
@@ -1421,6 +1482,7 @@ fr:
     login: "Nom d'utilisateur"
     mail: "E-mail"
     name: "Nom"
+    note: "Note"
     password: "Mot de passe"
     priority: "Priorité"
     project: "Projet"
@@ -1517,6 +1579,7 @@ fr:
   button_print: "Imprimer"
   button_quote: "Citer"
   button_remove: Supprimer
+  button_remove_reminder: "Supprimer le rappel"
   button_rename: "Renommer"
   button_replace: "Remplacer"
   button_revoke: "Révoquer"
@@ -1527,6 +1590,7 @@ fr:
   button_save_as: "Enregistrer sous"
   button_apply_changes: "Appliquer les modifications"
   button_save_back: "Enregistrer et revenir"
+  button_set_reminder: "Définir un rappel"
   button_show: "Afficher"
   button_sort: "Trier"
   button_submit: "Envoyer"
@@ -1732,12 +1796,12 @@ fr:
   direction: de gauche à droite
   ee:
     upsale:
+      title: "Add-on Enterprise"
+      link_title: "Plus d'informations"
       form_configuration:
         description: "Personnaliser la configuration du formulaire avec ces add-ons supplémentaires :"
         add_groups: "Ajouter de nouveaux groupes d’attributs"
         rename_groups: "Renommer les groupes d’attributs"
-      project_filters:
-        description_html: "Le filtrage et le tri sur les champs personnalisés sont un add-on de l'édition Entreprise."
   enumeration_activities: "Activités de suivi du temps"
   enumeration_work_package_priorities: "Priorités du Lot de Travaux"
   enumeration_reported_project_statuses: "Statuts de projet signalés"
@@ -1770,6 +1834,7 @@ fr:
   error_pdf_export_too_many_columns: "Trop de colonnes sélectionnées pour l’exportation PDF. Veuillez réduire le nombre de colonnes."
   error_pdf_failed_to_export: "L'export PDF n'a pas pu être enregistré: %{error}"
   error_token_authenticity: "Impossible de vérifier le jeton de Cross-Site Request Forgery. Avez-vous essayé d'envoyer des données sur plusieurs navigateurs ou onglets ? Veuillez fermer tous les onglets et réessayer."
+  error_reminder_not_found: "Le rappel n'a pas été trouvé ou a déjà été notifié."
   error_work_package_not_found_in_project: "Le Lot de Travaux n'a pas été trouvé ou n'appartient pas à ce projet"
   error_work_package_id_not_found: "Le lot de travaux n'a pas été trouvé."
   error_must_be_project_member: "doit être membre du projet"
@@ -2063,6 +2128,7 @@ fr:
       responsible: "Responsable"
       shared: "Partagé"
       watched: "Observateur"
+      reminder: "Rappel"
     facets:
       unread: "Non lu"
       unread_title: "Afficher les messages non lus"
@@ -2230,8 +2296,10 @@ fr:
   label_default: "défaut"
   label_delete_user: "Supprimer l’utilisateur"
   label_delete_project: "Supprimer le projet"
+  label_delete: "Supprimer"
   label_deleted: "supprimé"
   label_deleted_custom_field: "(champs personnalisés supprimés)"
+  label_deleted_custom_item: "(élément supprimé)"
   label_deleted_custom_option: "(option supprimée)"
   label_empty_element: "(vide)"
   label_missing_or_hidden_custom_option: "(valeur manquante ou manque d'autorisations d'accès)"
@@ -2268,7 +2336,6 @@ fr:
   label_enterprise_active_users: "%{current}/%{limit} utilisateurs actifs inscrits"
   label_enterprise_edition: "Version Entreprise"
   label_enterprise_support: "Support Enterprise"
-  label_enterprise_addon: "add-on Enterprise"
   label_environment: "Environement"
   label_estimates_and_progress: "Estimations et progression"
   label_equals: "est"
@@ -2453,6 +2520,7 @@ fr:
   label_none_parentheses: "(none)"
   label_not_contains: "ne contient pas"
   label_not_equals: "n'est pas"
+  label_life_cycle_step_plural: "Cycle de vie du projet"
   label_on: "le"
   label_operator_all: "n'est pas vide"
   label_operator_none: "est vide"
@@ -2554,6 +2622,7 @@ fr:
   label_reporting: "Rapport"
   label_reporting_plural: "Rapports"
   label_repository: "Référentiel"
+  label_repository_remove: "Supprimer le dépôt"
   label_repository_root: "Racine du dépôt"
   label_repository_plural: "Dépôts"
   label_required: "requis"
@@ -2616,6 +2685,7 @@ fr:
   label_this_month: "ce mois"
   label_this_week: "cette semaine"
   label_this_year: "cette année"
+  label_time: "Heure "
   label_time_entry_plural: "Temps passé"
   label_time_entry_activity_plural: "Activités du temps passé"
   label_title: "Titre"
@@ -2651,6 +2721,7 @@ fr:
   label_user_settings: "Paramètres de l'utilisateur"
   label_users_settings: "Paramètres des utilisateurs"
   label_version_new: "Nouvelle version"
+  label_version_edit: "Modifier la version"
   label_version_plural: "Versions"
   label_version_sharing_descendants: "Avec sous-projets"
   label_version_sharing_hierarchy: "Avec hiérarchie du projet"
@@ -2788,8 +2859,13 @@ fr:
         prefix: "Reçu en raison du paramètre de notification : %{reason}"
         date_alert_start_date: "Alarmes"
         date_alert_due_date: "Alarmes"
+        reminder: "Rappel"
       see_all: "Voir tout"
       updated_at: "Mis à jour le %{timestamp} par %{user}"
+    reminder_notifications:
+      subject: "Rappel : %{note}"
+      heading: "Vous avez un nouveau rappel"
+      note: "Note : « %{note} »"
     sharing:
       work_packages:
         allowed_actions: "Vous pouvez %{allowed_actions} ce lot de travaux. Cela peut changer en fonction de votre rôle dans le projet et de vos droits."
@@ -2956,6 +3032,7 @@ fr:
   notice_successful_connection: "Connection réussie."
   notice_successful_create: "Création réussie."
   notice_successful_delete: "Suppression réussie."
+  notice_successful_cancel: "Annulation réussie."
   notice_successful_update: "Mise à jour réussie."
   notice_successful_update_custom_fields_added_to_project: |
     Mise à jour réussie. Les champs personnalisés des types activés sont automatiquement activés
@@ -3033,6 +3110,7 @@ fr:
   permission_edit_own_time_entries: "Éditer mes propres enregistrements de temps"
   permission_edit_project: "Éditer le projet"
   permission_edit_project_attributes: "Modifier les attributs du projet"
+  permission_edit_project_stages_and_gates: "Modifier les étapes et les portes du projet"
   permission_edit_reportings: "Éditer rapports"
   permission_edit_time_entries: "Modifier les journaux de temps pour les autres utilisateurs"
   permission_edit_timelines: "Éditer les lignes du temps"
@@ -3062,9 +3140,12 @@ fr:
   permission_search_project: "Rechercher un projet"
   permission_select_custom_fields: "Sélectionner les champs personnalisés"
   permission_select_project_custom_fields: "Sélectionner les attributs du projet"
+  permission_select_project_life_cycle: "Sélectionner les étapes et les portes du projet"
+  permission_select_project_life_cycle_explanation: "Activer/désactiver les étapes et les portes d'un projet. Permet à l'utilisateur de sélectionner le cycle de vie approprié pour le projet, car les étapes et les portes inactives ne seront pas visibles dans la page de présentation du projet ni dans la liste des projets."
   permission_select_project_modules: "Sélectionner modules de projet"
   permission_share_work_packages: "Partager des lots de travaux"
   permission_manage_types: "Sélectionner types"
+  permission_manage_own_reminders: "Créer des rappels personnalisés"
   permission_view_project: "Voir les projets"
   permission_view_changesets: "Voir révisions du dépôt dans OpenProject"
   permission_view_commit_author_statistics: "Voir les statistiques des auteurs de «commit»"
@@ -3085,6 +3166,7 @@ fr:
   permission_work_package_assigned_explanation: "Des lots de travaux peuvent être assignés à des utilisateurs et des groupes possédant ce rôle dans le projet respectif"
   permission_view_project_activity: "Visualisation de l'activité du projet"
   permission_view_project_attributes: "Voir les attributs du projet"
+  permission_view_project_stages_and_gates: "Voir les étapes et les portes du projet"
   permission_save_bcf_queries: "Enregistrer les requêtes BCF"
   permission_manage_public_bcf_queries: "Gérer les requêtes publiques BCF"
   permission_edit_attribute_help_texts: "Modifier les textes d'aide des attributs"
@@ -3764,6 +3846,12 @@ fr:
       edit_description: "Peut consulter, commenter et modifier ce lot de travaux."
       view: "Voir"
       view_description: "Peut consulter ce lot de travaux."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Pourquoi définissez-vous ce rappel ?"
+      success_creation_message: "Le rappel a été défini avec succès. Vous recevrez une notification pour ce lot de travaux au moment choisi."
+      success_update_message: "Rappel mis à jour avec succès."
+      success_deletion_message: "Rappel supprimé avec succès."
   sharing:
     count:
       zero: "0 utilisateur"
diff --git a/config/locales/crowdin/he.yml b/config/locales/crowdin/he.yml
index 571f486d9ea4..c2ab82dd858f 100644
--- a/config/locales/crowdin/he.yml
+++ b/config/locales/crowdin/he.yml
@@ -343,6 +343,9 @@ he:
         text: "This action will not delete any project the list contains. Are you sure you want to delete this project list?"
     settings:
       change_identifier: Change identifier
+      actions:
+        label_enable_all: "Enable all"
+        label_disable_all: "Disable all"
       activities:
         no_results_title_text: There are currently no activities available.
       forums:
@@ -353,18 +356,26 @@ he:
         no_results_content_text: Create a new work package category
       custom_fields:
         no_results_title_text: אין כרגע שדות מותאמים אישית.
+      life_cycle:
+        header:
+          title: "Project lifecycle"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "Neither stages nor gates are currently defined."
+        section_header: "Stages and gates"
+        step:
+          use_in_project: "Use %{step} in this project"
+        filter:
+          label: "Search project stage or gate"
       project_custom_fields:
         header:
           title: "Project attributes"
-          description: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
+          description_html: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
         filter:
           label: "Search project attribute"
         actions:
           label_enable_single: "Active in this project, click to disable"
           label_disable_single: "Inactive in this project, click to enable"
           remove_from_project: "Remove from project"
-          label_enable_all: "Enable all"
-          label_disable_all: "Disable all"
         is_required_blank_slate:
           heading: Required in all projects
           description: This project attribute is activated in all projects since the "Required in all projects" option is checked. It cannot be deactivated for individual projects.
@@ -377,6 +388,12 @@ he:
         no_results_content_text: Create a new version
       storage:
         no_results_title_text: There is no additional recorded disk space consumed by this project.
+  project_stage:
+    working_days_count:
+      one: "Duration: %{count} working day"
+      two: "Duration: %{count} working days"
+      many: "Duration: %{count} working days"
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "The modified list has been saved as a new list"
@@ -509,8 +526,12 @@ he:
     groups:
       member_in_these_groups: "This user is currently a member of the following groups:"
       no_results_title_text: This user is currently not a member in any group.
+      summary_with_more: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary: Member of %{names}.
     memberships:
       no_results_title_text: This user is currently not a member of a project.
+    open_profile: "Open profile"
   page:
     text: "טקסט"
   placeholder_users:
@@ -583,18 +604,27 @@ he:
       no_results_title_text: There are currently no types.
       no_results_content_text: ליצור סוג חדש
     edit:
-      settings: "הגדרות"
-      form_configuration: "Form configuration"
+      form_configuration:
+        tab: "Form configuration"
       more_info_text_html: >
         Enterprise edition allows you to customize form configuration with these additional add-ons: <br> <ul class="%{list_styling_class}"> <li><b>Add new attribute groups</b></li> <li><b>Rename attribute groups</b></li> <li><b>Add a table of related work packages</b></li> </ul>
-      projects: "פרויקטים"
-      enabled_projects: "Enabled projects"
-      edit_query: "Edit table"
-      query_group_placeholder: "Give the table a name"
-      reset: "Reset to defaults"
-      type_color_text: |
-        The selected color distinguishes different types
-        in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      projects:
+        tab: "Projects"
+        enabled_projects: "Enabled projects"
+      settings:
+        tab: "Settings"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Subject configuration"
+        manually_editable_subjects:
+          label: "Manually editable subjects"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automatically generated subjects"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Subject pattern"
+          caption: "Search for an attribute or add text. To create a space between elements add it as a text."
   versions:
     overview:
       work_packages_in_archived_projects: "The version is shared with archived projects which still have work packages assigned to this version. These are counted, but will not appear in the linked views."
@@ -659,6 +689,10 @@ he:
     label_add_x: "Add %{x}"
     label_edit_x: "Edit %{x}"
     label_add_description: "Add description"
+    lag:
+      subject: "Lag"
+      title: "Lag (in days)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
       label_relates_singular: "related to"
       label_relates_plural: "related to"
@@ -863,6 +897,9 @@ he:
         lag: "Lag"
         from: "חבילת עבודה"
         to: "חבילת עבודה קשורה"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Time"
       repository:
         url: "כתובת URL"
       role:
@@ -951,6 +988,7 @@ he:
       messages:
         accepted: "must be accepted."
         after: "must be after %{date}."
+        after_today: "must be in the future."
         after_or_equal_to: "must be after or equal to %{date}."
         before: "must be before %{date}."
         before_or_equal_to: "must be before or equal to %{date}."
@@ -997,6 +1035,7 @@ he:
         not_an_integer: "is not an integer."
         not_an_iso_date: "is not a valid date. Required format: YYYY-MM-DD."
         not_same_project: "doesn't belong to the same project."
+        datetime_must_be_in_future: "must be in the future."
         odd: "must be odd."
         regex_match_failed: "does not match the regular expression %{expression}."
         regex_invalid: "could not be validated with the associated regular expression."
@@ -1110,16 +1149,38 @@ he:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "start date must be before the end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "is incomplete."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1342,6 +1403,8 @@ he:
         other: "Notifications"
       placeholder_user: "Placeholder user"
       project: "פרוייקט"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         one: "Project list"
         two: "Project lists"
@@ -1459,6 +1522,7 @@ he:
     login: "Username"
     mail: "אימייל"
     name: "שם"
+    note: "Note"
     password: "סיסמה"
     priority: "עדיפות"
     project: "פרוייקט"
@@ -1555,6 +1619,7 @@ he:
   button_print: "Print"
   button_quote: "צטט"
   button_remove: Remove
+  button_remove_reminder: "Remove reminder"
   button_rename: "שינוי שם"
   button_replace: "Replace"
   button_revoke: "Revoke"
@@ -1565,6 +1630,7 @@ he:
   button_save_as: "שמירה בשם"
   button_apply_changes: "Apply changes"
   button_save_back: "Save and back"
+  button_set_reminder: "Set reminder"
   button_show: "הצג"
   button_sort: "מיין"
   button_submit: "שלח"
@@ -1806,12 +1872,12 @@ he:
   direction: משמאל לימין
   ee:
     upsale:
+      title: "Enterprise add-on"
+      link_title: "More information"
       form_configuration:
         description: "Customize the form configuration with these additional add-ons:"
         add_groups: "Add new attribute groups"
         rename_groups: "Rename attributes groups"
-      project_filters:
-        description_html: "Filtering and sorting on custom fields is an Enterprise edition add-on."
   enumeration_activities: "Time tracking activities"
   enumeration_work_package_priorities: "עדיפויות חבילת עבודה"
   enumeration_reported_project_statuses: "סטטוסים של הפרויקט המדווח"
@@ -1844,6 +1910,7 @@ he:
   error_pdf_export_too_many_columns: "Too many columns selected for the PDF export. Please reduce the number of columns."
   error_pdf_failed_to_export: "The PDF export could not be saved: %{error}"
   error_token_authenticity: "Unable to verify Cross-Site Request Forgery token. Did you try to submit data on multiple browsers or tabs? Please close all tabs and try again."
+  error_reminder_not_found: "The reminder was not found or was already notified about."
   error_work_package_not_found_in_project: "חבילת העבודה לא נמצאה או לא שייכת לפרוייקט זה"
   error_work_package_id_not_found: "The work package was not found."
   error_must_be_project_member: "חייב להיות חבר בפרוייקט"
@@ -2137,6 +2204,7 @@ he:
       responsible: "Accountable"
       shared: "Shared"
       watched: "צופה"
+      reminder: "Reminder"
     facets:
       unread: "Unread"
       unread_title: "Show unread"
@@ -2304,8 +2372,10 @@ he:
   label_default: "ברירת מחדל"
   label_delete_user: "Delete user"
   label_delete_project: "Delete project"
+  label_delete: "Delete"
   label_deleted: "נמחק"
   label_deleted_custom_field: "(למחוק שדה מותאם אישית)"
+  label_deleted_custom_item: "(deleted item)"
   label_deleted_custom_option: "(deleted option)"
   label_empty_element: "(empty)"
   label_missing_or_hidden_custom_option: "(missing value or lacking permissions to access)"
@@ -2342,7 +2412,6 @@ he:
   label_enterprise_active_users: "%{current}/%{limit} booked active users"
   label_enterprise_edition: "Enterprise edition"
   label_enterprise_support: "Enterprise support"
-  label_enterprise_addon: "Enterprise add-on"
   label_environment: "סביבה"
   label_estimates_and_progress: "Estimates and progress"
   label_equals: "הינו"
@@ -2527,6 +2596,7 @@ he:
   label_none_parentheses: "(none)"
   label_not_contains: "doesn't contain"
   label_not_equals: "is not"
+  label_life_cycle_step_plural: "Project lifecycle"
   label_on: "פועל"
   label_operator_all: "is not empty"
   label_operator_none: "is empty"
@@ -2628,6 +2698,7 @@ he:
   label_reporting: "Reporting"
   label_reporting_plural: "Reportings"
   label_repository: "Repository"
+  label_repository_remove: "Remove repository"
   label_repository_root: "Repository root"
   label_repository_plural: "Repositories"
   label_required: "required"
@@ -2690,6 +2761,7 @@ he:
   label_this_month: "החודש"
   label_this_week: "השבוע"
   label_this_year: "this year"
+  label_time: "Time"
   label_time_entry_plural: "זמן שבוזבז"
   label_time_entry_activity_plural: "Spent time activities"
   label_title: "כותרת"
@@ -2725,6 +2797,7 @@ he:
   label_user_settings: "User settings"
   label_users_settings: "Users settings"
   label_version_new: "גרסה חדשה"
+  label_version_edit: "Edit version"
   label_version_plural: "גירסאות"
   label_version_sharing_descendants: "With subprojects"
   label_version_sharing_hierarchy: "With project hierarchy"
@@ -2864,8 +2937,13 @@ he:
         prefix: "Received because of the notification setting: %{reason}"
         date_alert_start_date: "Date alert"
         date_alert_due_date: "Date alert"
+        reminder: "Reminder"
       see_all: "See all"
       updated_at: "Updated at %{timestamp} by %{user}"
+    reminder_notifications:
+      subject: "Reminder: %{note}"
+      heading: "You have a new reminder"
+      note: "Note: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "You may %{allowed_actions} this work package. This can change depending on your project role and permissions."
@@ -3032,6 +3110,7 @@ he:
   notice_successful_connection: "Successful connection."
   notice_successful_create: "Successful creation."
   notice_successful_delete: "Successful deletion."
+  notice_successful_cancel: "Successful cancellation."
   notice_successful_update: "Successful update."
   notice_successful_update_custom_fields_added_to_project: |
     Successful update. The custom fields of the activated types are automatically activated
@@ -3111,6 +3190,7 @@ he:
   permission_edit_own_time_entries: "Edit own time logs"
   permission_edit_project: "Edit project"
   permission_edit_project_attributes: "Edit project attributes"
+  permission_edit_project_stages_and_gates: "Edit project stages and gates"
   permission_edit_reportings: "Edit reportings"
   permission_edit_time_entries: "Edit time logs for other users"
   permission_edit_timelines: "Edit timelines"
@@ -3140,9 +3220,12 @@ he:
   permission_search_project: "Search project"
   permission_select_custom_fields: "Select custom fields"
   permission_select_project_custom_fields: "Select project attributes"
+  permission_select_project_life_cycle: "Select project stages and gates"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "Select project modules"
   permission_share_work_packages: "Share work packages"
   permission_manage_types: "Select types"
+  permission_manage_own_reminders: "Create own reminders"
   permission_view_project: "View projects"
   permission_view_changesets: "View repository revisions in OpenProject"
   permission_view_commit_author_statistics: "View commit author statistics"
@@ -3163,6 +3246,7 @@ he:
   permission_work_package_assigned_explanation: "Work packages can be assigned to users and groups in possession of this role in the respective project"
   permission_view_project_activity: "View project activity"
   permission_view_project_attributes: "View project attributes"
+  permission_view_project_stages_and_gates: "View project stages and gates"
   permission_save_bcf_queries: "Save BCF queries"
   permission_manage_public_bcf_queries: "Manage public BCF queries"
   permission_edit_attribute_help_texts: "Edit attribute help texts"
@@ -3845,6 +3929,12 @@ he:
       edit_description: "Can view, comment and edit this work package."
       view: "תצוגה"
       view_description: "Can view this work package."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Why are you setting this reminder?"
+      success_creation_message: "Reminder set successfully. You will receive a notification for this work package at the chosen time."
+      success_update_message: "Reminder updated successfully."
+      success_deletion_message: "Reminder deleted successfully."
   sharing:
     count:
       zero: "0 users"
diff --git a/config/locales/crowdin/hi.yml b/config/locales/crowdin/hi.yml
index 0d46401ee6e4..b9b26c66c7bd 100644
--- a/config/locales/crowdin/hi.yml
+++ b/config/locales/crowdin/hi.yml
@@ -343,6 +343,9 @@ hi:
         text: "This action will not delete any project the list contains. Are you sure you want to delete this project list?"
     settings:
       change_identifier: Change identifier
+      actions:
+        label_enable_all: "Enable all"
+        label_disable_all: "Disable all"
       activities:
         no_results_title_text: There are currently no activities available.
       forums:
@@ -353,18 +356,26 @@ hi:
         no_results_content_text: Create a new work package category
       custom_fields:
         no_results_title_text: There are currently no custom fields available.
+      life_cycle:
+        header:
+          title: "Project lifecycle"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "Neither stages nor gates are currently defined."
+        section_header: "Stages and gates"
+        step:
+          use_in_project: "Use %{step} in this project"
+        filter:
+          label: "Search project stage or gate"
       project_custom_fields:
         header:
           title: "Project attributes"
-          description: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
+          description_html: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
         filter:
           label: "Search project attribute"
         actions:
           label_enable_single: "Active in this project, click to disable"
           label_disable_single: "Inactive in this project, click to enable"
           remove_from_project: "Remove from project"
-          label_enable_all: "Enable all"
-          label_disable_all: "Disable all"
         is_required_blank_slate:
           heading: Required in all projects
           description: This project attribute is activated in all projects since the "Required in all projects" option is checked. It cannot be deactivated for individual projects.
@@ -377,6 +388,10 @@ hi:
         no_results_content_text: Create a new version
       storage:
         no_results_title_text: There is no additional recorded disk space consumed by this project.
+  project_stage:
+    working_days_count:
+      one: "Duration: %{count} working day"
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "The modified list has been saved as a new list"
@@ -497,8 +512,12 @@ hi:
     groups:
       member_in_these_groups: "This user is currently a member of the following groups:"
       no_results_title_text: This user is currently not a member in any group.
+      summary_with_more: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary: Member of %{names}.
     memberships:
       no_results_title_text: This user is currently not a member of a project.
+    open_profile: "Open profile"
   page:
     text: "टेक्स्ट"
   placeholder_users:
@@ -567,18 +586,27 @@ hi:
       no_results_title_text: There are currently no types.
       no_results_content_text: Create a new type
     edit:
-      settings: "Settings"
-      form_configuration: "Form configuration"
+      form_configuration:
+        tab: "Form configuration"
       more_info_text_html: >
         Enterprise edition allows you to customize form configuration with these additional add-ons: <br> <ul class="%{list_styling_class}"> <li><b>Add new attribute groups</b></li> <li><b>Rename attribute groups</b></li> <li><b>Add a table of related work packages</b></li> </ul>
-      projects: "Projects"
-      enabled_projects: "Enabled projects"
-      edit_query: "Edit table"
-      query_group_placeholder: "Give the table a name"
-      reset: "Reset to defaults"
-      type_color_text: |
-        The selected color distinguishes different types
-        in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      projects:
+        tab: "Projects"
+        enabled_projects: "Enabled projects"
+      settings:
+        tab: "Settings"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Subject configuration"
+        manually_editable_subjects:
+          label: "Manually editable subjects"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automatically generated subjects"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Subject pattern"
+          caption: "Search for an attribute or add text. To create a space between elements add it as a text."
   versions:
     overview:
       work_packages_in_archived_projects: "The version is shared with archived projects which still have work packages assigned to this version. These are counted, but will not appear in the linked views."
@@ -641,6 +669,10 @@ hi:
     label_add_x: "Add %{x}"
     label_edit_x: "Edit %{x}"
     label_add_description: "Add description"
+    lag:
+      subject: "Lag"
+      title: "Lag (in days)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
       label_relates_singular: "related to"
       label_relates_plural: "related to"
@@ -845,6 +877,9 @@ hi:
         lag: "Lag"
         from: "कार्य पैकेज"
         to: "संबंधित कार्य पैकेज"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Time"
       repository:
         url: "यू आर एल"
       role:
@@ -933,6 +968,7 @@ hi:
       messages:
         accepted: "must be accepted."
         after: "must be after %{date}."
+        after_today: "must be in the future."
         after_or_equal_to: "must be after or equal to %{date}."
         before: "must be before %{date}."
         before_or_equal_to: "must be before or equal to %{date}."
@@ -979,6 +1015,7 @@ hi:
         not_an_integer: "is not an integer."
         not_an_iso_date: "is not a valid date. Required format: YYYY-MM-DD."
         not_same_project: "doesn't belong to the same project."
+        datetime_must_be_in_future: "must be in the future."
         odd: "must be odd."
         regex_match_failed: "does not match the regular expression %{expression}."
         regex_invalid: "could not be validated with the associated regular expression."
@@ -1092,16 +1129,38 @@ hi:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "start date must be before the end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "is incomplete."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1318,6 +1377,8 @@ hi:
         other: "Notifications"
       placeholder_user: "Placeholder user"
       project: "परियोजना"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         one: "Project list"
         other: "Project lists"
@@ -1421,6 +1482,7 @@ hi:
     login: "Username"
     mail: "ईमेल"
     name: "नाम"
+    note: "Note"
     password: "पासवर्ड"
     priority: "वरीयता"
     project: "परियोजना"
@@ -1517,6 +1579,7 @@ hi:
   button_print: "Print"
   button_quote: "उद्धरण"
   button_remove: Remove
+  button_remove_reminder: "Remove reminder"
   button_rename: "नाम बदलें"
   button_replace: "Replace"
   button_revoke: "Revoke"
@@ -1527,6 +1590,7 @@ hi:
   button_save_as: "के रूप में सहेजें..."
   button_apply_changes: "Apply changes"
   button_save_back: "Save and back"
+  button_set_reminder: "Set reminder"
   button_show: "दिखाएँ"
   button_sort: "क्रम में लगायें"
   button_submit: "सबमिट करें"
@@ -1732,12 +1796,12 @@ hi:
   direction: ltr
   ee:
     upsale:
+      title: "Enterprise add-on"
+      link_title: "More information"
       form_configuration:
         description: "Customize the form configuration with these additional add-ons:"
         add_groups: "Add new attribute groups"
         rename_groups: "Rename attributes groups"
-      project_filters:
-        description_html: "Filtering and sorting on custom fields is an Enterprise edition add-on."
   enumeration_activities: "Time tracking activities"
   enumeration_work_package_priorities: "Work package priorities"
   enumeration_reported_project_statuses: "रिपोर्ट की गई प्रोजेक्ट स्थिति"
@@ -1770,6 +1834,7 @@ hi:
   error_pdf_export_too_many_columns: "Too many columns selected for the PDF export. Please reduce the number of columns."
   error_pdf_failed_to_export: "The PDF export could not be saved: %{error}"
   error_token_authenticity: "क्रॉस-साइट अनुरोध जालसाज़ी टोकन सत्यापित करने में असमर्थ । क्या आपने एकाधिक ब्राउज़र्स या टैब पर डेटा सबमिट करने का प्रयास किया है? कृपया सभी टैब बंद करें और पुन: प्रयास करे ।"
+  error_reminder_not_found: "The reminder was not found or was already notified about."
   error_work_package_not_found_in_project: "कार्य पैकेज नहीं मिला, या इस प्रोजेक्ट से संबंधित नहीं है"
   error_work_package_id_not_found: "The work package was not found."
   error_must_be_project_member: "प्रोजेक्ट सदस्य होना जरूरी है"
@@ -2063,6 +2128,7 @@ hi:
       responsible: "जवाबदेह"
       shared: "Shared"
       watched: "वॉचर"
+      reminder: "Reminder"
     facets:
       unread: "Unread"
       unread_title: "Show unread"
@@ -2230,8 +2296,10 @@ hi:
   label_default: "Default"
   label_delete_user: "Delete user"
   label_delete_project: "Delete project"
+  label_delete: "Delete"
   label_deleted: "deleted"
   label_deleted_custom_field: "(deleted custom field)"
+  label_deleted_custom_item: "(deleted item)"
   label_deleted_custom_option: "(deleted option)"
   label_empty_element: "(empty)"
   label_missing_or_hidden_custom_option: "(missing value or lacking permissions to access)"
@@ -2268,7 +2336,6 @@ hi:
   label_enterprise_active_users: "%{current}/%{limit} booked active users"
   label_enterprise_edition: "Enterprise edition"
   label_enterprise_support: "Enterprise support"
-  label_enterprise_addon: "Enterprise add-on"
   label_environment: "Environment"
   label_estimates_and_progress: "Estimates and progress"
   label_equals: "is"
@@ -2453,6 +2520,7 @@ hi:
   label_none_parentheses: "(none)"
   label_not_contains: "शामिल नहीं है"
   label_not_equals: "नहीं है"
+  label_life_cycle_step_plural: "Project lifecycle"
   label_on: "पर"
   label_operator_all: "is not empty"
   label_operator_none: "is empty"
@@ -2554,6 +2622,7 @@ hi:
   label_reporting: "Reporting"
   label_reporting_plural: "Reportings"
   label_repository: "Repository"
+  label_repository_remove: "Remove repository"
   label_repository_root: "Repository root"
   label_repository_plural: "Repositories"
   label_required: "required"
@@ -2616,6 +2685,7 @@ hi:
   label_this_month: "इस महीने"
   label_this_week: "इस सप्ताह"
   label_this_year: "इस वर्ष"
+  label_time: "Time"
   label_time_entry_plural: "समय बिताया"
   label_time_entry_activity_plural: "Spent time activities"
   label_title: "शीर्षक"
@@ -2651,6 +2721,7 @@ hi:
   label_user_settings: "User settings"
   label_users_settings: "Users settings"
   label_version_new: "New version"
+  label_version_edit: "Edit version"
   label_version_plural: "संस्करण"
   label_version_sharing_descendants: "With subprojects"
   label_version_sharing_hierarchy: "With project hierarchy"
@@ -2788,8 +2859,13 @@ hi:
         prefix: "Received because of the notification setting: %{reason}"
         date_alert_start_date: "Date alert"
         date_alert_due_date: "Date alert"
+        reminder: "Reminder"
       see_all: "See all"
       updated_at: "Updated at %{timestamp} by %{user}"
+    reminder_notifications:
+      subject: "Reminder: %{note}"
+      heading: "You have a new reminder"
+      note: "Note: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "You may %{allowed_actions} this work package. This can change depending on your project role and permissions."
@@ -2956,6 +3032,7 @@ hi:
   notice_successful_connection: "Successful connection."
   notice_successful_create: "Successful creation."
   notice_successful_delete: "Successful deletion."
+  notice_successful_cancel: "Successful cancellation."
   notice_successful_update: "Successful update."
   notice_successful_update_custom_fields_added_to_project: |
     Successful update. The custom fields of the activated types are automatically activated
@@ -3033,6 +3110,7 @@ hi:
   permission_edit_own_time_entries: "Edit own time logs"
   permission_edit_project: "Edit project"
   permission_edit_project_attributes: "Edit project attributes"
+  permission_edit_project_stages_and_gates: "Edit project stages and gates"
   permission_edit_reportings: "Edit reportings"
   permission_edit_time_entries: "Edit time logs for other users"
   permission_edit_timelines: "Edit timelines"
@@ -3062,9 +3140,12 @@ hi:
   permission_search_project: "Search project"
   permission_select_custom_fields: "Select custom fields"
   permission_select_project_custom_fields: "Select project attributes"
+  permission_select_project_life_cycle: "Select project stages and gates"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "Select project modules"
   permission_share_work_packages: "Share work packages"
   permission_manage_types: "Select types"
+  permission_manage_own_reminders: "Create own reminders"
   permission_view_project: "View projects"
   permission_view_changesets: "View repository revisions in OpenProject"
   permission_view_commit_author_statistics: "View commit author statistics"
@@ -3085,6 +3166,7 @@ hi:
   permission_work_package_assigned_explanation: "Work packages can be assigned to users and groups in possession of this role in the respective project"
   permission_view_project_activity: "View project activity"
   permission_view_project_attributes: "View project attributes"
+  permission_view_project_stages_and_gates: "View project stages and gates"
   permission_save_bcf_queries: "Save BCF queries"
   permission_manage_public_bcf_queries: "Manage public BCF queries"
   permission_edit_attribute_help_texts: "Edit attribute help texts"
@@ -3765,6 +3847,12 @@ hi:
       edit_description: "Can view, comment and edit this work package."
       view: "दृश्य"
       view_description: "Can view this work package."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Why are you setting this reminder?"
+      success_creation_message: "Reminder set successfully. You will receive a notification for this work package at the chosen time."
+      success_update_message: "Reminder updated successfully."
+      success_deletion_message: "Reminder deleted successfully."
   sharing:
     count:
       zero: "0 users"
diff --git a/config/locales/crowdin/hr.yml b/config/locales/crowdin/hr.yml
index b2482be431d2..7a7cd09f0ea6 100644
--- a/config/locales/crowdin/hr.yml
+++ b/config/locales/crowdin/hr.yml
@@ -343,6 +343,9 @@ hr:
         text: "This action will not delete any project the list contains. Are you sure you want to delete this project list?"
     settings:
       change_identifier: Change identifier
+      actions:
+        label_enable_all: "Enable all"
+        label_disable_all: "Disable all"
       activities:
         no_results_title_text: Trenutno nema dostupnih aktivnosti.
       forums:
@@ -353,18 +356,26 @@ hr:
         no_results_content_text: Nova kategorija za radni paket
       custom_fields:
         no_results_title_text: Trenutno nije dostupno niti jedno prilagođeno polje.
+      life_cycle:
+        header:
+          title: "Project lifecycle"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "Neither stages nor gates are currently defined."
+        section_header: "Stages and gates"
+        step:
+          use_in_project: "Use %{step} in this project"
+        filter:
+          label: "Search project stage or gate"
       project_custom_fields:
         header:
           title: "Project attributes"
-          description: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
+          description_html: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
         filter:
           label: "Search project attribute"
         actions:
           label_enable_single: "Active in this project, click to disable"
           label_disable_single: "Inactive in this project, click to enable"
           remove_from_project: "Remove from project"
-          label_enable_all: "Enable all"
-          label_disable_all: "Disable all"
         is_required_blank_slate:
           heading: Required in all projects
           description: This project attribute is activated in all projects since the "Required in all projects" option is checked. It cannot be deactivated for individual projects.
@@ -377,6 +388,11 @@ hr:
         no_results_content_text: Dodaj novu verziju projekta
       storage:
         no_results_title_text: There is no additional recorded disk space consumed by this project.
+  project_stage:
+    working_days_count:
+      one: "Duration: %{count} working day"
+      few: "Duration: %{count} working days"
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "The modified list has been saved as a new list"
@@ -503,8 +519,12 @@ hr:
     groups:
       member_in_these_groups: "This user is currently a member of the following groups:"
       no_results_title_text: This user is currently not a member in any group.
+      summary_with_more: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary: Member of %{names}.
     memberships:
       no_results_title_text: Korisnik trenutno nije član projekta.
+    open_profile: "Open profile"
   page:
     text: "Tekst"
   placeholder_users:
@@ -576,18 +596,27 @@ hr:
       no_results_title_text: Trenutno ne postoji niti jedan tip projekta.
       no_results_content_text: Novi tip
     edit:
-      settings: "Postavke"
-      form_configuration: "Form configuration"
+      form_configuration:
+        tab: "Form configuration"
       more_info_text_html: >
         Enterprise edition allows you to customize form configuration with these additional add-ons: <br> <ul class="%{list_styling_class}"> <li><b>Add new attribute groups</b></li> <li><b>Rename attribute groups</b></li> <li><b>Add a table of related work packages</b></li> </ul>
-      projects: "Projekti"
-      enabled_projects: "Omogućeni projekti"
-      edit_query: "Edit table"
-      query_group_placeholder: "Give the table a name"
-      reset: "Reset to defaults"
-      type_color_text: |
-        The selected color distinguishes different types
-        in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      projects:
+        tab: "Projects"
+        enabled_projects: "Enabled projects"
+      settings:
+        tab: "Settings"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Subject configuration"
+        manually_editable_subjects:
+          label: "Manually editable subjects"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automatically generated subjects"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Subject pattern"
+          caption: "Search for an attribute or add text. To create a space between elements add it as a text."
   versions:
     overview:
       work_packages_in_archived_projects: "The version is shared with archived projects which still have work packages assigned to this version. These are counted, but will not appear in the linked views."
@@ -651,6 +680,10 @@ hr:
     label_add_x: "Add %{x}"
     label_edit_x: "Edit %{x}"
     label_add_description: "Add description"
+    lag:
+      subject: "Lag"
+      title: "Lag (in days)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
       label_relates_singular: "related to"
       label_relates_plural: "related to"
@@ -855,6 +888,9 @@ hr:
         lag: "Lag"
         from: "Radni paket"
         to: "Pripadajući radni paket"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Time"
       repository:
         url: "URL"
       role:
@@ -943,6 +979,7 @@ hr:
       messages:
         accepted: "mora biti prihvaćeno."
         after: "mora biti nakon %{date}."
+        after_today: "must be in the future."
         after_or_equal_to: "mora biti nakon ili jednako %{date}."
         before: "mora biti prije %{date}."
         before_or_equal_to: "mora biti prije ili jednako %{date}."
@@ -989,6 +1026,7 @@ hr:
         not_an_integer: "nije tip podatka integer."
         not_an_iso_date: "is not a valid date. Required format: YYYY-MM-DD."
         not_same_project: "ne pripada istom projektu."
+        datetime_must_be_in_future: "must be in the future."
         odd: "mora biti neparan."
         regex_match_failed: "does not match the regular expression %{expression}."
         regex_invalid: "could not be validated with the associated regular expression."
@@ -1102,16 +1140,38 @@ hr:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "start date must be before the end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "is incomplete."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1331,6 +1391,8 @@ hr:
         other: "Notifications"
       placeholder_user: "Placeholder user"
       project: "Projekt"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         one: "Project list"
         few: "Project lists"
@@ -1441,6 +1503,7 @@ hr:
     login: "Korisničko ime"
     mail: "Email"
     name: "Naziv"
+    note: "Note"
     password: "Lozinka"
     priority: "Prioritet"
     project: "Projekt"
@@ -1537,6 +1600,7 @@ hr:
   button_print: "Ispis"
   button_quote: "Citiraj"
   button_remove: Ukloni
+  button_remove_reminder: "Remove reminder"
   button_rename: "Preimenuj"
   button_replace: "Zamijeni"
   button_revoke: "Revoke"
@@ -1547,6 +1611,7 @@ hr:
   button_save_as: "Spremiti kao"
   button_apply_changes: "Apply changes"
   button_save_back: "Snimi i vratiti"
+  button_set_reminder: "Set reminder"
   button_show: "Prikaži"
   button_sort: "Sortiraj"
   button_submit: "Pošalji"
@@ -1770,12 +1835,12 @@ hr:
   direction: ltr
   ee:
     upsale:
+      title: "Enterprise add-on"
+      link_title: "More information"
       form_configuration:
         description: "Customize the form configuration with these additional add-ons:"
         add_groups: "Add new attribute groups"
         rename_groups: "Rename attributes groups"
-      project_filters:
-        description_html: "Filtering and sorting on custom fields is an Enterprise edition add-on."
   enumeration_activities: "Time tracking activities"
   enumeration_work_package_priorities: "Prioriteti radnog paketa"
   enumeration_reported_project_statuses: "Priopćeni statusi projekta"
@@ -1808,6 +1873,7 @@ hr:
   error_pdf_export_too_many_columns: "Too many columns selected for the PDF export. Please reduce the number of columns."
   error_pdf_failed_to_export: "The PDF export could not be saved: %{error}"
   error_token_authenticity: "Unable to verify Cross-Site Request Forgery token. Did you try to submit data on multiple browsers or tabs? Please close all tabs and try again."
+  error_reminder_not_found: "The reminder was not found or was already notified about."
   error_work_package_not_found_in_project: "Radni paket nije pronađen ili ne pripada ovom projektu"
   error_work_package_id_not_found: "The work package was not found."
   error_must_be_project_member: "mora biti član projekta"
@@ -2101,6 +2167,7 @@ hr:
       responsible: "Accountable"
       shared: "Shared"
       watched: "Nadglednik"
+      reminder: "Reminder"
     facets:
       unread: "Unread"
       unread_title: "Show unread"
@@ -2268,8 +2335,10 @@ hr:
   label_default: "Zadana vrijednost"
   label_delete_user: "Delete user"
   label_delete_project: "Delete project"
+  label_delete: "Delete"
   label_deleted: "izbrisano"
   label_deleted_custom_field: "(izbrisano prilagođeno polje)"
+  label_deleted_custom_item: "(deleted item)"
   label_deleted_custom_option: "(deleted option)"
   label_empty_element: "(prazno)"
   label_missing_or_hidden_custom_option: "(missing value or lacking permissions to access)"
@@ -2306,7 +2375,6 @@ hr:
   label_enterprise_active_users: "%{current}/%{limit} booked active users"
   label_enterprise_edition: "Enterprise edition"
   label_enterprise_support: "Enterprise support"
-  label_enterprise_addon: "Enterprise add-on"
   label_environment: "Okruženje"
   label_estimates_and_progress: "Estimates and progress"
   label_equals: "je"
@@ -2491,6 +2559,7 @@ hr:
   label_none_parentheses: "(nijedan)"
   label_not_contains: "ne sadrži"
   label_not_equals: "nije"
+  label_life_cycle_step_plural: "Project lifecycle"
   label_on: "na"
   label_operator_all: "is not empty"
   label_operator_none: "is empty"
@@ -2592,6 +2661,7 @@ hr:
   label_reporting: "Izvještavanje"
   label_reporting_plural: "Izvještavanja"
   label_repository: "Repozitorij"
+  label_repository_remove: "Remove repository"
   label_repository_root: "Izvršni repozitorij"
   label_repository_plural: "Repozitoriji"
   label_required: "potrebne"
@@ -2654,6 +2724,7 @@ hr:
   label_this_month: "ovaj mjesec"
   label_this_week: "ovog tjedna"
   label_this_year: "ove godine"
+  label_time: "Time"
   label_time_entry_plural: "Utrošeno vrijeme"
   label_time_entry_activity_plural: "Spent time activities"
   label_title: "Naziv"
@@ -2689,6 +2760,7 @@ hr:
   label_user_settings: "User settings"
   label_users_settings: "Users settings"
   label_version_new: "Nova verzija"
+  label_version_edit: "Edit version"
   label_version_plural: "Verzije"
   label_version_sharing_descendants: "S podprojektima"
   label_version_sharing_hierarchy: "S hijerarhijom projekta"
@@ -2827,8 +2899,13 @@ hr:
         prefix: "Received because of the notification setting: %{reason}"
         date_alert_start_date: "Date alert"
         date_alert_due_date: "Date alert"
+        reminder: "Reminder"
       see_all: "See all"
       updated_at: "Updated at %{timestamp} by %{user}"
+    reminder_notifications:
+      subject: "Reminder: %{note}"
+      heading: "You have a new reminder"
+      note: "Note: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "You may %{allowed_actions} this work package. This can change depending on your project role and permissions."
@@ -2995,6 +3072,7 @@ hr:
   notice_successful_connection: "Uspješna spojen."
   notice_successful_create: "Uspješno kreirano."
   notice_successful_delete: "Brisanje uspješno."
+  notice_successful_cancel: "Successful cancellation."
   notice_successful_update: "Ažuriranje je uspješno završeno."
   notice_successful_update_custom_fields_added_to_project: |
     Successful update. The custom fields of the activated types are automatically activated
@@ -3073,6 +3151,7 @@ hr:
   permission_edit_own_time_entries: "Uređivanje vaših zapisa o vremenu"
   permission_edit_project: "Uredi projekt"
   permission_edit_project_attributes: "Edit project attributes"
+  permission_edit_project_stages_and_gates: "Edit project stages and gates"
   permission_edit_reportings: "Uredi izvješćivanje"
   permission_edit_time_entries: "Edit time logs for other users"
   permission_edit_timelines: "Uredi kronologiju"
@@ -3102,9 +3181,12 @@ hr:
   permission_search_project: "Search project"
   permission_select_custom_fields: "Select custom fields"
   permission_select_project_custom_fields: "Select project attributes"
+  permission_select_project_life_cycle: "Select project stages and gates"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "Odaberi module projekta"
   permission_share_work_packages: "Share work packages"
   permission_manage_types: "Odaberi tipove"
+  permission_manage_own_reminders: "Create own reminders"
   permission_view_project: "View projects"
   permission_view_changesets: "Pogledaj revizije za repozitorij unutar OpenProjecta"
   permission_view_commit_author_statistics: "Pogledaj statistiku commitanja autora"
@@ -3125,6 +3207,7 @@ hr:
   permission_work_package_assigned_explanation: "Work packages can be assigned to users and groups in possession of this role in the respective project"
   permission_view_project_activity: "View project activity"
   permission_view_project_attributes: "View project attributes"
+  permission_view_project_stages_and_gates: "View project stages and gates"
   permission_save_bcf_queries: "Save BCF queries"
   permission_manage_public_bcf_queries: "Manage public BCF queries"
   permission_edit_attribute_help_texts: "Edit attribute help texts"
@@ -3806,6 +3889,12 @@ hr:
       edit_description: "Can view, comment and edit this work package."
       view: "Pregled"
       view_description: "Can view this work package."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Why are you setting this reminder?"
+      success_creation_message: "Reminder set successfully. You will receive a notification for this work package at the chosen time."
+      success_update_message: "Reminder updated successfully."
+      success_deletion_message: "Reminder deleted successfully."
   sharing:
     count:
       zero: "0 users"
diff --git a/config/locales/crowdin/hu.yml b/config/locales/crowdin/hu.yml
index 6a69534f594c..0d054fd10c12 100644
--- a/config/locales/crowdin/hu.yml
+++ b/config/locales/crowdin/hu.yml
@@ -342,6 +342,9 @@ hu:
         text: "Ez a művelet nem törli a listában szereplő projekteket. Biztos, hogy törölni szeretné ezt a projektlistát?"
     settings:
       change_identifier: Azonosító megváltoztatása
+      actions:
+        label_enable_all: "Enable all"
+        label_disable_all: "Disable all"
       activities:
         no_results_title_text: Jelenleg nincs elérhető esemény.
       forums:
@@ -352,18 +355,26 @@ hu:
         no_results_content_text: Hozzon létre egy új munkacsomag kategóriát
       custom_fields:
         no_results_title_text: Jelenleg nincs elérhető egyedi mező.
+      life_cycle:
+        header:
+          title: "Project lifecycle"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "Neither stages nor gates are currently defined."
+        section_header: "Stages and gates"
+        step:
+          use_in_project: "Use %{step} in this project"
+        filter:
+          label: "Search project stage or gate"
       project_custom_fields:
         header:
           title: "Projekt attribútumok"
-          description: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
+          description_html: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
         filter:
           label: "Search project attribute"
         actions:
           label_enable_single: "Active in this project, click to disable"
           label_disable_single: "Inactive in this project, click to enable"
           remove_from_project: "Remove from project"
-          label_enable_all: "Enable all"
-          label_disable_all: "Disable all"
         is_required_blank_slate:
           heading: Required in all projects
           description: This project attribute is activated in all projects since the "Required in all projects" option is checked. It cannot be deactivated for individual projects.
@@ -376,6 +387,10 @@ hu:
         no_results_content_text: Új verzió létrehozása
       storage:
         no_results_title_text: "Ebben a projektben nincs további rögzített lemezterület.\n"
+  project_stage:
+    working_days_count:
+      one: "Duration: %{count} working day"
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "The modified list has been saved as a new list"
@@ -496,8 +511,12 @@ hu:
     groups:
       member_in_these_groups: "A felhasználó a következő csoportoknak a tagja:"
       no_results_title_text: A falhasználó egyik csoportnak se a tagja
+      summary_with_more: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary: Member of %{names}.
     memberships:
       no_results_title_text: Ez a felhasználó jelenleg nem tagja egy projektnek sem.
+    open_profile: "Open profile"
   page:
     text: "Szöveg"
   placeholder_users:
@@ -567,17 +586,27 @@ hu:
       no_results_title_text: Jelenleg nincsenek típusok.
       no_results_content_text: Új típus létrehozása
     edit:
-      settings: "Beállítások"
-      form_configuration: "Űrlap konfiguráció"
+      form_configuration:
+        tab: "Form configuration"
       more_info_text_html: >
         Enterprise edition allows you to customize form configuration with these additional add-ons: <br> <ul class="%{list_styling_class}"> <li><b>Add new attribute groups</b></li> <li><b>Rename attribute groups</b></li> <li><b>Add a table of related work packages</b></li> </ul>
-      projects: "Projektek"
-      enabled_projects: "Engedélyezett projektek"
-      edit_query: "Táblázat szerkesztése"
-      query_group_placeholder: "Adja meg a tábla nevét"
-      reset: "Alapbeállítások visszaállítása"
-      type_color_text: |
-        A kiválasztott szín a Gantt diagramban vagy munkacsomag táblákban az eltérő típusokat különbözteti meg egymástól. Ezért javasolt az élénk színek használata.
+      projects:
+        tab: "Projects"
+        enabled_projects: "Enabled projects"
+      settings:
+        tab: "Settings"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Subject configuration"
+        manually_editable_subjects:
+          label: "Manually editable subjects"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automatically generated subjects"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Subject pattern"
+          caption: "Search for an attribute or add text. To create a space between elements add it as a text."
   versions:
     overview:
       work_packages_in_archived_projects: "A verzió megosztásra kerül az archivált projektekkel, amelyekhez még mindig vannak ehhez a verzióhoz rendelt munkacsomagok. Ezek számításba kerülnek, de nem jelennek meg a kapcsolódó nézetekben."
@@ -640,6 +669,10 @@ hu:
     label_add_x: "Add %{x}"
     label_edit_x: "Edit %{x}"
     label_add_description: "Add description"
+    lag:
+      subject: "Lag"
+      title: "Lag (in days)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
       label_relates_singular: "related to"
       label_relates_plural: "related to"
@@ -844,6 +877,9 @@ hu:
         lag: "Lag"
         from: "Feladatcsoport"
         to: "Kapcsolódó feladatcsoport"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Time"
       repository:
         url: "URL"
       role:
@@ -932,6 +968,7 @@ hu:
       messages:
         accepted: "el kell fogadni."
         after: "későbbinek kell lennie, mint %{date}."
+        after_today: "must be in the future."
         after_or_equal_to: "későbbinek vagy egyenlőnek kell lennie, mint %{date}."
         before: "korábbinak kell lennie, mint %{date}."
         before_or_equal_to: "korábbinak vagy egyenlőnek kell lennie, mint %{date}."
@@ -978,6 +1015,7 @@ hu:
         not_an_integer: "ez nem egy szám."
         not_an_iso_date: "nem érvényes dátum. A szükséges formátum ÉÉÉÉ-HH-NN."
         not_same_project: "nem azonos projekthez tartozik."
+        datetime_must_be_in_future: "must be in the future."
         odd: "páratlan kell legyen."
         regex_match_failed: "does not match the regular expression %{expression}."
         regex_invalid: "nem lehet a hozzárendelt reguláris kifejezéssel ellenőrizni."
@@ -1091,16 +1129,38 @@ hu:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "start date must be before the end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "is incomplete."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1317,6 +1377,8 @@ hu:
         other: "Értesítések"
       placeholder_user: "Teszt felhasználó"
       project: "Projekt"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         one: "Project list"
         other: "Project lists"
@@ -1420,6 +1482,7 @@ hu:
     login: "Felhasználónév"
     mail: "Email"
     name: "Név"
+    note: "Note"
     password: "Jelszó"
     priority: "Fontosság"
     project: "Projekt"
@@ -1516,6 +1579,7 @@ hu:
   button_print: "Nyomtatás"
   button_quote: "Idéz"
   button_remove: Eltávolítás
+  button_remove_reminder: "Remove reminder"
   button_rename: "Átnevezés"
   button_replace: "Csere"
   button_revoke: "Visszavonás"
@@ -1526,6 +1590,7 @@ hu:
   button_save_as: "Mentés másként"
   button_apply_changes: "Változások alkalmazása"
   button_save_back: "Mentés és vissza"
+  button_set_reminder: "Set reminder"
   button_show: "Mutat"
   button_sort: "Rendez"
   button_submit: "Küldés"
@@ -1731,12 +1796,12 @@ hu:
   direction: ltr
   ee:
     upsale:
+      title: "Enterprise add-on"
+      link_title: "More information"
       form_configuration:
         description: "Testre szabhatja az űrlap konfigurációját ezekkel a további bővítményekkel:"
         add_groups: "Attribútum-csoport hozzáadása"
         rename_groups: "Attribútum-csoportok átnevezése"
-      project_filters:
-        description_html: "Az egyéni mezők szűrése és rendezése a Vállalati Verzió kiegészítője."
   enumeration_activities: "Időnyilvántartási tevékenységek"
   enumeration_work_package_priorities: "Feladatcsoport fontosság"
   enumeration_reported_project_statuses: "Projekt állapot beszámoló"
@@ -1769,6 +1834,7 @@ hu:
   error_pdf_export_too_many_columns: "Túl sok oszlop lett kiválasztva a PDF exportáláshoz. Kérlek csökkentsd a sorok számát."
   error_pdf_failed_to_export: "A PDF-Exportálás mentése nem sikerült: %{error}"
   error_token_authenticity: "Nem sikerült ellenőrizni a Cross-Site Request Forgery token-t. Megpróbált adatokat küldeni több böngészőn vagy lapon keresztül? Kérjük, zárja be az összes lapot, és próbálkozzon újra."
+  error_reminder_not_found: "The reminder was not found or was already notified about."
   error_work_package_not_found_in_project: "A feladatcsoport nem található, vagy nem tartozik ehhez a projekthez"
   error_work_package_id_not_found: "The work package was not found."
   error_must_be_project_member: "projekt tagnak kell lennie"
@@ -2062,6 +2128,7 @@ hu:
       responsible: "Felelős"
       shared: "Megosztva"
       watched: "Megfigyelő"
+      reminder: "Reminder"
     facets:
       unread: "Olvasatlan"
       unread_title: "Show unread"
@@ -2229,8 +2296,10 @@ hu:
   label_default: "alapértelmezett"
   label_delete_user: "Felhasználó törlése"
   label_delete_project: "Projekt törlése"
+  label_delete: "Delete"
   label_deleted: "Törölve"
   label_deleted_custom_field: "(egyéni mező törölve)"
+  label_deleted_custom_item: "(deleted item)"
   label_deleted_custom_option: "(opció törlése)"
   label_empty_element: "(üres)"
   label_missing_or_hidden_custom_option: "(hiányzó érték vagy a hozzáférési jogosultságok hiánya)\n"
@@ -2267,7 +2336,6 @@ hu:
   label_enterprise_active_users: "%{current}/%{limit} foglalt aktív felhasználók"
   label_enterprise_edition: "Vállalati Verzió."
   label_enterprise_support: "Enterprise support"
-  label_enterprise_addon: "Enterprise add-on"
   label_environment: "Környezet"
   label_estimates_and_progress: "Estimates and progress"
   label_equals: "van"
@@ -2452,6 +2520,7 @@ hu:
   label_none_parentheses: "(nincs)"
   label_not_contains: "nem tartalmaz"
   label_not_equals: "nem"
+  label_life_cycle_step_plural: "Project lifecycle"
   label_on: "be"
   label_operator_all: "is not empty"
   label_operator_none: "is empty"
@@ -2553,6 +2622,7 @@ hu:
   label_reporting: "Jelentés"
   label_reporting_plural: "Jelentések"
   label_repository: "Csomagtároló"
+  label_repository_remove: "Remove repository"
   label_repository_root: "Tároló gyökérkönyvtára"
   label_repository_plural: "Csomagtárolók"
   label_required: "kötelező"
@@ -2615,6 +2685,7 @@ hu:
   label_this_month: "Ebben a hónapban"
   label_this_week: "ezen a héten"
   label_this_year: "Ebben az évben"
+  label_time: "Time"
   label_time_entry_plural: "Eltöltött idő"
   label_time_entry_activity_plural: "Spent time activities"
   label_title: "Cím"
@@ -2650,6 +2721,7 @@ hu:
   label_user_settings: "Felhasználói beállítások"
   label_users_settings: "Users settings"
   label_version_new: "Új verzió"
+  label_version_edit: "Edit version"
   label_version_plural: "Verzió"
   label_version_sharing_descendants: "Az alprojektekkel rendelkező"
   label_version_sharing_hierarchy: "A projekt hierarchiában"
@@ -2787,8 +2859,13 @@ hu:
         prefix: "Az értesítés beállítása miatt érkezett: %{reason}\n"
         date_alert_start_date: "Date alert"
         date_alert_due_date: "Date alert"
+        reminder: "Reminder"
       see_all: "Mutasd mindet"
       updated_at: "%{timestamp} időpontban %{user} frissítette"
+    reminder_notifications:
+      subject: "Reminder: %{note}"
+      heading: "You have a new reminder"
+      note: "Note: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "You may %{allowed_actions} this work package. This can change depending on your project role and permissions."
@@ -2954,6 +3031,7 @@ hu:
   notice_successful_connection: "Sikeresen létrejött a kapcsolat."
   notice_successful_create: "Sikeres létrehozás."
   notice_successful_delete: "Sikeres törlés."
+  notice_successful_cancel: "Successful cancellation."
   notice_successful_update: "Sikeres frissítés."
   notice_successful_update_custom_fields_added_to_project: |
     Sikeres frissítés. Az aktivált típusok egyéni mezői automatikusan aktiválódnak
@@ -3031,6 +3109,7 @@ hu:
   permission_edit_own_time_entries: "Rögzített eltöltött időim szerkesztése"
   permission_edit_project: "Projekt szerkesztése"
   permission_edit_project_attributes: "Edit project attributes"
+  permission_edit_project_stages_and_gates: "Edit project stages and gates"
   permission_edit_reportings: "Jelentések szerkesztése"
   permission_edit_time_entries: "Edit time logs for other users"
   permission_edit_timelines: "Idővonalak szerkesztése"
@@ -3060,9 +3139,12 @@ hu:
   permission_search_project: "Search project"
   permission_select_custom_fields: "Egyedi mezők kiválasztása"
   permission_select_project_custom_fields: "Select project attributes"
+  permission_select_project_life_cycle: "Select project stages and gates"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "Projekt modulok kiválasztása"
   permission_share_work_packages: "Share work packages"
   permission_manage_types: "Jelölje ki a típust"
+  permission_manage_own_reminders: "Create own reminders"
   permission_view_project: "View projects"
   permission_view_changesets: "Tároló verziók megtekintése az OpenProject-ben"
   permission_view_commit_author_statistics: "Szerző,statisztika megtekintése"
@@ -3083,6 +3165,7 @@ hu:
   permission_work_package_assigned_explanation: "Munkacsomagok hozzárendelhetők a szerephez tartozó felhasználókhoz és csoportokhoz az adott projektben"
   permission_view_project_activity: "View project activity"
   permission_view_project_attributes: "View project attributes"
+  permission_view_project_stages_and_gates: "View project stages and gates"
   permission_save_bcf_queries: "Save BCF queries"
   permission_manage_public_bcf_queries: "Manage public BCF queries"
   permission_edit_attribute_help_texts: "Edit attribute help texts"
@@ -3763,6 +3846,12 @@ hu:
       edit_description: "Can view, comment and edit this work package."
       view: "Nézet"
       view_description: "Can view this work package."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Why are you setting this reminder?"
+      success_creation_message: "Reminder set successfully. You will receive a notification for this work package at the chosen time."
+      success_update_message: "Reminder updated successfully."
+      success_deletion_message: "Reminder deleted successfully."
   sharing:
     count:
       zero: "0 users"
diff --git a/config/locales/crowdin/id.yml b/config/locales/crowdin/id.yml
index 568083bdd60c..fdfeccb12685 100644
--- a/config/locales/crowdin/id.yml
+++ b/config/locales/crowdin/id.yml
@@ -337,6 +337,9 @@ id:
         text: "This action will not delete any project the list contains. Are you sure you want to delete this project list?"
     settings:
       change_identifier: Ubah pengenal
+      actions:
+        label_enable_all: "Enable all"
+        label_disable_all: "Disable all"
       activities:
         no_results_title_text: There are currently no activities available.
       forums:
@@ -347,18 +350,26 @@ id:
         no_results_content_text: Create a new work package category
       custom_fields:
         no_results_title_text: There are currently no custom fields available.
+      life_cycle:
+        header:
+          title: "Project lifecycle"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "Neither stages nor gates are currently defined."
+        section_header: "Stages and gates"
+        step:
+          use_in_project: "Use %{step} in this project"
+        filter:
+          label: "Search project stage or gate"
       project_custom_fields:
         header:
           title: "Atribut proyek"
-          description: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
+          description_html: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
         filter:
           label: "Search project attribute"
         actions:
           label_enable_single: "Active in this project, click to disable"
           label_disable_single: "Inactive in this project, click to enable"
           remove_from_project: "Remove from project"
-          label_enable_all: "Enable all"
-          label_disable_all: "Disable all"
         is_required_blank_slate:
           heading: Required in all projects
           description: This project attribute is activated in all projects since the "Required in all projects" option is checked. It cannot be deactivated for individual projects.
@@ -371,6 +382,9 @@ id:
         no_results_content_text: Create a new version
       storage:
         no_results_title_text: Tidak ada ruang disk terekam tambahan yang digunakan oleh proyek ini.
+  project_stage:
+    working_days_count:
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "The modified list has been saved as a new list"
@@ -485,8 +499,12 @@ id:
     groups:
       member_in_these_groups: "Pengguna ini saat ini adalah anggota dari grup berikut:"
       no_results_title_text: Pengguna ini saat ini bukan anggota di grup mana pun.
+      summary_with_more: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary: Member of %{names}.
     memberships:
       no_results_title_text: This user is currently not a member of a project.
+    open_profile: "Open profile"
   page:
     text: "Teks"
   placeholder_users:
@@ -556,17 +574,27 @@ id:
       no_results_title_text: There are currently no types.
       no_results_content_text: Create a new type
     edit:
-      settings: "Pengaturan"
-      form_configuration: "Form configuration"
+      form_configuration:
+        tab: "Form configuration"
       more_info_text_html: >
         Enterprise edition allows you to customize form configuration with these additional add-ons: <br> <ul class="%{list_styling_class}"> <li><b>Add new attribute groups</b></li> <li><b>Rename attribute groups</b></li> <li><b>Add a table of related work packages</b></li> </ul>
-      projects: "Project"
-      enabled_projects: "Proyek-proyek yang diaktifkan"
-      edit_query: "Merubah tabel"
-      query_group_placeholder: "Berikan nama untuk table"
-      reset: "Disetel ulang ke kondisi bawaan"
-      type_color_text: |
-        Warna yang dipilih membedakan Jenis yang berbeda dalam bagan Gantt atau tabel paket kerja. Oleh karena itu disarankan untuk menggunakan warna yang kuat.
+      projects:
+        tab: "Projects"
+        enabled_projects: "Enabled projects"
+      settings:
+        tab: "Settings"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Subject configuration"
+        manually_editable_subjects:
+          label: "Manually editable subjects"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automatically generated subjects"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Subject pattern"
+          caption: "Search for an attribute or add text. To create a space between elements add it as a text."
   versions:
     overview:
       work_packages_in_archived_projects: "The version is shared with archived projects which still have work packages assigned to this version. These are counted, but will not appear in the linked views."
@@ -628,6 +656,10 @@ id:
     label_add_x: "Add %{x}"
     label_edit_x: "Edit %{x}"
     label_add_description: "Add description"
+    lag:
+      subject: "Lag"
+      title: "Lag (in days)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
       label_relates_singular: "related to"
       label_relates_plural: "related to"
@@ -832,6 +864,9 @@ id:
         lag: "Lag"
         from: "Paket-Penugasan"
         to: "Work package terkait"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Time"
       repository:
         url: "URL"
       role:
@@ -920,6 +955,7 @@ id:
       messages:
         accepted: "harus disetujui."
         after: "harus setelah %{date}."
+        after_today: "must be in the future."
         after_or_equal_to: "harus setelah atau sama dengan %{date}."
         before: "harus sebelum %{date}."
         before_or_equal_to: "harus sebelum atau maksimal %{date}."
@@ -966,6 +1002,7 @@ id:
         not_an_integer: "harus bilangan bulat."
         not_an_iso_date: "is not a valid date. Required format: YYYY-MM-DD."
         not_same_project: "harus berasal dari proyek yang sama."
+        datetime_must_be_in_future: "must be in the future."
         odd: "harus ganjil."
         regex_match_failed: "does not match the regular expression %{expression}."
         regex_invalid: "tidak dapat divalidasi dengan ekspresi reguler terkait."
@@ -1079,16 +1116,38 @@ id:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "start date must be before the end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "is incomplete."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1302,6 +1361,8 @@ id:
         other: "Notifications"
       placeholder_user: "Pengguna placeholder"
       project: "Project"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         other: "Project lists"
       query: "Query kustom"
@@ -1398,6 +1459,7 @@ id:
     login: "Nama pengguna"
     mail: "Email"
     name: "Nama"
+    note: "Note"
     password: "Password"
     priority: "Prioritas"
     project: "Project"
@@ -1494,6 +1556,7 @@ id:
   button_print: "Cetak"
   button_quote: "Kutipan"
   button_remove: Remove
+  button_remove_reminder: "Remove reminder"
   button_rename: "Ubah nama"
   button_replace: "Ganti"
   button_revoke: "Menarik kembali"
@@ -1504,6 +1567,7 @@ id:
   button_save_as: "Simpan sebagai"
   button_apply_changes: "Menerapkan perubahan"
   button_save_back: "Save and back"
+  button_set_reminder: "Set reminder"
   button_show: "Tampilkan"
   button_sort: "Urutkan"
   button_submit: "Kirim"
@@ -1691,12 +1755,12 @@ id:
   direction: ltr
   ee:
     upsale:
+      title: "Enterprise add-on"
+      link_title: "More information"
       form_configuration:
         description: "Customize the form configuration with these additional add-ons:"
         add_groups: "Menambahkan atribut kelompok-kelompok baru"
         rename_groups: "Menamai ulang atribut kelompok-kelompok"
-      project_filters:
-        description_html: "Filtering and sorting on custom fields is an Enterprise edition add-on."
   enumeration_activities: "Kegiatan pelacakan waktu"
   enumeration_work_package_priorities: "Paket-Penugasan prioritas"
   enumeration_reported_project_statuses: "Status Project yang di-Report"
@@ -1729,6 +1793,7 @@ id:
   error_pdf_export_too_many_columns: "Kolom yang dipilih utnuk ekspor PDF terlalu banyak. Mohon kurangi jumlah kolom."
   error_pdf_failed_to_export: "Ekspor PDF tidak dapat disimpan: %{error}"
   error_token_authenticity: "Tidak dapat memverifikasi token Pemalsuan Permintaan Lintas Situs. Apakah Anda mencoba mengirimkan data di beberapa browser atau tab? Harap tutup semua tab dan coba lagi."
+  error_reminder_not_found: "The reminder was not found or was already notified about."
   error_work_package_not_found_in_project: "Paket-Penugasan tidak ditemukan atau tidak termasuk dalam Project ini"
   error_work_package_id_not_found: "The work package was not found."
   error_must_be_project_member: "harus sbg Project Member"
@@ -2022,6 +2087,7 @@ id:
       responsible: "Akuntabel"
       shared: "Shared"
       watched: "Pemantau"
+      reminder: "Reminder"
     facets:
       unread: "Unread"
       unread_title: "Show unread"
@@ -2189,8 +2255,10 @@ id:
   label_default: "Default"
   label_delete_user: "Menghapus pengguna"
   label_delete_project: "Hapus proyek"
+  label_delete: "Delete"
   label_deleted: "dihapus"
   label_deleted_custom_field: "(isian kustom dihapus)"
+  label_deleted_custom_item: "(deleted item)"
   label_deleted_custom_option: "(opsi dihapus)"
   label_empty_element: "(kosong)"
   label_missing_or_hidden_custom_option: "(nilai hilang atau kurang izin untuk mengakses)"
@@ -2227,7 +2295,6 @@ id:
   label_enterprise_active_users: "%{current}/%{limit} pengguna aktif yang dipesan"
   label_enterprise_edition: "Enterprise edition"
   label_enterprise_support: "Dukungan perusahaan"
-  label_enterprise_addon: "Enterprise add-on"
   label_environment: "Environment"
   label_estimates_and_progress: "Estimates and progress"
   label_equals: "adalah"
@@ -2412,6 +2479,7 @@ id:
   label_none_parentheses: "(kosong)"
   label_not_contains: "tidak berisi"
   label_not_equals: "tidak"
+  label_life_cycle_step_plural: "Project lifecycle"
   label_on: "pada"
   label_operator_all: "tidak kosong"
   label_operator_none: "kosong"
@@ -2513,6 +2581,7 @@ id:
   label_reporting: "Pelaporan"
   label_reporting_plural: "Pelaporan"
   label_repository: "Repositori"
+  label_repository_remove: "Remove repository"
   label_repository_root: "Repository root"
   label_repository_plural: "Repositori"
   label_required: "dibutuhkan"
@@ -2575,6 +2644,7 @@ id:
   label_this_month: "bulan ini"
   label_this_week: "minggu ini"
   label_this_year: "tahun ini"
+  label_time: "Time"
   label_time_entry_plural: "Durasi"
   label_time_entry_activity_plural: "Spent time activities"
   label_title: "Judul"
@@ -2610,6 +2680,7 @@ id:
   label_user_settings: "User settings"
   label_users_settings: "Users settings"
   label_version_new: "Versi baru"
+  label_version_edit: "Edit version"
   label_version_plural: "Versi"
   label_version_sharing_descendants: "Dengan Sub-Project"
   label_version_sharing_hierarchy: "Dengan hirarki Project"
@@ -2746,8 +2817,13 @@ id:
         prefix: "Received because of the notification setting: %{reason}"
         date_alert_start_date: "Peringatan tanggal"
         date_alert_due_date: "Peringatan tanggal"
+        reminder: "Reminder"
       see_all: "Lihat semua"
       updated_at: "Diperbarui pada %{timestamp} oleh %{user}"
+    reminder_notifications:
+      subject: "Reminder: %{note}"
+      heading: "You have a new reminder"
+      note: "Note: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "You may %{allowed_actions} this work package. This can change depending on your project role and permissions."
@@ -2914,6 +2990,7 @@ id:
   notice_successful_connection: "Sambungan berhasil."
   notice_successful_create: "Berhasil dibuat."
   notice_successful_delete: "Berhasil dihapus."
+  notice_successful_cancel: "Successful cancellation."
   notice_successful_update: "Berhasil diperbarui."
   notice_successful_update_custom_fields_added_to_project: |
     Pembaruan berhasil. Bidang kustom dari jenis yang diaktifkan secara otomatis diaktifkan pada formulir paket pekerjaan. <a href="%{url}" target="_blank">Lihat selengkapnya</a>.
@@ -2989,6 +3066,7 @@ id:
   permission_edit_own_time_entries: "Edit Time log"
   permission_edit_project: "Edit Project"
   permission_edit_project_attributes: "Edit project attributes"
+  permission_edit_project_stages_and_gates: "Edit project stages and gates"
   permission_edit_reportings: "Edit pelaporan"
   permission_edit_time_entries: "Edit time logs for other users"
   permission_edit_timelines: "Edit Timeline"
@@ -3018,9 +3096,12 @@ id:
   permission_search_project: "Search project"
   permission_select_custom_fields: "Pilih bidang khusus"
   permission_select_project_custom_fields: "Select project attributes"
+  permission_select_project_life_cycle: "Select project stages and gates"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "Pilih modul Project"
   permission_share_work_packages: "Share work packages"
   permission_manage_types: "Pilih Tipe"
+  permission_manage_own_reminders: "Create own reminders"
   permission_view_project: "View projects"
   permission_view_changesets: "View repository revisions in OpenProject"
   permission_view_commit_author_statistics: "Lihat commit statistik penulis"
@@ -3041,6 +3122,7 @@ id:
   permission_work_package_assigned_explanation: "Paket kerja dapat ditetapkan untuk pengguna-pengguna tunggal dan kelompok-kelompok yang memiliki peran dalam proyek masing-masing"
   permission_view_project_activity: "View project activity"
   permission_view_project_attributes: "View project attributes"
+  permission_view_project_stages_and_gates: "View project stages and gates"
   permission_save_bcf_queries: "Save BCF queries"
   permission_manage_public_bcf_queries: "Manage public BCF queries"
   permission_edit_attribute_help_texts: "Edit attribute help texts"
@@ -3718,6 +3800,12 @@ id:
       edit_description: "Can view, comment and edit this work package."
       view: "Lihat"
       view_description: "Can view this work package."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Why are you setting this reminder?"
+      success_creation_message: "Reminder set successfully. You will receive a notification for this work package at the chosen time."
+      success_update_message: "Reminder updated successfully."
+      success_deletion_message: "Reminder deleted successfully."
   sharing:
     count:
       zero: "0 users"
diff --git a/config/locales/crowdin/it.yml b/config/locales/crowdin/it.yml
index e4dfd76a981d..3d2155024a32 100644
--- a/config/locales/crowdin/it.yml
+++ b/config/locales/crowdin/it.yml
@@ -340,6 +340,9 @@ it:
         text: "Questa azione non eliminerà alcun progetto contenuto nell'elenco. Vuoi davvero eliminare questo elenco di progetti?"
     settings:
       change_identifier: Cambia identificatore
+      actions:
+        label_enable_all: "Abilita tutto"
+        label_disable_all: "Disabilita tutto"
       activities:
         no_results_title_text: Al momento non vi sono attività disponibili.
       forums:
@@ -350,18 +353,26 @@ it:
         no_results_content_text: Crea una nuova categoria di macro-attività
       custom_fields:
         no_results_title_text: Al momento non sono disponibili dei campi personalizzati.
+      life_cycle:
+        header:
+          title: "Ciclo di vita del progetto"
+          description_html: 'Queste fasi e controlli di progetto nel ciclo di vita del progetto saranno visualizzati nella tua <a href=%{overview_url} target="_blank">pagina di panoramica del progetto</a> e sono definiti nelle <a href=%{admin_settings_url} target="_blank">impostazioni di amministrazione</a> dall''amministratore dell''istanza. Puoi abilitare o disabilitare singoli attributi.'
+        non_defined: "Attualmente non sono definiti né controlli né fasi."
+        section_header: "Fasi e controlli"
+        step:
+          use_in_project: "Usa %{step} in questo progetto"
+        filter:
+          label: "Cerca la fase o il controllo di progetto"
       project_custom_fields:
         header:
           title: "Attributi del progetto"
-          description: 'Questi attributi del progetto saranno visualizzati nella tua <a href=%{overview_url} target="_blank">pagina di panoramica del progetto</a> sotto le rispettive sezioni. Puoi attivare o disattivare i singoli attributi. Gli attributi e le sezioni del progetto sono definiti nelle <a href=%{admin_settings_url} target="_blank">impostazioni di amministrazione</a> dall''amministratore dell''istanza. '
+          description_html: 'Questi attributi del progetto saranno visualizzati nella tua <a href=%{overview_url} target="_blank">pagina di panoramica del progetto</a> sotto le rispettive sezioni. Puoi attivare o disattivare i singoli attributi. Gli attributi e le sezioni del progetto sono definiti nelle <a href=%{admin_settings_url} target="_blank">impostazioni di amministrazione</a> dall''amministratore dell''istanza. '
         filter:
           label: "Cerca l'attributo del progetto"
         actions:
           label_enable_single: "Attivo in questo progetto, clicca per disattivarlo"
           label_disable_single: "Non attivo in questo progetto, clicca per attivarlo"
           remove_from_project: "Rimuovi dal progetto"
-          label_enable_all: "Abilita tutti"
-          label_disable_all: "Disabilita tutti"
         is_required_blank_slate:
           heading: Richiesto in tutti i progetti
           description: Questo attributo di progetto è attivato in tutti i progetti, poiché l'opzione "Richiesto in tutti i progetti" è selezionata. Non può essere disattivato per i singoli progetti.
@@ -374,6 +385,10 @@ it:
         no_results_content_text: Crea una nuova versione
       storage:
         no_results_title_text: Nessuno spazio su disco registrato aggiuntivo consumato da questo progetto.
+  project_stage:
+    working_days_count:
+      one: "Durata: %{count} giorno lavorativo"
+      other: "Durata: %{count} giorni lavorativi"
   lists:
     create:
       success: "L'elenco modificato è stato salvato come nuovo elenco"
@@ -494,8 +509,12 @@ it:
     groups:
       member_in_these_groups: "Questo utente è attualmente membro dei seguenti gruppi:"
       no_results_title_text: Questo utente al momento non è un membro di alcun gruppo.
+      summary_with_more: Membro di %{names} e %{count_link}.
+      more: "altri %{count}"
+      summary: Membro di %{names}.
     memberships:
       no_results_title_text: Questo utente non è attualmente membro di alcun progetto.
+    open_profile: "Apri il profilo"
   page:
     text: "Testo"
   placeholder_users:
@@ -565,18 +584,27 @@ it:
       no_results_title_text: Al momento non esistono tipi.
       no_results_content_text: Crea un nuovo tipo
     edit:
-      settings: "Impostazioni"
-      form_configuration: "Configurazione del modulo"
+      form_configuration:
+        tab: "Configurazione del modulo"
       more_info_text_html: >
         L'edizione Enterprise ti consente di personalizzare la configurazione dei moduli con queste aggiunte: <br> <ul class="%{list_styling_class}"> <li><b>Aggiungi nuovi gruppi di attributi</b></li> <li><b >Rinomina gruppi di attributi</b></li> <li><b>Aggiungi una tabella di macro-attività correlate</b></li> </ul>
-      projects: "Progetti"
-      enabled_projects: "Progetti abilitati"
-      edit_query: "Modificare la Tabella"
-      query_group_placeholder: "Assegnare un nome alla tabella"
-      reset: "Ripristino predefinite"
-      type_color_text: |
-        Il colore selezionato distingue diverse tipologie
-        neidiagrammi Gantt o nelle tabelle delle macro-attività. Si consiglia quindi di utilizzare colori forti.
+      projects:
+        tab: "Progetti"
+        enabled_projects: "Progetti abilitati"
+      settings:
+        tab: "Impostazioni"
+        type_color_text: Il colore selezionato distingue diverse tipologie nei diagrammi Gantt o nelle tabelle delle macro-attività. Si consiglia quindi di utilizzare colori forti.
+      subject_configuration:
+        tab: "Configurazione dell'oggetto"
+        manually_editable_subjects:
+          label: "Oggetti modificabili manualmente"
+          caption: "Gli utenti possono inserire e modificare manualmente gli oggetti delle macro-attività senza restrizioni."
+        automatically_generated_subjects:
+          label: "Oggetti generati automaticamente"
+          caption: "Definisci uno schema utilizzando attributi e testo referenziati per generare automaticamente gli oggetti delle macro-attività. Gli utenti non saranno in grado di modificare manualmente gli oggetti."
+        pattern:
+          label: "Schema dell'oggetto"
+          caption: "Cerca un attributo o aggiungi testo. Per creare uno spazio tra gli elementi aggiungilo come testo."
   versions:
     overview:
       work_packages_in_archived_projects: "La versione è condivisa con progetti archiviati che hanno ancora macro-attività assegnate a questa versione. Queste vengono conteggiate, ma non appariranno nelle viste collegate."
@@ -639,6 +667,10 @@ it:
     label_add_x: "Aggiungi %{x}"
     label_edit_x: "Modifica %{x}"
     label_add_description: "Aggiungi descrizione"
+    lag:
+      subject: "Ritardo"
+      title: "Ritardo (in giorni)"
+      caption: "Il numero minimo di giorni lavorativi da far trascorrere tra le due macro-attività."
     relations:
       label_relates_singular: "correlata con"
       label_relates_plural: "correlate con"
@@ -654,7 +686,7 @@ it:
       follows_description: "La macro-attività correlata deve necessariamente terminare prima dell'inizio di questa"
       label_child_singular: "figlia"
       label_child_plural: "figlie"
-      child_description: "Makes the related work package a sub-item of the current (parent) work package"
+      child_description: "Rende la macro-attività correlata un sottoelemento della macro-attività corrente (genitore)"
       label_blocks_singular: "blocca"
       label_blocks_plural: "blocca"
       blocks_description: "La relativa macro-attività non può essere chiusa fino a quando questa non sarà chiusa prima"
@@ -843,6 +875,9 @@ it:
         lag: "Ritardo"
         from: "Macro-attività"
         to: "Macro-attività correlata"
+      reminder:
+        remind_at_date: "Data"
+        remind_at_time: "Ora"
       repository:
         url: "URL"
       role:
@@ -931,6 +966,7 @@ it:
       messages:
         accepted: "deve essere accettato."
         after: "deve essere successivo al %{date}."
+        after_today: "deve essere nel futuro."
         after_or_equal_to: "deve essere successivo o uguale al %{date}."
         before: "deve essere precedente al %{date}."
         before_or_equal_to: "deve essere precedente o uguale al %{date}."
@@ -977,6 +1013,7 @@ it:
         not_an_integer: "non è un numero intero."
         not_an_iso_date: "non è una data valida. Formato richiesto: AAAA-MM-GG."
         not_same_project: "non appartiene allo stesso progetto."
+        datetime_must_be_in_future: "deve essere nel futuro."
         odd: "deve essere dispari."
         regex_match_failed: "non corrisponde all'espressione regolare %{expression}."
         regex_invalid: "non può essere convalidato con l'espressione regolare associata."
@@ -1090,16 +1127,38 @@ it:
           attributes:
             type:
               must_be_a_stage_or_gate: "deve essere Project::StageDefinition o Project::GateDefinition"
+              type_and_class_name_mismatch: "deve corrispondere al nome della classe istanziata"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "deve essere un Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "deve essere un Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "deve essere Project::Stage o Project::Gate"
               must_be_a_stage: "deve essere un Project::Stage"
               must_be_a_gate: "deve essere un Project::Gate"
+              type_and_class_name_mismatch: "deve corrispondere al nome della classe istanziata"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Impossibile assegnare `end_date` a un Project::Gate"
+              end_date_not_allowed: "Impossibile assegnare la data di fine a un Project::Gate"
+            type:
+              type_and_class_name_mismatch: "deve essere un Project::Gate"
+            date:
+              non_continuous_dates: "non può essere precedente alla data di fine del precedente %{step}."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "la data di inizio deve precedere quella di fine."
+              non_continuous_dates: "non può essere precedente alla data di fine del precedente %{step}."
+              incomplete: "è incompleto."
+            type:
+              type_and_class_name_mismatch: "deve essere un Project::Stage"
         query:
           attributes:
             project:
@@ -1316,6 +1375,8 @@ it:
         other: "Notifiche"
       placeholder_user: "Utente segnaposto"
       project: "Progetto"
+      project/gate_definition: "Controllo"
+      project/stage_definition: "Fase"
       project_query:
         one: "Elenco di progetti"
         other: "Elenchi di progetti"
@@ -1419,6 +1480,7 @@ it:
     login: "Nome utente"
     mail: "Email"
     name: "Nome"
+    note: "Nota"
     password: "Password"
     priority: "Priorità"
     project: "Progetto"
@@ -1515,6 +1577,7 @@ it:
   button_print: "Stampa"
   button_quote: "Cita"
   button_remove: Rimuovi
+  button_remove_reminder: "Rimuovi promemoria"
   button_rename: "Rinomina"
   button_replace: "Sostituisci"
   button_revoke: "Revoca"
@@ -1525,6 +1588,7 @@ it:
   button_save_as: "Salva come"
   button_apply_changes: "Applica modifiche"
   button_save_back: "Salva e ritorna"
+  button_set_reminder: "Imposta promemoria"
   button_show: "Mostra"
   button_sort: "Ordina"
   button_submit: "Invia"
@@ -1730,12 +1794,12 @@ it:
   direction: da sinistra a destra
   ee:
     upsale:
+      title: "Componente aggiuntivo Enterprise"
+      link_title: "Altre informazioni"
       form_configuration:
         description: "Personalizza la configurazione del modulo con le seguenti aggiunte:"
         add_groups: "Aggiunta di gruppi di proprietà"
         rename_groups: "Rinominazione di gruppi di proprietà"
-      project_filters:
-        description_html: "Le opzioni di filtraggio e ordinamento dei campi personalizzati sono disponibili nella versione Enterprise."
   enumeration_activities: "Attività di monitoraggio dei tempi"
   enumeration_work_package_priorities: "Priorità della macro-attività"
   enumeration_reported_project_statuses: "Stato di progetto segnalato"
@@ -1768,6 +1832,7 @@ it:
   error_pdf_export_too_many_columns: "Troppe colonne selezionate per l'esportazione in PDF. Ridurre il numero di colonne."
   error_pdf_failed_to_export: "L'esportazione del PDF non può essere salvata: %{error}"
   error_token_authenticity: "Impossibile verificare il token di richiesta. Forse hai provato a inviare i dati da più browser o schede? Chiudi tutte le schede e riprova."
+  error_reminder_not_found: "Il promemoria non è stato trovato o è già stato notificato."
   error_work_package_not_found_in_project: "La macro-attività non è stata trovata o non appartiene a questo progetto"
   error_work_package_id_not_found: "Impossibile trovare la macro-attività."
   error_must_be_project_member: "deve essere membro del progetto"
@@ -2061,6 +2126,7 @@ it:
       responsible: "Responsabile"
       shared: "Condiviso"
       watched: "Osservatore"
+      reminder: "Promemoria"
     facets:
       unread: "Non letta"
       unread_title: "Mostra non lette"
@@ -2228,8 +2294,10 @@ it:
   label_default: "Predefinito"
   label_delete_user: "Elimina utente"
   label_delete_project: "Elimina progetto"
+  label_delete: "Elimina"
   label_deleted: "cancellato"
   label_deleted_custom_field: "(campo personalizzato eliminato)"
+  label_deleted_custom_item: "(elemento eliminato)"
   label_deleted_custom_option: "(opzione eliminata)"
   label_empty_element: "(vuoto)"
   label_missing_or_hidden_custom_option: "(valore mancante o assenza di permessi di accesso)"
@@ -2266,7 +2334,6 @@ it:
   label_enterprise_active_users: "%{current}/%{limit} utenti attivi riservati"
   label_enterprise_edition: "Enterprise Edition"
   label_enterprise_support: "Supporto per Imprese"
-  label_enterprise_addon: "Componente aggiuntivo Enterprise"
   label_environment: "Ambiente"
   label_estimates_and_progress: "Stime e progressi"
   label_equals: "è"
@@ -2451,6 +2518,7 @@ it:
   label_none_parentheses: "(nessuno)"
   label_not_contains: "non contiene"
   label_not_equals: "non è"
+  label_life_cycle_step_plural: "Ciclo di vita del progetto"
   label_on: "il"
   label_operator_all: "non è vuoto"
   label_operator_none: "è vuoto"
@@ -2552,6 +2620,7 @@ it:
   label_reporting: "Prospetto"
   label_reporting_plural: "Prospetti"
   label_repository: "Archivio"
+  label_repository_remove: "Rimuovi il repository"
   label_repository_root: "Cartella radice dell'archivio"
   label_repository_plural: "Archivi"
   label_required: "obbligatorio"
@@ -2614,6 +2683,7 @@ it:
   label_this_month: "questo mese"
   label_this_week: "questa settimana"
   label_this_year: "questo anno"
+  label_time: "Ora"
   label_time_entry_plural: "Tempo speso"
   label_time_entry_activity_plural: "Attività che richiedono tempo"
   label_title: "Titolo"
@@ -2649,6 +2719,7 @@ it:
   label_user_settings: "Impostazioni utente"
   label_users_settings: "Impostazioni utenti"
   label_version_new: "Nuova versione"
+  label_version_edit: "Modifica versione"
   label_version_plural: "Versioni"
   label_version_sharing_descendants: "Con i sotto-progetti"
   label_version_sharing_hierarchy: "Con la gerarchia del progetto"
@@ -2786,8 +2857,13 @@ it:
         prefix: "Ricevuto a causa dell'impostazione della notifica: %{reason}"
         date_alert_start_date: "Avviso data"
         date_alert_due_date: "Avviso data"
+        reminder: "Promemoria"
       see_all: "Vedi tutti"
       updated_at: "Aggiornato il %{timestamp} da %{user}"
+    reminder_notifications:
+      subject: "Promemoria: %{note}"
+      heading: "Hai un nuovo promemoria"
+      note: "Nota: \"%{note}\""
     sharing:
       work_packages:
         allowed_actions: "Puoi %{allowed_actions} questa macro-attività. Questa impostazione può cambiare a seconda del ruolo e delle autorizzazioni del progetto."
@@ -2954,6 +3030,7 @@ it:
   notice_successful_connection: "Connesso con successo."
   notice_successful_create: "Creato con successo."
   notice_successful_delete: "Cancellato con successo."
+  notice_successful_cancel: "Cancellato con successo."
   notice_successful_update: "Aggiornato con successo."
   notice_successful_update_custom_fields_added_to_project: |
     Aggiornamento riuscito. I campi personalizzati dei tipi attivati ​​vengono attivati ​​automaticamente
@@ -3031,6 +3108,7 @@ it:
   permission_edit_own_time_entries: "Modificare i propri registri di orario effettuato"
   permission_edit_project: "Modificare un progetto"
   permission_edit_project_attributes: "Modifica gli attributi del progetto"
+  permission_edit_project_stages_and_gates: "Modifica le fasi e i controlli di progetto"
   permission_edit_reportings: "Modificare prospetti"
   permission_edit_time_entries: "Modificare i registri temporali per altri utenti"
   permission_edit_timelines: "Modificare cronologie"
@@ -3060,9 +3138,12 @@ it:
   permission_search_project: "Cerca progetto"
   permission_select_custom_fields: "Seleziona campi personalizzati"
   permission_select_project_custom_fields: "Selezionare gli attributi del progetto"
+  permission_select_project_life_cycle: "Seleziona le fasi e i controlli di progetto"
+  permission_select_project_life_cycle_explanation: "Attiva/Disattiva le fasi e i controlli di un progetto. Consente all'utente di selezionare il ciclo di vita appropriato per il progetto, in quanto le fasi e i controlli inattivi non saranno visibili nella pagina di panoramica del progetto né nell'elenco dei progetti."
   permission_select_project_modules: "Seleziona moduli del progetto"
   permission_share_work_packages: "Condividi macro-attività"
   permission_manage_types: "Seleziona i tipi"
+  permission_manage_own_reminders: "Crea promemoria"
   permission_view_project: "Visualizza progetti"
   permission_view_changesets: "Visualizza l'archivio revisioni in OpenProject"
   permission_view_commit_author_statistics: "Visualizza le statistiche dell'autore delle modifiche confermate"
@@ -3083,6 +3164,7 @@ it:
   permission_work_package_assigned_explanation: "È possibile assegnare macro-attività ad utenti e gruppi che hanno questo ruolo nel rispettivo progetto"
   permission_view_project_activity: "Visualizza attività del progetto"
   permission_view_project_attributes: "Mostra gli attributi del progetto"
+  permission_view_project_stages_and_gates: "Visualizza fasi e controlli di progetto"
   permission_save_bcf_queries: "Salva query BCF"
   permission_manage_public_bcf_queries: "Gestisci query BCF pubbliche"
   permission_edit_attribute_help_texts: "Modifica i testi guida dell'attributo"
@@ -3763,6 +3845,12 @@ it:
       edit_description: "Può visu"
       view: "Visualizzare"
       view_description: "Può visualizzare questa macro-attività."
+    reminders:
+      label_remind_at: "Data"
+      note_placeholder: "Perché stai impostando questo promemoria?"
+      success_creation_message: "Il promemoria è stato impostato con successo. Riceverai una notifica per questa macro-attività all'ora scelta."
+      success_update_message: "Promemoria aggiornato con successo."
+      success_deletion_message: "Promemoria eliminato con successo."
   sharing:
     count:
       zero: "0 utenti"
diff --git a/config/locales/crowdin/ja.yml b/config/locales/crowdin/ja.yml
index 68c753ef3557..6d122ca219b5 100644
--- a/config/locales/crowdin/ja.yml
+++ b/config/locales/crowdin/ja.yml
@@ -341,6 +341,9 @@ ja:
         text: "This action will not delete any project the list contains. Are you sure you want to delete this project list?"
     settings:
       change_identifier: 識別子の変更
+      actions:
+        label_enable_all: "Enable all"
+        label_disable_all: "Disable all"
       activities:
         no_results_title_text: 現在、有効な活動はありません。
       forums:
@@ -351,18 +354,26 @@ ja:
         no_results_content_text: 新しいワークパッケージのカテゴリを作成
       custom_fields:
         no_results_title_text: 現在、有効なカスタム フィールドはありません。
+      life_cycle:
+        header:
+          title: "Project lifecycle"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "Neither stages nor gates are currently defined."
+        section_header: "Stages and gates"
+        step:
+          use_in_project: "Use %{step} in this project"
+        filter:
+          label: "Search project stage or gate"
       project_custom_fields:
         header:
           title: "Project attributes"
-          description: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
+          description_html: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
         filter:
           label: "Search project attribute"
         actions:
           label_enable_single: "Active in this project, click to disable"
           label_disable_single: "Inactive in this project, click to enable"
           remove_from_project: "Remove from project"
-          label_enable_all: "Enable all"
-          label_disable_all: "Disable all"
         is_required_blank_slate:
           heading: Required in all projects
           description: This project attribute is activated in all projects since the "Required in all projects" option is checked. It cannot be deactivated for individual projects.
@@ -375,6 +386,9 @@ ja:
         no_results_content_text: 新しいバージョンを作成
       storage:
         no_results_title_text: このプロジェクトによって使用される追加のディスク領域はありません。
+  project_stage:
+    working_days_count:
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "The modified list has been saved as a new list"
@@ -489,8 +503,12 @@ ja:
     groups:
       member_in_these_groups: "このユーザーは現在以下のグループのメンバーです："
       no_results_title_text: このユーザーは現在どのグループのメンバーでもありません。
+      summary_with_more: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary: Member of %{names}.
     memberships:
       no_results_title_text: このユーザは現在プロジェクトのメンバーではありません。
+    open_profile: "Open profile"
   page:
     text: "テキスト（本文）"
   placeholder_users:
@@ -558,18 +576,27 @@ ja:
       no_results_title_text: 現在、種類はありません。
       no_results_content_text: 新しい種類を作成
     edit:
-      settings: "設定"
-      form_configuration: "フォーム設定"
+      form_configuration:
+        tab: "Form configuration"
       more_info_text_html: >
         Enterprise edition allows you to customize form configuration with these additional add-ons: <br> <ul class="%{list_styling_class}"> <li><b>Add new attribute groups</b></li> <li><b>Rename attribute groups</b></li> <li><b>Add a table of related work packages</b></li> </ul>
-      projects: "プロジェクト"
-      enabled_projects: "有効なプロジェクト"
-      edit_query: "テーブルを編集"
-      query_group_placeholder: "テーブルに名前を付けます"
-      reset: "デフォルトに戻す"
-      type_color_text: |
-        The selected color distinguishes different types
-        in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      projects:
+        tab: "Projects"
+        enabled_projects: "Enabled projects"
+      settings:
+        tab: "Settings"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Subject configuration"
+        manually_editable_subjects:
+          label: "Manually editable subjects"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automatically generated subjects"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Subject pattern"
+          caption: "Search for an attribute or add text. To create a space between elements add it as a text."
   versions:
     overview:
       work_packages_in_archived_projects: "The version is shared with archived projects which still have work packages assigned to this version. These are counted, but will not appear in the linked views."
@@ -631,6 +658,10 @@ ja:
     label_add_x: "Add %{x}"
     label_edit_x: "Edit %{x}"
     label_add_description: "Add description"
+    lag:
+      subject: "Lag"
+      title: "Lag (in days)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
       label_relates_singular: "related to"
       label_relates_plural: "related to"
@@ -835,6 +866,9 @@ ja:
         lag: "Lag"
         from: "ワーク パッケージ"
         to: "関係するワークパッケージ"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Time"
       repository:
         url: "URL"
       role:
@@ -923,6 +957,7 @@ ja:
       messages:
         accepted: "は受諾しなければなりません。"
         after: "は%{date}より後にしてください。"
+        after_today: "must be in the future."
         after_or_equal_to: "は%{date}以降にしてください。"
         before: "は%{date}の前にしてください。"
         before_or_equal_to: "は%{date}より以前にしてください。"
@@ -969,6 +1004,7 @@ ja:
         not_an_integer: "は整数にしてください。"
         not_an_iso_date: "は有効な日付ではありません。必要な形式: YYYY-MM-dd。"
         not_same_project: "は同じプロジェクトに属していません。"
+        datetime_must_be_in_future: "must be in the future."
         odd: "は奇数にしてください。"
         regex_match_failed: "does not match the regular expression %{expression}."
         regex_invalid: "関連付けられた正規表現を検証できませんでした。"
@@ -1082,16 +1118,38 @@ ja:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "start date must be before the end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "is incomplete."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1305,6 +1363,8 @@ ja:
         other: "Notifications"
       placeholder_user: "プレースホルダー ユーザー"
       project: "プロジェクト"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         other: "Project lists"
       query: "ユーザのクエリ"
@@ -1401,6 +1461,7 @@ ja:
     login: "ユーザー名"
     mail: "電子メールアドレス"
     name: "名称"
+    note: "Note"
     password: "パスワード"
     priority: "優先度"
     project: "プロジェクト"
@@ -1497,6 +1558,7 @@ ja:
   button_print: "印刷"
   button_quote: "引用"
   button_remove: 削除
+  button_remove_reminder: "Remove reminder"
   button_rename: "名称変更"
   button_replace: "置き換え"
   button_revoke: "取り消し"
@@ -1507,6 +1569,7 @@ ja:
   button_save_as: "名前をつけて保存"
   button_apply_changes: "Apply changes"
   button_save_back: "保存して戻る"
+  button_set_reminder: "Set reminder"
   button_show: "表示"
   button_sort: "並べ替え"
   button_submit: "適用"
@@ -1694,12 +1757,12 @@ ja:
   direction: 左から右
   ee:
     upsale:
+      title: "Enterprise add-on"
+      link_title: "More information"
       form_configuration:
         description: "これらの追加機能でフォームの設定をカスタマイズします:"
         add_groups: "新しい属性グループを追加"
         rename_groups: "属性グループの名前を変更"
-      project_filters:
-        description_html: "Filtering and sorting on custom fields is an Enterprise edition add-on."
   enumeration_activities: "タイムトラッキングアクティビティ"
   enumeration_work_package_priorities: "ワークパッケージの優先度"
   enumeration_reported_project_statuses: "報告されるプロジェクト進捗状況"
@@ -1732,6 +1795,7 @@ ja:
   error_pdf_export_too_many_columns: "PDF エクスポート用に選択された列が多すぎます。 列の数を減らしてください。"
   error_pdf_failed_to_export: "PDFエクスポートを保存できませんでした： %{error}"
   error_token_authenticity: "クロスサイトリクエスト偽造トークンを確認できません。 複数のブラウザやタブでデータを送信しようとしましたか？ すべてのタブを閉じてもう一度やり直してください。"
+  error_reminder_not_found: "The reminder was not found or was already notified about."
   error_work_package_not_found_in_project: "ワークパッケージが見つからないか、このプロジェクトに属していません。"
   error_work_package_id_not_found: "The work package was not found."
   error_must_be_project_member: "プロジェクトのメンバーである必要があります。"
@@ -2025,6 +2089,7 @@ ja:
       responsible: "責任者"
       shared: "Shared"
       watched: "ウォッチャー"
+      reminder: "Reminder"
     facets:
       unread: "Unread"
       unread_title: "Show unread"
@@ -2192,8 +2257,10 @@ ja:
   label_default: "既定の項目"
   label_delete_user: "ユーザーを削除"
   label_delete_project: "プロジェクトを削除"
+  label_delete: "Delete"
   label_deleted: "削除された"
   label_deleted_custom_field: "（削除されたカスタムフィールド）"
+  label_deleted_custom_item: "(deleted item)"
   label_deleted_custom_option: "(削除されたオプション)"
   label_empty_element: "（空）"
   label_missing_or_hidden_custom_option: "(missing value or lacking permissions to access)"
@@ -2230,7 +2297,6 @@ ja:
   label_enterprise_active_users: "%{current}/%{limit} 予約済みのアクティブユーザー"
   label_enterprise_edition: "エンタープライズ版"
   label_enterprise_support: "Enterprise support"
-  label_enterprise_addon: "Enterprise add-on"
   label_environment: "環境"
   label_estimates_and_progress: "Estimates and progress"
   label_equals: "等しい"
@@ -2415,6 +2481,7 @@ ja:
   label_none_parentheses: "(なし)"
   label_not_contains: "含まない"
   label_not_equals: "等しくない"
+  label_life_cycle_step_plural: "Project lifecycle"
   label_on: "オン"
   label_operator_all: "is not empty"
   label_operator_none: "is empty"
@@ -2516,6 +2583,7 @@ ja:
   label_reporting: "レポート作成"
   label_reporting_plural: "レポート"
   label_repository: "リポジトリ"
+  label_repository_remove: "Remove repository"
   label_repository_root: "リポジトリのルート"
   label_repository_plural: "リポジトリ"
   label_required: "必須"
@@ -2578,6 +2646,7 @@ ja:
   label_this_month: "今月"
   label_this_week: "今週"
   label_this_year: "今年"
+  label_time: "Time"
   label_time_entry_plural: "作業時間の記録"
   label_time_entry_activity_plural: "Spent time activities"
   label_title: "タイトル"
@@ -2613,6 +2682,7 @@ ja:
   label_user_settings: "ユーザー設定"
   label_users_settings: "Users settings"
   label_version_new: "新しいバージョン"
+  label_version_edit: "Edit version"
   label_version_plural: "バージョン"
   label_version_sharing_descendants: "子プロジェクト単位"
   label_version_sharing_hierarchy: "プロジェクト階層単位"
@@ -2749,8 +2819,13 @@ ja:
         prefix: "Received because of the notification setting: %{reason}"
         date_alert_start_date: "Date alert"
         date_alert_due_date: "Date alert"
+        reminder: "Reminder"
       see_all: "See all"
       updated_at: "Updated at %{timestamp} by %{user}"
+    reminder_notifications:
+      subject: "Reminder: %{note}"
+      heading: "You have a new reminder"
+      note: "Note: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "You may %{allowed_actions} this work package. This can change depending on your project role and permissions."
@@ -2917,6 +2992,7 @@ ja:
   notice_successful_connection: "正常に接続しました。"
   notice_successful_create: "正常に作成しました。"
   notice_successful_delete: "正常に削除しました。"
+  notice_successful_cancel: "Successful cancellation."
   notice_successful_update: "正常に更新しました。"
   notice_successful_update_custom_fields_added_to_project: |
     Successful update. The custom fields of the activated types are automatically activated
@@ -2993,6 +3069,7 @@ ja:
   permission_edit_own_time_entries: "自分が記入した作業時間の編集"
   permission_edit_project: "プロジェクトの編集"
   permission_edit_project_attributes: "Edit project attributes"
+  permission_edit_project_stages_and_gates: "Edit project stages and gates"
   permission_edit_reportings: "レポートの編集"
   permission_edit_time_entries: "Edit time logs for other users"
   permission_edit_timelines: "タイムラインの編集"
@@ -3022,9 +3099,12 @@ ja:
   permission_search_project: "Search project"
   permission_select_custom_fields: "Select custom fields"
   permission_select_project_custom_fields: "Select project attributes"
+  permission_select_project_life_cycle: "Select project stages and gates"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "プロジェクトでモジュールの選択"
   permission_share_work_packages: "Share work packages"
   permission_manage_types: "ワークパッケージのタイプを選択"
+  permission_manage_own_reminders: "Create own reminders"
   permission_view_project: "View projects"
   permission_view_changesets: "OpenProject にリポジトリのリビジョンを表示"
   permission_view_commit_author_statistics: "コミット作成者の統計情報の閲覧"
@@ -3045,6 +3125,7 @@ ja:
   permission_work_package_assigned_explanation: "それぞれのプロジェクトで、ワークパッケージはこの役割をもつユーザーおよびグループに割り当てることができます。"
   permission_view_project_activity: "View project activity"
   permission_view_project_attributes: "View project attributes"
+  permission_view_project_stages_and_gates: "View project stages and gates"
   permission_save_bcf_queries: "Save BCF queries"
   permission_manage_public_bcf_queries: "Manage public BCF queries"
   permission_edit_attribute_help_texts: "Edit attribute help texts"
@@ -3723,6 +3804,12 @@ ja:
       edit_description: "Can view, comment and edit this work package."
       view: "表示"
       view_description: "Can view this work package."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Why are you setting this reminder?"
+      success_creation_message: "Reminder set successfully. You will receive a notification for this work package at the chosen time."
+      success_update_message: "Reminder updated successfully."
+      success_deletion_message: "Reminder deleted successfully."
   sharing:
     count:
       zero: "0 users"
diff --git a/config/locales/crowdin/js-af.yml b/config/locales/crowdin/js-af.yml
index 1b7233869545..1779f0b7f5d3 100644
--- a/config/locales/crowdin/js-af.yml
+++ b/config/locales/crowdin/js-af.yml
@@ -357,10 +357,10 @@ af:
           learn_about: "Learn more about the new features"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Subscribe to calendar"
       inital_setup_error_message: "An error occured while fetching data."
@@ -621,14 +621,15 @@ af:
         prioritized: "Prioritized"
         dateAlert: "Date alert"
         shared: "Shared"
+        reminder: "Reminder"
       date_alerts:
         milestone_date: "Milestone date"
         overdue: "Overdue"
-        overdue_since: "since %{difference_in_days}"
-        property_today: "is today"
-        property_is: "is in %{difference_in_days}"
-        property_was: "was %{difference_in_days} ago"
-        property_is_deleted: "is deleted"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Date alerts"
           description: "With date alerts, you will be notified of upcoming start or finish dates so that you never miss or forget an important deadline."
@@ -653,6 +654,8 @@ af:
         new_notifications:
           message: "There are new notifications."
           link_text: "Click here to load them."
+      reminders:
+        note: "Note: “%{note}”"
       settings:
         change_notification_settings: 'You can modify your <a target="_blank" href="%{url}">notification settings</a> to ensure you never miss an important update.'
         title: "Notification settings"
@@ -740,6 +743,7 @@ af:
         immediate:
           title: "Send me an email reminder"
           mentioned: "Immediately when someone @mentions me"
+          personal_reminder: "Immediately when I receive a personal reminder"
         alerts:
           title: "Email alerts for other items (that are not work packages)"
           explanation: >
@@ -771,10 +775,6 @@ af:
         upgrade_to_ee_text: "Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?"
         more_information: "More information"
         nevermind: "Nevermind"
-      edit:
-        form_configuration: "Form Configuration"
-        projects: "Projekte"
-        settings: "Instellings"
     time_entry:
       work_package_required: "Requires selecting a work package first."
       title: "Log tyd"
@@ -1043,6 +1043,12 @@ af:
           not_found: "There is no such view"
           duplicate_query_title: "Name of this view already exists. Change anyway?"
         text_no_results: "No matching views were found."
+      reminders:
+        button_label: "Set reminder"
+        title:
+          new: "Set reminder"
+          edit: "Edit reminder"
+        subtitle: "You will receive a notification for this work package at the chosen time."
       scheduling:
         is_parent: "The dates of this work package are automatically deduced from its children. Activate 'Manual scheduling' to set the dates."
         is_switched_from_manual_to_automatic: "The dates of this work package may need to be recalculated after switching from manual to automatic scheduling due to relationships with other work packages."
@@ -1346,5 +1352,3 @@ af:
       waiting_subtitle:
         network_off: "There is a network problem."
         network_on: "Network is back. We are trying."
-        timeout: >
-          OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check the <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">health status of the file storage setup</a>.
diff --git a/config/locales/crowdin/js-ar.yml b/config/locales/crowdin/js-ar.yml
index 0578854d62a2..182406d201e8 100644
--- a/config/locales/crowdin/js-ar.yml
+++ b/config/locales/crowdin/js-ar.yml
@@ -357,10 +357,10 @@ ar:
           learn_about: "Learn more about the new features"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Subscribe to calendar"
       inital_setup_error_message: "An error occured while fetching data."
@@ -621,14 +621,15 @@ ar:
         prioritized: "Prioritized"
         dateAlert: "Date alert"
         shared: "Shared"
+        reminder: "Reminder"
       date_alerts:
         milestone_date: "Milestone date"
         overdue: "Overdue"
-        overdue_since: "since %{difference_in_days}"
-        property_today: "is today"
-        property_is: "is in %{difference_in_days}"
-        property_was: "was %{difference_in_days} ago"
-        property_is_deleted: "is deleted"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Date alerts"
           description: "With date alerts, you will be notified of upcoming start or finish dates so that you never miss or forget an important deadline."
@@ -657,6 +658,8 @@ ar:
         new_notifications:
           message: "There are new notifications."
           link_text: "Click here to load them."
+      reminders:
+        note: "Note: “%{note}”"
       settings:
         change_notification_settings: 'You can modify your <a target="_blank" href="%{url}">notification settings</a> to ensure you never miss an important update.'
         title: "Notification settings"
@@ -744,6 +747,7 @@ ar:
         immediate:
           title: "Send me an email reminder"
           mentioned: "Immediately when someone @mentions me"
+          personal_reminder: "Immediately when I receive a personal reminder"
         alerts:
           title: "Email alerts for other items (that are not work packages)"
           explanation: >
@@ -775,10 +779,6 @@ ar:
         upgrade_to_ee_text: "Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?"
         more_information: "More information"
         nevermind: "Nevermind"
-      edit:
-        form_configuration: "Form Configuration"
-        projects: "المشاريع"
-        settings: "إعدادات"
     time_entry:
       work_package_required: "Requires selecting a work package first."
       title: "وقت السجل"
@@ -1047,6 +1047,12 @@ ar:
           not_found: "There is no such view"
           duplicate_query_title: "Name of this view already exists. Change anyway?"
         text_no_results: "No matching views were found."
+      reminders:
+        button_label: "Set reminder"
+        title:
+          new: "Set reminder"
+          edit: "Edit reminder"
+        subtitle: "You will receive a notification for this work package at the chosen time."
       scheduling:
         is_parent: "The dates of this work package are automatically deduced from its children. Activate 'Manual scheduling' to set the dates."
         is_switched_from_manual_to_automatic: "The dates of this work package may need to be recalculated after switching from manual to automatic scheduling due to relationships with other work packages."
@@ -1362,5 +1368,3 @@ ar:
       waiting_subtitle:
         network_off: "There is a network problem."
         network_on: "Network is back. We are trying."
-        timeout: >
-          OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check the <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">health status of the file storage setup</a>.
diff --git a/config/locales/crowdin/js-az.yml b/config/locales/crowdin/js-az.yml
index 5d74c5a26ca3..a11862af646d 100644
--- a/config/locales/crowdin/js-az.yml
+++ b/config/locales/crowdin/js-az.yml
@@ -357,10 +357,10 @@ az:
           learn_about: "Learn more about the new features"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Subscribe to calendar"
       inital_setup_error_message: "An error occured while fetching data."
@@ -621,14 +621,15 @@ az:
         prioritized: "Prioritized"
         dateAlert: "Date alert"
         shared: "Shared"
+        reminder: "Reminder"
       date_alerts:
         milestone_date: "Milestone date"
         overdue: "Overdue"
-        overdue_since: "since %{difference_in_days}"
-        property_today: "is today"
-        property_is: "is in %{difference_in_days}"
-        property_was: "was %{difference_in_days} ago"
-        property_is_deleted: "is deleted"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Date alerts"
           description: "With date alerts, you will be notified of upcoming start or finish dates so that you never miss or forget an important deadline."
@@ -653,6 +654,8 @@ az:
         new_notifications:
           message: "There are new notifications."
           link_text: "Click here to load them."
+      reminders:
+        note: "Note: “%{note}”"
       settings:
         change_notification_settings: 'You can modify your <a target="_blank" href="%{url}">notification settings</a> to ensure you never miss an important update.'
         title: "Notification settings"
@@ -740,6 +743,7 @@ az:
         immediate:
           title: "Send me an email reminder"
           mentioned: "Immediately when someone @mentions me"
+          personal_reminder: "Immediately when I receive a personal reminder"
         alerts:
           title: "Email alerts for other items (that are not work packages)"
           explanation: >
@@ -771,10 +775,6 @@ az:
         upgrade_to_ee_text: "Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?"
         more_information: "More information"
         nevermind: "Nevermind"
-      edit:
-        form_configuration: "Form Configuration"
-        projects: "Projects"
-        settings: "Settings"
     time_entry:
       work_package_required: "Requires selecting a work package first."
       title: "Jurnal vaxtı"
@@ -1043,6 +1043,12 @@ az:
           not_found: "There is no such view"
           duplicate_query_title: "Name of this view already exists. Change anyway?"
         text_no_results: "No matching views were found."
+      reminders:
+        button_label: "Set reminder"
+        title:
+          new: "Set reminder"
+          edit: "Edit reminder"
+        subtitle: "You will receive a notification for this work package at the chosen time."
       scheduling:
         is_parent: "The dates of this work package are automatically deduced from its children. Activate 'Manual scheduling' to set the dates."
         is_switched_from_manual_to_automatic: "The dates of this work package may need to be recalculated after switching from manual to automatic scheduling due to relationships with other work packages."
@@ -1346,5 +1352,3 @@ az:
       waiting_subtitle:
         network_off: "There is a network problem."
         network_on: "Network is back. We are trying."
-        timeout: >
-          OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check the <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">health status of the file storage setup</a>.
diff --git a/config/locales/crowdin/js-be.yml b/config/locales/crowdin/js-be.yml
index c97a47def68d..2c2947d55d02 100644
--- a/config/locales/crowdin/js-be.yml
+++ b/config/locales/crowdin/js-be.yml
@@ -357,10 +357,10 @@ be:
           learn_about: "Learn more about the new features"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Subscribe to calendar"
       inital_setup_error_message: "An error occured while fetching data."
@@ -621,14 +621,15 @@ be:
         prioritized: "Prioritized"
         dateAlert: "Date alert"
         shared: "Shared"
+        reminder: "Reminder"
       date_alerts:
         milestone_date: "Milestone date"
         overdue: "Overdue"
-        overdue_since: "since %{difference_in_days}"
-        property_today: "is today"
-        property_is: "is in %{difference_in_days}"
-        property_was: "was %{difference_in_days} ago"
-        property_is_deleted: "is deleted"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Date alerts"
           description: "With date alerts, you will be notified of upcoming start or finish dates so that you never miss or forget an important deadline."
@@ -655,6 +656,8 @@ be:
         new_notifications:
           message: "There are new notifications."
           link_text: "Click here to load them."
+      reminders:
+        note: "Note: “%{note}”"
       settings:
         change_notification_settings: 'You can modify your <a target="_blank" href="%{url}">notification settings</a> to ensure you never miss an important update.'
         title: "Notification settings"
@@ -742,6 +745,7 @@ be:
         immediate:
           title: "Send me an email reminder"
           mentioned: "Immediately when someone @mentions me"
+          personal_reminder: "Immediately when I receive a personal reminder"
         alerts:
           title: "Email alerts for other items (that are not work packages)"
           explanation: >
@@ -773,10 +777,6 @@ be:
         upgrade_to_ee_text: "Нічога сабе! Калі вам патрэбны гэты дадатак, вы вялікі прафесіянал! Ці будзеце вы ветлівы падтрымаць нас, OpenSource распрацоўшчыкаў, пераўтварыўшыся ў карыстальніка Enterprise edition?"
         more_information: "Дадатковыя звесткі"
         nevermind: "Nevermind"
-      edit:
-        form_configuration: "Form Configuration"
-        projects: "Projects"
-        settings: "Settings"
     time_entry:
       work_package_required: "Requires selecting a work package first."
       title: "Log time"
@@ -1045,6 +1045,12 @@ be:
           not_found: "There is no such view"
           duplicate_query_title: "Name of this view already exists. Change anyway?"
         text_no_results: "No matching views were found."
+      reminders:
+        button_label: "Set reminder"
+        title:
+          new: "Set reminder"
+          edit: "Edit reminder"
+        subtitle: "You will receive a notification for this work package at the chosen time."
       scheduling:
         is_parent: "The dates of this work package are automatically deduced from its children. Activate 'Manual scheduling' to set the dates."
         is_switched_from_manual_to_automatic: "The dates of this work package may need to be recalculated after switching from manual to automatic scheduling due to relationships with other work packages."
@@ -1354,5 +1360,3 @@ be:
       waiting_subtitle:
         network_off: "There is a network problem."
         network_on: "Network is back. We are trying."
-        timeout: >
-          OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check the <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">health status of the file storage setup</a>.
diff --git a/config/locales/crowdin/js-bg.yml b/config/locales/crowdin/js-bg.yml
index dc746f1faec3..e766a9c70ba6 100644
--- a/config/locales/crowdin/js-bg.yml
+++ b/config/locales/crowdin/js-bg.yml
@@ -357,10 +357,10 @@ bg:
           learn_about: "Learn more about the new features"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Subscribe to calendar"
       inital_setup_error_message: "An error occured while fetching data."
@@ -621,14 +621,15 @@ bg:
         prioritized: "Prioritized"
         dateAlert: "Date alert"
         shared: "Shared"
+        reminder: "Reminder"
       date_alerts:
         milestone_date: "Milestone date"
         overdue: "Overdue"
-        overdue_since: "since %{difference_in_days}"
-        property_today: "is today"
-        property_is: "is in %{difference_in_days}"
-        property_was: "was %{difference_in_days} ago"
-        property_is_deleted: "is deleted"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Date alerts"
           description: "With date alerts, you will be notified of upcoming start or finish dates so that you never miss or forget an important deadline."
@@ -653,6 +654,8 @@ bg:
         new_notifications:
           message: "There are new notifications."
           link_text: "Click here to load them."
+      reminders:
+        note: "Note: “%{note}”"
       settings:
         change_notification_settings: 'You can modify your <a target="_blank" href="%{url}">notification settings</a> to ensure you never miss an important update.'
         title: "Notification settings"
@@ -740,6 +743,7 @@ bg:
         immediate:
           title: "Send me an email reminder"
           mentioned: "Immediately when someone @mentions me"
+          personal_reminder: "Immediately when I receive a personal reminder"
         alerts:
           title: "Email alerts for other items (that are not work packages)"
           explanation: >
@@ -771,10 +775,6 @@ bg:
         upgrade_to_ee_text: "Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?"
         more_information: "Повече информация"
         nevermind: "Nevermind"
-      edit:
-        form_configuration: "Конфигуриране на Форма"
-        projects: "Проекти"
-        settings: "Настройки"
     time_entry:
       work_package_required: "Requires selecting a work package first."
       title: "Отчетено време"
@@ -1043,6 +1043,12 @@ bg:
           not_found: "There is no such view"
           duplicate_query_title: "Name of this view already exists. Change anyway?"
         text_no_results: "No matching views were found."
+      reminders:
+        button_label: "Set reminder"
+        title:
+          new: "Set reminder"
+          edit: "Edit reminder"
+        subtitle: "You will receive a notification for this work package at the chosen time."
       scheduling:
         is_parent: "Датите на този работен пакет се извеждат автоматично от неговите деца. Активирайте „Ръчно планиране“, за да зададете датите."
         is_switched_from_manual_to_automatic: "Датите на този работен пакет може да се наложи да бъдат преизчислени след преминаване от ръчно към автоматично планиране поради връзки с други работни пакети."
@@ -1346,5 +1352,3 @@ bg:
       waiting_subtitle:
         network_off: "There is a network problem."
         network_on: "Network is back. We are trying."
-        timeout: >
-          OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check the <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">health status of the file storage setup</a>.
diff --git a/config/locales/crowdin/js-ca.yml b/config/locales/crowdin/js-ca.yml
index 24b604295ea6..8ca2e3e2460d 100644
--- a/config/locales/crowdin/js-ca.yml
+++ b/config/locales/crowdin/js-ca.yml
@@ -357,10 +357,10 @@ ca:
           learn_about: "Més informació sobre les noves funcions"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Subscribe to calendar"
       inital_setup_error_message: "S'ha produït un error en carregar les dades."
@@ -621,14 +621,15 @@ ca:
         prioritized: "Prioritized"
         dateAlert: "Alerta per dates"
         shared: "Compartida"
+        reminder: "Reminder"
       date_alerts:
         milestone_date: "Data de fita"
         overdue: "Vençut"
-        overdue_since: "des de %{difference_in_days}"
-        property_today: "és avui"
-        property_is: "és en %{difference_in_days}"
-        property_was: "va ser fa %{difference_in_days}"
-        property_is_deleted: "eliminat"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Alertes per dates"
           description: "Amb les alertes per dates, se't notificarà quan una data d'inici o finalització s'apropi de tal manera que no se't puguin oblidar o passar dates rellevants."
@@ -653,6 +654,8 @@ ca:
         new_notifications:
           message: "No hi ha notificacions noves"
           link_text: "Click here to load them."
+      reminders:
+        note: "Note: “%{note}”"
       settings:
         change_notification_settings: 'Pots modificar la teva <a target="_blank" href="%{url}">configuració de notificacions</a> per assegurar-te que mai et perds informació important.'
         title: "Configuració de notificacions"
@@ -740,6 +743,7 @@ ca:
         immediate:
           title: "Envia'm un correu electrònic recordatori"
           mentioned: "Immediatament quan algú em @menciona"
+          personal_reminder: "Immediately when I receive a personal reminder"
         alerts:
           title: "Alertes en correu electrònic per altres elements (que no són paquets de treball)"
           explanation: >
@@ -771,10 +775,6 @@ ca:
         upgrade_to_ee_text: "Ostres! Si necessita aquesta funció ets un súper pro! T'importaria donar suport als nostres desenvolupadors de codi obert convertint-te en client de l'edició Enterprise?"
         more_information: "Més informació"
         nevermind: "Sense importància"
-      edit:
-        form_configuration: "Configuració del formulari"
-        projects: "Projectes"
-        settings: "Configuració"
     time_entry:
       work_package_required: "Requereix seleccionar un paquet de treball primer."
       title: "Registrar temps"
@@ -1043,6 +1043,12 @@ ca:
           not_found: "No existeix aquesta vista"
           duplicate_query_title: "El nom de la vista ja existeix. Canvia de totes formes?"
         text_no_results: "No hi ha vistes que coincideixin"
+      reminders:
+        button_label: "Set reminder"
+        title:
+          new: "Set reminder"
+          edit: "Edit reminder"
+        subtitle: "You will receive a notification for this work package at the chosen time."
       scheduling:
         is_parent: "Les dates d'aquest paquet de treball estan derivades automàticament dels seus fills. Activa la \"Planificació manual\" per canviar les dates."
         is_switched_from_manual_to_automatic: "Pot ser que les dates d'aquest paquet de treball no es tornin a calcular automàticament en canviar de planificació manual a automàtica a causa de les relacions amb altres paquets de treball."
@@ -1346,5 +1352,3 @@ ca:
       waiting_subtitle:
         network_off: "There is a network problem."
         network_on: "Network is back. We are trying."
-        timeout: >
-          OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check the <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">health status of the file storage setup</a>.
diff --git a/config/locales/crowdin/js-ckb-IR.yml b/config/locales/crowdin/js-ckb-IR.yml
index 76c5fcc7be48..0fd41f61726e 100644
--- a/config/locales/crowdin/js-ckb-IR.yml
+++ b/config/locales/crowdin/js-ckb-IR.yml
@@ -357,10 +357,10 @@ ckb-IR:
           learn_about: "Learn more about the new features"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Subscribe to calendar"
       inital_setup_error_message: "An error occured while fetching data."
@@ -621,14 +621,15 @@ ckb-IR:
         prioritized: "Prioritized"
         dateAlert: "Date alert"
         shared: "Shared"
+        reminder: "Reminder"
       date_alerts:
         milestone_date: "Milestone date"
         overdue: "Overdue"
-        overdue_since: "since %{difference_in_days}"
-        property_today: "is today"
-        property_is: "is in %{difference_in_days}"
-        property_was: "was %{difference_in_days} ago"
-        property_is_deleted: "is deleted"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Date alerts"
           description: "With date alerts, you will be notified of upcoming start or finish dates so that you never miss or forget an important deadline."
@@ -653,6 +654,8 @@ ckb-IR:
         new_notifications:
           message: "There are new notifications."
           link_text: "Click here to load them."
+      reminders:
+        note: "Note: “%{note}”"
       settings:
         change_notification_settings: 'You can modify your <a target="_blank" href="%{url}">notification settings</a> to ensure you never miss an important update.'
         title: "Notification settings"
@@ -740,6 +743,7 @@ ckb-IR:
         immediate:
           title: "Send me an email reminder"
           mentioned: "Immediately when someone @mentions me"
+          personal_reminder: "Immediately when I receive a personal reminder"
         alerts:
           title: "Email alerts for other items (that are not work packages)"
           explanation: >
@@ -771,10 +775,6 @@ ckb-IR:
         upgrade_to_ee_text: "Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?"
         more_information: "More information"
         nevermind: "Nevermind"
-      edit:
-        form_configuration: "Form Configuration"
-        projects: "Projects"
-        settings: "Settings"
     time_entry:
       work_package_required: "Requires selecting a work package first."
       title: "Log time"
@@ -1043,6 +1043,12 @@ ckb-IR:
           not_found: "There is no such view"
           duplicate_query_title: "Name of this view already exists. Change anyway?"
         text_no_results: "No matching views were found."
+      reminders:
+        button_label: "Set reminder"
+        title:
+          new: "Set reminder"
+          edit: "Edit reminder"
+        subtitle: "You will receive a notification for this work package at the chosen time."
       scheduling:
         is_parent: "The dates of this work package are automatically deduced from its children. Activate 'Manual scheduling' to set the dates."
         is_switched_from_manual_to_automatic: "The dates of this work package may need to be recalculated after switching from manual to automatic scheduling due to relationships with other work packages."
@@ -1346,5 +1352,3 @@ ckb-IR:
       waiting_subtitle:
         network_off: "There is a network problem."
         network_on: "Network is back. We are trying."
-        timeout: >
-          OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check the <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">health status of the file storage setup</a>.
diff --git a/config/locales/crowdin/js-cs.yml b/config/locales/crowdin/js-cs.yml
index 9f3493c02919..47dbad221318 100644
--- a/config/locales/crowdin/js-cs.yml
+++ b/config/locales/crowdin/js-cs.yml
@@ -105,7 +105,7 @@ cs:
     button_update: "Aktualizovat"
     button_export-pdf: "Stáhnout PDF"
     button_export-atom: "Stáhnout Atom"
-    button_generate_pdf: "Generate PDF"
+    button_generate_pdf: ""
     button_create: "Vytvořit"
     card:
       add_new: "Přidat novou kartu"
@@ -140,7 +140,7 @@ cs:
     description_subwork_package: "Podřazený pracovního balíčku #%{id}"
     editor:
       revisions: "Show local modifications"
-      no_revisions: "No local modifications found"
+      no_revisions: "Nebyly nalezeny žádné místní úpravy"
       preview: "Přepnout režim náhledu"
       source_code: "Přepnout zdrojový mód Markdown"
       error_saving_failed: "Uložení dokumentu se nezdařilo s následující chybou: %{error}"
@@ -153,7 +153,7 @@ cs:
         attribute_reference:
           macro_help_tooltip: "Tento textový segment je dynamicky rendrován makrem."
           not_found: "Požadovaný zdroj nebyl nalezen."
-          nested_macro: "This macro is recursively referencing %{model} %{id}."
+          nested_macro: "Tento makro rekurzivně odkazuje na %{model} %{id}."
           invalid_attribute: "Vybraný atribut '%{name}' neexistuje."
         child_pages:
           button: "Odkazy na podřízené stránky"
@@ -356,10 +356,10 @@ cs:
           learn_about: "Další informace o nových funkcích"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Přihlásit kalendář k odběru"
       inital_setup_error_message: "Při načítání dat došlo k chybě."
@@ -400,7 +400,7 @@ cs:
     label_create: "Vytvořit"
     label_create_work_package: "Vytvořit nový pracovní balíček"
     label_created_by: "Vytvořil(a)"
-    label_current: "current"
+    label_current: "aktuální"
     label_date: "Datum"
     label_date_with_format: "Zadejte %{date_attribute} v následujícím formátu: %{format}"
     label_deactivate: "Deaktivovat"
@@ -620,14 +620,15 @@ cs:
         prioritized: "Prioritní"
         dateAlert: "Upozornění na datum"
         shared: "Sdíleno"
+        reminder: "Připomínka"
       date_alerts:
         milestone_date: "Datum milníku"
         overdue: "Po termínu"
-        overdue_since: "od %{difference_in_days}"
-        property_today: "je dnes"
-        property_is: "je v %{difference_in_days}"
-        property_was: "byl před %{difference_in_days}"
-        property_is_deleted: "Smazáno"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Upozornění na datum"
           description: "S upozorněním na datum budete upozorněni na blížící se datum zahájení nebo ukončení, abyste nikdy nezmeškali nebo nezapomněli na důležitou lhůtu."
@@ -643,17 +644,19 @@ cs:
           with_current_filter: "V současné době nejsou v tomto zobrazení žádná oznámení"
         mark_all_read: "Označit vše jako přečtené"
         mark_as_read: "Označit jako přečtené"
-        text_update_date_by: "%{date} by"
+        text_update_date_by: "%{date} podle"
         total_count_warning: "Zobrazení posledních oznámení %{newest_count} . Nezobrazuje se ještě %{more_count}"
         empty_state:
           no_notification: "Vypadá to, že jste všechno dohnali..."
           no_notification_with_current_project_filter: "Vypadá to, že nemáte žadné nové oznámení pro vybraný projekt."
           no_notification_with_current_filter: "Vypadá to, že tady nic není %{filter} filtr."
-          no_notification_for_filter: "Looks like you are all caught up for this filter."
+          no_notification_for_filter: "Vypadá to, že jste všichni zachytili tento filtr."
           no_selection: "Klikněte na oznámení pro zobrazení všech podrobností o aktivitě."
         new_notifications:
           message: "Máte nová oznámení."
           link_text: "Klikněte zde pro jejich načtení."
+      reminders:
+        note: "Poznámka: \"%{note}\""
       settings:
         change_notification_settings: 'Můžete změnit nastavení <a target="_blank" href="%{url}">oznámení</a> , abyste se ujistili, že nikdy nezmeškáte důležitou aktualizaci.'
         title: "Nastavení oznámení"
@@ -741,6 +744,7 @@ cs:
         immediate:
           title: "Pošlete mi připomenutí e-mailem"
           mentioned: "V momente  když mě někdo @zmiňuje"
+          personal_reminder: "Okamžitě po osobní připomenutí"
         alerts:
           title: "E-mailová upozornění pro ostatní položky (které nejsou pracovní balíčky)"
           explanation: >
@@ -772,10 +776,6 @@ cs:
         upgrade_to_ee_text: "Páni! Pokud potřebujete tuto funkci, jste super pro! Nevadili byste nám podpořit OpenSource vývojáře tím, že se stanete klientem Enterprise Edition?"
         more_information: "Více informací"
         nevermind: "Nevadí"
-      edit:
-        form_configuration: "Konfigurace formuláře"
-        projects: "Projekty"
-        settings: "Nastavení"
     time_entry:
       work_package_required: "Vyžaduje nejprve výběr pracovního balíčku."
       title: "Čas protokolu"
@@ -1001,7 +1001,7 @@ cs:
         workAlternative: "Odhadovaný čas"
         remainingTime: "Zbývající práce"
       default_queries:
-        manually_sorted: "New manually sorted query"
+        manually_sorted: "Nový ručně seřazený dotaz"
         latest_activity: "Poslední aktivita"
         created_by_me: "Vytvořeno mnou"
         assigned_to_me: "Přiřazeno mně"
@@ -1044,12 +1044,18 @@ cs:
           not_found: "Neexistuje takové zobrazení"
           duplicate_query_title: "Název tohoto zobrazení již existuje. Chcete přesto změnit?"
         text_no_results: "Nebyly nalezeny žádné odpovídající zobrazení."
+      reminders:
+        button_label: "Nastavit připomínku"
+        title:
+          new: "Nastavit připomenutí"
+          edit: "Upravit připomínku"
+        subtitle: "Za tento pracovní balíček obdržíte oznámení ve zvoleném čase."
       scheduling:
         is_parent: "Data tohoto pracovního balíčku jsou automaticky odvozena od jeho dětí. Aktivujte 'Manuální plánování' pro ručné nastavení dat."
         is_switched_from_manual_to_automatic: "Data tohoto pracovního balíčku budou možná muset být přepočítána po přepnutí z manuálu na automatické plánování kvůli vztahům s ostatními pracovními balíčky."
       sharing:
         title: "Sdílet pracovní balíček"
-        show_all_users: "Show all users with whom the work package has been shared with"
+        show_all_users: "Zobrazit všechny uživatele, s nimiž byl pracovní balíček sdílen s"
         upsale:
           description: "Sdílejte pracovní balíčky s uživateli, kteří nejsou členy projektu."
       table:
@@ -1194,9 +1200,9 @@ cs:
         zero: "0 dní"
       word:
         one: "1 slovo"
-        few: "%{count} words"
-        many: "%{count} words"
-        other: "%{count} words"
+        few: "%{count} slov"
+        many: "%{count} slov"
+        other: "%{count} slov"
     zen_mode:
       button_activate: "Aktivovat zen režim"
       button_deactivate: "Deaktivovat zen režim"
@@ -1353,5 +1359,3 @@ cs:
       waiting_subtitle:
         network_off: "Je tu problém se sítí."
         network_on: "Síť je zpátky . Zkoušíme to."
-        timeout: >
-          OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check the <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">health status of the file storage setup</a>.
diff --git a/config/locales/crowdin/js-da.yml b/config/locales/crowdin/js-da.yml
index 451ef1c4b401..f2151e79097a 100644
--- a/config/locales/crowdin/js-da.yml
+++ b/config/locales/crowdin/js-da.yml
@@ -356,10 +356,10 @@ da:
           learn_about: "Learn more about the new features"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Subscribe to calendar"
       inital_setup_error_message: "An error occured while fetching data."
@@ -620,14 +620,15 @@ da:
         prioritized: "Prioritized"
         dateAlert: "Date alert"
         shared: "Shared"
+        reminder: "Reminder"
       date_alerts:
         milestone_date: "Milestone date"
         overdue: "Overdue"
-        overdue_since: "since %{difference_in_days}"
-        property_today: "is today"
-        property_is: "is in %{difference_in_days}"
-        property_was: "was %{difference_in_days} ago"
-        property_is_deleted: "is deleted"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Date alerts"
           description: "With date alerts, you will be notified of upcoming start or finish dates so that you never miss or forget an important deadline."
@@ -652,6 +653,8 @@ da:
         new_notifications:
           message: "There are new notifications."
           link_text: "Click here to load them."
+      reminders:
+        note: "Note: “%{note}”"
       settings:
         change_notification_settings: 'You can modify your <a target="_blank" href="%{url}">notification settings</a> to ensure you never miss an important update.'
         title: "Notification settings"
@@ -739,6 +742,7 @@ da:
         immediate:
           title: "Send me an email reminder"
           mentioned: "Immediately when someone @mentions me"
+          personal_reminder: "Immediately when I receive a personal reminder"
         alerts:
           title: "Email alerts for other items (that are not work packages)"
           explanation: >
@@ -770,10 +774,6 @@ da:
         upgrade_to_ee_text: "Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?"
         more_information: "More information"
         nevermind: "Nevermind"
-      edit:
-        form_configuration: "Form Configuration"
-        projects: "Projekter"
-        settings: "Indstillinger"
     time_entry:
       work_package_required: "Requires selecting a work package first."
       title: "Tidsregistrering"
@@ -1042,6 +1042,12 @@ da:
           not_found: "There is no such view"
           duplicate_query_title: "Name of this view already exists. Change anyway?"
         text_no_results: "No matching views were found."
+      reminders:
+        button_label: "Set reminder"
+        title:
+          new: "Set reminder"
+          edit: "Edit reminder"
+        subtitle: "You will receive a notification for this work package at the chosen time."
       scheduling:
         is_parent: "The dates of this work package are automatically deduced from its children. Activate 'Manual scheduling' to set the dates."
         is_switched_from_manual_to_automatic: "The dates of this work package may need to be recalculated after switching from manual to automatic scheduling due to relationships with other work packages."
@@ -1345,5 +1351,3 @@ da:
       waiting_subtitle:
         network_off: "There is a network problem."
         network_on: "Network is back. We are trying."
-        timeout: >
-          OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check the <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">health status of the file storage setup</a>.
diff --git a/config/locales/crowdin/js-de.yml b/config/locales/crowdin/js-de.yml
index e020343c7f49..e48852262cf7 100644
--- a/config/locales/crowdin/js-de.yml
+++ b/config/locales/crowdin/js-de.yml
@@ -356,10 +356,10 @@ de:
           learn_about: "Erfahren Sie mehr über die neuen Funktionen"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                Die Version bringt verschiedene Funktionen und Verbesserungen für Sie, z.B. <br> <ul class="%{list_styling_class}"> <li>Selbstdefinierte Felder vom Typ Hierarchie (Enterprise Add-on).</li> <li>Neugestaltung des Beziehungen-Tabs in Arbeitspaketen.</li> <li>Neugestaltung der Besprechungen-Indexseite.</li> <li>Manuelle Seitenumbrüche beim PDF-Export von Arbeitspaketen.</li> <li>Zen-Modus für Projektlisten.</li> </ul>
+                Die Version bringt Ihnen verschiedene Funktionen und Verbesserungen, z.B. <br> <ul class="%{list_styling_class}"> <li>Legen Sie Erinnerungen für Arbeitspakete fest, um Benachrichtigungen zu generieren.</li> <li>Erstellen Sie neue Ordner direkt beim Hochladen einer Datei.</li> <li>Legen Sie einen gewünschten Abstand zwischen Nachfolgern und Vorgängern von Arbeitspaketen fest.</li> <li>Aktivieren Sie die Sortierung und Gruppierung von Arbeitspaketen nach ihren Werten für benutzerdefinierte Felder vom Typ Hierarchie.</li> <li>Exportieren Sie Zeiteinträge als PDF-Zeiterfassungsbögen.</li> <li>Nutzen Sie ein Popover mit Benutzerinformationen indem Sie den Mauszeiger über Avatare bewegen.</li> </ul>
     ical_sharing_modal:
       title: "Kalender abonnieren"
       inital_setup_error_message: "Beim Abrufen der Daten ist ein Fehler aufgetreten."
@@ -620,14 +620,15 @@ de:
         prioritized: "Priorisiert"
         dateAlert: "Datums-Erinnerung"
         shared: "Geteilt"
+        reminder: "Erinnerung"
       date_alerts:
         milestone_date: "Datum des Meilensteins"
         overdue: "Überfällig"
-        overdue_since: "seit %{difference_in_days}"
-        property_today: "ist heute"
-        property_is: "ist in %{difference_in_days}"
-        property_was: "war vor %{difference_in_days}"
-        property_is_deleted: "wurde gelöscht"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Datums-Erinnerungen"
           description: "Mit Datums-Erinnerungen werden Sie über bevorstehende Start- oder Endtermine informiert, so dass Sie nie einen wichtigen Termin verpassen oder übersehen."
@@ -652,6 +653,8 @@ de:
         new_notifications:
           message: "Es gibt neue Benachrichtigungen."
           link_text: "Hier klicken zum Aktualisieren."
+      reminders:
+        note: "Anmerkung: „%{note}“"
       settings:
         change_notification_settings: 'Sie können Ihre <a target="_blank" href="%{url}">Benachrichtigungseinstellungen</a> ändern, um sicherzustellen, dass Sie keine wichtige Aktualisierung verpassen.'
         title: "Benachrichtigungseinstellungen"
@@ -739,6 +742,7 @@ de:
         immediate:
           title: "Eine E-Mail Erinnerung an mich senden"
           mentioned: "Sofort, wenn mich jemand @erwähnt"
+          personal_reminder: "Sofort, wenn ich eine persönliche Erinnerung erhalte"
         alerts:
           title: "E-Mail-Benachrichtigungen für andere Objekte (die keine Arbeitspakete sind)"
           explanation: >
@@ -770,10 +774,6 @@ de:
         upgrade_to_ee_text: "Wow! Wenn du dieses Add-on benötigst, bist du ein super Pro! Würdest du uns OpenProject-Entwickler unterstützen, indem du ein Enterprise Edition-Kunde wirst?"
         more_information: "Weitere Informationen"
         nevermind: "Nein danke"
-      edit:
-        form_configuration: "Formularkonfiguration"
-        projects: "Projekte"
-        settings: "Einstellungen"
     time_entry:
       work_package_required: "Benötigt zuerst die Auswahl eines Arbeitspakets."
       title: "Zeit buchen"
@@ -1042,6 +1042,12 @@ de:
           not_found: "Diese Ansicht konnte nicht gefunden werden"
           duplicate_query_title: "Eine Ansicht mit diesem Namen existiert bereits. Trotzdem ändern?"
         text_no_results: "Keine übereinstimmenden Ansichten gefunden."
+      reminders:
+        button_label: "Erinnerung einrichten"
+        title:
+          new: "Erinnerung einrichten"
+          edit: "Erinnerung bearbeiten"
+        subtitle: "Sie erhalten zum ausgewählten Zeitpunkt eine Benachrichtigung für dieses Arbeitspaket."
       scheduling:
         is_parent: "Die Termine dieses Arbeitspakets werden automatisch von seinen Kindern aggregiert. Aktivieren Sie \"Manuelle Planung\", um die Termine frei zu setzen."
         is_switched_from_manual_to_automatic: "Die Termine dieses Arbeitspakets müssen nach dem Wechsel auf automatische Planung neu berechnet werden."
@@ -1345,5 +1351,3 @@ de:
       waiting_subtitle:
         network_off: "Es gibt ein Netzwerkproblem."
         network_on: "Netzwerk ist wieder da. Wir versuchen es erneut."
-        timeout: >
-          OpenProject konnte Ihnen den Zugriff auf den Projektordner nicht innerhalb des erwarteten Zeitlimits ermöglichen. Bitte versuchen Sie es noch einmal.<br><br> Wenn das Problem weiterhin besteht, wenden Sie sich bitte an Ihren OpenProject-Administrator, um den Status der <a href="https://www.openproject.org/de/docs/system-admin-guide/dateien/external-file-storages/file-storage-troubleshooting/">Dateiablage</a> zu überprüfen.
diff --git a/config/locales/crowdin/js-el.yml b/config/locales/crowdin/js-el.yml
index ce944329bdec..2e35faf513d1 100644
--- a/config/locales/crowdin/js-el.yml
+++ b/config/locales/crowdin/js-el.yml
@@ -356,10 +356,10 @@ el:
           learn_about: "Μάθετε περισσότερα για τις νέες λειτουργίες"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Subscribe to calendar"
       inital_setup_error_message: "An error occured while fetching data."
@@ -620,14 +620,15 @@ el:
         prioritized: "Prioritized"
         dateAlert: "Date alert"
         shared: "Shared"
+        reminder: "Reminder"
       date_alerts:
         milestone_date: "Milestone date"
         overdue: "Overdue"
-        overdue_since: "since %{difference_in_days}"
-        property_today: "is today"
-        property_is: "is in %{difference_in_days}"
-        property_was: "was %{difference_in_days} ago"
-        property_is_deleted: "is deleted"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Date alerts"
           description: "With date alerts, you will be notified of upcoming start or finish dates so that you never miss or forget an important deadline."
@@ -652,6 +653,8 @@ el:
         new_notifications:
           message: "There are new notifications."
           link_text: "Click here to load them."
+      reminders:
+        note: "Note: “%{note}”"
       settings:
         change_notification_settings: 'You can modify your <a target="_blank" href="%{url}">notification settings</a> to ensure you never miss an important update.'
         title: "Notification settings"
@@ -739,6 +742,7 @@ el:
         immediate:
           title: "Send me an email reminder"
           mentioned: "Immediately when someone @mentions me"
+          personal_reminder: "Immediately when I receive a personal reminder"
         alerts:
           title: "Email alerts for other items (that are not work packages)"
           explanation: >
@@ -770,10 +774,6 @@ el:
         upgrade_to_ee_text: "Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?"
         more_information: "Περισσότερες πληροφορίες"
         nevermind: "Δεν πειράζει"
-      edit:
-        form_configuration: "Διαμόρφωση Φόρμας"
-        projects: "Έργα"
-        settings: "Ρυθμίσεις"
     time_entry:
       work_package_required: "Πρέπει πρώτα να επιλεγεί ένα πακέτο εργασίας."
       title: "Καταγραφή χρόνου"
@@ -1042,6 +1042,12 @@ el:
           not_found: "Δεν υπάρχει τέτοια προβολή"
           duplicate_query_title: "Το όνομα αυτής της προβολής υπάρχει ήδη. Αλλαγή παρόλα αυτά;"
         text_no_results: "Δεν βρέθηκαν προβολές που να ταιριάζουν."
+      reminders:
+        button_label: "Set reminder"
+        title:
+          new: "Set reminder"
+          edit: "Edit reminder"
+        subtitle: "You will receive a notification for this work package at the chosen time."
       scheduling:
         is_parent: "Οι ημερομηνίες αυτού του πακέτου εργασίας προκύπτουν αυτόματα από τα παιδιά του. Ενεργοποιήστε τον \"Χειροκίνητο προγραμματισμό\" για να ορίσετε τις ημερομηνίες."
         is_switched_from_manual_to_automatic: "Οι ημερομηνίες αυτού του πακέτου εργασίας μπορεί να χρειαστεί να υπολογιστούν εκ νέου μετά τη μετάβαση από χειροκίνητο σε αυτόματο προγραμματισμό λόγω των σχέσεων με άλλα πακέτα εργασίας."
@@ -1345,5 +1351,3 @@ el:
       waiting_subtitle:
         network_off: "There is a network problem."
         network_on: "Network is back. We are trying."
-        timeout: >
-          OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check the <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">health status of the file storage setup</a>.
diff --git a/config/locales/crowdin/js-eo.yml b/config/locales/crowdin/js-eo.yml
index 00f11c8d6d45..21aff1710c70 100644
--- a/config/locales/crowdin/js-eo.yml
+++ b/config/locales/crowdin/js-eo.yml
@@ -357,10 +357,10 @@ eo:
           learn_about: "Lerni pli pri la novaj plibonigoj"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Subscribe to calendar"
       inital_setup_error_message: "An error occured while fetching data."
@@ -621,14 +621,15 @@ eo:
         prioritized: "Prioritized"
         dateAlert: "Date alert"
         shared: "Shared"
+        reminder: "Reminder"
       date_alerts:
         milestone_date: "Milestone date"
         overdue: "Overdue"
-        overdue_since: "since %{difference_in_days}"
-        property_today: "is today"
-        property_is: "is in %{difference_in_days}"
-        property_was: "was %{difference_in_days} ago"
-        property_is_deleted: "is deleted"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Date alerts"
           description: "With date alerts, you will be notified of upcoming start or finish dates so that you never miss or forget an important deadline."
@@ -653,6 +654,8 @@ eo:
         new_notifications:
           message: "There are new notifications."
           link_text: "Click here to load them."
+      reminders:
+        note: "Note: “%{note}”"
       settings:
         change_notification_settings: 'You can modify your <a target="_blank" href="%{url}">notification settings</a> to ensure you never miss an important update.'
         title: "Notification settings"
@@ -740,6 +743,7 @@ eo:
         immediate:
           title: "Send me an email reminder"
           mentioned: "Immediately when someone @mentions me"
+          personal_reminder: "Immediately when I receive a personal reminder"
         alerts:
           title: "Email alerts for other items (that are not work packages)"
           explanation: >
@@ -771,10 +775,6 @@ eo:
         upgrade_to_ee_text: "Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?"
         more_information: "Pliaj informoj"
         nevermind: "Nevermind"
-      edit:
-        form_configuration: "El agordoj"
-        projects: "Projektoj"
-        settings: "Agordoj"
     time_entry:
       work_package_required: "Requires selecting a work package first."
       title: "Tempoprotokolo"
@@ -1043,6 +1043,12 @@ eo:
           not_found: "There is no such view"
           duplicate_query_title: "Name of this view already exists. Change anyway?"
         text_no_results: "No matching views were found."
+      reminders:
+        button_label: "Set reminder"
+        title:
+          new: "Set reminder"
+          edit: "Edit reminder"
+        subtitle: "You will receive a notification for this work package at the chosen time."
       scheduling:
         is_parent: "The dates of this work package are automatically deduced from its children. Activate 'Manual scheduling' to set the dates."
         is_switched_from_manual_to_automatic: "The dates of this work package may need to be recalculated after switching from manual to automatic scheduling due to relationships with other work packages."
@@ -1346,5 +1352,3 @@ eo:
       waiting_subtitle:
         network_off: "There is a network problem."
         network_on: "Network is back. We are trying."
-        timeout: >
-          OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check the <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">health status of the file storage setup</a>.
diff --git a/config/locales/crowdin/js-es.yml b/config/locales/crowdin/js-es.yml
index ec6b4dc0a3e7..caff16230e5e 100644
--- a/config/locales/crowdin/js-es.yml
+++ b/config/locales/crowdin/js-es.yml
@@ -357,10 +357,10 @@ es:
           learn_about: "Más información sobre las nuevas funciones"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                La versión trae varias características y mejoras para usted, por ejemplo <br> <ul class="%{list_styling_class}"> <li>Campos personalizados de tipo jerarquía (extensión Enterprise).</li> <li>Rediseño de la pestaña Relaciones en los paquetes de trabajo.</li> <li>Rediseño de la página de índice de Reuniones.</li> <li>Saltos de página manuales en las exportaciones de paquetes de trabajo en PDF.</li> <li>Modo Zen para las listas de proyectos.</li> </ul>
+                Esta versión incluye varias funciones y mejoras, por ejemplo: <br> <ul class="%{list_styling_class}"> <li>Establezca recordatorios para que los paquetes de trabajo generen notificaciones de alerta de fecha.</li> <li>Cree nuevas carpetas directamente desde el selector de ubicación para el almacenamiento de archivos. </li> <li>Especifique un desfase necesario entre los paquetes de trabajo sucesores y predecesores.</li> <li>Active la ordenación y agrupación de los paquetes de trabajo en función de los valores de los campos personalizados de tipo jerarquía.</li> <li>Exporte las entradas de tiempo como entradas de tiempo en PDF.</li> <li>Añada un elemento emergente que muestra información del usuario al pasar el ratón por encima.</li> </ul>
     ical_sharing_modal:
       title: "Suscribirse al calendario"
       inital_setup_error_message: "Se ha producido un error al obtener los datos."
@@ -621,14 +621,15 @@ es:
         prioritized: "Priorizado"
         dateAlert: "Alerta de fecha"
         shared: "Compartido"
+        reminder: "Recordatorio"
       date_alerts:
         milestone_date: "Fecha de hito"
         overdue: "Vencido"
-        overdue_since: "desde %{difference_in_days}"
-        property_today: "es hoy"
-        property_is: "está en %{difference_in_days}"
-        property_was: "era hace %{difference_in_days}"
-        property_is_deleted: "se ha eliminado"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Alertas de fecha"
           description: "Con las alertas de fecha, recibirá notificaciones de próximas fechas de inicio o finalización para que nunca olvide una fecha límite importante."
@@ -653,6 +654,8 @@ es:
         new_notifications:
           message: "Hay nuevas notificaciones."
           link_text: "Haga clic aquí para cargarlas."
+      reminders:
+        note: "Nota: «%{note}»"
       settings:
         change_notification_settings: 'Puede modificar su <a target="_blank" href="%{url}">configuración de notificaciones</a> para asegurarse que nunca se pierda una actualización importante.'
         title: "Ajustes de notificación"
@@ -740,6 +743,7 @@ es:
         immediate:
           title: "Enviarme un recordatorio por correo electrónico"
           mentioned: "De inmediato cuando alguien me @mencione"
+          personal_reminder: "Inmediatamente al recibir un recordatorio personal"
         alerts:
           title: "Alertas por correo electrónico de otros elementos (que no sean paquetes de trabajo)"
           explanation: >
@@ -771,10 +775,6 @@ es:
         upgrade_to_ee_text: "¡Vaya! Si necesita está extensión, entonces ¡es un usuario experto! ¿Le importaría apoyar a los desarrolladores de código abierto convirtiéndose en cliente de Enterprise?"
         more_information: "Más información"
         nevermind: "No importa"
-      edit:
-        form_configuration: "Configuración del formulario"
-        projects: "Proyectos"
-        settings: "Configuración"
     time_entry:
       work_package_required: "Es necesario seleccionar primero un paquete de trabajo."
       title: "Registro de tiempo"
@@ -1043,6 +1043,12 @@ es:
           not_found: "No existe la vista"
           duplicate_query_title: "El nombre de la vista ya existe. ¿Quiere cambiarlo de todos modos?"
         text_no_results: "No se encontraron vistas que coincidan."
+      reminders:
+        button_label: "Establecer recordatorio"
+        title:
+          new: "Establecer recordatorio"
+          edit: "Editar recordatorio"
+        subtitle: "Recibirá una notificación para este paquete de trabajo en el momento elegido."
       scheduling:
         is_parent: "Las fechas de este paquete de trabajo son deducidas automáticamente de sus sub-elementos. Active 'Programación manual' para establecer las fechas."
         is_switched_from_manual_to_automatic: "Las fechas de este paquete de trabajo pueden necesitar ser recalculadas después de pasar de programación manual a programación automática debido a las relaciones con otros paquetes de trabajo."
@@ -1346,5 +1352,3 @@ es:
       waiting_subtitle:
         network_off: "Hay un problema de red."
         network_on: "La red ha vuelto. Lo estamos intentando."
-        timeout: >
-          OpenProject no ha podido proporcionarle acceso a la carpeta del proyecto en el periodo de tiempo esperado. Inténtelo de nuevo.<br><br> Si el problema persiste, contacte con su administrador de OpenProject para comprobar el <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">estado de salud de la configuración de almacenamiento de archivos</a>.
diff --git a/config/locales/crowdin/js-et.yml b/config/locales/crowdin/js-et.yml
index acf06de0967d..d4703e6b3c5b 100644
--- a/config/locales/crowdin/js-et.yml
+++ b/config/locales/crowdin/js-et.yml
@@ -357,10 +357,10 @@ et:
           learn_about: "Learn more about the new features"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Subscribe to calendar"
       inital_setup_error_message: "An error occured while fetching data."
@@ -621,14 +621,15 @@ et:
         prioritized: "Prioritized"
         dateAlert: "Date alert"
         shared: "Shared"
+        reminder: "Reminder"
       date_alerts:
         milestone_date: "Milestone date"
         overdue: "Overdue"
-        overdue_since: "since %{difference_in_days}"
-        property_today: "is today"
-        property_is: "is in %{difference_in_days}"
-        property_was: "was %{difference_in_days} ago"
-        property_is_deleted: "is deleted"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Date alerts"
           description: "With date alerts, you will be notified of upcoming start or finish dates so that you never miss or forget an important deadline."
@@ -653,6 +654,8 @@ et:
         new_notifications:
           message: "There are new notifications."
           link_text: "Click here to load them."
+      reminders:
+        note: "Note: “%{note}”"
       settings:
         change_notification_settings: 'You can modify your <a target="_blank" href="%{url}">notification settings</a> to ensure you never miss an important update.'
         title: "Notification settings"
@@ -740,6 +743,7 @@ et:
         immediate:
           title: "Send me an email reminder"
           mentioned: "Immediately when someone @mentions me"
+          personal_reminder: "Immediately when I receive a personal reminder"
         alerts:
           title: "Email alerts for other items (that are not work packages)"
           explanation: >
@@ -771,10 +775,6 @@ et:
         upgrade_to_ee_text: "Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?"
         more_information: "Lisainfo"
         nevermind: "Nevermind"
-      edit:
-        form_configuration: "Form Configuration"
-        projects: "Projektid"
-        settings: "Seaded"
     time_entry:
       work_package_required: "Requires selecting a work package first."
       title: "Ajakulu"
@@ -1043,6 +1043,12 @@ et:
           not_found: "There is no such view"
           duplicate_query_title: "Name of this view already exists. Change anyway?"
         text_no_results: "No matching views were found."
+      reminders:
+        button_label: "Set reminder"
+        title:
+          new: "Set reminder"
+          edit: "Edit reminder"
+        subtitle: "You will receive a notification for this work package at the chosen time."
       scheduling:
         is_parent: "The dates of this work package are automatically deduced from its children. Activate 'Manual scheduling' to set the dates."
         is_switched_from_manual_to_automatic: "The dates of this work package may need to be recalculated after switching from manual to automatic scheduling due to relationships with other work packages."
@@ -1346,5 +1352,3 @@ et:
       waiting_subtitle:
         network_off: "There is a network problem."
         network_on: "Network is back. We are trying."
-        timeout: >
-          OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check the <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">health status of the file storage setup</a>.
diff --git a/config/locales/crowdin/js-eu.yml b/config/locales/crowdin/js-eu.yml
index a0f4fd38aace..4e4acfcd7636 100644
--- a/config/locales/crowdin/js-eu.yml
+++ b/config/locales/crowdin/js-eu.yml
@@ -357,10 +357,10 @@ eu:
           learn_about: "Learn more about the new features"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Subscribe to calendar"
       inital_setup_error_message: "An error occured while fetching data."
@@ -621,14 +621,15 @@ eu:
         prioritized: "Prioritized"
         dateAlert: "Date alert"
         shared: "Shared"
+        reminder: "Reminder"
       date_alerts:
         milestone_date: "Milestone date"
         overdue: "Overdue"
-        overdue_since: "since %{difference_in_days}"
-        property_today: "is today"
-        property_is: "is in %{difference_in_days}"
-        property_was: "was %{difference_in_days} ago"
-        property_is_deleted: "is deleted"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Date alerts"
           description: "With date alerts, you will be notified of upcoming start or finish dates so that you never miss or forget an important deadline."
@@ -653,6 +654,8 @@ eu:
         new_notifications:
           message: "There are new notifications."
           link_text: "Click here to load them."
+      reminders:
+        note: "Note: “%{note}”"
       settings:
         change_notification_settings: 'You can modify your <a target="_blank" href="%{url}">notification settings</a> to ensure you never miss an important update.'
         title: "Notification settings"
@@ -740,6 +743,7 @@ eu:
         immediate:
           title: "Send me an email reminder"
           mentioned: "Immediately when someone @mentions me"
+          personal_reminder: "Immediately when I receive a personal reminder"
         alerts:
           title: "Email alerts for other items (that are not work packages)"
           explanation: >
@@ -771,10 +775,6 @@ eu:
         upgrade_to_ee_text: "Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?"
         more_information: "More information"
         nevermind: "Nevermind"
-      edit:
-        form_configuration: "Form Configuration"
-        projects: "Projects"
-        settings: "Settings"
     time_entry:
       work_package_required: "Requires selecting a work package first."
       title: "Log time"
@@ -1043,6 +1043,12 @@ eu:
           not_found: "There is no such view"
           duplicate_query_title: "Name of this view already exists. Change anyway?"
         text_no_results: "No matching views were found."
+      reminders:
+        button_label: "Set reminder"
+        title:
+          new: "Set reminder"
+          edit: "Edit reminder"
+        subtitle: "You will receive a notification for this work package at the chosen time."
       scheduling:
         is_parent: "The dates of this work package are automatically deduced from its children. Activate 'Manual scheduling' to set the dates."
         is_switched_from_manual_to_automatic: "The dates of this work package may need to be recalculated after switching from manual to automatic scheduling due to relationships with other work packages."
@@ -1346,5 +1352,3 @@ eu:
       waiting_subtitle:
         network_off: "There is a network problem."
         network_on: "Network is back. We are trying."
-        timeout: >
-          OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check the <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">health status of the file storage setup</a>.
diff --git a/config/locales/crowdin/js-fa.yml b/config/locales/crowdin/js-fa.yml
index 56a14dc267cb..ee2163c8c081 100644
--- a/config/locales/crowdin/js-fa.yml
+++ b/config/locales/crowdin/js-fa.yml
@@ -357,10 +357,10 @@ fa:
           learn_about: "Learn more about the new features"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Subscribe to calendar"
       inital_setup_error_message: "An error occured while fetching data."
@@ -621,14 +621,15 @@ fa:
         prioritized: "Prioritized"
         dateAlert: "Date alert"
         shared: "Shared"
+        reminder: "Reminder"
       date_alerts:
         milestone_date: "Milestone date"
         overdue: "Overdue"
-        overdue_since: "since %{difference_in_days}"
-        property_today: "is today"
-        property_is: "is in %{difference_in_days}"
-        property_was: "was %{difference_in_days} ago"
-        property_is_deleted: "is deleted"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Date alerts"
           description: "With date alerts, you will be notified of upcoming start or finish dates so that you never miss or forget an important deadline."
@@ -653,6 +654,8 @@ fa:
         new_notifications:
           message: "There are new notifications."
           link_text: "Click here to load them."
+      reminders:
+        note: "Note: “%{note}”"
       settings:
         change_notification_settings: 'You can modify your <a target="_blank" href="%{url}">notification settings</a> to ensure you never miss an important update.'
         title: "Notification settings"
@@ -740,6 +743,7 @@ fa:
         immediate:
           title: "Send me an email reminder"
           mentioned: "Immediately when someone @mentions me"
+          personal_reminder: "Immediately when I receive a personal reminder"
         alerts:
           title: "Email alerts for other items (that are not work packages)"
           explanation: >
@@ -771,10 +775,6 @@ fa:
         upgrade_to_ee_text: "وااای! اگر به این افزونه نیاز دارید، شما یک حرفه‌ای هستید! آیا ممکن است ما توسعه‌دهندگان متن‌باز را با تبدیل شدن به مشتری نسخه انترپرایز حمایت کنید؟"
         more_information: "اطلاعات بیشتر"
         nevermind: "Nevermind"
-      edit:
-        form_configuration: "Form Configuration"
-        projects: "پروژه‌ها"
-        settings: "تنظیمات"
     time_entry:
       work_package_required: "Requires selecting a work package first."
       title: "پیگیری زمان"
@@ -1043,6 +1043,12 @@ fa:
           not_found: "There is no such view"
           duplicate_query_title: "Name of this view already exists. Change anyway?"
         text_no_results: "No matching views were found."
+      reminders:
+        button_label: "Set reminder"
+        title:
+          new: "Set reminder"
+          edit: "Edit reminder"
+        subtitle: "You will receive a notification for this work package at the chosen time."
       scheduling:
         is_parent: "The dates of this work package are automatically deduced from its children. Activate 'Manual scheduling' to set the dates."
         is_switched_from_manual_to_automatic: "The dates of this work package may need to be recalculated after switching from manual to automatic scheduling due to relationships with other work packages."
@@ -1346,5 +1352,3 @@ fa:
       waiting_subtitle:
         network_off: "There is a network problem."
         network_on: "Network is back. We are trying."
-        timeout: >
-          OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check the <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">health status of the file storage setup</a>.
diff --git a/config/locales/crowdin/js-fi.yml b/config/locales/crowdin/js-fi.yml
index 52a5b29a49aa..0add734c1a33 100644
--- a/config/locales/crowdin/js-fi.yml
+++ b/config/locales/crowdin/js-fi.yml
@@ -357,10 +357,10 @@ fi:
           learn_about: "Lisätietoja uusista ominaisuuksista"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Subscribe to calendar"
       inital_setup_error_message: "An error occured while fetching data."
@@ -621,14 +621,15 @@ fi:
         prioritized: "Prioritized"
         dateAlert: "Date alert"
         shared: "Shared"
+        reminder: "Reminder"
       date_alerts:
         milestone_date: "Milestone date"
         overdue: "Overdue"
-        overdue_since: "since %{difference_in_days}"
-        property_today: "is today"
-        property_is: "is in %{difference_in_days}"
-        property_was: "was %{difference_in_days} ago"
-        property_is_deleted: "is deleted"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Date alerts"
           description: "With date alerts, you will be notified of upcoming start or finish dates so that you never miss or forget an important deadline."
@@ -653,6 +654,8 @@ fi:
         new_notifications:
           message: "There are new notifications."
           link_text: "Click here to load them."
+      reminders:
+        note: "Note: “%{note}”"
       settings:
         change_notification_settings: 'You can modify your <a target="_blank" href="%{url}">notification settings</a> to ensure you never miss an important update.'
         title: "Notification settings"
@@ -740,6 +743,7 @@ fi:
         immediate:
           title: "Send me an email reminder"
           mentioned: "Immediately when someone @mentions me"
+          personal_reminder: "Immediately when I receive a personal reminder"
         alerts:
           title: "Email alerts for other items (that are not work packages)"
           explanation: >
@@ -771,10 +775,6 @@ fi:
         upgrade_to_ee_text: "Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?"
         more_information: "Lisätietoja"
         nevermind: "Nevermind"
-      edit:
-        form_configuration: "Lomakkeen muokkaus"
-        projects: "Projektit"
-        settings: "Asetukset"
     time_entry:
       work_package_required: "Requires selecting a work package first."
       title: "Kirjaa työaika"
@@ -1043,6 +1043,12 @@ fi:
           not_found: "There is no such view"
           duplicate_query_title: "Name of this view already exists. Change anyway?"
         text_no_results: "No matching views were found."
+      reminders:
+        button_label: "Set reminder"
+        title:
+          new: "Set reminder"
+          edit: "Edit reminder"
+        subtitle: "You will receive a notification for this work package at the chosen time."
       scheduling:
         is_parent: "The dates of this work package are automatically deduced from its children. Activate 'Manual scheduling' to set the dates."
         is_switched_from_manual_to_automatic: "The dates of this work package may need to be recalculated after switching from manual to automatic scheduling due to relationships with other work packages."
@@ -1346,5 +1352,3 @@ fi:
       waiting_subtitle:
         network_off: "There is a network problem."
         network_on: "Network is back. We are trying."
-        timeout: >
-          OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check the <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">health status of the file storage setup</a>.
diff --git a/config/locales/crowdin/js-fil.yml b/config/locales/crowdin/js-fil.yml
index d1c475adf801..641cd5422fec 100644
--- a/config/locales/crowdin/js-fil.yml
+++ b/config/locales/crowdin/js-fil.yml
@@ -357,10 +357,10 @@ fil:
           learn_about: "Learn more about the new features"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Subscribe to calendar"
       inital_setup_error_message: "An error occured while fetching data."
@@ -621,14 +621,15 @@ fil:
         prioritized: "Prioritized"
         dateAlert: "Date alert"
         shared: "Shared"
+        reminder: "Reminder"
       date_alerts:
         milestone_date: "Milestone date"
         overdue: "Overdue"
-        overdue_since: "since %{difference_in_days}"
-        property_today: "is today"
-        property_is: "is in %{difference_in_days}"
-        property_was: "was %{difference_in_days} ago"
-        property_is_deleted: "is deleted"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Date alerts"
           description: "With date alerts, you will be notified of upcoming start or finish dates so that you never miss or forget an important deadline."
@@ -653,6 +654,8 @@ fil:
         new_notifications:
           message: "There are new notifications."
           link_text: "Click here to load them."
+      reminders:
+        note: "Note: “%{note}”"
       settings:
         change_notification_settings: 'You can modify your <a target="_blank" href="%{url}">notification settings</a> to ensure you never miss an important update.'
         title: "Notification settings"
@@ -740,6 +743,7 @@ fil:
         immediate:
           title: "Send me an email reminder"
           mentioned: "Immediately when someone @mentions me"
+          personal_reminder: "Immediately when I receive a personal reminder"
         alerts:
           title: "Email alerts for other items (that are not work packages)"
           explanation: >
@@ -771,10 +775,6 @@ fil:
         upgrade_to_ee_text: "Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?"
         more_information: "Karagdagang impornasyon"
         nevermind: "Hindi bale"
-      edit:
-        form_configuration: "Form Configuration"
-        projects: "Mga proyekto"
-        settings: "Mga setting"
     time_entry:
       work_package_required: "Requires selecting a work package first."
       title: "Ang oras ng tala"
@@ -1043,6 +1043,12 @@ fil:
           not_found: "There is no such view"
           duplicate_query_title: "Name of this view already exists. Change anyway?"
         text_no_results: "No matching views were found."
+      reminders:
+        button_label: "Set reminder"
+        title:
+          new: "Set reminder"
+          edit: "Edit reminder"
+        subtitle: "You will receive a notification for this work package at the chosen time."
       scheduling:
         is_parent: "The dates of this work package are automatically deduced from its children. Activate 'Manual scheduling' to set the dates."
         is_switched_from_manual_to_automatic: "The dates of this work package may need to be recalculated after switching from manual to automatic scheduling due to relationships with other work packages."
@@ -1346,5 +1352,3 @@ fil:
       waiting_subtitle:
         network_off: "There is a network problem."
         network_on: "Network is back. We are trying."
-        timeout: >
-          OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check the <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">health status of the file storage setup</a>.
diff --git a/config/locales/crowdin/js-fr.yml b/config/locales/crowdin/js-fr.yml
index 0b0eac331e1a..f3424cd65d4a 100644
--- a/config/locales/crowdin/js-fr.yml
+++ b/config/locales/crowdin/js-fr.yml
@@ -357,10 +357,10 @@ fr:
           learn_about: "En savoir plus sur les nouvelles fonctionnalités"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                Cette version apporte diverses fonctionnalités et améliorations, par exemple <br> <ul class="%{list_styling_class}"> <li>Champs personnalisés de type hiérarchique (module Enterprise).</li> <li>Refonte de l'onglet Relations dans les lots de travaux.</li> <li>Refonte de la page d'index des réunions.</li> <li>Sauts de page manuels dans les exportations de lots de travaux PDF.</li> <li>Mode Zen pour les listes de projets.</li> </ul>
+                Cette version apporte diverses fonctionnalités et améliorations, par exemple :<br> <ul class="%{list_styling_class}"> <li>Définissez des rappels pour les lots de travaux afin de générer des notifications d'alerte de date.</li> <li>Créez de nouveaux dossiers directement à partir du sélecteur d'emplacement pour le stockage des fichiers.</li> <li>Spécifiez un délai requis entre les successeurs et les prédécesseurs des lots de travaux.</li> <li>Activez l'ordre et le regroupement des lots de travaux en fonction des valeurs des champs personnalisés de type hiérarchique.</li> <li>Exportez les entrées de temps sous forme de feuilles de temps PDF.</li> <li>Ajoutez une fenêtre contextuelle affichant des informations sur l'utilisateur lors du survol à l'écran.</li> </ul>
     ical_sharing_modal:
       title: "S'abonner au calendrier"
       inital_setup_error_message: "Une erreur est survenue lors de la récupération des données."
@@ -621,14 +621,15 @@ fr:
         prioritized: "Priorisé"
         dateAlert: "Alarmes"
         shared: "Partagé"
+        reminder: "Rappel"
       date_alerts:
         milestone_date: "Date jalon"
         overdue: "En retard"
-        overdue_since: "depuis %{difference_in_days}"
-        property_today: "est aujourd’hui"
-        property_is: "est dans %{difference_in_days}"
-        property_was: "était il y a %{difference_in_days}"
-        property_is_deleted: "est supprimé"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Alarmes"
           description: "Avec les alarmes, vous serez informé(e) à l'approche des dates de début ou de fin vous concernant afin de ne jamais manquer ou oublier une échéance importante."
@@ -653,6 +654,8 @@ fr:
         new_notifications:
           message: "Il y a de nouvelles notifications."
           link_text: "Cliquez ici pour les télécharger."
+      reminders:
+        note: "Note : \"%{note}\""
       settings:
         change_notification_settings: 'Vous pouvez modifier vos <a target="_blank" href="%{url}">paramètres de notification</a> pour vous assurer de ne jamais manquer une mise à jour importante.'
         title: "Paramètres de notifications"
@@ -740,6 +743,7 @@ fr:
         immediate:
           title: "Envoyez-moi un rappel par e-mail"
           mentioned: "Immédiatement quand quelqu'un me @mentionne"
+          personal_reminder: "Immédiatement lorsque je reçois un rappel personnel"
         alerts:
           title: "Alertes par e-mail pour les autres éléments (qui ne sont pas des lots de travaux)"
           explanation: >
@@ -771,10 +775,6 @@ fr:
         upgrade_to_ee_text: "Waouh ! Si vous avez besoin de cette fonctionnalité, vous êtes un véritable pro ! Cela vous dérangerait-il de soutenir les développeurs Open Source en devenant un client de la version Entreprise ?"
         more_information: "Plus d'informations"
         nevermind: "Peu importe"
-      edit:
-        form_configuration: "Configuration du formulaire"
-        projects: "Projets"
-        settings: "Paramètres"
     time_entry:
       work_package_required: "Nécessite d'abord la sélection d'un lot de travaux."
       title: "Consigner temps"
@@ -1043,6 +1043,12 @@ fr:
           not_found: "Cette vue n'existe pas"
           duplicate_query_title: "Le nom de cette vue existe déjà. Changer quand même ?"
         text_no_results: "Aucune vue correspondante n'a été trouvée."
+      reminders:
+        button_label: "Définir un rappel"
+        title:
+          new: "Définir un rappel"
+          edit: "Modifier un rappel"
+        subtitle: "Vous recevrez une notification pour ce lot de travaux au moment choisi."
       scheduling:
         is_parent: "Les dates de ce lot de travaux sont automatiquement déduites de ses enfants. Activez la « Planification manuelle » pour définir les dates."
         is_switched_from_manual_to_automatic: "Les dates de ce lot de travaux peuvent avoir besoin d'être recalculées après avoir passé de la planification manuelle à la planification automatique en raison de relations avec d'autres lots de travaux."
@@ -1346,5 +1352,3 @@ fr:
       waiting_subtitle:
         network_off: "Un problème de réseau est survenu."
         network_on: "Le réseau est à nouveau disponible. Nous essayons."
-        timeout: >
-          OpenProject n'a pas pu vous donner accès au dossier du projet dans le délai imparti. Veuillez réessayer.<br><br> Si ce problème persiste, veuillez contacter votre administrateur OpenProject pour vérifier le <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">statut de santé de l'espace de stockage de fichiers</a>.
diff --git a/config/locales/crowdin/js-he.yml b/config/locales/crowdin/js-he.yml
index 9ccb008bddb1..cc6330d9b144 100644
--- a/config/locales/crowdin/js-he.yml
+++ b/config/locales/crowdin/js-he.yml
@@ -357,10 +357,10 @@ he:
           learn_about: "Learn more about the new features"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Subscribe to calendar"
       inital_setup_error_message: "An error occured while fetching data."
@@ -621,14 +621,15 @@ he:
         prioritized: "Prioritized"
         dateAlert: "Date alert"
         shared: "Shared"
+        reminder: "Reminder"
       date_alerts:
         milestone_date: "Milestone date"
         overdue: "Overdue"
-        overdue_since: "since %{difference_in_days}"
-        property_today: "is today"
-        property_is: "is in %{difference_in_days}"
-        property_was: "was %{difference_in_days} ago"
-        property_is_deleted: "is deleted"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Date alerts"
           description: "With date alerts, you will be notified of upcoming start or finish dates so that you never miss or forget an important deadline."
@@ -655,6 +656,8 @@ he:
         new_notifications:
           message: "There are new notifications."
           link_text: "Click here to load them."
+      reminders:
+        note: "Note: “%{note}”"
       settings:
         change_notification_settings: 'You can modify your <a target="_blank" href="%{url}">notification settings</a> to ensure you never miss an important update.'
         title: "Notification settings"
@@ -742,6 +745,7 @@ he:
         immediate:
           title: "Send me an email reminder"
           mentioned: "Immediately when someone @mentions me"
+          personal_reminder: "Immediately when I receive a personal reminder"
         alerts:
           title: "Email alerts for other items (that are not work packages)"
           explanation: >
@@ -773,10 +777,6 @@ he:
         upgrade_to_ee_text: "Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?"
         more_information: "More information"
         nevermind: "Nevermind"
-      edit:
-        form_configuration: "Form Configuration"
-        projects: "פרויקטים"
-        settings: "הגדרות"
     time_entry:
       work_package_required: "Requires selecting a work package first."
       title: "נרשם ביומן"
@@ -1045,6 +1045,12 @@ he:
           not_found: "There is no such view"
           duplicate_query_title: "Name of this view already exists. Change anyway?"
         text_no_results: "No matching views were found."
+      reminders:
+        button_label: "Set reminder"
+        title:
+          new: "Set reminder"
+          edit: "Edit reminder"
+        subtitle: "You will receive a notification for this work package at the chosen time."
       scheduling:
         is_parent: "The dates of this work package are automatically deduced from its children. Activate 'Manual scheduling' to set the dates."
         is_switched_from_manual_to_automatic: "The dates of this work package may need to be recalculated after switching from manual to automatic scheduling due to relationships with other work packages."
@@ -1354,5 +1360,3 @@ he:
       waiting_subtitle:
         network_off: "There is a network problem."
         network_on: "Network is back. We are trying."
-        timeout: >
-          OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check the <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">health status of the file storage setup</a>.
diff --git a/config/locales/crowdin/js-hi.yml b/config/locales/crowdin/js-hi.yml
index a739f006dd74..632304c35190 100644
--- a/config/locales/crowdin/js-hi.yml
+++ b/config/locales/crowdin/js-hi.yml
@@ -357,10 +357,10 @@ hi:
           learn_about: "Learn more about the new features"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Subscribe to calendar"
       inital_setup_error_message: "An error occured while fetching data."
@@ -621,14 +621,15 @@ hi:
         prioritized: "Prioritized"
         dateAlert: "Date alert"
         shared: "Shared"
+        reminder: "Reminder"
       date_alerts:
         milestone_date: "Milestone date"
         overdue: "Overdue"
-        overdue_since: "since %{difference_in_days}"
-        property_today: "is today"
-        property_is: "is in %{difference_in_days}"
-        property_was: "was %{difference_in_days} ago"
-        property_is_deleted: "is deleted"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Date alerts"
           description: "With date alerts, you will be notified of upcoming start or finish dates so that you never miss or forget an important deadline."
@@ -653,6 +654,8 @@ hi:
         new_notifications:
           message: "There are new notifications."
           link_text: "Click here to load them."
+      reminders:
+        note: "Note: “%{note}”"
       settings:
         change_notification_settings: 'You can modify your <a target="_blank" href="%{url}">notification settings</a> to ensure you never miss an important update.'
         title: "Notification settings"
@@ -740,6 +743,7 @@ hi:
         immediate:
           title: "Send me an email reminder"
           mentioned: "Immediately when someone @mentions me"
+          personal_reminder: "Immediately when I receive a personal reminder"
         alerts:
           title: "Email alerts for other items (that are not work packages)"
           explanation: >
@@ -771,10 +775,6 @@ hi:
         upgrade_to_ee_text: "Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?"
         more_information: "More information"
         nevermind: "Nevermind"
-      edit:
-        form_configuration: "Form Configuration"
-        projects: "Projects"
-        settings: "Settings"
     time_entry:
       work_package_required: "Requires selecting a work package first."
       title: "लॉग समय"
@@ -1043,6 +1043,12 @@ hi:
           not_found: "ऐसा कोई दृश्य नहीं है"
           duplicate_query_title: "इस दृश्य का नाम पहले से मौजूद है । वैसे भी बदल?"
         text_no_results: "कोई मेल खाता दृश्य नहीं मिले ।"
+      reminders:
+        button_label: "Set reminder"
+        title:
+          new: "Set reminder"
+          edit: "Edit reminder"
+        subtitle: "You will receive a notification for this work package at the chosen time."
       scheduling:
         is_parent: "The dates of this work package are automatically deduced from its children. Activate 'Manual scheduling' to set the dates."
         is_switched_from_manual_to_automatic: "The dates of this work package may need to be recalculated after switching from manual to automatic scheduling due to relationships with other work packages."
@@ -1346,5 +1352,3 @@ hi:
       waiting_subtitle:
         network_off: "There is a network problem."
         network_on: "Network is back. We are trying."
-        timeout: >
-          OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check the <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">health status of the file storage setup</a>.
diff --git a/config/locales/crowdin/js-hr.yml b/config/locales/crowdin/js-hr.yml
index 1382033ba64c..703c88070929 100644
--- a/config/locales/crowdin/js-hr.yml
+++ b/config/locales/crowdin/js-hr.yml
@@ -357,10 +357,10 @@ hr:
           learn_about: "Saznaj više o novim značajkama"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Subscribe to calendar"
       inital_setup_error_message: "An error occured while fetching data."
@@ -621,14 +621,15 @@ hr:
         prioritized: "Prioritized"
         dateAlert: "Date alert"
         shared: "Shared"
+        reminder: "Reminder"
       date_alerts:
         milestone_date: "Milestone date"
         overdue: "Overdue"
-        overdue_since: "since %{difference_in_days}"
-        property_today: "is today"
-        property_is: "is in %{difference_in_days}"
-        property_was: "was %{difference_in_days} ago"
-        property_is_deleted: "is deleted"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Date alerts"
           description: "With date alerts, you will be notified of upcoming start or finish dates so that you never miss or forget an important deadline."
@@ -654,6 +655,8 @@ hr:
         new_notifications:
           message: "There are new notifications."
           link_text: "Click here to load them."
+      reminders:
+        note: "Note: “%{note}”"
       settings:
         change_notification_settings: 'You can modify your <a target="_blank" href="%{url}">notification settings</a> to ensure you never miss an important update.'
         title: "Notification settings"
@@ -741,6 +744,7 @@ hr:
         immediate:
           title: "Send me an email reminder"
           mentioned: "Immediately when someone @mentions me"
+          personal_reminder: "Immediately when I receive a personal reminder"
         alerts:
           title: "Email alerts for other items (that are not work packages)"
           explanation: >
@@ -772,10 +776,6 @@ hr:
         upgrade_to_ee_text: "Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?"
         more_information: "Više informacija"
         nevermind: "Nevermind"
-      edit:
-        form_configuration: "Form Configuration"
-        projects: "Projekti"
-        settings: "Postavke"
     time_entry:
       work_package_required: "Requires selecting a work package first."
       title: "Vrijeme pristupa"
@@ -1044,6 +1044,12 @@ hr:
           not_found: "There is no such view"
           duplicate_query_title: "Name of this view already exists. Change anyway?"
         text_no_results: "No matching views were found."
+      reminders:
+        button_label: "Set reminder"
+        title:
+          new: "Set reminder"
+          edit: "Edit reminder"
+        subtitle: "You will receive a notification for this work package at the chosen time."
       scheduling:
         is_parent: "The dates of this work package are automatically deduced from its children. Activate 'Manual scheduling' to set the dates."
         is_switched_from_manual_to_automatic: "The dates of this work package may need to be recalculated after switching from manual to automatic scheduling due to relationships with other work packages."
@@ -1350,5 +1356,3 @@ hr:
       waiting_subtitle:
         network_off: "There is a network problem."
         network_on: "Network is back. We are trying."
-        timeout: >
-          OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check the <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">health status of the file storage setup</a>.
diff --git a/config/locales/crowdin/js-hu.yml b/config/locales/crowdin/js-hu.yml
index d796727faf32..b433a9d22759 100644
--- a/config/locales/crowdin/js-hu.yml
+++ b/config/locales/crowdin/js-hu.yml
@@ -357,10 +357,10 @@ hu:
           learn_about: "Tudjon meg többet az új funkciókról"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Subscribe to calendar"
       inital_setup_error_message: "An error occured while fetching data."
@@ -621,14 +621,15 @@ hu:
         prioritized: "Prioritized"
         dateAlert: "Date alert"
         shared: "Megosztva"
+        reminder: "Reminder"
       date_alerts:
         milestone_date: "Milestone date"
         overdue: "Overdue"
-        overdue_since: "since %{difference_in_days}"
-        property_today: "is today"
-        property_is: "is in %{difference_in_days}"
-        property_was: "was %{difference_in_days} ago"
-        property_is_deleted: "is deleted"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Date alerts"
           description: "With date alerts, you will be notified of upcoming start or finish dates so that you never miss or forget an important deadline."
@@ -653,6 +654,8 @@ hu:
         new_notifications:
           message: "Új értesítések érkeztek."
           link_text: "Click here to load them."
+      reminders:
+        note: "Note: “%{note}”"
       settings:
         change_notification_settings: 'You can modify your <a target="_blank" href="%{url}">notification settings</a> to ensure you never miss an important update.'
         title: "Értesítési beállítások"
@@ -740,6 +743,7 @@ hu:
         immediate:
           title: "Kérek email emlékeztetőt!"
           mentioned: "Amint valaki @megemlít engem"
+          personal_reminder: "Immediately when I receive a personal reminder"
         alerts:
           title: "Email alerts for other items (that are not work packages)"
           explanation: >
@@ -771,10 +775,6 @@ hu:
         upgrade_to_ee_text: "Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?"
         more_information: "További információ"
         nevermind: "Mindegy"
-      edit:
-        form_configuration: "Ürlap beállítása"
-        projects: "Projektek"
-        settings: "Beállítások"
     time_entry:
       work_package_required: "Először ki kell választania egy munkacsomagot."
       title: "Eltöltött idő rögzítése"
@@ -1043,6 +1043,12 @@ hu:
           not_found: "Nincs ilyen nézet"
           duplicate_query_title: "A nézet neve már létezik. Biztos megváltoztatod?"
         text_no_results: "Nem található egyező nézet"
+      reminders:
+        button_label: "Set reminder"
+        title:
+          new: "Set reminder"
+          edit: "Edit reminder"
+        subtitle: "You will receive a notification for this work package at the chosen time."
       scheduling:
         is_parent: "A munkacsomag dátumait automatikusan levezetik a gyermekeiből. A dátumok beállításához aktiválja a „Kézi ütemezést”"
         is_switched_from_manual_to_automatic: "Ennek a munkacsomagnak a dátumait újra kell kalkulálni, miután a kézi üzemmódról az automatikus ütemezésre váltott, más munkacsomagokkal való kapcsolat miatt.\n"
@@ -1346,5 +1352,3 @@ hu:
       waiting_subtitle:
         network_off: "There is a network problem."
         network_on: "Network is back. We are trying."
-        timeout: >
-          OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check the <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">health status of the file storage setup</a>.
diff --git a/config/locales/crowdin/js-id.yml b/config/locales/crowdin/js-id.yml
index f2c83edaafc1..dd2de98c5ab2 100644
--- a/config/locales/crowdin/js-id.yml
+++ b/config/locales/crowdin/js-id.yml
@@ -357,10 +357,10 @@ id:
           learn_about: "Learn more about the new features"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Subscribe to calendar"
       inital_setup_error_message: "An error occured while fetching data."
@@ -621,14 +621,15 @@ id:
         prioritized: "Prioritized"
         dateAlert: "Peringatan tanggal"
         shared: "Shared"
+        reminder: "Reminder"
       date_alerts:
         milestone_date: "Milestone date"
         overdue: "Overdue"
-        overdue_since: "since %{difference_in_days}"
-        property_today: "is today"
-        property_is: "is in %{difference_in_days}"
-        property_was: "was %{difference_in_days} ago"
-        property_is_deleted: "is deleted"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Date alerts"
           description: "With date alerts, you will be notified of upcoming start or finish dates so that you never miss or forget an important deadline."
@@ -652,6 +653,8 @@ id:
         new_notifications:
           message: "There are new notifications."
           link_text: "Click here to load them."
+      reminders:
+        note: "Note: “%{note}”"
       settings:
         change_notification_settings: 'You can modify your <a target="_blank" href="%{url}">notification settings</a> to ensure you never miss an important update.'
         title: "Notification settings"
@@ -739,6 +742,7 @@ id:
         immediate:
           title: "Send me an email reminder"
           mentioned: "Immediately when someone @mentions me"
+          personal_reminder: "Immediately when I receive a personal reminder"
         alerts:
           title: "Email alerts for other items (that are not work packages)"
           explanation: >
@@ -770,10 +774,6 @@ id:
         upgrade_to_ee_text: "Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?"
         more_information: "Informasi lebih lanjut"
         nevermind: "Tidak masalah"
-      edit:
-        form_configuration: "Form Configuration"
-        projects: "Project"
-        settings: "Pengaturan"
     time_entry:
       work_package_required: "Requires selecting a work package first."
       title: "Catatan waktu"
@@ -1042,6 +1042,12 @@ id:
           not_found: "There is no such view"
           duplicate_query_title: "Name of this view already exists. Change anyway?"
         text_no_results: "No matching views were found."
+      reminders:
+        button_label: "Set reminder"
+        title:
+          new: "Set reminder"
+          edit: "Edit reminder"
+        subtitle: "You will receive a notification for this work package at the chosen time."
       scheduling:
         is_parent: "The dates of this work package are automatically deduced from its children. Activate 'Manual scheduling' to set the dates."
         is_switched_from_manual_to_automatic: "The dates of this work package may need to be recalculated after switching from manual to automatic scheduling due to relationships with other work packages."
@@ -1342,5 +1348,3 @@ id:
       waiting_subtitle:
         network_off: "There is a network problem."
         network_on: "Network is back. We are trying."
-        timeout: >
-          OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check the <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">health status of the file storage setup</a>.
diff --git a/config/locales/crowdin/js-it.yml b/config/locales/crowdin/js-it.yml
index 09c339e1e3c4..a01645abe354 100644
--- a/config/locales/crowdin/js-it.yml
+++ b/config/locales/crowdin/js-it.yml
@@ -357,10 +357,10 @@ it:
           learn_about: "Scopri di più sulle nuove funzionalità"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                Questa versione offre varie funzionalità e miglioramenti, ad esempio <br> <ul class="%{list_styling_class}"> <li>Campi personalizzati di tipo gerarchia (componente aggiuntivo Enterprise).</li> <li>Riprogettazione della scheda Relazioni nelle macro-attività.</li> <li>Riprogettazione della pagina indice Riunioni.</li> <li>Interruzioni di pagina manuali nelle esportazioni dei PDF delle macro-attività.</li> <li>Modalità Zen per gli elenchi di progetti.</li> </ul>
+                Questa versione offre diverse funzionalità e miglioramenti, ad esempio <br> <ul class="%{list_styling_class}"> <li>Impostare dei promemoria per le macro-attività per generare notifiche di avviso di data.</li> <li>Creare nuove cartelle direttamente dal selettore di posizione per l'archiviazione dei file.</li> <li>Specificare un ritardo necessario tra i successori e i predecessori delle macro-attività.</li> <li>Abilitare l'ordinamento e il raggruppamento per le macro-attività in base ai valori della gerarchia di tipo dei campi personalizzati.</li> <li>Esportare le voci temporali come fogli presenze in PDF.</li> <li>Aggiungere un pop-up che mostra le informazioni dell'utente quando ci si passa su il mouse.</li> </ul>
     ical_sharing_modal:
       title: "Iscriviti al calendario"
       inital_setup_error_message: "Si è verificato un errore recuperando i dati."
@@ -621,14 +621,15 @@ it:
         prioritized: "Assegnata priorità"
         dateAlert: "Avviso data"
         shared: "Condiviso"
+        reminder: "Promemoria"
       date_alerts:
         milestone_date: "Data inizio"
         overdue: "In ritardo"
-        overdue_since: "da %{difference_in_days}"
-        property_today: "è oggi"
-        property_is: "tra %{difference_in_days}"
-        property_was: "era %{difference_in_days} fa"
-        property_is_deleted: "è eliminato"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Avvisi data"
           description: "Con gli avvisi sulle date, sarai avvisato delle prossime date di inizio o di fine in modo da non perdere mai o dimenticare una scadenza importante."
@@ -653,6 +654,8 @@ it:
         new_notifications:
           message: "Ci sono nuove notifiche."
           link_text: "Clicca qui per caricarli."
+      reminders:
+        note: "Nota: \"%{note}\""
       settings:
         change_notification_settings: 'Puoi modificare le tue <a target="_blank" href="%{url}">impostazioni di notifica</a> per assicurarti di non perderti mai un aggiornamento importante.'
         title: "Impostazioni notifiche"
@@ -740,6 +743,7 @@ it:
         immediate:
           title: "Inviami un promemoria email"
           mentioned: "Subito quando qualcuno mi @menziona"
+          personal_reminder: "Immediatamente quando ricevo un promemoria personale"
         alerts:
           title: "Avvisi email per altri elementi (che non sono macro-attività)"
           explanation: >
@@ -771,10 +775,6 @@ it:
         upgrade_to_ee_text: "Wow! Se hai bisogno di questa aggiunta sei un vero professionista! Ti andrebbe di aiutare noi sviluppatori OpenSource diventando un cliente dell'edizione Enterprise?"
         more_information: "Altre informazioni"
         nevermind: "Lascia stare"
-      edit:
-        form_configuration: "Configurazione del modulo"
-        projects: "Progetti"
-        settings: "Impostazioni"
     time_entry:
       work_package_required: "Richiede prima di selezionare una macro-attività."
       title: "Registra l'orario effettuato"
@@ -1043,6 +1043,12 @@ it:
           not_found: "La vista non esiste"
           duplicate_query_title: "Il nome di questa vista è già esistente. Cambiarlo comunque?"
         text_no_results: "Nessuna vista corrispondente trovata."
+      reminders:
+        button_label: "Imposta promemoria"
+        title:
+          new: "Imposta promemoria"
+          edit: "Modifica promemoria"
+        subtitle: "Riceverai una notifica per questa macro-attività all'ora scelta."
       scheduling:
         is_parent: "Le date di questa macro-attività vengono automaticamente dedotte dai suoi figli. Attiva 'Programmazione manuale' per impostare le date."
         is_switched_from_manual_to_automatic: "Potrebbe essere necessario ricalcolare le date di questa macro-attività dopo il passaggio dalla programmazione manuale alla programmazione automatica a causa delle relazioni con altre macro-attività."
@@ -1346,5 +1352,3 @@ it:
       waiting_subtitle:
         network_off: "C'è un problema di rete."
         network_on: "La rete è tornata. Stiamo provando."
-        timeout: >
-          OpenProject non è stato in grado di darti accesso alla cartella del progetto entro il tempo previsto. Prova di nuovo.<br><br> Se il problema persiste contatta il tuo amministratore OpenProject per controllare lo <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">stato della configurazione di archiviazione dei file</a>.
diff --git a/config/locales/crowdin/js-ja.yml b/config/locales/crowdin/js-ja.yml
index 2d53bbd958f4..bd21c6c521c5 100644
--- a/config/locales/crowdin/js-ja.yml
+++ b/config/locales/crowdin/js-ja.yml
@@ -358,10 +358,10 @@ ja:
           learn_about: "新機能の詳細はこちら"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Subscribe to calendar"
       inital_setup_error_message: "An error occured while fetching data."
@@ -622,14 +622,15 @@ ja:
         prioritized: "Prioritized"
         dateAlert: "Date alert"
         shared: "Shared"
+        reminder: "Reminder"
       date_alerts:
         milestone_date: "Milestone date"
         overdue: "Overdue"
-        overdue_since: "since %{difference_in_days}"
-        property_today: "is today"
-        property_is: "is in %{difference_in_days}"
-        property_was: "was %{difference_in_days} ago"
-        property_is_deleted: "is deleted"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Date alerts"
           description: "With date alerts, you will be notified of upcoming start or finish dates so that you never miss or forget an important deadline."
@@ -653,6 +654,8 @@ ja:
         new_notifications:
           message: "There are new notifications."
           link_text: "Click here to load them."
+      reminders:
+        note: "Note: “%{note}”"
       settings:
         change_notification_settings: 'You can modify your <a target="_blank" href="%{url}">notification settings</a> to ensure you never miss an important update.'
         title: "Notification settings"
@@ -740,6 +743,7 @@ ja:
         immediate:
           title: "Send me an email reminder"
           mentioned: "Immediately when someone @mentions me"
+          personal_reminder: "Immediately when I receive a personal reminder"
         alerts:
           title: "Email alerts for other items (that are not work packages)"
           explanation: >
@@ -771,10 +775,6 @@ ja:
         upgrade_to_ee_text: "Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?"
         more_information: "詳細情報"
         nevermind: "無視"
-      edit:
-        form_configuration: "フォーム設定"
-        projects: "プロジェクト"
-        settings: "設定"
     time_entry:
       work_package_required: "最初にワークパッケージを選択する必要があります。"
       title: "時間を記録"
@@ -1043,6 +1043,12 @@ ja:
           not_found: "そのようなビューはありません"
           duplicate_query_title: "このビューの名前は既に存在します。 とにかく変更しますか？"
         text_no_results: "一致するビューは見つかりませんでした。"
+      reminders:
+        button_label: "Set reminder"
+        title:
+          new: "Set reminder"
+          edit: "Edit reminder"
+        subtitle: "You will receive a notification for this work package at the chosen time."
       scheduling:
         is_parent: "このワークパッケージの日付は、その子から自動的に推定されます。日付を設定するには、「手動スケジューリング」を有効にします。"
         is_switched_from_manual_to_automatic: "他のワークパッケージとの関連により、手動スケジューリングから自動スケジューリングに切り替えた後に、このワークパッケージの日付を再計算する必要がある場合があります。"
@@ -1343,5 +1349,3 @@ ja:
       waiting_subtitle:
         network_off: "There is a network problem."
         network_on: "Network is back. We are trying."
-        timeout: >
-          OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check the <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">health status of the file storage setup</a>.
diff --git a/config/locales/crowdin/js-ka.yml b/config/locales/crowdin/js-ka.yml
index 526cbd906243..11c96938b328 100644
--- a/config/locales/crowdin/js-ka.yml
+++ b/config/locales/crowdin/js-ka.yml
@@ -357,10 +357,10 @@ ka:
           learn_about: "Learn more about the new features"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Subscribe to calendar"
       inital_setup_error_message: "An error occured while fetching data."
@@ -621,14 +621,15 @@ ka:
         prioritized: "Prioritized"
         dateAlert: "გაფრთხილების თარიღი"
         shared: "გაზიარებული"
+        reminder: "Reminder"
       date_alerts:
         milestone_date: "Milestone date"
         overdue: "ვადაგადაცილებული"
-        overdue_since: "since %{difference_in_days}"
-        property_today: "დღესაა"
-        property_is: "is in %{difference_in_days}"
-        property_was: "was %{difference_in_days} ago"
-        property_is_deleted: "წაშლილია"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "განგაშების თარიღი"
           description: "With date alerts, you will be notified of upcoming start or finish dates so that you never miss or forget an important deadline."
@@ -653,6 +654,8 @@ ka:
         new_notifications:
           message: "There are new notifications."
           link_text: "Click here to load them."
+      reminders:
+        note: "Note: “%{note}”"
       settings:
         change_notification_settings: 'You can modify your <a target="_blank" href="%{url}">notification settings</a> to ensure you never miss an important update.'
         title: "Notification settings"
@@ -740,6 +743,7 @@ ka:
         immediate:
           title: "Send me an email reminder"
           mentioned: "Immediately when someone @mentions me"
+          personal_reminder: "Immediately when I receive a personal reminder"
         alerts:
           title: "Email alerts for other items (that are not work packages)"
           explanation: >
@@ -771,10 +775,6 @@ ka:
         upgrade_to_ee_text: "Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?"
         more_information: "More information"
         nevermind: "გადავიფიქრე"
-      edit:
-        form_configuration: "Form Configuration"
-        projects: "პროექტები"
-        settings: "მორგება"
     time_entry:
       work_package_required: "Requires selecting a work package first."
       title: "ჟურნალში დროის ჩაწერა"
@@ -1043,6 +1043,12 @@ ka:
           not_found: "There is no such view"
           duplicate_query_title: "Name of this view already exists. Change anyway?"
         text_no_results: "No matching views were found."
+      reminders:
+        button_label: "Set reminder"
+        title:
+          new: "Set reminder"
+          edit: "Edit reminder"
+        subtitle: "You will receive a notification for this work package at the chosen time."
       scheduling:
         is_parent: "The dates of this work package are automatically deduced from its children. Activate 'Manual scheduling' to set the dates."
         is_switched_from_manual_to_automatic: "The dates of this work package may need to be recalculated after switching from manual to automatic scheduling due to relationships with other work packages."
@@ -1346,5 +1352,3 @@ ka:
       waiting_subtitle:
         network_off: "There is a network problem."
         network_on: "Network is back. We are trying."
-        timeout: >
-          OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check the <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">health status of the file storage setup</a>.
diff --git a/config/locales/crowdin/js-kk.yml b/config/locales/crowdin/js-kk.yml
index 1118b73a2826..b158537d6d63 100644
--- a/config/locales/crowdin/js-kk.yml
+++ b/config/locales/crowdin/js-kk.yml
@@ -357,10 +357,10 @@ kk:
           learn_about: "Learn more about the new features"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Subscribe to calendar"
       inital_setup_error_message: "An error occured while fetching data."
@@ -621,14 +621,15 @@ kk:
         prioritized: "Prioritized"
         dateAlert: "Date alert"
         shared: "Shared"
+        reminder: "Reminder"
       date_alerts:
         milestone_date: "Milestone date"
         overdue: "Overdue"
-        overdue_since: "since %{difference_in_days}"
-        property_today: "is today"
-        property_is: "is in %{difference_in_days}"
-        property_was: "was %{difference_in_days} ago"
-        property_is_deleted: "is deleted"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Date alerts"
           description: "With date alerts, you will be notified of upcoming start or finish dates so that you never miss or forget an important deadline."
@@ -653,6 +654,8 @@ kk:
         new_notifications:
           message: "There are new notifications."
           link_text: "Click here to load them."
+      reminders:
+        note: "Note: “%{note}”"
       settings:
         change_notification_settings: 'You can modify your <a target="_blank" href="%{url}">notification settings</a> to ensure you never miss an important update.'
         title: "Notification settings"
@@ -740,6 +743,7 @@ kk:
         immediate:
           title: "Send me an email reminder"
           mentioned: "Immediately when someone @mentions me"
+          personal_reminder: "Immediately when I receive a personal reminder"
         alerts:
           title: "Email alerts for other items (that are not work packages)"
           explanation: >
@@ -771,10 +775,6 @@ kk:
         upgrade_to_ee_text: "Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?"
         more_information: "More information"
         nevermind: "Nevermind"
-      edit:
-        form_configuration: "Form Configuration"
-        projects: "Projects"
-        settings: "Settings"
     time_entry:
       work_package_required: "Requires selecting a work package first."
       title: "Log time"
@@ -1043,6 +1043,12 @@ kk:
           not_found: "There is no such view"
           duplicate_query_title: "Name of this view already exists. Change anyway?"
         text_no_results: "No matching views were found."
+      reminders:
+        button_label: "Set reminder"
+        title:
+          new: "Set reminder"
+          edit: "Edit reminder"
+        subtitle: "You will receive a notification for this work package at the chosen time."
       scheduling:
         is_parent: "The dates of this work package are automatically deduced from its children. Activate 'Manual scheduling' to set the dates."
         is_switched_from_manual_to_automatic: "The dates of this work package may need to be recalculated after switching from manual to automatic scheduling due to relationships with other work packages."
@@ -1346,5 +1352,3 @@ kk:
       waiting_subtitle:
         network_off: "There is a network problem."
         network_on: "Network is back. We are trying."
-        timeout: >
-          OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check the <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">health status of the file storage setup</a>.
diff --git a/config/locales/crowdin/js-ko.yml b/config/locales/crowdin/js-ko.yml
index dff74bc2bbf6..e8df9eba3094 100644
--- a/config/locales/crowdin/js-ko.yml
+++ b/config/locales/crowdin/js-ko.yml
@@ -357,10 +357,10 @@ ko:
           learn_about: "새로운 기능에 대해 자세히 알아보기"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                이 릴리스에서는 다음과 같은 다양한 기능과 개선 사항이 제공됩니다. <br> <ul class="%{list_styling_class}"> <li>유형 계층의 사용자 지정 필드(Enterprise 추가 기능).</li> <li>작업 패키지의 관계 탭에 대한 새로운 디자인.</li> <li>미팅 색인 페이지의 새로운 디자인.</li> <li>PDF 작업 패키지 내보내기에서 수동 페이지 나누기.</li> <li>프로젝트 목록의 젠 모드.</li> </ul>
+                이 릴리스에는 사용자를 위한 다양한 기능과 개선 사항이 포함되어 있습니다. 예: <br> <ul class="%{list_styling_class}"> <li>작업 패키지에 대한 미리 알림을 설정하여 날짜 경보 알림을 생성합니다.</li> <li>파일 저장소의 위치 선택기에서 새 폴더를 바로 만듭니다.</li> <li>작업 패키지 후행 단계 및 선행 단계 간에 필요한 지연 시간을 지정합니다.</li> <li>사용자 지정 필드 유형 계층 값에 대한 작업 패키지의 순서 지정 및 그룹화를 활성화합니다.</li> <li>시간 항목을 PDF 타임시트로 내보냅니다.</li> <li>마우스를 올리면 사용자 정보가 표시되는 팝오버를 추가합니다.</li> </ul>
     ical_sharing_modal:
       title: "캘린더 구독"
       inital_setup_error_message: "데이터를 가져오는 중에 오류가 발생했습니다."
@@ -621,14 +621,15 @@ ko:
         prioritized: "우선 순위 지정됨"
         dateAlert: "날짜 경보"
         shared: "공유됨"
+        reminder: "미리 알림"
       date_alerts:
         milestone_date: "마일스톤 날짜"
         overdue: "기한 지남"
-        overdue_since: "%{difference_in_days} 이후"
-        property_today: "- 오늘입니다"
-        property_is: "- %{difference_in_days} 이내입니다"
-        property_was: "- %{difference_in_days} 전이었습니다"
-        property_is_deleted: "- 삭제되었습니다"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "날짜 경보"
           description: "날짜 경보를 사용하면, 중요 마감일을 놓치거나 잊지 않도록 향후 시작 날짜 또는 종료 날짜에 대한 알림을 받게 됩니다."
@@ -652,6 +653,8 @@ ko:
         new_notifications:
           message: "새 알림이 있습니다."
           link_text: "로드하려면 여기를 클릭하세요."
+      reminders:
+        note: "참고: \"%{note}\""
       settings:
         change_notification_settings: '중요 업데이트를 놓치지 않도록 <a target="_blank" href="%{url}">알림 설정</a>을 수정할 수 있습니다.'
         title: "알림 설정"
@@ -739,6 +742,7 @@ ko:
         immediate:
           title: "내게 이메일 미리 알림 보내기"
           mentioned: "누군가 나를 @멘션할 때 즉시"
+          personal_reminder: "개인 미리 알림을 받는 즉시"
         alerts:
           title: "기타 항목에 대한 이메일 알림(작업 패키지 외)"
           explanation: >
@@ -770,10 +774,6 @@ ko:
         upgrade_to_ee_text: "와우! 만약 이 추가 기능이 필요하다면 여러분은 진짜 프로입니다! Enterprise Edition 고객이 되어서 OpenSource 개발자들을 지원할 생각이 있으신가요?"
         more_information: "더보기"
         nevermind: "신경쓰지 마세요"
-      edit:
-        form_configuration: "양식 구성"
-        projects: "프로젝트"
-        settings: "설정"
     time_entry:
       work_package_required: "먼저 작업 패키지를 선택해야 합니다."
       title: "작업시간 기록"
@@ -1042,6 +1042,12 @@ ko:
           not_found: "해당 보기가 없습니다."
           duplicate_query_title: "이 보기의 이름이 이미 존재합니다. 그래도 변경하시겠습니까?"
         text_no_results: "일치하는 보기가 없습니다."
+      reminders:
+        button_label: "미리 알림 설정"
+        title:
+          new: "미리 알림 설정"
+          edit: "미리 알림 편집"
+        subtitle: "선택한 시간에 이 작업 패키지에 대한 알림을 받게 됩니다."
       scheduling:
         is_parent: "이 작업 패키지의 날짜는 자식으로부터 자동으로 추정됩니다. '수동 스케줄링'을 활성화하여 날짜를 설정할 수 있습니다."
         is_switched_from_manual_to_automatic: "다른 작업 패키지와의 관계로 인해 수동 스케줄링에서 자동 스케줄링으로 전환한 후 이 작업 패키지의 날짜를 다시 계산해야 할 수 있습니다."
@@ -1342,5 +1348,3 @@ ko:
       waiting_subtitle:
         network_off: "네트워크 문제가 있습니다."
         network_on: "네트워크가 복원되었습니다. 작업 중입니다."
-        timeout: >
-          예상 시간 내에 OpenProject에서 프로젝트 폴더에 대한 액세스를 제공하지 못했습니다. 다시 한 번 시도해 보세요.<br><br> 문제가 지속되면 OpenProject 관리자에게 문의하여 <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">파일 저장소 설정 상태</a>를 확인하세요.
diff --git a/config/locales/crowdin/js-lt.yml b/config/locales/crowdin/js-lt.yml
index a85ccb593784..ecb7e88f556c 100644
--- a/config/locales/crowdin/js-lt.yml
+++ b/config/locales/crowdin/js-lt.yml
@@ -357,10 +357,10 @@ lt:
           learn_about: "Sužinokite daugiau apie naujas galimybes"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Prenumeruoti kalendorių"
       inital_setup_error_message: "Gaunant duomenis įvyko klaida."
@@ -621,14 +621,15 @@ lt:
         prioritized: "Prioritized"
         dateAlert: "Datos įspėjimas"
         shared: "Bendrinta"
+        reminder: "Reminder"
       date_alerts:
         milestone_date: "Gairės data"
         overdue: "Vėluojama"
-        overdue_since: "nuo %{difference_in_days}"
-        property_today: "yra šiandien"
-        property_is: "yra %{difference_in_days}"
-        property_was: "buvo prieš %{difference_in_days}"
-        property_is_deleted: "yra ištrintas"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Datos įspėjimai"
           description: "Su datos įspėjimais jus informuos apie ateinančias pradžios ir pabaigos datas, kad niekada nepraleistumėte ar nepamirštumėte svarbių terminų."
@@ -655,6 +656,8 @@ lt:
         new_notifications:
           message: "Yra naujų pranešimų."
           link_text: "Spauskite čia, kad juos įkeltumėte."
+      reminders:
+        note: "Note: “%{note}”"
       settings:
         change_notification_settings: 'Jūs galite keisti savo <a target="_blank" href="%{url}">pranešimų nustatymus</a>, kad užtikrintumėte, jog niekada nepraleisite svarbaus atnaujinimo.'
         title: "Pranešimų nustatymai"
@@ -742,6 +745,7 @@ lt:
         immediate:
           title: "Siųsti man e-pašto priminimą"
           mentioned: "Iš karto, kai kažkas @pamini mane"
+          personal_reminder: "Immediately when I receive a personal reminder"
         alerts:
           title: "E-pašto pranešimai kitiems (ne darbo paketų) elementams"
           explanation: >
@@ -773,10 +777,6 @@ lt:
         upgrade_to_ee_text: "Oho! Jei Jums reikia šio priedo, esate super pro! Ar nenorėtumėte paremti mus, OpenSource (atviro kodo) kūrėjus, tapdami Enterprise versijos klientu?"
         more_information: "Daugiau informacijos"
         nevermind: "Nesvarbu"
-      edit:
-        form_configuration: "Formos konfigūracija"
-        projects: "Projektai"
-        settings: "Nustatymai"
     time_entry:
       work_package_required: "Reikia pirma pasirinkti darbo paketą."
       title: "Registruoti laiką"
@@ -1045,6 +1045,12 @@ lt:
           not_found: "Nėra tokio vaizdo"
           duplicate_query_title: "Toks vaizdo vardas jau yra. Vis tiek keisti?"
         text_no_results: "Atitinkančių vaizdų nerasta."
+      reminders:
+        button_label: "Set reminder"
+        title:
+          new: "Set reminder"
+          edit: "Edit reminder"
+        subtitle: "You will receive a notification for this work package at the chosen time."
       scheduling:
         is_parent: "Šio darbų paketo datos yra automatiškai nustatomos pagal jo vaikų datas. Norėdami nustatyti kitokias datas įjunkite „Rankinį tvarkaraščio parinkimą“"
         is_switched_from_manual_to_automatic: "Po perjungimo iš rankinio į automatinį tvarkaraščio parinkimą, šio darbų paketo datas gali reikėti perskaičiuoti, nes yra sąryšių su kitais darbų paketais."
@@ -1354,5 +1360,3 @@ lt:
       waiting_subtitle:
         network_off: "Yra tinklo problema."
         network_on: "Tinklas grįžo. Mes bandome."
-        timeout: >
-          OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check the <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">health status of the file storage setup</a>.
diff --git a/config/locales/crowdin/js-lv.yml b/config/locales/crowdin/js-lv.yml
index 9d70db165667..17d6a855d285 100644
--- a/config/locales/crowdin/js-lv.yml
+++ b/config/locales/crowdin/js-lv.yml
@@ -357,10 +357,10 @@ lv:
           learn_about: "Learn more about the new features"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Subscribe to calendar"
       inital_setup_error_message: "An error occured while fetching data."
@@ -621,14 +621,15 @@ lv:
         prioritized: "Prioritized"
         dateAlert: "Date alert"
         shared: "Shared"
+        reminder: "Reminder"
       date_alerts:
         milestone_date: "Milestone date"
         overdue: "Overdue"
-        overdue_since: "since %{difference_in_days}"
-        property_today: "is today"
-        property_is: "is in %{difference_in_days}"
-        property_was: "was %{difference_in_days} ago"
-        property_is_deleted: "is deleted"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Date alerts"
           description: "With date alerts, you will be notified of upcoming start or finish dates so that you never miss or forget an important deadline."
@@ -654,6 +655,8 @@ lv:
         new_notifications:
           message: "There are new notifications."
           link_text: "Click here to load them."
+      reminders:
+        note: "Note: “%{note}”"
       settings:
         change_notification_settings: 'You can modify your <a target="_blank" href="%{url}">notification settings</a> to ensure you never miss an important update.'
         title: "Notification settings"
@@ -741,6 +744,7 @@ lv:
         immediate:
           title: "Send me an email reminder"
           mentioned: "Immediately when someone @mentions me"
+          personal_reminder: "Immediately when I receive a personal reminder"
         alerts:
           title: "Email alerts for other items (that are not work packages)"
           explanation: >
@@ -772,10 +776,6 @@ lv:
         upgrade_to_ee_text: "Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?"
         more_information: "More information"
         nevermind: "Nevermind"
-      edit:
-        form_configuration: "Form Configuration"
-        projects: "Projekti"
-        settings: "Iestatījumi"
     time_entry:
       work_package_required: "Requires selecting a work package first."
       title: "Log time"
@@ -1044,6 +1044,12 @@ lv:
           not_found: "There is no such view"
           duplicate_query_title: "Name of this view already exists. Change anyway?"
         text_no_results: "No matching views were found."
+      reminders:
+        button_label: "Set reminder"
+        title:
+          new: "Set reminder"
+          edit: "Edit reminder"
+        subtitle: "You will receive a notification for this work package at the chosen time."
       scheduling:
         is_parent: "The dates of this work package are automatically deduced from its children. Activate 'Manual scheduling' to set the dates."
         is_switched_from_manual_to_automatic: "The dates of this work package may need to be recalculated after switching from manual to automatic scheduling due to relationships with other work packages."
@@ -1350,5 +1356,3 @@ lv:
       waiting_subtitle:
         network_off: "There is a network problem."
         network_on: "Network is back. We are trying."
-        timeout: >
-          OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check the <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">health status of the file storage setup</a>.
diff --git a/config/locales/crowdin/js-mn.yml b/config/locales/crowdin/js-mn.yml
index 52e0c9b9379e..ec14c0877f58 100644
--- a/config/locales/crowdin/js-mn.yml
+++ b/config/locales/crowdin/js-mn.yml
@@ -357,10 +357,10 @@ mn:
           learn_about: "Learn more about the new features"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Subscribe to calendar"
       inital_setup_error_message: "An error occured while fetching data."
@@ -621,14 +621,15 @@ mn:
         prioritized: "Prioritized"
         dateAlert: "Date alert"
         shared: "Shared"
+        reminder: "Reminder"
       date_alerts:
         milestone_date: "Milestone date"
         overdue: "Overdue"
-        overdue_since: "since %{difference_in_days}"
-        property_today: "is today"
-        property_is: "is in %{difference_in_days}"
-        property_was: "was %{difference_in_days} ago"
-        property_is_deleted: "is deleted"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Date alerts"
           description: "With date alerts, you will be notified of upcoming start or finish dates so that you never miss or forget an important deadline."
@@ -653,6 +654,8 @@ mn:
         new_notifications:
           message: "There are new notifications."
           link_text: "Click here to load them."
+      reminders:
+        note: "Note: “%{note}”"
       settings:
         change_notification_settings: 'You can modify your <a target="_blank" href="%{url}">notification settings</a> to ensure you never miss an important update.'
         title: "Notification settings"
@@ -740,6 +743,7 @@ mn:
         immediate:
           title: "Send me an email reminder"
           mentioned: "Immediately when someone @mentions me"
+          personal_reminder: "Immediately when I receive a personal reminder"
         alerts:
           title: "Email alerts for other items (that are not work packages)"
           explanation: >
@@ -771,10 +775,6 @@ mn:
         upgrade_to_ee_text: "Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?"
         more_information: "More information"
         nevermind: "Nevermind"
-      edit:
-        form_configuration: "Form Configuration"
-        projects: "Projects"
-        settings: "Settings"
     time_entry:
       work_package_required: "Requires selecting a work package first."
       title: "Log time"
@@ -1043,6 +1043,12 @@ mn:
           not_found: "There is no such view"
           duplicate_query_title: "Name of this view already exists. Change anyway?"
         text_no_results: "No matching views were found."
+      reminders:
+        button_label: "Set reminder"
+        title:
+          new: "Set reminder"
+          edit: "Edit reminder"
+        subtitle: "You will receive a notification for this work package at the chosen time."
       scheduling:
         is_parent: "The dates of this work package are automatically deduced from its children. Activate 'Manual scheduling' to set the dates."
         is_switched_from_manual_to_automatic: "The dates of this work package may need to be recalculated after switching from manual to automatic scheduling due to relationships with other work packages."
@@ -1346,5 +1352,3 @@ mn:
       waiting_subtitle:
         network_off: "There is a network problem."
         network_on: "Network is back. We are trying."
-        timeout: >
-          OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check the <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">health status of the file storage setup</a>.
diff --git a/config/locales/crowdin/js-ms.yml b/config/locales/crowdin/js-ms.yml
index 94472d471e24..93c7b015cc5e 100644
--- a/config/locales/crowdin/js-ms.yml
+++ b/config/locales/crowdin/js-ms.yml
@@ -66,7 +66,7 @@ ms:
     button_back_to_list_view: "Kembali ke paparan senarai"
     button_cancel: "Batal"
     button_close: "Tutup"
-    button_change_project: "Move to another project"
+    button_change_project: "Beralih ke projek lain"
     button_check_all: "Tanda semua"
     button_configure-form: "Konfigurasi borang"
     button_confirm: "Sahkan"
@@ -74,7 +74,7 @@ ms:
     button_copy: "Salin"
     button_copy_to_clipboard: "Salin ke papan klip"
     button_copy_link_to_clipboard: "Salin pautan ke papan klip"
-    button_copy_to_other_project: "Duplicate in another project"
+    button_copy_to_other_project: "Salin dalam projek lain"
     button_custom-fields: "Ruang tersuai"
     button_delete: "Padam"
     button_delete_watcher: "Padam pemerhati"
@@ -105,7 +105,7 @@ ms:
     button_update: "Kemas kini"
     button_export-pdf: "Muat turun PDF"
     button_export-atom: "Muat Turun Atom"
-    button_generate_pdf: "Generate PDF"
+    button_generate_pdf: "Menjana PDF"
     button_create: "Cipta"
     card:
       add_new: "Tambah kad baharu"
@@ -139,8 +139,8 @@ ms:
     description_select_work_package: "Pilih pakej kerja #%{id}"
     description_subwork_package: "Anak kepada pakej kerja #%{id}"
     editor:
-      revisions: "Show local modifications"
-      no_revisions: "No local modifications found"
+      revisions: "Tunjukkan pengubahsuaian tempatan"
+      no_revisions: "Tiada pengubahsuaian tempatan ditemui"
       preview: "Tukar mod tinjauan"
       source_code: "Tukar mod sumber Markdown"
       error_saving_failed: "Penyimpanan dokumen gagal dengan ralat yang berikut: %{error}"
@@ -153,7 +153,7 @@ ms:
         attribute_reference:
           macro_help_tooltip: "Bahagian teks ini sedang dihasilkan secara dinamik oleh makro."
           not_found: "Sumber yang diminta tidak dapat ditemui"
-          nested_macro: "This macro is recursively referencing %{model} %{id}."
+          nested_macro: "Makro ini merujuk secara rekursif %{model} %{id}."
           invalid_attribute: "Atribut yang dipilih '%{name}' tidak wujud."
         child_pages:
           button: "Terpaut pada halaman anak"
@@ -280,7 +280,7 @@ ms:
           Adakah anda pasti anda ingin teruskan?
       work_packages_settings:
         warning_progress_calculation_mode_change_from_status_to_field_html: >-
-          Changing progress calculation mode from status-based to work-based will make the <i>% Complete</i> field freely editable. If you optionally enter values for <i>Work</i> or <i>Remaining work</i>, they will also be linked to <i>% Complete</i>. Changing <i>Remaining work</i> can then update <i>% Complete</i>.
+          Menukar mod pengiraan kemajuan daripada berasaskan status kepada berasaskan kerja akan menjadikan medan <i>% Selesai</i> boleh diedit secara bebas. Jika anda secara pilihan memasukkan nilai untuk <i>Kerja</i> atau <i>Kerja yang tinggal</i>, nilai tersebut juga akan dipautkan kepada <i>% Selesai</i>. Menukar <i>Baki kerja</i> kemudian boleh mengemas kini <i>% Selesai</i>.
         warning_progress_calculation_mode_change_from_field_to_status_html: >-
           Mengubah mod pengiraan perkembangan daripada berasaskan-kerja kepada berasaskan-status akan menjadikan semua nilai <i>% Selesai</i> yang sedia ada hilang dan digantikan dengan nilai yang berkaitan dengan setiap status. Nilai sedia ada bagi <i>Kerja yang berbaki</i> juga akan dikira semula untuk menggambarkan perubahan ini. Tindakan ini tidak boleh dipulihkan.
     custom_actions:
@@ -357,10 +357,10 @@ ms:
           learn_about: "Ketahui lebih lanjut mengenai fitur-fitur baharu."
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Langgan kalendar"
       inital_setup_error_message: "Ralat berlaku ketika sedang mengambil data."
@@ -401,7 +401,7 @@ ms:
     label_create: "Cipta"
     label_create_work_package: "Cipta pakej kerja baharu"
     label_created_by: "Dicipta oleh"
-    label_current: "current"
+    label_current: "semasa"
     label_date: "Tarikh"
     label_date_with_format: "Masukkan %{date_attribute} menggunakan format berikut: %{format}"
     label_deactivate: "Nyahaktifkan"
@@ -576,7 +576,7 @@ ms:
         members: "Jemput <b>ahli</b> baharu untuk sertai projek anda."
         quick_add_button: "Klik ikon tambah (+) dalam navigasi pengepala untuk <b>cipta projek baharu</b> atau untuk <b>jemput rakan sekerja</b>."
         sidebar_arrow: "Guna anak panah kembali di sudut kiri atas untuk kembali ke <b>menu utama</b> projek."
-        welcome: "Take a three-minute introduction tour to learn the most <b>important features</b>. <br> We recommend completing the steps until the end. You can restart the tour any time."
+        welcome: "Ikuti lawatan pengenalan selama tiga minit untuk mempelajari <b>ciri penting</b> yang paling. <br> Kami mengesyorkan anda melengkapkan langkah sehingga tamat. Anda boleh memulakan semula lawatan pada bila-bila masa."
         wiki: "Dalam <b>wiki</b> anda boleh mendokumentasikan dan kongsi pengetahuan bersama pasukan anda."
         backlogs:
           overview: "Kendalikan kerja anda dalam paparan <b>tunggakan</b>."
@@ -613,22 +613,23 @@ ms:
         assigned: "Penerima tugasan"
         #The enum value is named 'responsible' in the database and that is what is transported through the API
         #up to the frontend.
-        responsible: "Accountable"
+        responsible: "Bertanggungjawab"
         created: "Dicipta"
         scheduled: "Dijadualkan"
         commented: "Komen"
-        processed: "Processed"
-        prioritized: "Prioritized"
+        processed: "Diproses"
+        prioritized: "Diutamakan"
         dateAlert: "Peringatan tarikh"
         shared: "Telah dikongsi"
+        reminder: "Peringatan"
       date_alerts:
         milestone_date: "Tarikh pencapaian"
         overdue: "Tertangguh"
-        overdue_since: "sejak %{difference_in_days}"
-        property_today: "adalah hari ini"
-        property_is: "adalah dalam %{difference_in_days}"
-        property_was: "%{difference_in_days} yang lalu"
-        property_is_deleted: "dipadamkan"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Peringatan tarikh"
           description: "Dengan peringatan tarikh, anda akan dimaklumkan tentang tarikh mula dan akhir yang akan datang supaya anda tidak pernah terlepas atau lupa tarikh akhir yang penting."
@@ -641,17 +642,19 @@ ms:
           with_current_filter: "Tiada pemberitahuan dalam paparan ini buat masa ini"
         mark_all_read: "Tanda semua sudah dibaca"
         mark_as_read: "Tanda sudah dibaca"
-        text_update_date_by: "%{date} by"
+        text_update_date_by: "%{date} oleh"
         total_count_warning: "Sedang memaparkan %{newest_count} pemberitahuan yang terbaru. %{more_count} lagi tidak dipaparkan."
         empty_state:
           no_notification: "Nampaknya anda telah selesaikan semuanya."
           no_notification_with_current_project_filter: "Nampaknya anda sudah selesai dengan projek yang dipilih."
           no_notification_with_current_filter: "Nampaknya anda sudah selesai untuk penyaringan %{filter}."
-          no_notification_for_filter: "Looks like you are all caught up for this filter."
+          no_notification_for_filter: "Nampaknya anda semua terperangkap untuk penapis ini."
           no_selection: "Klik pemberitahuan untuk paparkan semua butiran aktiviti."
         new_notifications:
           message: "Terdapat pemberitahuan baharu."
           link_text: "Klik sini untuk memuatkan mereka."
+      reminders:
+        note: "Nota: \"%{note}\""
       settings:
         change_notification_settings: 'Anda boleh mengubah suai <a target="_blank" href="%{url}">tetapan pemberitahuan</a> anda untuk memastikan anda tidak terlepas tarikh yang penting.'
         title: "Tetapan pemberitahuan"
@@ -739,6 +742,7 @@ ms:
         immediate:
           title: "Hantar saya peringatan e-mel"
           mentioned: "Serta merta apabila sesiapa @menyebut saya"
+          personal_reminder: "Serta-merta apabila saya menerima peringatan peribadi"
         alerts:
           title: "Peringatan e-mel untuk item lain (yang bukan pakej kerja)"
           explanation: >
@@ -770,10 +774,6 @@ ms:
         upgrade_to_ee_text: "Wah! Jika anda perlukan tambahan ini anda sungguh pro! Bolehkah anda menyokong kami, pembangun OpenProject, dengan menjadi pelanggan edisi Enterprise?"
         more_information: "Maklumat lanjut"
         nevermind: "Tidak mengapa"
-      edit:
-        form_configuration: "Konfigurasi Borang"
-        projects: "Projek"
-        settings: "Tetapan"
     time_entry:
       work_package_required: "Memerlukan pemilihan pakej kerja dahulu."
       title: "Masa log"
@@ -999,7 +999,7 @@ ms:
         workAlternative: "Anggaran masa"
         remainingTime: "Kerja yang berbaki"
       default_queries:
-        manually_sorted: "New manually sorted query"
+        manually_sorted: "Pertanyaan diisih secara manual baharu"
         latest_activity: "Aktiviti terkini"
         created_by_me: "Dicipta oleh saya"
         assigned_to_me: "Ditugaskan kepada saya"
@@ -1042,6 +1042,12 @@ ms:
           not_found: "Tiada paparan seperti itu"
           duplicate_query_title: "Nama paparan ini sudah wujud. Tukar juga?"
         text_no_results: "Tiada paparan yang sepadan ditemui."
+      reminders:
+        button_label: "Tetapkan peringatan"
+        title:
+          new: "Tetapkan peringatan"
+          edit: "Sunting peringatan"
+        subtitle: "Anda akan menerima pemberitahuan untuk pakej kerja ini pada masa yang dipilih."
       scheduling:
         is_parent: "Tarikh pakej kerja ini disimpulkan secara automatik dari anaknya. Aktifkan 'Penjadualan Manual' untuk tetapkan tarikh."
         is_switched_from_manual_to_automatic: "Tarikh pakej kerja ini mungkin perlu dikira semula selepas menukar dari penjadualan manual ke automatik kerana hubungan dengan pakej kerja lain."
@@ -1185,7 +1191,7 @@ ms:
         other: "%{count} hari"
         zero: "0 hari"
       word:
-        other: "%{count} words"
+        other: "%{count} perkataan"
     zen_mode:
       button_activate: "Aktifkan mod zen"
       button_deactivate: "Nyahaktifkan mod zen"
@@ -1342,5 +1348,3 @@ ms:
       waiting_subtitle:
         network_off: "Terdapat masalah rangkaian."
         network_on: "Rangkaian kembali. Kami sedang mencuba."
-        timeout: >
-          OpenProject tidak dapat memberikan anda akses ke folder projek dalam tempoh masa yang dijangkakan. Sila cubasekali lagi.<br><br> Jika masalah itu berterusan, sila hubungi pentadbir OpenProject anda untuk menyemak <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">status kesihatan penyediaan storan fail</a>.
diff --git a/config/locales/crowdin/js-ne.yml b/config/locales/crowdin/js-ne.yml
index 8fba28800552..e03b823e95ed 100644
--- a/config/locales/crowdin/js-ne.yml
+++ b/config/locales/crowdin/js-ne.yml
@@ -357,10 +357,10 @@ ne:
           learn_about: "Learn more about the new features"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Subscribe to calendar"
       inital_setup_error_message: "An error occured while fetching data."
@@ -621,14 +621,15 @@ ne:
         prioritized: "Prioritized"
         dateAlert: "Date alert"
         shared: "Shared"
+        reminder: "Reminder"
       date_alerts:
         milestone_date: "Milestone date"
         overdue: "Overdue"
-        overdue_since: "since %{difference_in_days}"
-        property_today: "is today"
-        property_is: "is in %{difference_in_days}"
-        property_was: "was %{difference_in_days} ago"
-        property_is_deleted: "is deleted"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Date alerts"
           description: "With date alerts, you will be notified of upcoming start or finish dates so that you never miss or forget an important deadline."
@@ -653,6 +654,8 @@ ne:
         new_notifications:
           message: "There are new notifications."
           link_text: "Click here to load them."
+      reminders:
+        note: "Note: “%{note}”"
       settings:
         change_notification_settings: 'You can modify your <a target="_blank" href="%{url}">notification settings</a> to ensure you never miss an important update.'
         title: "Notification settings"
@@ -740,6 +743,7 @@ ne:
         immediate:
           title: "Send me an email reminder"
           mentioned: "Immediately when someone @mentions me"
+          personal_reminder: "Immediately when I receive a personal reminder"
         alerts:
           title: "Email alerts for other items (that are not work packages)"
           explanation: >
@@ -771,10 +775,6 @@ ne:
         upgrade_to_ee_text: "Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?"
         more_information: "More information"
         nevermind: "Nevermind"
-      edit:
-        form_configuration: "फारम कन्फिगरेसन"
-        projects: "Projects"
-        settings: "Settings"
     time_entry:
       work_package_required: "सबै भन्दा पहिले कार्य प्याकेज चयन गर्न आवश्यक छ।"
       title: "Log time"
@@ -1043,6 +1043,12 @@ ne:
           not_found: "There is no such view"
           duplicate_query_title: "Name of this view already exists. Change anyway?"
         text_no_results: "No matching views were found."
+      reminders:
+        button_label: "Set reminder"
+        title:
+          new: "Set reminder"
+          edit: "Edit reminder"
+        subtitle: "You will receive a notification for this work package at the chosen time."
       scheduling:
         is_parent: "The dates of this work package are automatically deduced from its children. Activate 'Manual scheduling' to set the dates."
         is_switched_from_manual_to_automatic: "The dates of this work package may need to be recalculated after switching from manual to automatic scheduling due to relationships with other work packages."
@@ -1346,5 +1352,3 @@ ne:
       waiting_subtitle:
         network_off: "There is a network problem."
         network_on: "Network is back. We are trying."
-        timeout: >
-          OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check the <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">health status of the file storage setup</a>.
diff --git a/config/locales/crowdin/js-nl.yml b/config/locales/crowdin/js-nl.yml
index 1d811294c413..26ff767795cd 100644
--- a/config/locales/crowdin/js-nl.yml
+++ b/config/locales/crowdin/js-nl.yml
@@ -357,10 +357,10 @@ nl:
           learn_about: "Meer informatie over de nieuwe functies"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Abonneren op agenda"
       inital_setup_error_message: "Er is een fout opgetreden tijdens het ophalen van gegevens."
@@ -621,14 +621,15 @@ nl:
         prioritized: "Prioritized"
         dateAlert: "Date alert"
         shared: "Gedeeld"
+        reminder: "Reminder"
       date_alerts:
         milestone_date: "Milestone date"
         overdue: "Te laat"
-        overdue_since: "sinds %{difference_in_days}"
-        property_today: "is vandaag"
-        property_is: "is in %{difference_in_days}"
-        property_was: "was %{difference_in_days} geleden"
-        property_is_deleted: "Is verwijderd"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Date alerts"
           description: "Met datummeldingen wordt u op de hoogte gebracht van de start- of einddatum, zodat u nooit een belangrijke deadline mist of vergeet."
@@ -653,6 +654,8 @@ nl:
         new_notifications:
           message: "Er zijn nieuwe meldingen."
           link_text: "Klik hier om ze te laden."
+      reminders:
+        note: "Note: “%{note}”"
       settings:
         change_notification_settings: 'You can modify your <a target="_blank" href="%{url}">notification settings</a> to ensure you never miss an important update.'
         title: "Instellingen voor meldingen"
@@ -740,6 +743,7 @@ nl:
         immediate:
           title: "Stuur me een e-mail herinnering"
           mentioned: "Onmiddellijk wanneer iemand @vermeldt"
+          personal_reminder: "Immediately when I receive a personal reminder"
         alerts:
           title: "E-mail meldingen voor andere items (die geen werkpakketten zijn)"
           explanation: >
@@ -771,10 +775,6 @@ nl:
         upgrade_to_ee_text: "Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?"
         more_information: "Meer informatie"
         nevermind: "Geen aandacht"
-      edit:
-        form_configuration: "Formulier configuratie"
-        projects: "Projecten"
-        settings: "Instellingen"
     time_entry:
       work_package_required: "Vereist eerst een werkpakket te selecteren."
       title: "Gelogde tijd"
@@ -1043,6 +1043,12 @@ nl:
           not_found: "Deze weergave bestaat niet"
           duplicate_query_title: "Naam van deze weergave bestaat al. Toch wijzigen?"
         text_no_results: "Geen overeenkomende weergaven werden gevonden."
+      reminders:
+        button_label: "Set reminder"
+        title:
+          new: "Set reminder"
+          edit: "Edit reminder"
+        subtitle: "You will receive a notification for this work package at the chosen time."
       scheduling:
         is_parent: "The dates of this work package are automatically deduced from its children. Activate 'Manual scheduling' to set the dates."
         is_switched_from_manual_to_automatic: "The dates of this work package may need to be recalculated after switching from manual to automatic scheduling due to relationships with other work packages."
@@ -1346,5 +1352,3 @@ nl:
       waiting_subtitle:
         network_off: "There is a network problem."
         network_on: "Network is back. We are trying."
-        timeout: >
-          OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check the <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">health status of the file storage setup</a>.
diff --git a/config/locales/crowdin/js-no.yml b/config/locales/crowdin/js-no.yml
index d48af805231e..93a5bd3100fd 100644
--- a/config/locales/crowdin/js-no.yml
+++ b/config/locales/crowdin/js-no.yml
@@ -357,10 +357,10 @@
           learn_about: "Lær mer om de nye funksjonene"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Abonner på kalender"
       inital_setup_error_message: "En feil oppstod under henting av data."
@@ -621,14 +621,15 @@
         prioritized: "Prioritized"
         dateAlert: "Dato varsel"
         shared: "Delt"
+        reminder: "Reminder"
       date_alerts:
         milestone_date: "Milepæl dato"
         overdue: "Forfalt"
-        overdue_since: "siden %{difference_in_days}"
-        property_today: "er i dag"
-        property_is: "er om  %{difference_in_days}"
-        property_was: "var %{difference_in_days} siden"
-        property_is_deleted: "er slettet"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Dato varsler"
           description: "Med datovarsler, vil du bli varslet om kommende start- eller sluttdatoer slik at du aldri går glipp av eller glemmer en viktig frist."
@@ -653,6 +654,8 @@
         new_notifications:
           message: "Det finnes nye varsler."
           link_text: "Klikk her for å laste dem"
+      reminders:
+        note: "Note: “%{note}”"
       settings:
         change_notification_settings: 'Du kan endre <a target="_blank" href="%{url}">varslingsinnstillinger</a> for å sikre at du aldri går glipp av en viktig oppdatering.'
         title: "Varslingsinnstillinger"
@@ -740,6 +743,7 @@
         immediate:
           title: "Send meg en påminnelse"
           mentioned: "Umiddelbart hvis noen @nevner meg"
+          personal_reminder: "Immediately when I receive a personal reminder"
         alerts:
           title: "Epost varsler for andre produkter (som ikke er arbeidspakker)"
           explanation: >
@@ -771,10 +775,6 @@
         upgrade_to_ee_text: "Wow! Hvis du trenger dette tillegget er en superpro! Vil du støtte oss OpenSource-utviklere ved å bli en Enterpris-utgave-kunde?"
         more_information: "Mer informasjon"
         nevermind: "Glem det"
-      edit:
-        form_configuration: "Konfigurering av skjema"
-        projects: "Prosjekter"
-        settings: "Innstillinger"
     time_entry:
       work_package_required: "Valg av arbeidspakke er påkrevd"
       title: "Logg tid"
@@ -1043,6 +1043,12 @@
           not_found: "Det finnes ingen slik visning."
           duplicate_query_title: "Navnet på denne visningen finnes allerede. Endre allikevel?"
         text_no_results: "Ingen samsvarende visninger ble funnet."
+      reminders:
+        button_label: "Set reminder"
+        title:
+          new: "Set reminder"
+          edit: "Edit reminder"
+        subtitle: "You will receive a notification for this work package at the chosen time."
       scheduling:
         is_parent: "Datoene for denne arbeidspakken trekkes automatisk fra de underordnede. Aktiver 'Manuell planlegging' for å angi datoene."
         is_switched_from_manual_to_automatic: "Datoene for denne arbeidspakken må eventuelt beregnes på nytt etter å ha byttet fra manual til automatisk planlegging på grunn av relasjoner med andre arbeidspakker."
@@ -1346,5 +1352,3 @@
       waiting_subtitle:
         network_off: "Det er et nettverksproblem."
         network_on: "Nettverket er tilbake. Vi prøver igjen."
-        timeout: >
-          OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check the <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">health status of the file storage setup</a>.
diff --git a/config/locales/crowdin/js-pl.yml b/config/locales/crowdin/js-pl.yml
index 2b0d733107b2..05e6b6e28380 100644
--- a/config/locales/crowdin/js-pl.yml
+++ b/config/locales/crowdin/js-pl.yml
@@ -357,10 +357,10 @@ pl:
           learn_about: "Dowiedz się więcej o nowych funkcjach"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                Ta wersja wprowadza różne funkcje i ulepszenia, np. <br> <ul class="%{list_styling_class}"> <li>Niestandardowe pola hierarchii typów (dodatek wersji Enterprise).</li> <li>Przeprojektowanie karty Relacje w pakietach roboczych.</li> <li>Przeprojektowanie strony indeksu Spotkania.</li> <li>Ręczne podziały stron w eksporcie pakietów roboczych w formacie PDF.</li> <li>Tryb Zen dla list projektów.</li> </ul>
+                Wersja wprowadza różne funkcje i ulepszenia, takie jak <br> <ul class="%{list_styling_class}"> <li>Ustawianie przypomnień dla pakietów roboczych w celu generowania powiadomień o datach.</li> <li>Tworzenie nowych folderów bezpośrednio z selektora lokalizacji w celu przechowywania plików.</li> <li>Określanie wymaganego odstępu między następcami i poprzednikami pakietów roboczych.</li> <li>Włączanie porządkowania i grupowania pakietów roboczych na podstawie wartości hierarchii typów pól niestandardowych.</li> <li>Eksportowanie wpisów czasu jako kart czasu pracy w formacie PDF.</li> <li>Dodawanie okienka wyskakującego wyświetlającego informacje o użytkowniku po najechaniu nań myszą.</li> </ul>
     ical_sharing_modal:
       title: "Subskrybuj kalendarz"
       inital_setup_error_message: "Podczas pobierania danych wystąpił błąd."
@@ -621,14 +621,15 @@ pl:
         prioritized: "Ma priorytet"
         dateAlert: "Alert dotyczący daty"
         shared: "Udostępniono"
+        reminder: "Przypomnienie"
       date_alerts:
         milestone_date: "Data  kamienia milowego"
         overdue: "Przekroczony termin"
-        overdue_since: "od %{difference_in_days}"
-        property_today: "jest dzisiaj"
-        property_is: "jest za %{difference_in_days}"
-        property_was: "była %{difference_in_days} temu"
-        property_is_deleted: "usunięto"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Alerty dotyczące dat"
           description: "Dzięki alertom dotyczącym dat będziesz otrzymywać powiadomienia o zbliżających się terminach rozpoczęcia lub zakończenia pracy, dzięki czemu nigdy nie przegapisz ani nie zapomnisz ważnego terminu."
@@ -655,6 +656,8 @@ pl:
         new_notifications:
           message: "Masz nowe powiadomienia."
           link_text: "Kliknij tutaj, aby je załadować."
+      reminders:
+        note: "Uwaga: „%{note}”"
       settings:
         change_notification_settings: 'Możesz zmodyfikować <a target="_blank" href="%{url}">ustawienia powiadomień</a>, aby upewnić się, że nigdy nie przegapisz ważnej aktualizacji.'
         title: "Ustawienia powiadomień"
@@ -742,6 +745,7 @@ pl:
         immediate:
           title: "Wyślij mi przypomnienie e-mail"
           mentioned: "Natychmiast, gdy pojawi się @wzmianka o mnie"
+          personal_reminder: "Natychmiast po otrzymaniu osobistego przypomnienia"
         alerts:
           title: "Powiadomienia e-mail dla innych elementów (które nie są pakietami roboczymi)"
           explanation: >
@@ -773,10 +777,6 @@ pl:
         upgrade_to_ee_text: "Znakomicie! Jeśli potrzebujesz tego dodatku, jesteś superprofesjonalistą! Może wesprzesz nas jako deweloperów OpenSource, zostając nabywcą wersji Enterprise?"
         more_information: "Więcej informacji"
         nevermind: "Nieważne"
-      edit:
-        form_configuration: "Konfiguracja formularza"
-        projects: "Projekty"
-        settings: "Ustawienia"
     time_entry:
       work_package_required: "Wymaga wybrania najpierw pakietu roboczego."
       title: "Rejestruj czas pracy"
@@ -1045,6 +1045,12 @@ pl:
           not_found: "Nie ma takiego widoku"
           duplicate_query_title: "Nazwa tego widoku już istnieje. Zmienić mimo to?"
         text_no_results: "Nie znaleziono żadnych pasujących widoków."
+      reminders:
+        button_label: "Ustaw przypomnienie"
+        title:
+          new: "Ustaw przypomnienie"
+          edit: "Edytuj przypomnienie"
+        subtitle: "W wybranym terminie otrzymasz powiadomienie dotyczące tego pakietu roboczego."
       scheduling:
         is_parent: "Daty tego pakietu roboczego są automatycznie odejmowane od jego elementów podrzędnych. Włącz funkcję Planowanie ręczne, aby ustawić daty."
         is_switched_from_manual_to_automatic: "Po przełączeniu planowania z ręcznego na automatyczne konieczne może być ponowne obliczenie dat tego pakietu roboczego ze względu na jego powiązania z innymi pakietami roboczymi."
@@ -1354,5 +1360,3 @@ pl:
       waiting_subtitle:
         network_off: "Występuje problem z siecią."
         network_on: "Sieć znów działa. Staramy się."
-        timeout: >
-          OpenProject nie mógł Ci zapewnić dostępu do folderu projektu w oczekiwanym czasie. Spróbuj ponownie.<br><br> Jeśli problem nie ustąpi, skontaktuj się z administratorem OpenProject w celu sprawdzenia <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">stanu konfiguracji magazynu plików</a>.
diff --git a/config/locales/crowdin/js-pt-BR.yml b/config/locales/crowdin/js-pt-BR.yml
index f676f73da14d..2642ebebf92c 100644
--- a/config/locales/crowdin/js-pt-BR.yml
+++ b/config/locales/crowdin/js-pt-BR.yml
@@ -356,10 +356,10 @@ pt-BR:
           learn_about: "Saiba mais sobre os novos recursos"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                A nova versão traz diversas melhorias e recursos, como: <br> <ul class="%{list_styling_class}"> <li>Campos personalizados em hierarquia (complemento Enterprise).</li> <li>Redesign da aba de Relações nos pacotes de trabalho.</li> <li>Redesign da página de índice das Reuniões.</li> <li>Quebras de página manuais nas exportações de pacotes de trabalho em PDF.</li> <li>Modo Zen para listas de projetos.</li> </ul>
+                A versão traz vários recursos e melhorias para você, como: <br> <ul class="%{list_styling_class}"> <li>Definir lembretes para pacotes de trabalho para gerar notificações de alerta com base em datas.</li> <li>Criar novas pastas diretamente no seletor de local para armazenamento de arquivos.</li> <li>Especificar um intervalo necessário entre sucessores e predecessores de pacotes de trabalho.</li> <li>Habilitar a ordenação e o agrupamento de pacotes de trabalho com base nos valores de campos personalizados do tipo hierarquia.</li> <li>Exportar entradas de tempo como planilhas de horas em PDF.</li> <li>Adicionar um popover exibindo informações do usuário ao passar o mouse.</li> </ul>
     ical_sharing_modal:
       title: "Assinar calendário"
       inital_setup_error_message: "Ocorreu um erro ao buscar dados."
@@ -620,14 +620,15 @@ pt-BR:
         prioritized: "Priorizado"
         dateAlert: "Alerta de data"
         shared: "Compartilhado"
+        reminder: "Lembrete"
       date_alerts:
         milestone_date: "Data de marco"
         overdue: "Atrasado"
-        overdue_since: "desde %{difference_in_days}"
-        property_today: "é hoje"
-        property_is: "está em %{difference_in_days}"
-        property_was: "há %{difference_in_days}"
-        property_is_deleted: "foi excluído"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Alertas de data"
           description: "Com os alertas de data, você receberá uma notificação das futuras datas de início e conclusão, assim você nunca perderá ou esquecerá prazos importante. "
@@ -652,6 +653,8 @@ pt-BR:
         new_notifications:
           message: "Há novas notificações."
           link_text: "Clique aqui para carregá-las."
+      reminders:
+        note: "Nota: \"%{note}\""
       settings:
         change_notification_settings: 'Você pode modificar suas <a target="_blank" href="%{url}">configurações de notificação</a> para se certificar de nunca perder nenhuma atualização importante.'
         title: "Configurações de notificação"
@@ -739,6 +742,7 @@ pt-BR:
         immediate:
           title: "Envie-me um lembrete por e-mail"
           mentioned: "Imediatamente quando alguém me @mencionar"
+          personal_reminder: "Imediatamente quando eu receber um lembrete pessoal"
         alerts:
           title: "Alertas por e-mail para outros itens (qua não sejam pacotes de trabalho)"
           explanation: >
@@ -770,10 +774,6 @@ pt-BR:
         upgrade_to_ee_text: "Uau! Se você precisa deste complemento, é porque é um super profissional! Gostaria de mostrar seu suporte aos desenvolvedores de código aberto tornando-se um cliente da edição Enterprise?"
         more_information: "Mais informações"
         nevermind: "Deixa pra lá"
-      edit:
-        form_configuration: "Configuração do formulário"
-        projects: "Projetos"
-        settings: "Configurações"
     time_entry:
       work_package_required: "É necessário selecionar primeiro um pacote de trabalho."
       title: "Registro de tempo"
@@ -1042,6 +1042,12 @@ pt-BR:
           not_found: "Esta visão não existe"
           duplicate_query_title: "O nome desta visão já existe. Modificar assim mesmo?"
         text_no_results: "Nenhuma visão correspondente foi encontrada."
+      reminders:
+        button_label: "Definir lembrete"
+        title:
+          new: "Definir lembrete"
+          edit: "Editar lembrete"
+        subtitle: "Você receberá uma notificação para este pacote de trabalho no horário selecionado."
       scheduling:
         is_parent: "As datas deste pacote de trabalho são deduzidas automaticamente de seus filhos. Ative o 'Planejamento manual' para definir as datas."
         is_switched_from_manual_to_automatic: "As datas deste pacote de trabalho podem precisar ser recalculadas após a alteração de planejamento manual para automático devido a relações com outros pacotes de trabalho."
@@ -1345,5 +1351,3 @@ pt-BR:
       waiting_subtitle:
         network_off: "Ocorreu um problema de rede"
         network_on: "A rede voltou. Estamos tentando."
-        timeout: >
-          Não foi possível acessar a pasta do projeto no OpenProject dentro do prazo esperado. Tente novamente.<br><br> Se o problema persistir, entre em contato com seu administrador OpenProject para verificar o <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">status de integridade da configuração de armazenamento de arquivos</a>.
diff --git a/config/locales/crowdin/js-pt-PT.yml b/config/locales/crowdin/js-pt-PT.yml
index 399ebcc12486..662b0cbbc045 100644
--- a/config/locales/crowdin/js-pt-PT.yml
+++ b/config/locales/crowdin/js-pt-PT.yml
@@ -357,10 +357,10 @@ pt-PT:
           learn_about: "Saiba mais sobre os novos recursos"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                A versão oferece várias funcionalidades e melhorias, por exemplo, <br> <ul class="%{list_styling_class}"> <li>Campos personalizados de tipo hierárquico (suplemento Enterprise).</li> <li>Reformulação do separador Relações nos pacotes de trabalho.</li> <li>Reformulação da página de índice das Reuniões.</li> <li>Quebras de página manuais nas exportações de pacotes de trabalho em PDF.</li> <li>Modo Zen para listas de projetos.</li> </ul>
+                A versão traz várias funcionalidades e melhorias para si, por exemplo, <br> <ul class="%{list_styling_class}"> <li>Defina lembretes para pacotes de trabalho para gerar notificações de alerta de data.</li> <li>Crie novas pastas diretamente a partir do seletor de localização para armazenamento de ficheiros.</li> <li>Especifique um desfasamento necessário entre os sucessores e os antecessores dos pacotes de trabalho.</li> <li>Ative a ordenação e o agrupamento de pacotes de trabalho com base nos valores da hierarquia de tipos de campos personalizados.</li> <li>Exporte registos de tempo como registos horários em PDF.</li> <li>Adicione uma janela popover que apresenta informações do utilizador ao passar o cursor do rato.</li> </ul>
     ical_sharing_modal:
       title: "Subscrever o calendário"
       inital_setup_error_message: "Ocorreu um erro ao recuperar os dados."
@@ -621,14 +621,15 @@ pt-PT:
         prioritized: "Priorizado"
         dateAlert: "Alerta de data"
         shared: "Partilhado"
+        reminder: "Lembrete"
       date_alerts:
         milestone_date: "Data do marco"
         overdue: "Em atraso"
-        overdue_since: "desde %{difference_in_days}"
-        property_today: "é hoje"
-        property_is: "é em %{difference_in_days}"
-        property_was: "há %{difference_in_days} atrás"
-        property_is_deleted: "foi apagado"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Alertas de data"
           description: "Com os alertas de data, receberá uma notificação sobre as próximas datas de início e conclusão, para que não nunca perca ou esqueça prazos importantes. "
@@ -653,6 +654,8 @@ pt-PT:
         new_notifications:
           message: "Há novas notificações."
           link_text: "Clique aqui para carregá-las."
+      reminders:
+        note: "Nota: \"%{note}\""
       settings:
         change_notification_settings: 'Pode modificar as suas <a target="_blank" href="%{url}">definições de notificações</a> para garantir que nunca perde uma atualização importante.'
         title: "Definições das notificações"
@@ -740,6 +743,7 @@ pt-PT:
         immediate:
           title: "Enviar-me um lembrete por e-mail"
           mentioned: "Imediatamente quando alguém me @mencionar"
+          personal_reminder: "Imediatamente quando recebo um lembrete pessoal"
         alerts:
           title: "Alertas de e-mail para outros itens (que não são pacotes de trabalho)"
           explanation: >
@@ -771,10 +775,6 @@ pt-PT:
         upgrade_to_ee_text: "Uau! Se precisa deste complemento é porque faz parte dos utilizadores especializados! Gostaria de apoiar os desenvolvedores de OpenSource tornando-se cliente da edição Enterprise?"
         more_information: "Mais informação"
         nevermind: "Não, obrigado"
-      edit:
-        form_configuration: "Configuração do formulário"
-        projects: "Projetos"
-        settings: "Definições"
     time_entry:
       work_package_required: "Requer que selecione um pacote de trabalho primeiro."
       title: "Tempo de registro"
@@ -1043,6 +1043,12 @@ pt-PT:
           not_found: "Não existe tal visualização"
           duplicate_query_title: "O nome desta visualização já existe. Mudar de qualquer forma?"
         text_no_results: "Não foram encontradas visualizações correspondentes."
+      reminders:
+        button_label: "Definir lembrete"
+        title:
+          new: "Definir lembrete"
+          edit: "Editar lembrete"
+        subtitle: "Irá receber uma notificação para este pacote de trabalho na hora selecionada."
       scheduling:
         is_parent: "As datas deste pacote de trabalho são deduzidas automaticamente dos seus filhos. Ative o 'Agendamento manual' para definir as datas."
         is_switched_from_manual_to_automatic: "As datas deste pacote de trabalho podem precisar de ser recalculadas após mudar de agendamento manual para automático, devido a relações com outros pacotes de trabalho."
@@ -1346,5 +1352,3 @@ pt-PT:
       waiting_subtitle:
         network_off: "Há um problema de rede."
         network_on: "A rede está de volta. Estamos a tentar."
-        timeout: >
-          O OpenProject não pôde fornecer acesso à pasta do projeto dentro do período esperado de tempo, tente novamente.<br><br> Se esse problema continuar, entre em contacto com o administrador do OpenProject para verificar o <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">estado de funcionamento da configuração de armazenamento de ficheiros</a>.
diff --git a/config/locales/crowdin/js-ro.yml b/config/locales/crowdin/js-ro.yml
index b9ffab63c936..74a501e5b0ef 100644
--- a/config/locales/crowdin/js-ro.yml
+++ b/config/locales/crowdin/js-ro.yml
@@ -356,10 +356,10 @@ ro:
           learn_about: "Aflați mai multe despre noile caracteristici"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Subscribe to calendar"
       inital_setup_error_message: "An error occured while fetching data."
@@ -620,14 +620,15 @@ ro:
         prioritized: "Prioritized"
         dateAlert: "Alertă dată"
         shared: "Partajat"
+        reminder: "Reminder"
       date_alerts:
         milestone_date: "Dată etapă"
         overdue: "Restanțe"
-        overdue_since: "din %{difference_in_days}"
-        property_today: "este astăzi"
-        property_is: "este în %{difference_in_days}"
-        property_was: "a fost %{difference_in_days} acum"
-        property_is_deleted: "este șters"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Alerte date"
           description: "Cu alertele de date, veți fi notificat cu privire la următoarele date de început sau de sfârșit, astfel încât să nu ratați sau să uitați niciodată un termen limită important."
@@ -653,6 +654,8 @@ ro:
         new_notifications:
           message: "Există notificări noi."
           link_text: "Click here to load them."
+      reminders:
+        note: "Note: “%{note}”"
       settings:
         change_notification_settings: 'Poți modifica setările <a target="_blank" href="%{url}">de notificare</a> pentru a te asigura că nu pierzi niciodată o actualizare importantă.'
         title: "Setări notificare"
@@ -740,6 +743,7 @@ ro:
         immediate:
           title: "Trimiteți-mi un e-mail de reamintire"
           mentioned: "Imediat când cineva mă @menționează"
+          personal_reminder: "Immediately when I receive a personal reminder"
         alerts:
           title: "Alerte prin e-mail pentru alte elemente (care nu sunt pachete de lucru)"
           explanation: >
@@ -771,10 +775,6 @@ ro:
         upgrade_to_ee_text: "Wow! Dacă aveți nevoie de acest add-on sunteți un super profesionist! Vrei să ne sprijini pe noi, dezvoltatorii OpenSource, devenind client al ediției Enterprise?"
         more_information: "Mai multe informatii"
         nevermind: "Asta e..."
-      edit:
-        form_configuration: "Configurare formular"
-        projects: "Proiecte"
-        settings: "Setări"
     time_entry:
       work_package_required: "Necesită să se selecteze mai întâi un pachet de lucru."
       title: "Registru timp"
@@ -1043,6 +1043,12 @@ ro:
           not_found: "Vezi"
           duplicate_query_title: "Numele acestei vizualizări există deja. Să-l schimbăm oricum?"
         text_no_results: "Nu au fost găsite vizualizări corespunzătoare."
+      reminders:
+        button_label: "Set reminder"
+        title:
+          new: "Set reminder"
+          edit: "Edit reminder"
+        subtitle: "You will receive a notification for this work package at the chosen time."
       scheduling:
         is_parent: "Datele acestui pachet de lucru sunt deduse automat din copiii săi. Activați \"Programare manuală\" pentru a stabili datele."
         is_switched_from_manual_to_automatic: "Este posibil ca datele acestui pachet de lucru să trebuiască să fie recalculate după trecerea de la programarea manuală la cea automată din cauza relațiilor cu alte pachete de lucru."
@@ -1349,5 +1355,3 @@ ro:
       waiting_subtitle:
         network_off: "There is a network problem."
         network_on: "Network is back. We are trying."
-        timeout: >
-          OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check the <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">health status of the file storage setup</a>.
diff --git a/config/locales/crowdin/js-ru.yml b/config/locales/crowdin/js-ru.yml
index 23d85b789c27..816248766a14 100644
--- a/config/locales/crowdin/js-ru.yml
+++ b/config/locales/crowdin/js-ru.yml
@@ -356,10 +356,10 @@ ru:
           learn_about: "Подробнее о новых функциях"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                Этот релиз предлагает Вам различные возможности и улучшения, например, <br>. <ul class="%{list_styling_class}"> <li>Пользовательские поля типа иерархии (Enterprise версия).</li> <li>Редизайн вкладки "Связи" в пакетах работ.</li> <li>Редизайн главной страницы "Совещания".</li> <li>Ручные разрывы страниц при экспорте рабочих пакетов в формате PDF.</li> <li>Режим Zen для списков проектов.</li> </ul>
+                Этот выпуск содержит различные функции и улучшения, например, <br> <ul class="%{list_styling_class}"> <li>Установка напоминания для пакетов работ для создания оповещений о дате.</li> <li>Создание новых папок непосредственно из выбора местоположения для хранения файлов.</li> <li>Выбор необходимого интервала между преемниками и предшественниками пакетов работ.</li> <li>Сортировка и группировка пакетов работ по значениям иерархии пользовательских полей.</li> <li>Экспорт записей о времени в виде временных таблиц в формате PDF.</li> <li>Добавлено всплывающее окно, отображающее информацию о пользователе при наведении курсора.</li> </ul>
     ical_sharing_modal:
       title: "Подписаться на календарь"
       inital_setup_error_message: "Произошла ошибка при получении данных."
@@ -620,14 +620,15 @@ ru:
         prioritized: "Приоритетный"
         dateAlert: "Дата оповещения"
         shared: "Общий доступ"
+        reminder: "Напоминания"
       date_alerts:
         milestone_date: "Дата вехи"
         overdue: "Просрочено"
-        overdue_since: "на %{difference_in_days}"
-        property_today: "сегодня"
-        property_is: "находится в %{difference_in_days}"
-        property_was: "была %{difference_in_days} назад"
-        property_is_deleted: "удалено"
+        overdue_since: "с %{difference_in_days}."
+        property_today: "сегодня."
+        property_is: "в %{difference_in_days}."
+        property_was: "было %{difference_in_days} назад."
+        property_is_deleted: "удалено."
         upsale:
           title: "Дата оповещения"
           description: "С датой оповещения вы будете получать уведомления о предстоящих датах начала или окончания, чтобы никогда не пропустить или не забыть важный сроки."
@@ -654,6 +655,8 @@ ru:
         new_notifications:
           message: "Есть новые уведомления."
           link_text: "Нажмите здесь, чтобы загрузить их."
+      reminders:
+        note: "Примечание: \"%{note}\""
       settings:
         change_notification_settings: 'Измените <a target="_blank" href="%{url}">настройки уведомлений</a> , чтобы не пропустить важное обновление.'
         title: "Настройки уведомлений"
@@ -741,6 +744,7 @@ ru:
         immediate:
           title: "Отправить мне напоминание по электронной почте"
           mentioned: "Сразу же когда кто-то @упоминает меня"
+          personal_reminder: "Немедленно, когда я получаю персональное напоминание"
         alerts:
           title: "Уведомления по электронной почте для других элементов (которые не являются пакетами работ)"
           explanation: >
@@ -772,10 +776,6 @@ ru:
         upgrade_to_ee_text: "Уууууууууу! Если вам нужен этот дополнение, то вы бы хотели поддержать нас разработчиков OpenSource, став клиентом корпоративной версии?"
         more_information: "Больше информации"
         nevermind: "Неважно"
-      edit:
-        form_configuration: "Конфигурация формы"
-        projects: "Проекты"
-        settings: "Параметры"
     time_entry:
       work_package_required: "Сначала необходимо выбрать пакет работ."
       title: "Журналировать время"
@@ -1044,6 +1044,12 @@ ru:
           not_found: "Нет такого представления"
           duplicate_query_title: "Представление с таким именем уже существует. Менять в любом случае?"
         text_no_results: "Подходящие представления не найдены."
+      reminders:
+        button_label: "Установить напоминание"
+        title:
+          new: "Установить напоминание"
+          edit: "Редактировать напоминание"
+        subtitle: "Вы получите уведомление о данном пакете работ в выбранное время."
       scheduling:
         is_parent: "Даты этого пакета работ выводятся автоматически из дочерних пакетов работ. Используйте «Ручной планировщик», чтобы установить даты."
         is_switched_from_manual_to_automatic: "Даты этого пакета работ могут быть пересчитаны после переключения с ручного на автоматическое планирование из-за связей с другими пакетами работ."
@@ -1353,5 +1359,3 @@ ru:
       waiting_subtitle:
         network_off: "Проблема с сетью."
         network_on: "Проблема с сетью решена."
-        timeout: >
-          OpenProject не смог предоставить вам доступ к папке проекта в течение ожидаемого периода времени. Пожалуйста, попробуйте еще раз.<br><br> Если проблема не исчезнет, ​​обратитесь к администратору OpenProject, чтобы проверить <a href="https://www.openproject.org/docs/system-admin-guide/files/external -file-storages/file-storage-troubleshooting/">состояние файлового хранилища</a>.
diff --git a/config/locales/crowdin/js-rw.yml b/config/locales/crowdin/js-rw.yml
index 0c608006cb32..d17107eb5aab 100644
--- a/config/locales/crowdin/js-rw.yml
+++ b/config/locales/crowdin/js-rw.yml
@@ -357,10 +357,10 @@ rw:
           learn_about: "Learn more about the new features"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Subscribe to calendar"
       inital_setup_error_message: "An error occured while fetching data."
@@ -621,14 +621,15 @@ rw:
         prioritized: "Prioritized"
         dateAlert: "Date alert"
         shared: "Shared"
+        reminder: "Reminder"
       date_alerts:
         milestone_date: "Milestone date"
         overdue: "Overdue"
-        overdue_since: "since %{difference_in_days}"
-        property_today: "is today"
-        property_is: "is in %{difference_in_days}"
-        property_was: "was %{difference_in_days} ago"
-        property_is_deleted: "is deleted"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Date alerts"
           description: "With date alerts, you will be notified of upcoming start or finish dates so that you never miss or forget an important deadline."
@@ -653,6 +654,8 @@ rw:
         new_notifications:
           message: "There are new notifications."
           link_text: "Click here to load them."
+      reminders:
+        note: "Note: “%{note}”"
       settings:
         change_notification_settings: 'You can modify your <a target="_blank" href="%{url}">notification settings</a> to ensure you never miss an important update.'
         title: "Notification settings"
@@ -740,6 +743,7 @@ rw:
         immediate:
           title: "Send me an email reminder"
           mentioned: "Immediately when someone @mentions me"
+          personal_reminder: "Immediately when I receive a personal reminder"
         alerts:
           title: "Email alerts for other items (that are not work packages)"
           explanation: >
@@ -771,10 +775,6 @@ rw:
         upgrade_to_ee_text: "Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?"
         more_information: "More information"
         nevermind: "Nevermind"
-      edit:
-        form_configuration: "Form Configuration"
-        projects: "Projects"
-        settings: "Settings"
     time_entry:
       work_package_required: "Requires selecting a work package first."
       title: "Log time"
@@ -1043,6 +1043,12 @@ rw:
           not_found: "There is no such view"
           duplicate_query_title: "Name of this view already exists. Change anyway?"
         text_no_results: "No matching views were found."
+      reminders:
+        button_label: "Set reminder"
+        title:
+          new: "Set reminder"
+          edit: "Edit reminder"
+        subtitle: "You will receive a notification for this work package at the chosen time."
       scheduling:
         is_parent: "The dates of this work package are automatically deduced from its children. Activate 'Manual scheduling' to set the dates."
         is_switched_from_manual_to_automatic: "The dates of this work package may need to be recalculated after switching from manual to automatic scheduling due to relationships with other work packages."
@@ -1346,5 +1352,3 @@ rw:
       waiting_subtitle:
         network_off: "There is a network problem."
         network_on: "Network is back. We are trying."
-        timeout: >
-          OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check the <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">health status of the file storage setup</a>.
diff --git a/config/locales/crowdin/js-si.yml b/config/locales/crowdin/js-si.yml
index d171399479a5..2838d8827617 100644
--- a/config/locales/crowdin/js-si.yml
+++ b/config/locales/crowdin/js-si.yml
@@ -357,10 +357,10 @@ si:
           learn_about: "නව විශේෂාංග ගැන වැඩි විස්තර දැනගන්න"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Subscribe to calendar"
       inital_setup_error_message: "An error occured while fetching data."
@@ -621,14 +621,15 @@ si:
         prioritized: "Prioritized"
         dateAlert: "Date alert"
         shared: "Shared"
+        reminder: "Reminder"
       date_alerts:
         milestone_date: "Milestone date"
         overdue: "Overdue"
-        overdue_since: "since %{difference_in_days}"
-        property_today: "is today"
-        property_is: "is in %{difference_in_days}"
-        property_was: "was %{difference_in_days} ago"
-        property_is_deleted: "is deleted"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Date alerts"
           description: "With date alerts, you will be notified of upcoming start or finish dates so that you never miss or forget an important deadline."
@@ -653,6 +654,8 @@ si:
         new_notifications:
           message: "There are new notifications."
           link_text: "Click here to load them."
+      reminders:
+        note: "Note: “%{note}”"
       settings:
         change_notification_settings: 'You can modify your <a target="_blank" href="%{url}">notification settings</a> to ensure you never miss an important update.'
         title: "Notification settings"
@@ -740,6 +743,7 @@ si:
         immediate:
           title: "Send me an email reminder"
           mentioned: "Immediately when someone @mentions me"
+          personal_reminder: "Immediately when I receive a personal reminder"
         alerts:
           title: "Email alerts for other items (that are not work packages)"
           explanation: >
@@ -771,10 +775,6 @@ si:
         upgrade_to_ee_text: "Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?"
         more_information: "වැඩි විස්තර"
         nevermind: "කිසි විටෙකත් මනස"
-      edit:
-        form_configuration: "ආකෘති වින්යාසය"
-        projects: "ව්‍යාපෘති"
-        settings: "සැකසුම්"
     time_entry:
       work_package_required: "පළමුව වැඩ පැකේජයක් තෝරා ගැනීම අවශ්ය වේ."
       title: "ලොග් වේලාව"
@@ -1043,6 +1043,12 @@ si:
           not_found: "එවැනි මතයක් නොමැත"
           duplicate_query_title: "මෙම දර්ශනයේ නම දැනටමත් පවතී. කෙසේ හෝ වෙනස් කරන්න?"
         text_no_results: "ගැලපෙන අදහස් කිසිවක් සොයාගත නොහැකි විය."
+      reminders:
+        button_label: "Set reminder"
+        title:
+          new: "Set reminder"
+          edit: "Edit reminder"
+        subtitle: "You will receive a notification for this work package at the chosen time."
       scheduling:
         is_parent: "The dates of this work package are automatically deduced from its children. Activate 'Manual scheduling' to set the dates."
         is_switched_from_manual_to_automatic: "The dates of this work package may need to be recalculated after switching from manual to automatic scheduling due to relationships with other work packages."
@@ -1346,5 +1352,3 @@ si:
       waiting_subtitle:
         network_off: "There is a network problem."
         network_on: "Network is back. We are trying."
-        timeout: >
-          OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check the <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">health status of the file storage setup</a>.
diff --git a/config/locales/crowdin/js-sk.yml b/config/locales/crowdin/js-sk.yml
index d9a1ceab5154..829e714681c2 100644
--- a/config/locales/crowdin/js-sk.yml
+++ b/config/locales/crowdin/js-sk.yml
@@ -357,10 +357,10 @@ sk:
           learn_about: "Learn more about the new features"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Subscribe to calendar"
       inital_setup_error_message: "An error occured while fetching data."
@@ -621,14 +621,15 @@ sk:
         prioritized: "Prioritized"
         dateAlert: "Date alert"
         shared: "Shared"
+        reminder: "Reminder"
       date_alerts:
         milestone_date: "Milestone date"
         overdue: "Overdue"
-        overdue_since: "since %{difference_in_days}"
-        property_today: "is today"
-        property_is: "is in %{difference_in_days}"
-        property_was: "was %{difference_in_days} ago"
-        property_is_deleted: "is deleted"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Date alerts"
           description: "With date alerts, you will be notified of upcoming start or finish dates so that you never miss or forget an important deadline."
@@ -655,6 +656,8 @@ sk:
         new_notifications:
           message: "There are new notifications."
           link_text: "Click here to load them."
+      reminders:
+        note: "Note: “%{note}”"
       settings:
         change_notification_settings: 'You can modify your <a target="_blank" href="%{url}">notification settings</a> to ensure you never miss an important update.'
         title: "Notification settings"
@@ -742,6 +745,7 @@ sk:
         immediate:
           title: "Send me an email reminder"
           mentioned: "Immediately when someone @mentions me"
+          personal_reminder: "Immediately when I receive a personal reminder"
         alerts:
           title: "Email alerts for other items (that are not work packages)"
           explanation: >
@@ -773,10 +777,6 @@ sk:
         upgrade_to_ee_text: "Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?"
         more_information: "Viac informácií"
         nevermind: "Nie ďakujem"
-      edit:
-        form_configuration: "Form Configuration"
-        projects: "Projekty"
-        settings: "Nastavenia"
     time_entry:
       work_package_required: "Requires selecting a work package first."
       title: "Zaprotokoluj čas"
@@ -1045,6 +1045,12 @@ sk:
           not_found: "Toto zobrazenie sa nepodarilo nájsť"
           duplicate_query_title: "Zobrazenie s týmto názvom už existuje. Napriek tomu zmeniť?"
         text_no_results: "Neboli nájdené žiadne zodpovedajúce zobrazenia."
+      reminders:
+        button_label: "Set reminder"
+        title:
+          new: "Set reminder"
+          edit: "Edit reminder"
+        subtitle: "You will receive a notification for this work package at the chosen time."
       scheduling:
         is_parent: "The dates of this work package are automatically deduced from its children. Activate 'Manual scheduling' to set the dates."
         is_switched_from_manual_to_automatic: "The dates of this work package may need to be recalculated after switching from manual to automatic scheduling due to relationships with other work packages."
@@ -1354,5 +1360,3 @@ sk:
       waiting_subtitle:
         network_off: "There is a network problem."
         network_on: "Network is back. We are trying."
-        timeout: >
-          OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check the <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">health status of the file storage setup</a>.
diff --git a/config/locales/crowdin/js-sl.yml b/config/locales/crowdin/js-sl.yml
index fc3107744c86..3333c6e88173 100644
--- a/config/locales/crowdin/js-sl.yml
+++ b/config/locales/crowdin/js-sl.yml
@@ -356,10 +356,10 @@ sl:
           learn_about: "Preberite več o novostih"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Subscribe to calendar"
       inital_setup_error_message: "An error occured while fetching data."
@@ -620,14 +620,15 @@ sl:
         prioritized: "Prioritized"
         dateAlert: "Date alert"
         shared: "Shared"
+        reminder: "Reminder"
       date_alerts:
         milestone_date: "Milestone date"
         overdue: "Overdue"
-        overdue_since: "since %{difference_in_days}"
-        property_today: "is today"
-        property_is: "is in %{difference_in_days}"
-        property_was: "was %{difference_in_days} ago"
-        property_is_deleted: "is deleted"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Date alerts"
           description: "With date alerts, you will be notified of upcoming start or finish dates so that you never miss or forget an important deadline."
@@ -654,6 +655,8 @@ sl:
         new_notifications:
           message: "There are new notifications."
           link_text: "Click here to load them."
+      reminders:
+        note: "Note: “%{note}”"
       settings:
         change_notification_settings: 'You can modify your <a target="_blank" href="%{url}">notification settings</a> to ensure you never miss an important update.'
         title: "Nastavitve obvestil"
@@ -741,6 +744,7 @@ sl:
         immediate:
           title: "Send me an email reminder"
           mentioned: "Immediately when someone @mentions me"
+          personal_reminder: "Immediately when I receive a personal reminder"
         alerts:
           title: "Email alerts for other items (that are not work packages)"
           explanation: >
@@ -772,10 +776,6 @@ sl:
         upgrade_to_ee_text: "Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?"
         more_information: "Več informacij"
         nevermind: "Pozabi"
-      edit:
-        form_configuration: "Konfiguracija forme"
-        projects: "Projekti"
-        settings: "Nastavitve"
     time_entry:
       work_package_required: "Najprej izberite opravilo"
       title: "Beleži čas"
@@ -1044,6 +1044,12 @@ sl:
           not_found: "Ta pogled ne obstaja"
           duplicate_query_title: "Ime tega pogleda že obstaja. Se vseeno spremeni?"
         text_no_results: "Ujemanj ni bilo najdenih."
+      reminders:
+        button_label: "Set reminder"
+        title:
+          new: "Set reminder"
+          edit: "Edit reminder"
+        subtitle: "You will receive a notification for this work package at the chosen time."
       scheduling:
         is_parent: "Datumi tega delovnega paketa so samodejno ugotovljeni od njegovih podrazredov. Za nastavitev datumov aktivirajte 'Ročno razvrščanje'."
         is_switched_from_manual_to_automatic: "Datumi delovnega paketa se bodo lahko, da morali preračunati po menjavi iz ročnega v samodejno razvrščanje zaradi razmerij z ostalimi delovnimi paketi."
@@ -1353,5 +1359,3 @@ sl:
       waiting_subtitle:
         network_off: "There is a network problem."
         network_on: "Network is back. We are trying."
-        timeout: >
-          OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check the <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">health status of the file storage setup</a>.
diff --git a/config/locales/crowdin/js-sr.yml b/config/locales/crowdin/js-sr.yml
index 0cc01275c54e..cd96824457b8 100644
--- a/config/locales/crowdin/js-sr.yml
+++ b/config/locales/crowdin/js-sr.yml
@@ -357,10 +357,10 @@ sr:
           learn_about: "Learn more about the new features"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Subscribe to calendar"
       inital_setup_error_message: "An error occured while fetching data."
@@ -621,14 +621,15 @@ sr:
         prioritized: "Prioritized"
         dateAlert: "Date alert"
         shared: "Shared"
+        reminder: "Reminder"
       date_alerts:
         milestone_date: "Milestone date"
         overdue: "Overdue"
-        overdue_since: "since %{difference_in_days}"
-        property_today: "is today"
-        property_is: "is in %{difference_in_days}"
-        property_was: "was %{difference_in_days} ago"
-        property_is_deleted: "is deleted"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Date alerts"
           description: "With date alerts, you will be notified of upcoming start or finish dates so that you never miss or forget an important deadline."
@@ -654,6 +655,8 @@ sr:
         new_notifications:
           message: "There are new notifications."
           link_text: "Click here to load them."
+      reminders:
+        note: "Note: “%{note}”"
       settings:
         change_notification_settings: 'You can modify your <a target="_blank" href="%{url}">notification settings</a> to ensure you never miss an important update.'
         title: "Notification settings"
@@ -741,6 +744,7 @@ sr:
         immediate:
           title: "Send me an email reminder"
           mentioned: "Immediately when someone @mentions me"
+          personal_reminder: "Immediately when I receive a personal reminder"
         alerts:
           title: "Email alerts for other items (that are not work packages)"
           explanation: >
@@ -772,10 +776,6 @@ sr:
         upgrade_to_ee_text: "Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?"
         more_information: "More information"
         nevermind: "Nevermind"
-      edit:
-        form_configuration: "Form Configuration"
-        projects: "Projects"
-        settings: "Settings"
     time_entry:
       work_package_required: "Requires selecting a work package first."
       title: "Log time"
@@ -1044,6 +1044,12 @@ sr:
           not_found: "There is no such view"
           duplicate_query_title: "Name of this view already exists. Change anyway?"
         text_no_results: "No matching views were found."
+      reminders:
+        button_label: "Set reminder"
+        title:
+          new: "Set reminder"
+          edit: "Edit reminder"
+        subtitle: "You will receive a notification for this work package at the chosen time."
       scheduling:
         is_parent: "The dates of this work package are automatically deduced from its children. Activate 'Manual scheduling' to set the dates."
         is_switched_from_manual_to_automatic: "The dates of this work package may need to be recalculated after switching from manual to automatic scheduling due to relationships with other work packages."
@@ -1350,5 +1356,3 @@ sr:
       waiting_subtitle:
         network_off: "There is a network problem."
         network_on: "Network is back. We are trying."
-        timeout: >
-          OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check the <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">health status of the file storage setup</a>.
diff --git a/config/locales/crowdin/js-sv.yml b/config/locales/crowdin/js-sv.yml
index ad3d5a52bcf0..78080ded519b 100644
--- a/config/locales/crowdin/js-sv.yml
+++ b/config/locales/crowdin/js-sv.yml
@@ -356,10 +356,10 @@ sv:
           learn_about: "Learn more about the new features"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Subscribe to calendar"
       inital_setup_error_message: "An error occured while fetching data."
@@ -620,14 +620,15 @@ sv:
         prioritized: "Prioritized"
         dateAlert: "Date alert"
         shared: "Shared"
+        reminder: "Reminder"
       date_alerts:
         milestone_date: "Milestone date"
         overdue: "Overdue"
-        overdue_since: "since %{difference_in_days}"
-        property_today: "is today"
-        property_is: "is in %{difference_in_days}"
-        property_was: "was %{difference_in_days} ago"
-        property_is_deleted: "is deleted"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Date alerts"
           description: "With date alerts, you will be notified of upcoming start or finish dates so that you never miss or forget an important deadline."
@@ -652,6 +653,8 @@ sv:
         new_notifications:
           message: "There are new notifications."
           link_text: "Click here to load them."
+      reminders:
+        note: "Note: “%{note}”"
       settings:
         change_notification_settings: 'You can modify your <a target="_blank" href="%{url}">notification settings</a> to ensure you never miss an important update.'
         title: "Notification settings"
@@ -739,6 +742,7 @@ sv:
         immediate:
           title: "Send me an email reminder"
           mentioned: "Immediately when someone @mentions me"
+          personal_reminder: "Immediately when I receive a personal reminder"
         alerts:
           title: "Email alerts for other items (that are not work packages)"
           explanation: >
@@ -770,10 +774,6 @@ sv:
         upgrade_to_ee_text: "Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?"
         more_information: "Mer information"
         nevermind: "Det var inget"
-      edit:
-        form_configuration: "Ställ in formulär"
-        projects: "Projekt"
-        settings: "Inställningar"
     time_entry:
       work_package_required: "Requires selecting a work package first."
       title: "Logga tid"
@@ -1042,6 +1042,12 @@ sv:
           not_found: "Det finns ingen sådan vy"
           duplicate_query_title: "Namnet på denna vy finns redan. Ändra ändå?"
         text_no_results: "Inga matchande vyer hittades."
+      reminders:
+        button_label: "Set reminder"
+        title:
+          new: "Set reminder"
+          edit: "Edit reminder"
+        subtitle: "You will receive a notification for this work package at the chosen time."
       scheduling:
         is_parent: "The dates of this work package are automatically deduced from its children. Activate 'Manual scheduling' to set the dates."
         is_switched_from_manual_to_automatic: "The dates of this work package may need to be recalculated after switching from manual to automatic scheduling due to relationships with other work packages."
@@ -1345,5 +1351,3 @@ sv:
       waiting_subtitle:
         network_off: "There is a network problem."
         network_on: "Network is back. We are trying."
-        timeout: >
-          OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check the <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">health status of the file storage setup</a>.
diff --git a/config/locales/crowdin/js-th.yml b/config/locales/crowdin/js-th.yml
index 67cb2ae5a9ff..97cea053a091 100644
--- a/config/locales/crowdin/js-th.yml
+++ b/config/locales/crowdin/js-th.yml
@@ -357,10 +357,10 @@ th:
           learn_about: "Learn more about the new features"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Subscribe to calendar"
       inital_setup_error_message: "An error occured while fetching data."
@@ -621,14 +621,15 @@ th:
         prioritized: "Prioritized"
         dateAlert: "Date alert"
         shared: "Shared"
+        reminder: "Reminder"
       date_alerts:
         milestone_date: "Milestone date"
         overdue: "Overdue"
-        overdue_since: "since %{difference_in_days}"
-        property_today: "is today"
-        property_is: "is in %{difference_in_days}"
-        property_was: "was %{difference_in_days} ago"
-        property_is_deleted: "is deleted"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Date alerts"
           description: "With date alerts, you will be notified of upcoming start or finish dates so that you never miss or forget an important deadline."
@@ -652,6 +653,8 @@ th:
         new_notifications:
           message: "There are new notifications."
           link_text: "Click here to load them."
+      reminders:
+        note: "Note: “%{note}”"
       settings:
         change_notification_settings: 'You can modify your <a target="_blank" href="%{url}">notification settings</a> to ensure you never miss an important update.'
         title: "Notification settings"
@@ -739,6 +742,7 @@ th:
         immediate:
           title: "Send me an email reminder"
           mentioned: "Immediately when someone @mentions me"
+          personal_reminder: "Immediately when I receive a personal reminder"
         alerts:
           title: "Email alerts for other items (that are not work packages)"
           explanation: >
@@ -770,10 +774,6 @@ th:
         upgrade_to_ee_text: "Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?"
         more_information: "More information"
         nevermind: "Nevermind"
-      edit:
-        form_configuration: "Form Configuration"
-        projects: "โครงการ"
-        settings: "การตั้งค่า"
     time_entry:
       work_package_required: "Requires selecting a work package first."
       title: "เวลาที่ถูกบันทึก"
@@ -1042,6 +1042,12 @@ th:
           not_found: "There is no such view"
           duplicate_query_title: "Name of this view already exists. Change anyway?"
         text_no_results: "No matching views were found."
+      reminders:
+        button_label: "Set reminder"
+        title:
+          new: "Set reminder"
+          edit: "Edit reminder"
+        subtitle: "You will receive a notification for this work package at the chosen time."
       scheduling:
         is_parent: "The dates of this work package are automatically deduced from its children. Activate 'Manual scheduling' to set the dates."
         is_switched_from_manual_to_automatic: "The dates of this work package may need to be recalculated after switching from manual to automatic scheduling due to relationships with other work packages."
@@ -1342,5 +1348,3 @@ th:
       waiting_subtitle:
         network_off: "There is a network problem."
         network_on: "Network is back. We are trying."
-        timeout: >
-          OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check the <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">health status of the file storage setup</a>.
diff --git a/config/locales/crowdin/js-tr.yml b/config/locales/crowdin/js-tr.yml
index e6aa0cfac3ce..903e972b4680 100644
--- a/config/locales/crowdin/js-tr.yml
+++ b/config/locales/crowdin/js-tr.yml
@@ -356,10 +356,10 @@ tr:
           learn_about: "Yeni özellikler hakkında daha fazla bilgi edinin"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Subscribe to calendar"
       inital_setup_error_message: "An error occured while fetching data."
@@ -620,14 +620,15 @@ tr:
         prioritized: "Prioritized"
         dateAlert: "Tarih uyarısı"
         shared: "Shared"
+        reminder: "Reminder"
       date_alerts:
         milestone_date: "Kilometre taşı tarihi"
         overdue: "Süresi geçmiş"
-        overdue_since: "%{difference_in_days} beri"
-        property_today: "bugün"
-        property_is: "%{difference_in_days} içinde"
-        property_was: "%{difference_in_days} önceydi"
-        property_is_deleted: "silindi"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Tarih uyarısı"
           description: "Tarih uyarıları ile yaklaşan başlangıç veya bitiş tarihleri hakkında bilgilendirileceksiniz, böylece önemli bir teslim tarihini asla kaçırmaz veya unutmazsınız."
@@ -652,6 +653,8 @@ tr:
         new_notifications:
           message: "Yeni bildirimler var"
           link_text: "Click here to load them."
+      reminders:
+        note: "Note: “%{note}”"
       settings:
         change_notification_settings: 'Önemli bir güncellemeyi asla kaçırmamak için <a target="_blank" href="%{url}">bildirim ayarlarınızı</a> değiştirebilirsiniz.'
         title: "Bildirim ayarları"
@@ -739,6 +742,7 @@ tr:
         immediate:
           title: "Bana email hatırlatıcısı gönder"
           mentioned: "Birisi benden @bahsettiğinde hemen"
+          personal_reminder: "Immediately when I receive a personal reminder"
         alerts:
           title: "Diğer öğeler için e-posta uyarıları (iş paketleri olmayanlar)"
           explanation: >
@@ -770,10 +774,6 @@ tr:
         upgrade_to_ee_text: "Vay! Bu eklentiye ihtiyacınız varsa, siz bir süper profesyonelsiniz! Enterprise sürümü müşterisi olarak biz OpenSource geliştiricilerini destekler misiniz?"
         more_information: "Daha fazla bilgi"
         nevermind: "Boşver"
-      edit:
-        form_configuration: "Form Yapılandırması"
-        projects: "Projeler"
-        settings: "Ayarlar"
     time_entry:
       work_package_required: "Önce bir iş paketi seçilmesini gerektirir."
       title: "Zaman kaydet"
@@ -1042,6 +1042,12 @@ tr:
           not_found: "Böyle bir görünüm bulunmamakta"
           duplicate_query_title: "Bu isimde bir görünüm var. Yinede devam edilsin mi?"
         text_no_results: "Eşleşen görünüm bulunamadı."
+      reminders:
+        button_label: "Set reminder"
+        title:
+          new: "Set reminder"
+          edit: "Edit reminder"
+        subtitle: "You will receive a notification for this work package at the chosen time."
       scheduling:
         is_parent: "Bu çalışma paketinin tarihleri otomatik olarak çocuklarından çıkarılır. Tarihleri ayarlamak için 'Manuel zamanlama'yı etkinleştirin."
         is_switched_from_manual_to_automatic: "Bu çalışma paketinin tarihlerinin, diğer çalışma paketleriyle olan ilişkiler nedeniyle manuelden otomatik zamanlamaya geçtikten sonra yeniden hesaplanması gerekebilir."
@@ -1345,5 +1351,3 @@ tr:
       waiting_subtitle:
         network_off: "There is a network problem."
         network_on: "Network is back. We are trying."
-        timeout: >
-          OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check the <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">health status of the file storage setup</a>.
diff --git a/config/locales/crowdin/js-uk.yml b/config/locales/crowdin/js-uk.yml
index 9951136d87ae..1cbdcfaca0c6 100644
--- a/config/locales/crowdin/js-uk.yml
+++ b/config/locales/crowdin/js-uk.yml
@@ -357,10 +357,10 @@ uk:
           learn_about: "Дізнатися більше про нові функції"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                Цей випуск включає багато нових функцій і покращень. <br> <ul class="%{list_styling_class}"> <li>Користувацькі поля ієрархії типів (доповнення версії Enterprise).</li> <li>Оновлений дизайн вкладки «Зв'язки» в пакетах робіт.</li> <li>Оновлений дизайн сторінки індексу нарад.</li> <li>Ручне розривання сторінок у PDF-файлах експорту пакетів робіт.</li> <li>Дзен-режим для списків проєктів.</li> </ul>
+                Цей випуск включає багато нових функцій і покращень. <br> <ul class="%{list_styling_class}"> <li>Установлюйте нагадування для пакетів робіт, щоб отримувати завчасні сповіщення.</li> <li>Створюйте нові папки безпосередньо під час вибору місця зберігання файлу в сховищі.</li> <li>Указуйте обов’язковий проміжок часу між нащадками й попередниками пакетів робіт.</li> <li>Дозвольте впорядковувати й групувати пакети робіт за значеннями ієрархії користувацьких полів.</li> <li>Експортуйте записи часу у вигляді таблиць обліку часу в PDF.</li> <li>Налаштуйте появу спливних вікон з інформацією про користувача в разі наведення вказівника миші.</li> </ul>
     ical_sharing_modal:
       title: "Підписатися на календар"
       inital_setup_error_message: "Під час отримання даних сталася помилка."
@@ -621,14 +621,15 @@ uk:
         prioritized: "Надано пріоритет"
         dateAlert: "Оповіщення про дату"
         shared: "Поширено"
+        reminder: "Нагадування"
       date_alerts:
         milestone_date: "Дата віхи"
         overdue: "Прострочено"
-        overdue_since: "на %{difference_in_days}"
-        property_today: "сьогодні"
-        property_is: "через %{difference_in_days}"
-        property_was: "%{difference_in_days} тому"
-        property_is_deleted: "видалено"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Оповіщення про дати"
           description: "Завдяки оповіщенням про дати ви завжди знатимете про заплановані дати початку або завершення, тож ніколи не пропускатимете важливі терміни та не забуватимете про них."
@@ -655,6 +656,8 @@ uk:
         new_notifications:
           message: "Немає нових сповіщень."
           link_text: "Натисніть тут, щоб завантажити."
+      reminders:
+        note: "Примітка: \"%{note}\""
       settings:
         change_notification_settings: 'Ви можете змінити <a target="_blank" href="%{url}">налаштування сповіщень</a>, щоб ніколи не пропускати важливі оновлення.'
         title: "Налаштування сповіщень"
@@ -742,6 +745,7 @@ uk:
         immediate:
           title: "Надсилати мені нагадування електронною поштою"
           mentioned: "Негайно, коли хтось згадує @мене"
+          personal_reminder: "Одразу після отримання особистого нагадування"
         alerts:
           title: "Сповіщення електронною поштою для інших елементів (які не є пакетами робіт)"
           explanation: >
@@ -773,10 +777,6 @@ uk:
         upgrade_to_ee_text: "Оце так! Якщо вам потрібне це доповнення, ви справжній профі! Підтримайте розробників OpenSource, перейшовши на версію Enterprise!"
         more_information: "Більше інформації"
         nevermind: "Nevermind"
-      edit:
-        form_configuration: "З конфігурації"
-        projects: "Проекти"
-        settings: "Налаштування"
     time_entry:
       work_package_required: "Спочатку потрібно вибрати пакет робіт."
       title: "Час журналу"
@@ -1045,6 +1045,12 @@ uk:
           not_found: "Такого погляду немає"
           duplicate_query_title: "Ім'я цього перегляду вже існує. Змінити все одно?"
         text_no_results: "Не знайдено відповідних переглядів."
+      reminders:
+        button_label: "Установити нагадування"
+        title:
+          new: "Установити нагадування"
+          edit: "Редагувати нагадування"
+        subtitle: "Ви отримаєте сповіщення про цей пакет робіт у вибраний час."
       scheduling:
         is_parent: "Дати цього пакета робіт автоматично виводяться з його дочірніх елементів. Активуйте «Ручне планування», щоб установити ці дати."
         is_switched_from_manual_to_automatic: "Можливо, дати цього пакета робіт знадобиться перерахувати після переходу з ручного на автоматичне планування через зв’язок з іншими пакетами робіт."
@@ -1354,5 +1360,3 @@ uk:
       waiting_subtitle:
         network_off: "Існує проблема з мережею."
         network_on: "З’єднання відновлено. Ми намагаємося."
-        timeout: >
-          Додатку OpenProject не вдалося надати вам доступ до папки проєкту протягом очікуваного періоду. Повторіть спробу.<br><br> Якщо ця проблема не зникне, зверніться до адміністратора OpenProject і попросіть його перевірити <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">стан справності конфігурації файлового сховища</a>.
diff --git a/config/locales/crowdin/js-uz.yml b/config/locales/crowdin/js-uz.yml
index a35f5a7117ca..914d3bf171d7 100644
--- a/config/locales/crowdin/js-uz.yml
+++ b/config/locales/crowdin/js-uz.yml
@@ -357,10 +357,10 @@ uz:
           learn_about: "Learn more about the new features"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Subscribe to calendar"
       inital_setup_error_message: "An error occured while fetching data."
@@ -621,14 +621,15 @@ uz:
         prioritized: "Prioritized"
         dateAlert: "Date alert"
         shared: "Shared"
+        reminder: "Reminder"
       date_alerts:
         milestone_date: "Milestone date"
         overdue: "Overdue"
-        overdue_since: "since %{difference_in_days}"
-        property_today: "is today"
-        property_is: "is in %{difference_in_days}"
-        property_was: "was %{difference_in_days} ago"
-        property_is_deleted: "is deleted"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Date alerts"
           description: "With date alerts, you will be notified of upcoming start or finish dates so that you never miss or forget an important deadline."
@@ -653,6 +654,8 @@ uz:
         new_notifications:
           message: "There are new notifications."
           link_text: "Click here to load them."
+      reminders:
+        note: "Note: “%{note}”"
       settings:
         change_notification_settings: 'You can modify your <a target="_blank" href="%{url}">notification settings</a> to ensure you never miss an important update.'
         title: "Notification settings"
@@ -740,6 +743,7 @@ uz:
         immediate:
           title: "Send me an email reminder"
           mentioned: "Immediately when someone @mentions me"
+          personal_reminder: "Immediately when I receive a personal reminder"
         alerts:
           title: "Email alerts for other items (that are not work packages)"
           explanation: >
@@ -771,10 +775,6 @@ uz:
         upgrade_to_ee_text: "Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?"
         more_information: "More information"
         nevermind: "Nevermind"
-      edit:
-        form_configuration: "Form Configuration"
-        projects: "Projects"
-        settings: "Settings"
     time_entry:
       work_package_required: "Requires selecting a work package first."
       title: "Log time"
@@ -1043,6 +1043,12 @@ uz:
           not_found: "There is no such view"
           duplicate_query_title: "Name of this view already exists. Change anyway?"
         text_no_results: "No matching views were found."
+      reminders:
+        button_label: "Set reminder"
+        title:
+          new: "Set reminder"
+          edit: "Edit reminder"
+        subtitle: "You will receive a notification for this work package at the chosen time."
       scheduling:
         is_parent: "The dates of this work package are automatically deduced from its children. Activate 'Manual scheduling' to set the dates."
         is_switched_from_manual_to_automatic: "The dates of this work package may need to be recalculated after switching from manual to automatic scheduling due to relationships with other work packages."
@@ -1346,5 +1352,3 @@ uz:
       waiting_subtitle:
         network_off: "There is a network problem."
         network_on: "Network is back. We are trying."
-        timeout: >
-          OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check the <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">health status of the file storage setup</a>.
diff --git a/config/locales/crowdin/js-vi.yml b/config/locales/crowdin/js-vi.yml
index f778cba6d52e..602b96823ca2 100644
--- a/config/locales/crowdin/js-vi.yml
+++ b/config/locales/crowdin/js-vi.yml
@@ -357,10 +357,10 @@ vi:
           learn_about: "Tìm hiểu thêm về các tính năng mới"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Custom fields of type hierarchy (Enterprise add-on).</li> <li>Redesign of the Relations tab in work packages.</li> <li>Redesign of the Meetings index page.</li> <li>Manual page breaks in PDF work package exports.</li> <li>Zen mode for project lists.</li> </ul>
+                The release brings various features and improvements for you, e.g. <br> <ul class="%{list_styling_class}"> <li>Set reminders for work packages to generate date alert notifications.</li> <li>Create new folders directly from the location picker for file storage.</li> <li>Specify a required lag between work packages successors and predecessors.</li> <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li> <li>Export time entries as PDF timesheets.</li> <li>Add a popover displaying user information when hovering.</li> </ul>
     ical_sharing_modal:
       title: "Đăng ký lịch"
       inital_setup_error_message: "Đã xảy ra lỗi khi lấy dữ liệu."
@@ -621,14 +621,15 @@ vi:
         prioritized: "được ưu tiên"
         dateAlert: "Cảnh báo ngày"
         shared: "được chia sẻ"
+        reminder: "Reminder"
       date_alerts:
         milestone_date: "Ngày mốc"
         overdue: "Quá hạn"
-        overdue_since: "kể từ %{difference_in_days}"
-        property_today: "là hôm nay"
-        property_is: "là trong %{difference_in_days}"
-        property_was: "đã là %{difference_in_days} trước"
-        property_is_deleted: "đã bị xóa"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Cảnh báo ngày"
           description: "Với cảnh báo ngày, bạn sẽ được thông báo về các ngày bắt đầu hoặc kết thúc sắp tới để không bao giờ bỏ lỡ hoặc quên hạn chót quan trọng."
@@ -652,6 +653,8 @@ vi:
         new_notifications:
           message: "Có thông báo mới."
           link_text: "Nhấp vào đây để tải chúng."
+      reminders:
+        note: "Note: “%{note}”"
       settings:
         change_notification_settings: 'Bạn có thể thay đổi <a target="_blank" href="%{url}">cài đặt thông báo</a> của mình để đảm bảo không bỏ lỡ cập nhật quan trọng nào.'
         title: "Cài đặt thông báo"
@@ -739,6 +742,7 @@ vi:
         immediate:
           title: "Gửi cho tôi nhắc nhở email"
           mentioned: "Ngay lập tức khi ai đó nhắc đến tôi"
+          personal_reminder: "Immediately when I receive a personal reminder"
         alerts:
           title: "Cảnh báo email cho các mục khác (không phải gói công việc)"
           explanation: >
@@ -770,10 +774,6 @@ vi:
         upgrade_to_ee_text: "Wow! Nếu bạn cần tiện ích bổ sung này, bạn là một chuyên gia tuyệt vời! Bạn có thể hỗ trợ chúng tôi, các nhà phát triển OpenSource, bằng cách trở thành khách hàng của phiên bản Enterprise không?"
         more_information: "Thông tin thêm"
         nevermind: "Không sao"
-      edit:
-        form_configuration: "Cấu hình Biểu mẫu"
-        projects: "Dự án"
-        settings: "Cài đặt"
     time_entry:
       work_package_required: "Yêu cầu chọn một gói công việc trước."
       title: "Ghi thời gian"
@@ -1042,6 +1042,12 @@ vi:
           not_found: "Không có chế độ xem như vậy"
           duplicate_query_title: "Tên của chế độ xem này đã tồn tại. Thay đổi bất chấp?"
         text_no_results: "Không tìm thấy chế độ xem phù hợp."
+      reminders:
+        button_label: "Set reminder"
+        title:
+          new: "Set reminder"
+          edit: "Edit reminder"
+        subtitle: "You will receive a notification for this work package at the chosen time."
       scheduling:
         is_parent: "Ngày của gói công việc này được suy ra tự động từ các con của nó. Kích hoạt 'Lên lịch thủ công' để đặt ngày."
         is_switched_from_manual_to_automatic: "Ngày của gói công việc này có thể cần phải được tính toán lại sau khi chuyển từ lên lịch thủ công sang tự động do mối quan hệ với các gói công việc khác."
@@ -1342,5 +1348,3 @@ vi:
       waiting_subtitle:
         network_off: "Có vấn đề về mạng."
         network_on: "Mạng đã trở lại. Chúng tôi đang thử lại."
-        timeout: >
-          OpenProject không thể cung cấp cho bạn quyền truy cập vào thư mục dự án trong khoảng thời gian dự kiến. Vui lòng thử lại.<br><br> Nếu vấn đề vẫn tiếp tục, vui lòng liên hệ với quản trị viên OpenProject của bạn để kiểm tra <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">tình trạng sức khỏe của cài đặt lưu trữ tệp</a>.
diff --git a/config/locales/crowdin/js-zh-CN.yml b/config/locales/crowdin/js-zh-CN.yml
index d1c4b79d83af..de5dfeef4b38 100644
--- a/config/locales/crowdin/js-zh-CN.yml
+++ b/config/locales/crowdin/js-zh-CN.yml
@@ -356,10 +356,10 @@ zh-CN:
           learn_about: "详细了解新功能"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                该版本为您带来了多种新功能和改进，例如<br> <ul class="%{list_styling_class}"> <li>分层类型的自定义字段(企业附加组件)。</li> <li>重新设计工作包中的关系选项卡。</li> <li>重新设计会议索引页。</li> <li>在导出 PDF 工作包时手动分页。</li> <li>项目列表的禅模式。</li> </ul>
+                该版本为您带来了各种功能和改进，例如<br> <ul class="%{list_styling_class}"> <li>为工作包设置提醒，生成日期提醒通知。</li> <li>直接从文件存储位置选择器创建新文件夹。</li> <li>在前置工作包和后置工作包之间指定所需的间隔。</li> <li>根据自定义字段类型层次结构的值对工作包进行排序和分组。</li> <li>将时间条目导出为 PDF时间表。</li> <li>添加弹出窗，在鼠标悬停时显示用户信息。</li> </ul>
     ical_sharing_modal:
       title: "订阅日历"
       inital_setup_error_message: "获取数据时发生错误。"
@@ -620,14 +620,15 @@ zh-CN:
         prioritized: "已优先"
         dateAlert: "日期提醒"
         shared: "已共享"
+        reminder: "提醒"
       date_alerts:
         milestone_date: "里程碑日期"
         overdue: "逾期"
-        overdue_since: "自 %{difference_in_days}"
-        property_today: "今天"
-        property_is: "%{difference_in_days}后"
-        property_was: "%{difference_in_days}前"
-        property_is_deleted: "已被删除"
+        overdue_since: "自 %{difference_in_days}起。"
+        property_today: "今天。"
+        property_is: "%{difference_in_days}后。"
+        property_was: "%{difference_in_days}前。"
+        property_is_deleted: "已删除。"
         upsale:
           title: "日期提醒"
           description: "借助日期提醒，您将收到即将到来的开始或结束日期的通知，以免错过或忘记重要截止日期。"
@@ -651,6 +652,8 @@ zh-CN:
         new_notifications:
           message: "有新的通知。"
           link_text: "点击此处加载。"
+      reminders:
+        note: "注：\"%{note}\""
       settings:
         change_notification_settings: '您可以修改您的<a target="_blank" href="%{url}">通知设置</a>，以确保您不会错过重要的更新。'
         title: "通知设置"
@@ -738,6 +741,7 @@ zh-CN:
         immediate:
           title: "向我发送电子邮件提醒"
           mentioned: "当有人@提及我时立即提醒"
+          personal_reminder: "收到个人提醒后立即发送"
         alerts:
           title: "其他项目（非工作包）的电子邮件提醒"
           explanation: >
@@ -769,10 +773,6 @@ zh-CN:
         upgrade_to_ee_text: "哇！如果您需要此插件，那么您是位超级行家！您是否考虑成为我们的企业版客户，以支持我们这些开源开发者？"
         more_information: "更多信息"
         nevermind: "我愿意"
-      edit:
-        form_configuration: "表单配置"
-        projects: "项目"
-        settings: "设置"
     time_entry:
       work_package_required: "需要先选择一个工作包。"
       title: "记录时间"
@@ -1041,6 +1041,12 @@ zh-CN:
           not_found: "无此视图"
           duplicate_query_title: "此视图的名称已存在。仍要更改？"
         text_no_results: "未找到匹配的视图。"
+      reminders:
+        button_label: "设置提醒"
+        title:
+          new: "设置提醒"
+          edit: "编辑提醒"
+        subtitle: "您将在所选时间收到此工作包的通知。"
       scheduling:
         is_parent: "此工作包的日期会自动从其子项推导出。可激活“手动计划”来设置日期。"
         is_switched_from_manual_to_automatic: "由于与其他工作包的关系，在从手动计划切换为自动计划后，此工作包的日期可能需要重新计算。"
@@ -1341,5 +1347,3 @@ zh-CN:
       waiting_subtitle:
         network_off: "网络有问题。"
         network_on: "网络已恢复。我们正在努力。"
-        timeout: >
-          OpenProject 无法让您在预期时间内访问项目文件夹。请再试一次。<br><br> 如果问题仍然存在，请联系 OpenProject 管理员检查<a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">文件存储设置的健康状态</a>。
diff --git a/config/locales/crowdin/js-zh-TW.yml b/config/locales/crowdin/js-zh-TW.yml
index 2a9ca97c2ba5..955bc44bddab 100644
--- a/config/locales/crowdin/js-zh-TW.yml
+++ b/config/locales/crowdin/js-zh-TW.yml
@@ -355,10 +355,10 @@ zh-TW:
           learn_about: "瞭解更多新功能的資訊"
           #Include the version to invalidate outdated translations in other locales.
           #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
-                該版本為您帶來了各種功能和改進，例如<br> <ul class="%{list_styling_class}"> <li>階層類型的自訂欄位 (企業附加元件)。</li> <li>重新設計工作套件中的「關係」標籤。</li> <li>重新設計會議索引頁。</li> <li>PDF 工作套件匯出中的手動分頁。</li> <li>專案清單的 Zen 模式。</li> </ul>
+                該版本為您帶來了各種功能和改進，例如<br> <ul class="%{list_styling_class}"> <li>為工作項目設定提醒，產生日期提示通知。</li> <li>直接從選擇位置建立新資料夾，以儲存檔案。</li> <li>指定工作項目與前後項之間所需的間隔時間。</li> <li>根據自訂欄位類型層級的值，啟用工作項目的排序和群組。</li> <li>匯出時間項目為 PDF 工時表。</li> <li>新增在滑鼠懸停時會顯示使用者資訊的彈出視窗。</li> </ul>
     ical_sharing_modal:
       title: "訂閱日曆"
       inital_setup_error_message: "更新資料時發生錯誤"
@@ -619,14 +619,15 @@ zh-TW:
         prioritized: "已優先"
         dateAlert: "日期提醒"
         shared: "參與"
+        reminder: "提醒"
       date_alerts:
         milestone_date: "里程碑日期"
         overdue: "逾期"
-        overdue_since: " %{difference_in_days}天前"
-        property_today: "今天"
-        property_is: " %{difference_in_days}內"
-        property_was: " %{difference_in_days}天前"
-        property_is_deleted: "已刪除"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "日期提醒"
           description: "透過日期提醒，您將收到相關通知，這樣您就不會錯過或忘記重要的日期。"
@@ -650,6 +651,8 @@ zh-TW:
         new_notifications:
           message: "您有新的通知"
           link_text: "點擊此處加載。"
+      reminders:
+        note: "備註： \"%{note}\""
       settings:
         change_notification_settings: '您可以修改 <a target="_blank" href="%{url}">通知設定</a>，以確保您不會錯過重要更新。'
         title: "通知設定"
@@ -737,6 +740,7 @@ zh-TW:
         immediate:
           title: "寄發提醒郵件給我"
           mentioned: "當有人使用「@帳號」提到我，系統立即發信通知我"
+          personal_reminder: "當我收到個人提醒時立即通知"
         alerts:
           title: "其他非工作項目之提醒"
           explanation: >
@@ -768,10 +772,6 @@ zh-TW:
         upgrade_to_ee_text: "哇！如果您需要使用此功能，說明您非常專業！您是否願意成為企業版客戶來支持 OpenSource 開發人員？"
         more_information: "更多資訊"
         nevermind: "無視"
-      edit:
-        form_configuration: "表單設定"
-        projects: "專案"
-        settings: "設定"
     time_entry:
       work_package_required: "需要先選擇一個工作項目。"
       title: "日誌的時間"
@@ -784,7 +784,7 @@ zh-TW:
       tracking_time: "跟蹤時間"
       button_stop: "停止當前計時器"
     two_factor_authentication:
-      label_two_factor_authentication: "兩階段驗證"
+      label_two_factor_authentication: "雙因素驗證"
     watchers:
       label_loading: 正在載入監看者...
       label_error_loading: 載入監看者時發生錯誤
@@ -1040,6 +1040,12 @@ zh-TW:
           not_found: "無此查詢"
           duplicate_query_title: "此版面的名稱已存在。確定改變？"
         text_no_results: "找不到符合的版面。"
+      reminders:
+        button_label: "設定提醒"
+        title:
+          new: "設定提醒"
+          edit: "編輯提醒"
+        subtitle: "您會在選擇的時間收到此工作項目的通知。"
       scheduling:
         is_parent: "此工作包的日期會自動從其子項推導出。可啟用“手動計劃”來設置日期。"
         is_switched_from_manual_to_automatic: "由於與其他工作包的關係，在從手動計劃切換為自動計劃後，此工作包的日期可能需要重新計算。"
@@ -1340,5 +1346,3 @@ zh-TW:
       waiting_subtitle:
         network_off: "網路有問題。"
         network_on: "網絡已恢復。我們正在努力。"
-        timeout: >
-          OpenProject 無法讓您在預期時間內訪問專案文件夾。請再試一次。<br><br> 如果問題仍然存在，請聯繫 OpenProject 管理員檢查<a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">文件存儲設置的健康狀態</a>。
diff --git a/config/locales/crowdin/ka.yml b/config/locales/crowdin/ka.yml
index 04758da9a851..3bfa6434feef 100644
--- a/config/locales/crowdin/ka.yml
+++ b/config/locales/crowdin/ka.yml
@@ -343,6 +343,9 @@ ka:
         text: "This action will not delete any project the list contains. Are you sure you want to delete this project list?"
     settings:
       change_identifier: Change identifier
+      actions:
+        label_enable_all: "Enable all"
+        label_disable_all: "Disable all"
       activities:
         no_results_title_text: There are currently no activities available.
       forums:
@@ -353,18 +356,26 @@ ka:
         no_results_content_text: Create a new work package category
       custom_fields:
         no_results_title_text: There are currently no custom fields available.
+      life_cycle:
+        header:
+          title: "Project lifecycle"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "Neither stages nor gates are currently defined."
+        section_header: "Stages and gates"
+        step:
+          use_in_project: "Use %{step} in this project"
+        filter:
+          label: "Search project stage or gate"
       project_custom_fields:
         header:
           title: "Project attributes"
-          description: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
+          description_html: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
         filter:
           label: "Search project attribute"
         actions:
           label_enable_single: "Active in this project, click to disable"
           label_disable_single: "Inactive in this project, click to enable"
           remove_from_project: "Remove from project"
-          label_enable_all: "Enable all"
-          label_disable_all: "Disable all"
         is_required_blank_slate:
           heading: Required in all projects
           description: This project attribute is activated in all projects since the "Required in all projects" option is checked. It cannot be deactivated for individual projects.
@@ -377,6 +388,10 @@ ka:
         no_results_content_text: Create a new version
       storage:
         no_results_title_text: There is no additional recorded disk space consumed by this project.
+  project_stage:
+    working_days_count:
+      one: "Duration: %{count} working day"
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "The modified list has been saved as a new list"
@@ -497,8 +512,12 @@ ka:
     groups:
       member_in_these_groups: "This user is currently a member of the following groups:"
       no_results_title_text: This user is currently not a member in any group.
+      summary_with_more: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary: Member of %{names}.
     memberships:
       no_results_title_text: This user is currently not a member of a project.
+    open_profile: "Open profile"
   page:
     text: "ტექსტი"
   placeholder_users:
@@ -569,18 +588,27 @@ ka:
       no_results_title_text: There are currently no types.
       no_results_content_text: Create a new type
     edit:
-      settings: "მორგება"
-      form_configuration: "Form configuration"
+      form_configuration:
+        tab: "Form configuration"
       more_info_text_html: >
         Enterprise edition allows you to customize form configuration with these additional add-ons: <br> <ul class="%{list_styling_class}"> <li><b>Add new attribute groups</b></li> <li><b>Rename attribute groups</b></li> <li><b>Add a table of related work packages</b></li> </ul>
-      projects: "პროექტები"
-      enabled_projects: "Enabled projects"
-      edit_query: "ცხრილის ჩასწორება"
-      query_group_placeholder: "Give the table a name"
-      reset: "Reset to defaults"
-      type_color_text: |
-        The selected color distinguishes different types
-        in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      projects:
+        tab: "Projects"
+        enabled_projects: "Enabled projects"
+      settings:
+        tab: "Settings"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Subject configuration"
+        manually_editable_subjects:
+          label: "Manually editable subjects"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automatically generated subjects"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Subject pattern"
+          caption: "Search for an attribute or add text. To create a space between elements add it as a text."
   versions:
     overview:
       work_packages_in_archived_projects: "The version is shared with archived projects which still have work packages assigned to this version. These are counted, but will not appear in the linked views."
@@ -643,6 +671,10 @@ ka:
     label_add_x: "Add %{x}"
     label_edit_x: "Edit %{x}"
     label_add_description: "Add description"
+    lag:
+      subject: "Lag"
+      title: "Lag (in days)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
       label_relates_singular: "related to"
       label_relates_plural: "related to"
@@ -847,6 +879,9 @@ ka:
         lag: "Lag"
         from: "სამუშაო პაკეტი"
         to: "Related work package"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Time"
       repository:
         url: "URL"
       role:
@@ -935,6 +970,7 @@ ka:
       messages:
         accepted: "must be accepted."
         after: "must be after %{date}."
+        after_today: "must be in the future."
         after_or_equal_to: "must be after or equal to %{date}."
         before: "must be before %{date}."
         before_or_equal_to: "must be before or equal to %{date}."
@@ -981,6 +1017,7 @@ ka:
         not_an_integer: "is not an integer."
         not_an_iso_date: "is not a valid date. Required format: YYYY-MM-DD."
         not_same_project: "doesn't belong to the same project."
+        datetime_must_be_in_future: "must be in the future."
         odd: "კენტი უნდა იყოს."
         regex_match_failed: "does not match the regular expression %{expression}."
         regex_invalid: "could not be validated with the associated regular expression."
@@ -1094,16 +1131,38 @@ ka:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "start date must be before the end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "is incomplete."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1320,6 +1379,8 @@ ka:
         other: "შეტყობინებები"
       placeholder_user: "Placeholder user"
       project: "პროექტი"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         one: "Project list"
         other: "Project lists"
@@ -1423,6 +1484,7 @@ ka:
     login: "მომხმარებლის სახელი"
     mail: "ელფოსტა"
     name: "სახელი"
+    note: "Note"
     password: "პაროლი"
     priority: "პრიორიტეტი"
     project: "პროექტი"
@@ -1519,6 +1581,7 @@ ka:
   button_print: "ბეჭდვა"
   button_quote: "ციტატა"
   button_remove: წაშლა
+  button_remove_reminder: "Remove reminder"
   button_rename: "გადარქმევა"
   button_replace: "ჩანაცვლება"
   button_revoke: "გაუქმება"
@@ -1529,6 +1592,7 @@ ka:
   button_save_as: "შენახვა, როგორც"
   button_apply_changes: "ცვლილებების გადატარება"
   button_save_back: "შენახვა და დაბრუნება"
+  button_set_reminder: "Set reminder"
   button_show: "ჩვენება"
   button_sort: "დალაგება"
   button_submit: "გადაცემა"
@@ -1734,12 +1798,12 @@ ka:
   direction: მარცხნიდან
   ee:
     upsale:
+      title: "Enterprise add-on"
+      link_title: "More information"
       form_configuration:
         description: "Customize the form configuration with these additional add-ons:"
         add_groups: "Add new attribute groups"
         rename_groups: "Rename attributes groups"
-      project_filters:
-        description_html: "Filtering and sorting on custom fields is an Enterprise edition add-on."
   enumeration_activities: "Time tracking activities"
   enumeration_work_package_priorities: "Work package priorities"
   enumeration_reported_project_statuses: "Reported project status"
@@ -1772,6 +1836,7 @@ ka:
   error_pdf_export_too_many_columns: "Too many columns selected for the PDF export. Please reduce the number of columns."
   error_pdf_failed_to_export: "The PDF export could not be saved: %{error}"
   error_token_authenticity: "Unable to verify Cross-Site Request Forgery token. Did you try to submit data on multiple browsers or tabs? Please close all tabs and try again."
+  error_reminder_not_found: "The reminder was not found or was already notified about."
   error_work_package_not_found_in_project: "The work package was not found or does not belong to this project"
   error_work_package_id_not_found: "The work package was not found."
   error_must_be_project_member: "must be project member"
@@ -2065,6 +2130,7 @@ ka:
       responsible: "ანგარიშვალდებული"
       shared: "გაზიარებული"
       watched: "მეთვალყურე"
+      reminder: "Reminder"
     facets:
       unread: "წაუკითხავი"
       unread_title: "წაუკითხავის ჩვენება"
@@ -2232,8 +2298,10 @@ ka:
   label_default: "ნაგულისხმევი"
   label_delete_user: "მომხმარებლის წაშლა"
   label_delete_project: "პროექტის წაშლა"
+  label_delete: "Delete"
   label_deleted: "წაშლილია"
   label_deleted_custom_field: "(deleted custom field)"
+  label_deleted_custom_item: "(deleted item)"
   label_deleted_custom_option: "(deleted option)"
   label_empty_element: "(ცარიელი)"
   label_missing_or_hidden_custom_option: "(missing value or lacking permissions to access)"
@@ -2270,7 +2338,6 @@ ka:
   label_enterprise_active_users: "%{current}/%{limit} booked active users"
   label_enterprise_edition: "Enterprise edition"
   label_enterprise_support: "Enterprise support"
-  label_enterprise_addon: "Enterprise add-on"
   label_environment: "გარემო"
   label_estimates_and_progress: "Estimates and progress"
   label_equals: "არის"
@@ -2455,6 +2522,7 @@ ka:
   label_none_parentheses: "(არც ერთი)"
   label_not_contains: "doesn't contain"
   label_not_equals: "არაა"
+  label_life_cycle_step_plural: "Project lifecycle"
   label_on: "რაზე"
   label_operator_all: "ცარიელი არაა"
   label_operator_none: "ცარიელია"
@@ -2556,6 +2624,7 @@ ka:
   label_reporting: "ანგარიშები"
   label_reporting_plural: "ანგარიშები"
   label_repository: "რეპოზიტორია"
+  label_repository_remove: "Remove repository"
   label_repository_root: "Repository root"
   label_repository_plural: "რეპოზიტორიები"
   label_required: "აუცილებელია"
@@ -2618,6 +2687,7 @@ ka:
   label_this_month: "ეს თვე"
   label_this_week: "ამ კვირაში "
   label_this_year: "ამ წელში"
+  label_time: "Time"
   label_time_entry_plural: "დახარჯული დრო"
   label_time_entry_activity_plural: "Spent time activities"
   label_title: "სათაური"
@@ -2653,6 +2723,7 @@ ka:
   label_user_settings: "მომხმარებლებს პარამეტრები"
   label_users_settings: "მომხმარებლების პარამეტრები"
   label_version_new: "ახალი ვერსია"
+  label_version_edit: "Edit version"
   label_version_plural: "ვერსიები"
   label_version_sharing_descendants: "With subprojects"
   label_version_sharing_hierarchy: "With project hierarchy"
@@ -2790,8 +2861,13 @@ ka:
         prefix: "Received because of the notification setting: %{reason}"
         date_alert_start_date: "გაფრთხილების თარიღი"
         date_alert_due_date: "გაფრთხილების თარიღი"
+        reminder: "Reminder"
       see_all: "ყველას ნახვა"
       updated_at: "Updated at %{timestamp} by %{user}"
+    reminder_notifications:
+      subject: "Reminder: %{note}"
+      heading: "You have a new reminder"
+      note: "Note: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "You may %{allowed_actions} this work package. This can change depending on your project role and permissions."
@@ -2958,6 +3034,7 @@ ka:
   notice_successful_connection: "Successful connection."
   notice_successful_create: "Successful creation."
   notice_successful_delete: "Successful deletion."
+  notice_successful_cancel: "Successful cancellation."
   notice_successful_update: "Successful update."
   notice_successful_update_custom_fields_added_to_project: |
     Successful update. The custom fields of the activated types are automatically activated
@@ -3035,6 +3112,7 @@ ka:
   permission_edit_own_time_entries: "Edit own time logs"
   permission_edit_project: "პროექტის ჩასწორება"
   permission_edit_project_attributes: "Edit project attributes"
+  permission_edit_project_stages_and_gates: "Edit project stages and gates"
   permission_edit_reportings: "Edit reportings"
   permission_edit_time_entries: "Edit time logs for other users"
   permission_edit_timelines: "დროის ხაზების ჩასწორება"
@@ -3064,9 +3142,12 @@ ka:
   permission_search_project: "პროექტის ძებნა"
   permission_select_custom_fields: "Select custom fields"
   permission_select_project_custom_fields: "Select project attributes"
+  permission_select_project_life_cycle: "Select project stages and gates"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "Select project modules"
   permission_share_work_packages: "Share work packages"
   permission_manage_types: "აირჩიეთ ტიპები"
+  permission_manage_own_reminders: "Create own reminders"
   permission_view_project: "პროექტების ნახვა"
   permission_view_changesets: "View repository revisions in OpenProject"
   permission_view_commit_author_statistics: "View commit author statistics"
@@ -3087,6 +3168,7 @@ ka:
   permission_work_package_assigned_explanation: "Work packages can be assigned to users and groups in possession of this role in the respective project"
   permission_view_project_activity: "View project activity"
   permission_view_project_attributes: "View project attributes"
+  permission_view_project_stages_and_gates: "View project stages and gates"
   permission_save_bcf_queries: "Save BCF queries"
   permission_manage_public_bcf_queries: "Manage public BCF queries"
   permission_edit_attribute_help_texts: "Edit attribute help texts"
@@ -3767,6 +3849,12 @@ ka:
       edit_description: "Can view, comment and edit this work package."
       view: "ხედი"
       view_description: "Can view this work package."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Why are you setting this reminder?"
+      success_creation_message: "Reminder set successfully. You will receive a notification for this work package at the chosen time."
+      success_update_message: "Reminder updated successfully."
+      success_deletion_message: "Reminder deleted successfully."
   sharing:
     count:
       zero: "0 მომხმარებელი"
diff --git a/config/locales/crowdin/kk.yml b/config/locales/crowdin/kk.yml
index 66cd8b506834..c123085b5ce2 100644
--- a/config/locales/crowdin/kk.yml
+++ b/config/locales/crowdin/kk.yml
@@ -343,6 +343,9 @@ kk:
         text: "This action will not delete any project the list contains. Are you sure you want to delete this project list?"
     settings:
       change_identifier: Change identifier
+      actions:
+        label_enable_all: "Enable all"
+        label_disable_all: "Disable all"
       activities:
         no_results_title_text: There are currently no activities available.
       forums:
@@ -353,18 +356,26 @@ kk:
         no_results_content_text: Create a new work package category
       custom_fields:
         no_results_title_text: There are currently no custom fields available.
+      life_cycle:
+        header:
+          title: "Project lifecycle"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "Neither stages nor gates are currently defined."
+        section_header: "Stages and gates"
+        step:
+          use_in_project: "Use %{step} in this project"
+        filter:
+          label: "Search project stage or gate"
       project_custom_fields:
         header:
           title: "Project attributes"
-          description: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
+          description_html: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
         filter:
           label: "Search project attribute"
         actions:
           label_enable_single: "Active in this project, click to disable"
           label_disable_single: "Inactive in this project, click to enable"
           remove_from_project: "Remove from project"
-          label_enable_all: "Enable all"
-          label_disable_all: "Disable all"
         is_required_blank_slate:
           heading: Required in all projects
           description: This project attribute is activated in all projects since the "Required in all projects" option is checked. It cannot be deactivated for individual projects.
@@ -377,6 +388,10 @@ kk:
         no_results_content_text: Create a new version
       storage:
         no_results_title_text: There is no additional recorded disk space consumed by this project.
+  project_stage:
+    working_days_count:
+      one: "Duration: %{count} working day"
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "The modified list has been saved as a new list"
@@ -497,8 +512,12 @@ kk:
     groups:
       member_in_these_groups: "This user is currently a member of the following groups:"
       no_results_title_text: This user is currently not a member in any group.
+      summary_with_more: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary: Member of %{names}.
     memberships:
       no_results_title_text: This user is currently not a member of a project.
+    open_profile: "Open profile"
   page:
     text: "Text"
   placeholder_users:
@@ -569,18 +588,27 @@ kk:
       no_results_title_text: There are currently no types.
       no_results_content_text: Create a new type
     edit:
-      settings: "Settings"
-      form_configuration: "Form configuration"
+      form_configuration:
+        tab: "Form configuration"
       more_info_text_html: >
         Enterprise edition allows you to customize form configuration with these additional add-ons: <br> <ul class="%{list_styling_class}"> <li><b>Add new attribute groups</b></li> <li><b>Rename attribute groups</b></li> <li><b>Add a table of related work packages</b></li> </ul>
-      projects: "Projects"
-      enabled_projects: "Enabled projects"
-      edit_query: "Edit table"
-      query_group_placeholder: "Give the table a name"
-      reset: "Reset to defaults"
-      type_color_text: |
-        The selected color distinguishes different types
-        in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      projects:
+        tab: "Projects"
+        enabled_projects: "Enabled projects"
+      settings:
+        tab: "Settings"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Subject configuration"
+        manually_editable_subjects:
+          label: "Manually editable subjects"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automatically generated subjects"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Subject pattern"
+          caption: "Search for an attribute or add text. To create a space between elements add it as a text."
   versions:
     overview:
       work_packages_in_archived_projects: "The version is shared with archived projects which still have work packages assigned to this version. These are counted, but will not appear in the linked views."
@@ -643,6 +671,10 @@ kk:
     label_add_x: "Add %{x}"
     label_edit_x: "Edit %{x}"
     label_add_description: "Add description"
+    lag:
+      subject: "Lag"
+      title: "Lag (in days)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
       label_relates_singular: "related to"
       label_relates_plural: "related to"
@@ -847,6 +879,9 @@ kk:
         lag: "Lag"
         from: "Work package"
         to: "Related work package"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Time"
       repository:
         url: "URL"
       role:
@@ -935,6 +970,7 @@ kk:
       messages:
         accepted: "must be accepted."
         after: "must be after %{date}."
+        after_today: "must be in the future."
         after_or_equal_to: "must be after or equal to %{date}."
         before: "must be before %{date}."
         before_or_equal_to: "must be before or equal to %{date}."
@@ -981,6 +1017,7 @@ kk:
         not_an_integer: "is not an integer."
         not_an_iso_date: "is not a valid date. Required format: YYYY-MM-DD."
         not_same_project: "doesn't belong to the same project."
+        datetime_must_be_in_future: "must be in the future."
         odd: "must be odd."
         regex_match_failed: "does not match the regular expression %{expression}."
         regex_invalid: "could not be validated with the associated regular expression."
@@ -1094,16 +1131,38 @@ kk:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "start date must be before the end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "is incomplete."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1320,6 +1379,8 @@ kk:
         other: "Notifications"
       placeholder_user: "Placeholder user"
       project: "Project"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         one: "Project list"
         other: "Project lists"
@@ -1423,6 +1484,7 @@ kk:
     login: "Username"
     mail: "Email"
     name: "Name"
+    note: "Note"
     password: "Password"
     priority: "Priority"
     project: "Project"
@@ -1519,6 +1581,7 @@ kk:
   button_print: "Print"
   button_quote: "Quote"
   button_remove: Remove
+  button_remove_reminder: "Remove reminder"
   button_rename: "Rename"
   button_replace: "Replace"
   button_revoke: "Revoke"
@@ -1529,6 +1592,7 @@ kk:
   button_save_as: "Save as"
   button_apply_changes: "Apply changes"
   button_save_back: "Save and back"
+  button_set_reminder: "Set reminder"
   button_show: "Show"
   button_sort: "Sort"
   button_submit: "Submit"
@@ -1734,12 +1798,12 @@ kk:
   direction: ltr
   ee:
     upsale:
+      title: "Enterprise add-on"
+      link_title: "More information"
       form_configuration:
         description: "Customize the form configuration with these additional add-ons:"
         add_groups: "Add new attribute groups"
         rename_groups: "Rename attributes groups"
-      project_filters:
-        description_html: "Filtering and sorting on custom fields is an Enterprise edition add-on."
   enumeration_activities: "Time tracking activities"
   enumeration_work_package_priorities: "Work package priorities"
   enumeration_reported_project_statuses: "Reported project status"
@@ -1772,6 +1836,7 @@ kk:
   error_pdf_export_too_many_columns: "Too many columns selected for the PDF export. Please reduce the number of columns."
   error_pdf_failed_to_export: "The PDF export could not be saved: %{error}"
   error_token_authenticity: "Unable to verify Cross-Site Request Forgery token. Did you try to submit data on multiple browsers or tabs? Please close all tabs and try again."
+  error_reminder_not_found: "The reminder was not found or was already notified about."
   error_work_package_not_found_in_project: "The work package was not found or does not belong to this project"
   error_work_package_id_not_found: "The work package was not found."
   error_must_be_project_member: "must be project member"
@@ -2065,6 +2130,7 @@ kk:
       responsible: "Accountable"
       shared: "Shared"
       watched: "Watcher"
+      reminder: "Reminder"
     facets:
       unread: "Unread"
       unread_title: "Show unread"
@@ -2232,8 +2298,10 @@ kk:
   label_default: "Default"
   label_delete_user: "Delete user"
   label_delete_project: "Delete project"
+  label_delete: "Delete"
   label_deleted: "deleted"
   label_deleted_custom_field: "(deleted custom field)"
+  label_deleted_custom_item: "(deleted item)"
   label_deleted_custom_option: "(deleted option)"
   label_empty_element: "(empty)"
   label_missing_or_hidden_custom_option: "(missing value or lacking permissions to access)"
@@ -2270,7 +2338,6 @@ kk:
   label_enterprise_active_users: "%{current}/%{limit} booked active users"
   label_enterprise_edition: "Enterprise edition"
   label_enterprise_support: "Enterprise support"
-  label_enterprise_addon: "Enterprise add-on"
   label_environment: "Environment"
   label_estimates_and_progress: "Estimates and progress"
   label_equals: "is"
@@ -2455,6 +2522,7 @@ kk:
   label_none_parentheses: "(none)"
   label_not_contains: "doesn't contain"
   label_not_equals: "is not"
+  label_life_cycle_step_plural: "Project lifecycle"
   label_on: "on"
   label_operator_all: "is not empty"
   label_operator_none: "is empty"
@@ -2556,6 +2624,7 @@ kk:
   label_reporting: "Reporting"
   label_reporting_plural: "Reportings"
   label_repository: "Repository"
+  label_repository_remove: "Remove repository"
   label_repository_root: "Repository root"
   label_repository_plural: "Repositories"
   label_required: "required"
@@ -2618,6 +2687,7 @@ kk:
   label_this_month: "this month"
   label_this_week: "this week"
   label_this_year: "this year"
+  label_time: "Time"
   label_time_entry_plural: "Spent time"
   label_time_entry_activity_plural: "Spent time activities"
   label_title: "Title"
@@ -2653,6 +2723,7 @@ kk:
   label_user_settings: "User settings"
   label_users_settings: "Users settings"
   label_version_new: "New version"
+  label_version_edit: "Edit version"
   label_version_plural: "Versions"
   label_version_sharing_descendants: "With subprojects"
   label_version_sharing_hierarchy: "With project hierarchy"
@@ -2790,8 +2861,13 @@ kk:
         prefix: "Received because of the notification setting: %{reason}"
         date_alert_start_date: "Date alert"
         date_alert_due_date: "Date alert"
+        reminder: "Reminder"
       see_all: "See all"
       updated_at: "Updated at %{timestamp} by %{user}"
+    reminder_notifications:
+      subject: "Reminder: %{note}"
+      heading: "You have a new reminder"
+      note: "Note: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "You may %{allowed_actions} this work package. This can change depending on your project role and permissions."
@@ -2958,6 +3034,7 @@ kk:
   notice_successful_connection: "Successful connection."
   notice_successful_create: "Successful creation."
   notice_successful_delete: "Successful deletion."
+  notice_successful_cancel: "Successful cancellation."
   notice_successful_update: "Successful update."
   notice_successful_update_custom_fields_added_to_project: |
     Successful update. The custom fields of the activated types are automatically activated
@@ -3035,6 +3112,7 @@ kk:
   permission_edit_own_time_entries: "Edit own time logs"
   permission_edit_project: "Edit project"
   permission_edit_project_attributes: "Edit project attributes"
+  permission_edit_project_stages_and_gates: "Edit project stages and gates"
   permission_edit_reportings: "Edit reportings"
   permission_edit_time_entries: "Edit time logs for other users"
   permission_edit_timelines: "Edit timelines"
@@ -3064,9 +3142,12 @@ kk:
   permission_search_project: "Search project"
   permission_select_custom_fields: "Select custom fields"
   permission_select_project_custom_fields: "Select project attributes"
+  permission_select_project_life_cycle: "Select project stages and gates"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "Select project modules"
   permission_share_work_packages: "Share work packages"
   permission_manage_types: "Select types"
+  permission_manage_own_reminders: "Create own reminders"
   permission_view_project: "View projects"
   permission_view_changesets: "View repository revisions in OpenProject"
   permission_view_commit_author_statistics: "View commit author statistics"
@@ -3087,6 +3168,7 @@ kk:
   permission_work_package_assigned_explanation: "Work packages can be assigned to users and groups in possession of this role in the respective project"
   permission_view_project_activity: "View project activity"
   permission_view_project_attributes: "View project attributes"
+  permission_view_project_stages_and_gates: "View project stages and gates"
   permission_save_bcf_queries: "Save BCF queries"
   permission_manage_public_bcf_queries: "Manage public BCF queries"
   permission_edit_attribute_help_texts: "Edit attribute help texts"
@@ -3767,6 +3849,12 @@ kk:
       edit_description: "Can view, comment and edit this work package."
       view: "View"
       view_description: "Can view this work package."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Why are you setting this reminder?"
+      success_creation_message: "Reminder set successfully. You will receive a notification for this work package at the chosen time."
+      success_update_message: "Reminder updated successfully."
+      success_deletion_message: "Reminder deleted successfully."
   sharing:
     count:
       zero: "0 users"
diff --git a/config/locales/crowdin/ko.yml b/config/locales/crowdin/ko.yml
index a9989fb2672f..f694182457ae 100644
--- a/config/locales/crowdin/ko.yml
+++ b/config/locales/crowdin/ko.yml
@@ -343,6 +343,9 @@ ko:
         text: "이 작업을 수행해도 목록에 포함된 프로젝트는 삭제되지 않습니다. 이 프로젝트 목록을 삭제하시겠습니까?"
     settings:
       change_identifier: 식별자 변경
+      actions:
+        label_enable_all: "모두 활성화"
+        label_disable_all: "모두 비활성화"
       activities:
         no_results_title_text: 가능한 활동이 없습니다.
       forums:
@@ -353,18 +356,26 @@ ko:
         no_results_content_text: 새 작업 패키지 구분 생성
       custom_fields:
         no_results_title_text: 사용 가능한 사용자 필드가 없습니다.
+      life_cycle:
+        header:
+          title: "프로젝트 수명 주기"
+          description_html: '프로젝트 수명 주기의 이러한 프로젝트 단계와 게이트는 <a href=%{overview_url} target="_blank">프로젝트 개요 페이지</a>에 표시되며, 인스턴스 관리자가 <a href=%{admin_settings_url} target="_blank">관리 설정</a>에서 정의합니다. 개별 특성을 활성화하거나 비활성화할 수 있습니다.'
+        non_defined: "단계나 게이트가 현재 정의되어 있지 않습니다."
+        section_header: "단계 및 게이트"
+        step:
+          use_in_project: "이 프로젝트에서 %{step} 사용"
+        filter:
+          label: "프로젝트 단계 또는 게이트 검색"
       project_custom_fields:
         header:
           title: "프로젝트 특성"
-          description: '이러한 프로젝트 특성은 해당 섹션 아래의 <a href=%{overview_url} target="_blank">프로젝트 개요 페이지</a>에 표시됩니다. 개별 특성을 활성화하거나 비활성화할 수 있습니다. 프로젝트 특성 및 섹션은 인스턴스 관리자가 <a href=%{admin_settings_url} target="_blank">관리 설정</a>에서 정의합니다. '
+          description_html: '이러한 프로젝트 특성은 해당 섹션 아래의 <a href=%{overview_url} target="_blank">프로젝트 개요 페이지</a>에 표시됩니다. 개별 특성을 활성화하거나 비활성화할 수 있습니다. 프로젝트 특성 및 섹션은 인스턴스 관리자가 <a href=%{admin_settings_url} target="_blank">관리 설정</a>에서 정의합니다. '
         filter:
           label: "프로젝트 특성 검색"
         actions:
           label_enable_single: "이 프로젝트에서 활성화되어 있습니다. 비활성화하려면 클릭하세요."
           label_disable_single: "이 프로젝트에서 비활성화되어 있습니다. 활성화하려면 클릭하세요."
           remove_from_project: "프로젝트에서 제거"
-          label_enable_all: "모두 활성화"
-          label_disable_all: "모두 비활성화"
         is_required_blank_slate:
           heading: 모든 프로젝트에서 필수
           description: '"모든 프로젝트에서 필수" 옵션이 선택되어 있으므로 모든 프로젝트에서 이 프로젝트 특성이 활성화됩니다. 개별 프로젝트에 대해 비활성화할 수 없습니다.'
@@ -377,6 +388,9 @@ ko:
         no_results_content_text: 새 버전 생성
       storage:
         no_results_title_text: 이 프로젝트에서 사용하는 추가 기록 디스크 공간이 없습니다.
+  project_stage:
+    working_days_count:
+      other: "기간: 근무일 %{count}일"
   lists:
     create:
       success: "수정된 목록이 새 목록으로 저장되었습니다"
@@ -491,8 +505,12 @@ ko:
     groups:
       member_in_these_groups: "이 사용자는 현재 다음 그룹의 멤버입니다:"
       no_results_title_text: 이 사용자는 현재 어떤 그룹의 멤버도 아닙니다.
+      summary_with_more: '%{names} 및 %{count_link}의 멤버입니다.'
+      more: "%{count}개 더 보기"
+      summary: '%{names}의 멤버입니다.'
     memberships:
       no_results_title_text: 이 사용자는 프로젝트의 멤버가 아닙니다.
+    open_profile: "프로필 열기"
   page:
     text: "텍스트"
   placeholder_users:
@@ -561,18 +579,27 @@ ko:
       no_results_title_text: 타입이 없습니다.
       no_results_content_text: 새 타입 생성
     edit:
-      settings: "설정"
-      form_configuration: "양식 구성"
+      form_configuration:
+        tab: "양식 구성"
       more_info_text_html: >
         Enterprise Edition에서는 다음과 같은 기타 추가 기능으로 양식 구성을 사용자 지정할 수 있습니다: <br> <ul class="%{list_styling_class}"> <li><b>새로운 특성 그룹 추가</b></li> <li><b>특성 그룹 이름 바꾸기</b></li> <li><b>관련 작업 패키지 테이블 추가</b></li> </ul>
-      projects: "프로젝트"
-      enabled_projects: "활성화 된 프로젝트"
-      edit_query: "테이블 편집"
-      query_group_placeholder: "테이블에 이름 지정"
-      reset: "기본값으로 초기화"
-      type_color_text: |
-        선택한 색상은 Gantt 차트 또는 작업 패키지 테이블에서
-        다양한 유형을 구분합니다. 따라서 진한 색상을 사용하는 것이 좋습니다.
+      projects:
+        tab: "프로젝트"
+        enabled_projects: "활성화된 프로젝트"
+      settings:
+        tab: "설정"
+        type_color_text: 선택한 색상은 Gantt 차트 또는 작업 패키지 테이블에서 다양한 유형을 구분합니다. 따라서 진한 색상을 사용하는 것이 좋습니다.
+      subject_configuration:
+        tab: "제목 구성"
+        manually_editable_subjects:
+          label: "수동으로 편집 가능한 제목"
+          caption: "사용자가 제한 없이 작업 패키지 제목을 수동으로 입력하고 편집할 수 있습니다."
+        automatically_generated_subjects:
+          label: "자동으로 생성되는 제목"
+          caption: "참조된 특성과 텍스트를 사용하여 패턴을 정의하고 작업 패키지 제목을 자동으로 생성하세요. 사용자는 제목을 수동으로 편집할 수 없습니다."
+        pattern:
+          label: "제목 패턴"
+          caption: "특성을 검색하거나 텍스트를 추가하세요. 요소 사이에 공백을 넣으려면 텍스트로 추가하세요."
   versions:
     overview:
       work_packages_in_archived_projects: "해당 버전은 이 버전에 할당된 작업 패키지가 아직 있는 보관된 프로젝트와 공유됩니다. 이러한 버전은 카운트되지만, 링크된 보기에 나타나지는 않습니다."
@@ -634,6 +661,10 @@ ko:
     label_add_x: "%{x} 추가"
     label_edit_x: "%{x} 편집"
     label_add_description: "설명 추가"
+    lag:
+      subject: "지연"
+      title: "지연(일)"
+      caption: "두 작업 패키지 간에 유지할 최소 근무일 수입니다."
     relations:
       label_relates_singular: "관련 항목"
       label_relates_plural: "관련 항목"
@@ -649,7 +680,7 @@ ko:
       follows_description: "이 패키지를 시작하려면 관련 작업 패키지가 반드시 먼저 완료되어야 합니다"
       label_child_singular: "자식"
       label_child_plural: "자식"
-      child_description: "Makes the related work package a sub-item of the current (parent) work package"
+      child_description: "관련 작업 패키지를 현재(부모) 작업 패키지의 하위 항목으로 만듭니다"
       label_blocks_singular: "블록"
       label_blocks_plural: "블록"
       blocks_description: "이 패키지가 먼저 종료될 때까지 관련 작업 패키지를 종료할 수 없습니다"
@@ -838,6 +869,9 @@ ko:
         lag: "지연"
         from: "작업 패키지"
         to: "관련 패키지"
+      reminder:
+        remind_at_date: "날짜"
+        remind_at_time: "시간"
       repository:
         url: "주소"
       role:
@@ -926,6 +960,7 @@ ko:
       messages:
         accepted: "허용 되어야 합니다."
         after: "은(는) %{date} 후이어야  합니다."
+        after_today: "- 미래여야 합니다."
         after_or_equal_to: "은(는) %{date} 이후여야 합니다."
         before: "은(는) %{date} 보다 전이어야 합니다."
         before_or_equal_to: "은(는) %{date} 이전이어야 합니다."
@@ -972,6 +1007,7 @@ ko:
         not_an_integer: "은(는) 정수가 아닙니다."
         not_an_iso_date: "은(는) 유효한 날짜가 아닙니다. 필요한 형식: YYYY-MM-DD."
         not_same_project: "은(는) 동일한 프로젝트에 속하지 않습니다."
+        datetime_must_be_in_future: "- 미래여야 합니다."
         odd: "에 홀수를 입력해 주세요"
         regex_match_failed: "%{expression} 정규식과 일치하지 않습니다."
         regex_invalid: "관련 정규식으로 유효성을 확인할 수 없습니다."
@@ -1085,16 +1121,38 @@ ko:
           attributes:
             type:
               must_be_a_stage_or_gate: "- Project::StageDefinition 또는 Project::GateDefinition여야(이어야) 합니다"
+              type_and_class_name_mismatch: "- 인스턴스화된 클래스 이름과 일치해야 합니다"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "- Project::GateDefinition여야(이어야) 합니다"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "- Project::StageDefinition여야(이어야) 합니다"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "- Project::Stage 또는 Project::Gate여야(이어야) 합니다"
               must_be_a_stage: "- Project::Stage여야(이어야) 합니다"
               must_be_a_gate: "- Project::Gate여야(이어야) 합니다"
+              type_and_class_name_mismatch: "- 인스턴스화된 클래스 이름과 일치해야 합니다"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Project::Gate에 `end_date`을(를) 할당할 수 없습니다"
+              end_date_not_allowed: "Project::Gate에 종료 날짜를 할당할 수 없습니다"
+            type:
+              type_and_class_name_mismatch: "- Project::Gate여야(이어야) 합니다"
+            date:
+              non_continuous_dates: "- 이전 %{step}의 종료일보다 빠를 수 없습니다."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "시작 날짜는 종료 날짜 이전이어야 합니다."
+              non_continuous_dates: "- 이전 %{step}의 종료일보다 빠를 수 없습니다."
+              incomplete: "- 미완료 상태입니다."
+            type:
+              type_and_class_name_mismatch: "- Project::Stage여야(이어야) 합니다"
         query:
           attributes:
             project:
@@ -1308,6 +1366,8 @@ ko:
         other: "알림"
       placeholder_user: "플레이스홀더 사용자"
       project: "프로젝트"
+      project/gate_definition: "게이트"
+      project/stage_definition: "단계"
       project_query:
         other: "프로젝트 목록"
       query: "사용자 지정 쿼리"
@@ -1404,6 +1464,7 @@ ko:
     login: "사용자 이름"
     mail: "이메일"
     name: "이름"
+    note: "메모"
     password: "암호"
     priority: "우선 순위"
     project: "프로젝트"
@@ -1500,6 +1561,7 @@ ko:
   button_print: "인쇄"
   button_quote: "인용"
   button_remove: 제거
+  button_remove_reminder: "미리 알림 제거"
   button_rename: "이름 바꾸기"
   button_replace: "교체하기"
   button_revoke: "취소"
@@ -1510,6 +1572,7 @@ ko:
   button_save_as: "다른 이름으로 저장"
   button_apply_changes: "변경 사항 적용"
   button_save_back: "저장하고 돌아가기"
+  button_set_reminder: "미리 알림 설정"
   button_show: "표시"
   button_sort: "분류"
   button_submit: "제출"
@@ -1697,12 +1760,12 @@ ko:
   direction: ltr
   ee:
     upsale:
+      title: "Enterprise 추가 기능"
+      link_title: "추가 정보"
       form_configuration:
         description: "다음과 같은 기타 추가 기능으로 양식 구성을 사용자 지정하세요."
         add_groups: "새로운 특성 그룹 추가"
         rename_groups: "특성 그룹 이름 바꾸기"
-      project_filters:
-        description_html: "사용자 지정 필드의 필터링 및 정렬은 Enterprise Edition의 추가 기능입니다."
   enumeration_activities: "시간 추적 활동"
   enumeration_work_package_priorities: "작업 패키지 우선 순위"
   enumeration_reported_project_statuses: "보고된 프로젝트 상태"
@@ -1735,6 +1798,7 @@ ko:
   error_pdf_export_too_many_columns: "PDF 내보내기에 대해 너무 많은 열을 선택했습니다. 열 수를 줄이십시오."
   error_pdf_failed_to_export: "PDF 내보내기를 저장할 수 없습니다: %{error}"
   error_token_authenticity: "교차 사이트 요청 위조 토큰을 확인할 수 없습니다. 여러 브라우저나 탭에서 데이터 제출을 시도하셨습니까? 모든 탭을 닫고 다시 시도하세요."
+  error_reminder_not_found: "미리 알림을 찾을 수 없거나 이미 알림을 받았습니다."
   error_work_package_not_found_in_project: "작업 패키지가 없거나 이 프로젝트에 속하지 않습니다."
   error_work_package_id_not_found: "작업 패키지를 찾을 수 없습니다."
   error_must_be_project_member: "은(는) 프로젝트 멤버여야 합니다."
@@ -2028,6 +2092,7 @@ ko:
       responsible: "담당"
       shared: "공유됨"
       watched: "주시자"
+      reminder: "미리 알림"
     facets:
       unread: "읽지 않음"
       unread_title: "읽지 않은 항목 표시"
@@ -2195,8 +2260,10 @@ ko:
   label_default: "기본"
   label_delete_user: "사용자 삭제"
   label_delete_project: "프로젝트 삭제"
+  label_delete: "삭제"
   label_deleted: "삭제됨"
   label_deleted_custom_field: "(삭제된 사용자 지정 필드)"
+  label_deleted_custom_item: "(삭제된 항목)"
   label_deleted_custom_option: "(삭제된 옵션)"
   label_empty_element: "(비어 있음)"
   label_missing_or_hidden_custom_option: "(값이 없거나 액세스 권한이 없음)"
@@ -2233,7 +2300,6 @@ ko:
   label_enterprise_active_users: "예약 활성 사용자 %{current}/%{limit}명"
   label_enterprise_edition: "Enterprise Edition"
   label_enterprise_support: "엔터프라이즈 지원"
-  label_enterprise_addon: "Enterprise 추가 기능"
   label_environment: "환경"
   label_estimates_and_progress: "견적 및 진행률"
   label_equals: "일치함"
@@ -2418,6 +2484,7 @@ ko:
   label_none_parentheses: "(없음)"
   label_not_contains: "포함하지 않음"
   label_not_equals: "일치하지 않음"
+  label_life_cycle_step_plural: "프로젝트 수명 주기"
   label_on: "에"
   label_operator_all: "비어 있지 않음"
   label_operator_none: "비어 있음"
@@ -2519,6 +2586,7 @@ ko:
   label_reporting: "보고"
   label_reporting_plural: "보고"
   label_repository: "리포지토리"
+  label_repository_remove: "리포지토리 제거"
   label_repository_root: "최상위 저장소"
   label_repository_plural: "리포지토리"
   label_required: "필수"
@@ -2581,6 +2649,7 @@ ko:
   label_this_month: "이번 달"
   label_this_week: "이번 주"
   label_this_year: "올해"
+  label_time: "시간"
   label_time_entry_plural: "소비한 시간"
   label_time_entry_activity_plural: "소요 시간 활동"
   label_title: "제목"
@@ -2616,6 +2685,7 @@ ko:
   label_user_settings: "사용자 설정"
   label_users_settings: "사용자 설정"
   label_version_new: "새 버전"
+  label_version_edit: "버전 편집"
   label_version_plural: "버전"
   label_version_sharing_descendants: "하위 프로젝트 포함"
   label_version_sharing_hierarchy: "프로젝트 계층 구조 포함"
@@ -2752,8 +2822,13 @@ ko:
         prefix: "수신 이유는 다음 알림 설정입니다: %{reason}"
         date_alert_start_date: "날짜 경보"
         date_alert_due_date: "날짜 경보"
+        reminder: "미리 알림"
       see_all: "모두 보기"
       updated_at: "%{timestamp}, %{user} 님이 업데이트함"
+    reminder_notifications:
+      subject: "미리 알림: %{note}"
+      heading: "새로운 미리 알림이 있습니다"
+      note: "참고: \"%{note}\""
     sharing:
       work_packages:
         allowed_actions: "이 작업 패키지를 %{allowed_actions}할 수 있습니다. 이는 프로젝트 역할 및 권한에 따라 변경될 수 있습니다."
@@ -2920,6 +2995,7 @@ ko:
   notice_successful_connection: "연결에 성공했습니다."
   notice_successful_create: "생성에 성공했습니다."
   notice_successful_delete: "삭제에 성공했습니다."
+  notice_successful_cancel: "취소에 성공했습니다."
   notice_successful_update: "업데이트에 성공했습니다."
   notice_successful_update_custom_fields_added_to_project: |
     업데이트 성공. 활성화된 유형의 사용자 지정 필드는 작업 패키지 양식에서 자동으로 활성화됩니다. <a href="%{url}" target="_blank">자세히 알아보세요</a>.
@@ -2995,6 +3071,7 @@ ko:
   permission_edit_own_time_entries: "내 시간 로그 편집"
   permission_edit_project: "프로젝트 편집"
   permission_edit_project_attributes: "프로젝트 특성 편집"
+  permission_edit_project_stages_and_gates: "프로젝트 단계 및 게이트 편집"
   permission_edit_reportings: "보고 편집"
   permission_edit_time_entries: "다른 사용자의 시간 로그 편집"
   permission_edit_timelines: "타임라인 편집"
@@ -3024,9 +3101,12 @@ ko:
   permission_search_project: "프로젝트 검색"
   permission_select_custom_fields: "사용자 지정 필드 선택"
   permission_select_project_custom_fields: "프로젝트 특성 선택"
+  permission_select_project_life_cycle: "프로젝트 단계 및 게이트 선택"
+  permission_select_project_life_cycle_explanation: "프로젝트의 단계 및 게이트를 활성화/비활성화하세요. 비활성 단계 및 게이트는 프로젝트 개요 페이지나 프로젝트 목록에 표시되지 않으므로 사용자가 프로젝트에 적합한 수명 주기를 선택할 수 있습니다."
   permission_select_project_modules: "프로젝트 모듈 선택"
   permission_share_work_packages: "작업 패키지 공유"
   permission_manage_types: "유형 선택"
+  permission_manage_own_reminders: "고유한 미리 알림 만들기"
   permission_view_project: "프로젝트 보기"
   permission_view_changesets: "OpenProject에서 리포지토리 수정 사항 보기"
   permission_view_commit_author_statistics: "커밋 작성자 통계 보기"
@@ -3047,6 +3127,7 @@ ko:
   permission_work_package_assigned_explanation: "작업 패키지는 각각의 프로젝트에서 이 역할을 가진 사용자와 그룹에 할당될 수 있습니다."
   permission_view_project_activity: "프로젝트 활동 보기"
   permission_view_project_attributes: "프로젝트 특성 보기"
+  permission_view_project_stages_and_gates: "프로젝트 단계 및 게이트 보기"
   permission_save_bcf_queries: "BCF 쿼리 저장"
   permission_manage_public_bcf_queries: "공용 BCF 쿼리 관리"
   permission_edit_attribute_help_texts: "특성 도움말 텍스트 편집"
@@ -3435,7 +3516,7 @@ ko:
       edit:
         description: "이 프로젝트 특성에 대한 변경 사항은 이 특성이 활성화된 모든 프로젝트에 반영됩니다. 필수 특성은 프로젝트별로 비활성화할 수 없습니다."
       new:
-        heading: "새로운 특성"
+        heading: "새 특성"
         description: "이 프로젝트 특성에 대한 변경 사항은 이 특성이 활성화된 모든 프로젝트에 반영됩니다. 필수 특성은 프로젝트별로 비활성화할 수 없습니다."
     projects:
       missing_dependencies: "%{dependencies}에 의존하는 프로젝트 모듈 %{module}이(가) 확인되었습니다. 이러한 종속성도 확인해야 합니다."
@@ -3724,6 +3805,12 @@ ko:
       edit_description: "이 작업 패키지 보기, 코멘트 작성 및 편집을 할 수 있습니다."
       view: "보기"
       view_description: "이 작업 패키지를 볼 수 있습니다."
+    reminders:
+      label_remind_at: "날짜"
+      note_placeholder: "이 미리 알림을 설정하는 이유는 무엇입니까?"
+      success_creation_message: "미리 알림이 설정되었습니다. 선택한 시간에 이 작업 패키지에 대한 알림을 받게 됩니다."
+      success_update_message: "미리 알림이 업데이트되었습니다."
+      success_deletion_message: "미리 알림이 삭제되었습니다."
   sharing:
     count:
       zero: "사용자 0명"
diff --git a/config/locales/crowdin/lt.yml b/config/locales/crowdin/lt.yml
index 724fdad6e656..9fedf77b74a9 100644
--- a/config/locales/crowdin/lt.yml
+++ b/config/locales/crowdin/lt.yml
@@ -340,6 +340,9 @@ lt:
         text: "Atlikus šį veiksmą nebus ištrintas nė vienas sąraše esantis projektas. Ar tikrai norite ištrinti šį projektų sąrašą?"
     settings:
       change_identifier: Pokyčio identifikatorius
+      actions:
+        label_enable_all: "Enable all"
+        label_disable_all: "Disable all"
       activities:
         no_results_title_text: Kolkas neprieinama jokia veikla.
       forums:
@@ -350,18 +353,26 @@ lt:
         no_results_content_text: Sukurti naują darbų paketo kategoriją
       custom_fields:
         no_results_title_text: Šiuo metu nėra prieinamų pasirinktinų laukų.
+      life_cycle:
+        header:
+          title: "Project lifecycle"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "Neither stages nor gates are currently defined."
+        section_header: "Stages and gates"
+        step:
+          use_in_project: "Use %{step} in this project"
+        filter:
+          label: "Search project stage or gate"
       project_custom_fields:
         header:
           title: "Projekto atributai"
-          description: 'Šie projekto atributai bus rodomi jūsų <a href=%{overview_url} target="_blank">projekto apžvalgos puslapyje</a> savo atitinkamose skiltyse. Galite įjungti ar išjungti konkrečius atributus. Projekto atributus ir skiltys egzemplioriaus administratorius apibrėžia <a href=%{admin_settings_url} target="_blank">administravimo nustatymuose</a>. '
+          description_html: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
         filter:
           label: "Ieškoti projekto atributo"
         actions:
           label_enable_single: "Aktyvus šiame projekte, spauskite, jei norite išjungti"
           label_disable_single: "Neakvyus šiame projekte, spauskite, jei norite įjungti"
           remove_from_project: "Pašalinti iš projekto"
-          label_enable_all: "Įjungti visus"
-          label_disable_all: "Išjungti visus"
         is_required_blank_slate:
           heading: Required in all projects
           description: This project attribute is activated in all projects since the "Required in all projects" option is checked. It cannot be deactivated for individual projects.
@@ -374,6 +385,12 @@ lt:
         no_results_content_text: Sukurti naują versiją
       storage:
         no_results_title_text: Šis projektas papildomos vietos diske nenaudoja.
+  project_stage:
+    working_days_count:
+      one: "Duration: %{count} working day"
+      few: "Duration: %{count} working days"
+      many: "Duration: %{count} working days"
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "Pakeistas sąrašas įrašytas kaip naujas sąrašas"
@@ -506,8 +523,12 @@ lt:
     groups:
       member_in_these_groups: "Šis naudotojas šiuo metu yra šių grupių narys:"
       no_results_title_text: Šis naudotojas nėra jokios grupės narys.
+      summary_with_more: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary: Member of %{names}.
     memberships:
       no_results_title_text: Šis naudotojas šiuo metu nėra projekto narys.
+    open_profile: "Open profile"
   page:
     text: "Tekstas"
   placeholder_users:
@@ -580,18 +601,27 @@ lt:
       no_results_title_text: Nėra jokių rūšių.
       no_results_content_text: Sukurti naują rūšį
     edit:
-      settings: "Nustatymai"
-      form_configuration: "Formos konfigūracija"
+      form_configuration:
+        tab: "Form configuration"
       more_info_text_html: >
         Enterprise versija leidžia jums keisti formos konfigūraciją naudojant papildomus priedus: <br> <ul class="%{list_styling_class}"> <li><b>Pridėti naujas atributų grupes</b></li> <li><b>Pervadinti atributų grupes</b></li> <li><b>Pridėti susijusių darbo paketų lentelę</b></li> </ul>
-      projects: "Projektai"
-      enabled_projects: "Įgalinti projektai"
-      edit_query: "Keisti lentelę"
-      query_group_placeholder: "Pavadinti lentelę"
-      reset: "Atkurti į numatytuosius"
-      type_color_text: |
-        Parinkta spalva išskiria skirtingus tipus
-        Gantt diagramoje ar darbo paketų lentelėse. Todėl rekomenduojama naudoti ryškią spalvą.
+      projects:
+        tab: "Projects"
+        enabled_projects: "Enabled projects"
+      settings:
+        tab: "Settings"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Subject configuration"
+        manually_editable_subjects:
+          label: "Manually editable subjects"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automatically generated subjects"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Subject pattern"
+          caption: "Search for an attribute or add text. To create a space between elements add it as a text."
   versions:
     overview:
       work_packages_in_archived_projects: "Versija bendrinama su archyvuotais projektais, kurie vis dar turi darbo paketų, priskirtų šiai versijai. Jie įskaičiuoti, bet nebus rodomi susietuose vaizduose."
@@ -656,6 +686,10 @@ lt:
     label_add_x: "Add %{x}"
     label_edit_x: "Edit %{x}"
     label_add_description: "Add description"
+    lag:
+      subject: "Lag"
+      title: "Lag (in days)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
       label_relates_singular: "related to"
       label_relates_plural: "related to"
@@ -860,6 +894,9 @@ lt:
         lag: "Vėlavimas"
         from: "Darbų paketas"
         to: "Susijusių darbų paketas"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Time"
       repository:
         url: "URL"
       role:
@@ -948,6 +985,7 @@ lt:
       messages:
         accepted: "turi būti patvirtinta."
         after: "turi būti po %{date}."
+        after_today: "must be in the future."
         after_or_equal_to: "turi eiti po arba būti lygu %{date}."
         before: "turi eiti prieš %{date}."
         before_or_equal_to: "turi eiti prieš arba būti lygu %{date}."
@@ -994,6 +1032,7 @@ lt:
         not_an_integer: "nėra sveikasis skaičius."
         not_an_iso_date: "nėra tinkama data. Reikalingas formatas: YYYY-MM-DD."
         not_same_project: "nepriklauso tam pačiam projektui."
+        datetime_must_be_in_future: "must be in the future."
         odd: "turi būti nelyginis."
         regex_match_failed: "neatitinka reguliariosios išraiškos %{expression}."
         regex_invalid: "negalėjo būti patvirtintas su susieta reguliaria išraiška."
@@ -1107,16 +1146,38 @@ lt:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "start date must be before the end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "is incomplete."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1339,6 +1400,8 @@ lt:
         other: "Pranešimų"
       placeholder_user: "Statytinis naudotojas"
       project: "Projektas"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         one: "Project list"
         few: "Projektų sąrašai"
@@ -1456,6 +1519,7 @@ lt:
     login: "Naudotojas"
     mail: "El. paštas"
     name: "Vardas"
+    note: "Note"
     password: "Slaptažodis"
     priority: "Pirmenybė"
     project: "Projektas"
@@ -1552,6 +1616,7 @@ lt:
   button_print: "Spausdinti"
   button_quote: "Cituoti"
   button_remove: Pašalinti
+  button_remove_reminder: "Remove reminder"
   button_rename: "Pervardinti"
   button_replace: "Pakeisti"
   button_revoke: "Atšaukti"
@@ -1562,6 +1627,7 @@ lt:
   button_save_as: "Įrašyti kaip"
   button_apply_changes: "Pritaikyti pakeitimus"
   button_save_back: "Įrašyti ir grįžti atgal"
+  button_set_reminder: "Set reminder"
   button_show: "Rodyti"
   button_sort: "Rūšiuoti"
   button_submit: "Siųsti"
@@ -1803,12 +1869,12 @@ lt:
   direction: ltr
   ee:
     upsale:
+      title: "Enterprise add-on"
+      link_title: "More information"
       form_configuration:
         description: "Pritaikyti sau formos konfigūraciją su šiais naujais priedais:"
         add_groups: "Pridėti naujas atributų grupes"
         rename_groups: "Pervadinti atributų grupes"
-      project_filters:
-        description_html: "Filtravimas ir rikiavimas pagal pritaikytus laukus yra tik Enterprise versijos priedas."
   enumeration_activities: "Laiko sekimo veiklos"
   enumeration_work_package_priorities: "Darbų paketo prioritetai"
   enumeration_reported_project_statuses: "Pranešta projekto būsena"
@@ -1841,6 +1907,7 @@ lt:
   error_pdf_export_too_many_columns: "PDF eksportavimui pasirinkta per daug stulpelių. Prašome sumažinti stulpelių skaičių."
   error_pdf_failed_to_export: "PDF eksportas negali būti išsaugotas: %{error}"
   error_token_authenticity: "Neįmanoma patikrinti Cross-Site Request Forgery žetono. Gal bandėte nusiųsti duomenis iš kelių naršyklių ar kortelių? Prašome uždaryti visas korteles ir pabandyti dar kartą."
+  error_reminder_not_found: "The reminder was not found or was already notified about."
   error_work_package_not_found_in_project: "Darbų paketas nerastas arba nepriklauso šiam projektui"
   error_work_package_id_not_found: "The work package was not found."
   error_must_be_project_member: "turi būti projekto narys"
@@ -2134,6 +2201,7 @@ lt:
       responsible: "Atsakingas"
       shared: "Bendrinta"
       watched: "Stebėtojas"
+      reminder: "Reminder"
     facets:
       unread: "Neskaitytas"
       unread_title: "Rodyti neperskaitytus"
@@ -2301,8 +2369,10 @@ lt:
   label_default: "Numatytasis"
   label_delete_user: "Ištrinti vartotoją"
   label_delete_project: "Ištrinti projektą"
+  label_delete: "Delete"
   label_deleted: "panaikintas"
   label_deleted_custom_field: "(panaikintas vartotojo laukas)"
+  label_deleted_custom_item: "(deleted item)"
   label_deleted_custom_option: "(panaikintas nustatymas)"
   label_empty_element: "(tuščia)"
   label_missing_or_hidden_custom_option: "(trūksta reikšmės arba prieigos teisių)"
@@ -2339,7 +2409,6 @@ lt:
   label_enterprise_active_users: "%{current}/%{limit} aktyviai naudojami naudotojai"
   label_enterprise_edition: "Enterprise versija"
   label_enterprise_support: "„Enterprise“ palaikymas"
-  label_enterprise_addon: "Enterprise priedas"
   label_environment: "Aplinka"
   label_estimates_and_progress: "Įvertinimai ir eiga"
   label_equals: "yra"
@@ -2524,6 +2593,7 @@ lt:
   label_none_parentheses: "(nėra)"
   label_not_contains: "neturi"
   label_not_equals: "nėra"
+  label_life_cycle_step_plural: "Project lifecycle"
   label_on: "įjungta"
   label_operator_all: "nėra tuščias"
   label_operator_none: "yra tuščias"
@@ -2625,6 +2695,7 @@ lt:
   label_reporting: "Atsiskaitymas"
   label_reporting_plural: "Atsiskaitymai"
   label_repository: "Repozitorija"
+  label_repository_remove: "Remove repository"
   label_repository_root: "Repozitorijos šaknis"
   label_repository_plural: "Repozitorijos"
   label_required: "reikalingas"
@@ -2687,6 +2758,7 @@ lt:
   label_this_month: "šis mėnuo"
   label_this_week: "ši savaitė"
   label_this_year: "šiemet"
+  label_time: "Time"
   label_time_entry_plural: "Praleista laiko"
   label_time_entry_activity_plural: "Praleisto laiko veiklos"
   label_title: "Pavadinimas"
@@ -2722,6 +2794,7 @@ lt:
   label_user_settings: "Naudotojo nustatymai"
   label_users_settings: "Naudotojo nustatymai"
   label_version_new: "Nauja versija"
+  label_version_edit: "Edit version"
   label_version_plural: "Versijos"
   label_version_sharing_descendants: "Su sub-projektais"
   label_version_sharing_hierarchy: "Su projekto hierarchija"
@@ -2861,8 +2934,13 @@ lt:
         prefix: "Gauta dėl pranešimų nustatymo: %{reason}"
         date_alert_start_date: "Datos įspėjimas"
         date_alert_due_date: "Datos įspėjimas"
+        reminder: "Reminder"
       see_all: "Žiūrėti visus"
       updated_at: "Pakeitė %{user} %{timestamp}"
+    reminder_notifications:
+      subject: "Reminder: %{note}"
+      heading: "You have a new reminder"
+      note: "Note: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "Šiame darbo pakete jums leidžiama %{allowed_actions}. Tai gali keistis priklausomai nuo jūsų vaidmens projekte ir teisių."
@@ -3029,6 +3107,7 @@ lt:
   notice_successful_connection: "Sėkmingas susijungimas."
   notice_successful_create: "Sėkmingas sukūrimas."
   notice_successful_delete: "Sėkmingas panaikinimas."
+  notice_successful_cancel: "Successful cancellation."
   notice_successful_update: "Sėkmingai atnaujinta."
   notice_successful_update_custom_fields_added_to_project: |
     Sėkmingas atnaujinimas. Savi aktyvuotų tipų laukai automatiškai aktivuoti darbo paketų formose. <a href="%{url}" target="_blank">Skaitykite daugiau</a>.
@@ -3107,6 +3186,7 @@ lt:
   permission_edit_own_time_entries: "Redaguoti savo laiko įrašus"
   permission_edit_project: "Redaguoti projektą"
   permission_edit_project_attributes: "Edit project attributes"
+  permission_edit_project_stages_and_gates: "Edit project stages and gates"
   permission_edit_reportings: "Redaguoti ataskaitas"
   permission_edit_time_entries: "Keitimo laiko žurnalai kitiems naudotojams"
   permission_edit_timelines: "Redaguoti tvarkaraščius"
@@ -3136,9 +3216,12 @@ lt:
   permission_search_project: "Ieškoti projekte"
   permission_select_custom_fields: "Parinkite savo laukus"
   permission_select_project_custom_fields: "Parinkite projekto atributus"
+  permission_select_project_life_cycle: "Select project stages and gates"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "Parinkti projekto modulius"
   permission_share_work_packages: "Bendrinti darbo paketus"
   permission_manage_types: "Pasirinkti tipus"
+  permission_manage_own_reminders: "Create own reminders"
   permission_view_project: "Peržiūrėti projektus"
   permission_view_changesets: "Rodyti repozitorijos pakeitimus OpenProject"
   permission_view_commit_author_statistics: "Peržiūrėti autorių pakeitimų pateikimo statistiką"
@@ -3159,6 +3242,7 @@ lt:
   permission_work_package_assigned_explanation: "Darbų paketai gali būti priskirti naudotojams ir grupėms pagal vaidmenį atitinkamame projekte"
   permission_view_project_activity: "Žiūrėti veiksmus projekte"
   permission_view_project_attributes: "View project attributes"
+  permission_view_project_stages_and_gates: "View project stages and gates"
   permission_save_bcf_queries: "Įrašyti BCF užklausas"
   permission_manage_public_bcf_queries: "Valdyti viešas BCF užklausas"
   permission_edit_attribute_help_texts: "Keisti atributų pagalbos tekstus"
@@ -3838,6 +3922,12 @@ lt:
       edit_description: "Gali žiūrėti, komentuoti ir keisti šį darbo paketą."
       view: "Peržiūrėti"
       view_description: "Gali žiūrėti šį darbo paketą."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Why are you setting this reminder?"
+      success_creation_message: "Reminder set successfully. You will receive a notification for this work package at the chosen time."
+      success_update_message: "Reminder updated successfully."
+      success_deletion_message: "Reminder deleted successfully."
   sharing:
     count:
       zero: "0 naudotojų"
diff --git a/config/locales/crowdin/lv.yml b/config/locales/crowdin/lv.yml
index 234f97126585..b75521c1143c 100644
--- a/config/locales/crowdin/lv.yml
+++ b/config/locales/crowdin/lv.yml
@@ -343,6 +343,9 @@ lv:
         text: "This action will not delete any project the list contains. Are you sure you want to delete this project list?"
     settings:
       change_identifier: Change identifier
+      actions:
+        label_enable_all: "Enable all"
+        label_disable_all: "Disable all"
       activities:
         no_results_title_text: Pašlaik neviena aktivitāte nav pieejama.
       forums:
@@ -353,18 +356,26 @@ lv:
         no_results_content_text: Izveidot jaunu darba grupas kategoriju
       custom_fields:
         no_results_title_text: Pašlaik nav neviena pieejamā pielāgotā lauka.
+      life_cycle:
+        header:
+          title: "Project lifecycle"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "Neither stages nor gates are currently defined."
+        section_header: "Stages and gates"
+        step:
+          use_in_project: "Use %{step} in this project"
+        filter:
+          label: "Search project stage or gate"
       project_custom_fields:
         header:
           title: "Project attributes"
-          description: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
+          description_html: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
         filter:
           label: "Search project attribute"
         actions:
           label_enable_single: "Active in this project, click to disable"
           label_disable_single: "Inactive in this project, click to enable"
           remove_from_project: "Remove from project"
-          label_enable_all: "Enable all"
-          label_disable_all: "Disable all"
         is_required_blank_slate:
           heading: Required in all projects
           description: This project attribute is activated in all projects since the "Required in all projects" option is checked. It cannot be deactivated for individual projects.
@@ -377,6 +388,11 @@ lv:
         no_results_content_text: Izveidot jaunu versiju
       storage:
         no_results_title_text: There is no additional recorded disk space consumed by this project.
+  project_stage:
+    working_days_count:
+      zero: "Duration: %{count} working days"
+      one: "Duration: %{count} working day"
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "The modified list has been saved as a new list"
@@ -503,8 +519,12 @@ lv:
     groups:
       member_in_these_groups: "This user is currently a member of the following groups:"
       no_results_title_text: This user is currently not a member in any group.
+      summary_with_more: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary: Member of %{names}.
     memberships:
       no_results_title_text: Šis lietotājs pašlaik nav projektu dalībnieks.
+    open_profile: "Open profile"
   page:
     text: "Teksts"
   placeholder_users:
@@ -576,18 +596,27 @@ lv:
       no_results_title_text: Pašlaik nav neviena veida.
       no_results_content_text: Izveidot jaunu veidu
     edit:
-      settings: "Iestatījumi"
-      form_configuration: "Form configuration"
+      form_configuration:
+        tab: "Form configuration"
       more_info_text_html: >
         Enterprise edition allows you to customize form configuration with these additional add-ons: <br> <ul class="%{list_styling_class}"> <li><b>Add new attribute groups</b></li> <li><b>Rename attribute groups</b></li> <li><b>Add a table of related work packages</b></li> </ul>
-      projects: "Projekti"
-      enabled_projects: "Enabled projects"
-      edit_query: "Edit table"
-      query_group_placeholder: "Give the table a name"
-      reset: "Reset to defaults"
-      type_color_text: |
-        The selected color distinguishes different types
-        in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      projects:
+        tab: "Projects"
+        enabled_projects: "Enabled projects"
+      settings:
+        tab: "Settings"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Subject configuration"
+        manually_editable_subjects:
+          label: "Manually editable subjects"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automatically generated subjects"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Subject pattern"
+          caption: "Search for an attribute or add text. To create a space between elements add it as a text."
   versions:
     overview:
       work_packages_in_archived_projects: "The version is shared with archived projects which still have work packages assigned to this version. These are counted, but will not appear in the linked views."
@@ -651,6 +680,10 @@ lv:
     label_add_x: "Add %{x}"
     label_edit_x: "Edit %{x}"
     label_add_description: "Add description"
+    lag:
+      subject: "Lag"
+      title: "Lag (in days)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
       label_relates_singular: "related to"
       label_relates_plural: "related to"
@@ -855,6 +888,9 @@ lv:
         lag: "Lag"
         from: "Darba pieteikums"
         to: "Saistītie pieteikuma tipi"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Time"
       repository:
         url: "URL"
       role:
@@ -943,6 +979,7 @@ lv:
       messages:
         accepted: "ir jāapstiprina."
         after: "jābūt pēc %{date}."
+        after_today: "must be in the future."
         after_or_equal_to: "jābūt pēc vai vienādam ar %{date}."
         before: "jābūt pirms %{date}."
         before_or_equal_to: "jābūt pirms vai vienādam ar %{date}."
@@ -989,6 +1026,7 @@ lv:
         not_an_integer: "nav vesels skaitlis."
         not_an_iso_date: "is not a valid date. Required format: YYYY-MM-DD."
         not_same_project: "neietilpst vienā un tai pašā projektā."
+        datetime_must_be_in_future: "must be in the future."
         odd: "jābūt nepāra."
         regex_match_failed: "does not match the regular expression %{expression}."
         regex_invalid: "could not be validated with the associated regular expression."
@@ -1102,16 +1140,38 @@ lv:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "start date must be before the end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "is incomplete."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1331,6 +1391,8 @@ lv:
         other: "Notifications"
       placeholder_user: "Placeholder user"
       project: "Projekts"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         zero: "Project lists"
         one: "Project list"
@@ -1441,6 +1503,7 @@ lv:
     login: "Username"
     mail: "E-Pasts"
     name: "Nosaukums"
+    note: "Note"
     password: "Parole"
     priority: "Prioritāte"
     project: "Projekts"
@@ -1537,6 +1600,7 @@ lv:
   button_print: "Drukāt"
   button_quote: "Citēt"
   button_remove: Noņemt
+  button_remove_reminder: "Remove reminder"
   button_rename: "Rename"
   button_replace: "Replace"
   button_revoke: "Revoke"
@@ -1547,6 +1611,7 @@ lv:
   button_save_as: "Saglabāt kā"
   button_apply_changes: "Apply changes"
   button_save_back: "Saglabāt un atpakaļ"
+  button_set_reminder: "Set reminder"
   button_show: "Rādīt"
   button_sort: "Sort"
   button_submit: "Publicēt"
@@ -1770,12 +1835,12 @@ lv:
   direction: ltr
   ee:
     upsale:
+      title: "Enterprise add-on"
+      link_title: "More information"
       form_configuration:
         description: "Customize the form configuration with these additional add-ons:"
         add_groups: "Add new attribute groups"
         rename_groups: "Rename attributes groups"
-      project_filters:
-        description_html: "Filtering and sorting on custom fields is an Enterprise edition add-on."
   enumeration_activities: "Time tracking activities"
   enumeration_work_package_priorities: "Pieteikumu prioritātes"
   enumeration_reported_project_statuses: "Reported project status"
@@ -1808,6 +1873,7 @@ lv:
   error_pdf_export_too_many_columns: "Too many columns selected for the PDF export. Please reduce the number of columns."
   error_pdf_failed_to_export: "The PDF export could not be saved: %{error}"
   error_token_authenticity: "Unable to verify Cross-Site Request Forgery token. Did you try to submit data on multiple browsers or tabs? Please close all tabs and try again."
+  error_reminder_not_found: "The reminder was not found or was already notified about."
   error_work_package_not_found_in_project: "The work package was not found or does not belong to this project"
   error_work_package_id_not_found: "The work package was not found."
   error_must_be_project_member: "must be project member"
@@ -2101,6 +2167,7 @@ lv:
       responsible: "Accountable"
       shared: "Shared"
       watched: "Sekotājs"
+      reminder: "Reminder"
     facets:
       unread: "Unread"
       unread_title: "Show unread"
@@ -2268,8 +2335,10 @@ lv:
   label_default: "Default"
   label_delete_user: "Delete user"
   label_delete_project: "Delete project"
+  label_delete: "Delete"
   label_deleted: "deleted"
   label_deleted_custom_field: "(deleted custom field)"
+  label_deleted_custom_item: "(deleted item)"
   label_deleted_custom_option: "(deleted option)"
   label_empty_element: "(empty)"
   label_missing_or_hidden_custom_option: "(missing value or lacking permissions to access)"
@@ -2306,7 +2375,6 @@ lv:
   label_enterprise_active_users: "%{current}/%{limit} booked active users"
   label_enterprise_edition: "Enterprise edition"
   label_enterprise_support: "Enterprise support"
-  label_enterprise_addon: "Enterprise add-on"
   label_environment: "Environment"
   label_estimates_and_progress: "Estimates and progress"
   label_equals: "is"
@@ -2491,6 +2559,7 @@ lv:
   label_none_parentheses: "(none)"
   label_not_contains: "doesn't contain"
   label_not_equals: "is not"
+  label_life_cycle_step_plural: "Project lifecycle"
   label_on: " "
   label_operator_all: "is not empty"
   label_operator_none: "is empty"
@@ -2592,6 +2661,7 @@ lv:
   label_reporting: "Reporting"
   label_reporting_plural: "Reportings"
   label_repository: "Repository"
+  label_repository_remove: "Remove repository"
   label_repository_root: "Krātuves sakne"
   label_repository_plural: "Repositories"
   label_required: "required"
@@ -2654,6 +2724,7 @@ lv:
   label_this_month: "this month"
   label_this_week: "this week"
   label_this_year: "this year"
+  label_time: "Time"
   label_time_entry_plural: "Pavadīts laiks"
   label_time_entry_activity_plural: "Spent time activities"
   label_title: "Virsraksts"
@@ -2689,6 +2760,7 @@ lv:
   label_user_settings: "User settings"
   label_users_settings: "Users settings"
   label_version_new: "New version"
+  label_version_edit: "Edit version"
   label_version_plural: "Versijas"
   label_version_sharing_descendants: "Ar apakšprojektiem"
   label_version_sharing_hierarchy: "With project hierarchy"
@@ -2827,8 +2899,13 @@ lv:
         prefix: "Received because of the notification setting: %{reason}"
         date_alert_start_date: "Date alert"
         date_alert_due_date: "Date alert"
+        reminder: "Reminder"
       see_all: "See all"
       updated_at: "Updated at %{timestamp} by %{user}"
+    reminder_notifications:
+      subject: "Reminder: %{note}"
+      heading: "You have a new reminder"
+      note: "Note: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "You may %{allowed_actions} this work package. This can change depending on your project role and permissions."
@@ -2995,6 +3072,7 @@ lv:
   notice_successful_connection: "Successful connection."
   notice_successful_create: "Successful creation."
   notice_successful_delete: "Successful deletion."
+  notice_successful_cancel: "Successful cancellation."
   notice_successful_update: "Successful update."
   notice_successful_update_custom_fields_added_to_project: |
     Successful update. The custom fields of the activated types are automatically activated
@@ -3073,6 +3151,7 @@ lv:
   permission_edit_own_time_entries: "Edit own time logs"
   permission_edit_project: "Edit project"
   permission_edit_project_attributes: "Edit project attributes"
+  permission_edit_project_stages_and_gates: "Edit project stages and gates"
   permission_edit_reportings: "Edit reportings"
   permission_edit_time_entries: "Edit time logs for other users"
   permission_edit_timelines: "Edit timelines"
@@ -3102,9 +3181,12 @@ lv:
   permission_search_project: "Search project"
   permission_select_custom_fields: "Select custom fields"
   permission_select_project_custom_fields: "Select project attributes"
+  permission_select_project_life_cycle: "Select project stages and gates"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "Atlasiet projekta moduļus"
   permission_share_work_packages: "Share work packages"
   permission_manage_types: "Select types"
+  permission_manage_own_reminders: "Create own reminders"
   permission_view_project: "View projects"
   permission_view_changesets: "View repository revisions in OpenProject"
   permission_view_commit_author_statistics: "View commit author statistics"
@@ -3125,6 +3207,7 @@ lv:
   permission_work_package_assigned_explanation: "Work packages can be assigned to users and groups in possession of this role in the respective project"
   permission_view_project_activity: "View project activity"
   permission_view_project_attributes: "View project attributes"
+  permission_view_project_stages_and_gates: "View project stages and gates"
   permission_save_bcf_queries: "Save BCF queries"
   permission_manage_public_bcf_queries: "Manage public BCF queries"
   permission_edit_attribute_help_texts: "Edit attribute help texts"
@@ -3806,6 +3889,12 @@ lv:
       edit_description: "Can view, comment and edit this work package."
       view: "View"
       view_description: "Can view this work package."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Why are you setting this reminder?"
+      success_creation_message: "Reminder set successfully. You will receive a notification for this work package at the chosen time."
+      success_update_message: "Reminder updated successfully."
+      success_deletion_message: "Reminder deleted successfully."
   sharing:
     count:
       zero: "0 users"
diff --git a/config/locales/crowdin/mn.yml b/config/locales/crowdin/mn.yml
index 2ee5bf5fa625..5d2a64cc6eb5 100644
--- a/config/locales/crowdin/mn.yml
+++ b/config/locales/crowdin/mn.yml
@@ -343,6 +343,9 @@ mn:
         text: "This action will not delete any project the list contains. Are you sure you want to delete this project list?"
     settings:
       change_identifier: Change identifier
+      actions:
+        label_enable_all: "Enable all"
+        label_disable_all: "Disable all"
       activities:
         no_results_title_text: There are currently no activities available.
       forums:
@@ -353,18 +356,26 @@ mn:
         no_results_content_text: Create a new work package category
       custom_fields:
         no_results_title_text: There are currently no custom fields available.
+      life_cycle:
+        header:
+          title: "Project lifecycle"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "Neither stages nor gates are currently defined."
+        section_header: "Stages and gates"
+        step:
+          use_in_project: "Use %{step} in this project"
+        filter:
+          label: "Search project stage or gate"
       project_custom_fields:
         header:
           title: "Project attributes"
-          description: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
+          description_html: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
         filter:
           label: "Search project attribute"
         actions:
           label_enable_single: "Active in this project, click to disable"
           label_disable_single: "Inactive in this project, click to enable"
           remove_from_project: "Төслөөс устгах"
-          label_enable_all: "Enable all"
-          label_disable_all: "Disable all"
         is_required_blank_slate:
           heading: Required in all projects
           description: This project attribute is activated in all projects since the "Required in all projects" option is checked. It cannot be deactivated for individual projects.
@@ -377,6 +388,10 @@ mn:
         no_results_content_text: Create a new version
       storage:
         no_results_title_text: There is no additional recorded disk space consumed by this project.
+  project_stage:
+    working_days_count:
+      one: "Duration: %{count} working day"
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "The modified list has been saved as a new list"
@@ -497,8 +512,12 @@ mn:
     groups:
       member_in_these_groups: "This user is currently a member of the following groups:"
       no_results_title_text: This user is currently not a member in any group.
+      summary_with_more: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary: Member of %{names}.
     memberships:
       no_results_title_text: This user is currently not a member of a project.
+    open_profile: "Open profile"
   page:
     text: "Text"
   placeholder_users:
@@ -569,18 +588,27 @@ mn:
       no_results_title_text: There are currently no types.
       no_results_content_text: Create a new type
     edit:
-      settings: "Settings"
-      form_configuration: "Form configuration"
+      form_configuration:
+        tab: "Form configuration"
       more_info_text_html: >
         Enterprise edition allows you to customize form configuration with these additional add-ons: <br> <ul class="%{list_styling_class}"> <li><b>Add new attribute groups</b></li> <li><b>Rename attribute groups</b></li> <li><b>Add a table of related work packages</b></li> </ul>
-      projects: "Projects"
-      enabled_projects: "Enabled projects"
-      edit_query: "Edit table"
-      query_group_placeholder: "Give the table a name"
-      reset: "Reset to defaults"
-      type_color_text: |
-        The selected color distinguishes different types
-        in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      projects:
+        tab: "Projects"
+        enabled_projects: "Enabled projects"
+      settings:
+        tab: "Settings"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Subject configuration"
+        manually_editable_subjects:
+          label: "Manually editable subjects"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automatically generated subjects"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Subject pattern"
+          caption: "Search for an attribute or add text. To create a space between elements add it as a text."
   versions:
     overview:
       work_packages_in_archived_projects: "The version is shared with archived projects which still have work packages assigned to this version. These are counted, but will not appear in the linked views."
@@ -643,6 +671,10 @@ mn:
     label_add_x: "Add %{x}"
     label_edit_x: "Edit %{x}"
     label_add_description: "Add description"
+    lag:
+      subject: "Lag"
+      title: "Lag (in days)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
       label_relates_singular: "related to"
       label_relates_plural: "related to"
@@ -847,6 +879,9 @@ mn:
         lag: "Lag"
         from: "Work package"
         to: "Related work package"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Time"
       repository:
         url: "URL"
       role:
@@ -935,6 +970,7 @@ mn:
       messages:
         accepted: "must be accepted."
         after: "must be after %{date}."
+        after_today: "must be in the future."
         after_or_equal_to: "must be after or equal to %{date}."
         before: "must be before %{date}."
         before_or_equal_to: "must be before or equal to %{date}."
@@ -981,6 +1017,7 @@ mn:
         not_an_integer: "is not an integer."
         not_an_iso_date: "is not a valid date. Required format: YYYY-MM-DD."
         not_same_project: "doesn't belong to the same project."
+        datetime_must_be_in_future: "must be in the future."
         odd: "must be odd."
         regex_match_failed: "does not match the regular expression %{expression}."
         regex_invalid: "could not be validated with the associated regular expression."
@@ -1094,16 +1131,38 @@ mn:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "start date must be before the end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "is incomplete."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1320,6 +1379,8 @@ mn:
         other: "Notifications"
       placeholder_user: "Placeholder user"
       project: "Project"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         one: "Төслийн жагсаалт"
         other: "Төслийн жагсаалтууд"
@@ -1423,6 +1484,7 @@ mn:
     login: "Username"
     mail: "Email"
     name: "Name"
+    note: "Note"
     password: "Password"
     priority: "Priority"
     project: "Project"
@@ -1519,6 +1581,7 @@ mn:
   button_print: "Print"
   button_quote: "Quote"
   button_remove: Remove
+  button_remove_reminder: "Remove reminder"
   button_rename: "Rename"
   button_replace: "Replace"
   button_revoke: "Revoke"
@@ -1529,6 +1592,7 @@ mn:
   button_save_as: "Save as"
   button_apply_changes: "Apply changes"
   button_save_back: "Save and back"
+  button_set_reminder: "Set reminder"
   button_show: "Show"
   button_sort: "Sort"
   button_submit: "Submit"
@@ -1734,12 +1798,12 @@ mn:
   direction: ltr
   ee:
     upsale:
+      title: "Enterprise add-on"
+      link_title: "More information"
       form_configuration:
         description: "Customize the form configuration with these additional add-ons:"
         add_groups: "Add new attribute groups"
         rename_groups: "Rename attributes groups"
-      project_filters:
-        description_html: "Filtering and sorting on custom fields is an Enterprise edition add-on."
   enumeration_activities: "Time tracking activities"
   enumeration_work_package_priorities: "Work package priorities"
   enumeration_reported_project_statuses: "Reported project status"
@@ -1772,6 +1836,7 @@ mn:
   error_pdf_export_too_many_columns: "Too many columns selected for the PDF export. Please reduce the number of columns."
   error_pdf_failed_to_export: "The PDF export could not be saved: %{error}"
   error_token_authenticity: "Unable to verify Cross-Site Request Forgery token. Did you try to submit data on multiple browsers or tabs? Please close all tabs and try again."
+  error_reminder_not_found: "The reminder was not found or was already notified about."
   error_work_package_not_found_in_project: "The work package was not found or does not belong to this project"
   error_work_package_id_not_found: "The work package was not found."
   error_must_be_project_member: "must be project member"
@@ -2065,6 +2130,7 @@ mn:
       responsible: "Accountable"
       shared: "Shared"
       watched: "Watcher"
+      reminder: "Reminder"
     facets:
       unread: "Unread"
       unread_title: "Show unread"
@@ -2232,8 +2298,10 @@ mn:
   label_default: "Default"
   label_delete_user: "Delete user"
   label_delete_project: "Delete project"
+  label_delete: "Delete"
   label_deleted: "deleted"
   label_deleted_custom_field: "(deleted custom field)"
+  label_deleted_custom_item: "(deleted item)"
   label_deleted_custom_option: "(deleted option)"
   label_empty_element: "(empty)"
   label_missing_or_hidden_custom_option: "(missing value or lacking permissions to access)"
@@ -2270,7 +2338,6 @@ mn:
   label_enterprise_active_users: "%{current}/%{limit} booked active users"
   label_enterprise_edition: "Enterprise edition"
   label_enterprise_support: "Enterprise support"
-  label_enterprise_addon: "Enterprise add-on"
   label_environment: "Environment"
   label_estimates_and_progress: "Estimates and progress"
   label_equals: "is"
@@ -2455,6 +2522,7 @@ mn:
   label_none_parentheses: "(none)"
   label_not_contains: "doesn't contain"
   label_not_equals: "is not"
+  label_life_cycle_step_plural: "Project lifecycle"
   label_on: "on"
   label_operator_all: "is not empty"
   label_operator_none: "is empty"
@@ -2556,6 +2624,7 @@ mn:
   label_reporting: "Reporting"
   label_reporting_plural: "Reportings"
   label_repository: "Repository"
+  label_repository_remove: "Remove repository"
   label_repository_root: "Repository root"
   label_repository_plural: "Repositories"
   label_required: "required"
@@ -2618,6 +2687,7 @@ mn:
   label_this_month: "this month"
   label_this_week: "this week"
   label_this_year: "this year"
+  label_time: "Time"
   label_time_entry_plural: "Spent time"
   label_time_entry_activity_plural: "Spent time activities"
   label_title: "Title"
@@ -2653,6 +2723,7 @@ mn:
   label_user_settings: "User settings"
   label_users_settings: "Users settings"
   label_version_new: "New version"
+  label_version_edit: "Edit version"
   label_version_plural: "Versions"
   label_version_sharing_descendants: "With subprojects"
   label_version_sharing_hierarchy: "With project hierarchy"
@@ -2790,8 +2861,13 @@ mn:
         prefix: "Received because of the notification setting: %{reason}"
         date_alert_start_date: "Date alert"
         date_alert_due_date: "Date alert"
+        reminder: "Reminder"
       see_all: "See all"
       updated_at: "Updated at %{timestamp} by %{user}"
+    reminder_notifications:
+      subject: "Reminder: %{note}"
+      heading: "You have a new reminder"
+      note: "Note: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "You may %{allowed_actions} this work package. This can change depending on your project role and permissions."
@@ -2958,6 +3034,7 @@ mn:
   notice_successful_connection: "Successful connection."
   notice_successful_create: "Successful creation."
   notice_successful_delete: "Successful deletion."
+  notice_successful_cancel: "Successful cancellation."
   notice_successful_update: "Successful update."
   notice_successful_update_custom_fields_added_to_project: |
     Successful update. The custom fields of the activated types are automatically activated
@@ -3035,6 +3112,7 @@ mn:
   permission_edit_own_time_entries: "Edit own time logs"
   permission_edit_project: "Edit project"
   permission_edit_project_attributes: "Edit project attributes"
+  permission_edit_project_stages_and_gates: "Edit project stages and gates"
   permission_edit_reportings: "Edit reportings"
   permission_edit_time_entries: "Edit time logs for other users"
   permission_edit_timelines: "Edit timelines"
@@ -3064,9 +3142,12 @@ mn:
   permission_search_project: "Search project"
   permission_select_custom_fields: "Select custom fields"
   permission_select_project_custom_fields: "Select project attributes"
+  permission_select_project_life_cycle: "Select project stages and gates"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "Select project modules"
   permission_share_work_packages: "Share work packages"
   permission_manage_types: "Select types"
+  permission_manage_own_reminders: "Create own reminders"
   permission_view_project: "View projects"
   permission_view_changesets: "View repository revisions in OpenProject"
   permission_view_commit_author_statistics: "View commit author statistics"
@@ -3087,6 +3168,7 @@ mn:
   permission_work_package_assigned_explanation: "Work packages can be assigned to users and groups in possession of this role in the respective project"
   permission_view_project_activity: "View project activity"
   permission_view_project_attributes: "View project attributes"
+  permission_view_project_stages_and_gates: "View project stages and gates"
   permission_save_bcf_queries: "Save BCF queries"
   permission_manage_public_bcf_queries: "Manage public BCF queries"
   permission_edit_attribute_help_texts: "Edit attribute help texts"
@@ -3767,6 +3849,12 @@ mn:
       edit_description: "Can view, comment and edit this work package."
       view: "View"
       view_description: "Can view this work package."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Why are you setting this reminder?"
+      success_creation_message: "Reminder set successfully. You will receive a notification for this work package at the chosen time."
+      success_update_message: "Reminder updated successfully."
+      success_deletion_message: "Reminder deleted successfully."
   sharing:
     count:
       zero: "0 users"
diff --git a/config/locales/crowdin/ms.seeders.yml b/config/locales/crowdin/ms.seeders.yml
index 8db31111b232..d178340e6504 100644
--- a/config/locales/crowdin/ms.seeders.yml
+++ b/config/locales/crowdin/ms.seeders.yml
@@ -36,15 +36,15 @@ ms:
           name: Hitam
       life_cycle_colors:
         item_0:
-          name: PM2 Orange
+          name: PM2 Jingga
         item_1:
-          name: PM2 Purple
+          name: PM2 Ungu
         item_2:
-          name: PM2 Red
+          name: PM2 Merah
         item_3:
           name: PM2 Magenta
         item_4:
-          name: PM2 Green Yellow
+          name: PM2 Hijau Kuning
       document_categories:
         item_0:
           name: Dokumentasi
@@ -79,23 +79,23 @@ ms:
         item_0:
           name: Kakitangan dan pengurus projek
         item_1:
-          name: Standard global role
+          name: Peranan global standard
     standard:
       life_cycles:
         item_0:
-          name: Initiating
+          name: Memulakan
         item_1:
-          name: Ready for Planning
+          name: Bersedia untuk Perancangan
         item_2:
-          name: Planning
+          name: Perancangan
         item_3:
-          name: Ready for Executing
+          name: Sedia untuk Melaksanakan
         item_4:
-          name: Executing
+          name: Melaksanakan
         item_5:
-          name: Ready for Closing
+          name: Sedia untuk Penutupan
         item_6:
-          name: Closing
+          name: Penutup
       priorities:
         item_0:
           name: Rendah
diff --git a/config/locales/crowdin/ms.yml b/config/locales/crowdin/ms.yml
index 9bbb041eb9c1..5fb24719d689 100644
--- a/config/locales/crowdin/ms.yml
+++ b/config/locales/crowdin/ms.yml
@@ -26,20 +26,20 @@ ms:
       no_results_title_text: Tiada sebarang aktiviti untuk projek dalam tempoh masa ini.
     work_packages:
       activity_tab:
-        no_results_title_text: No activity to display
-        no_results_description_text: "Choose \"Show everything\" to show all activity and comments"
-        label_activity_show_all: "Show everything"
-        label_activity_show_only_comments: "Show comments only"
-        label_activity_show_only_changes: "Show changes only"
-        label_sort_asc: "Newest at the bottom"
-        label_sort_desc: "Newest on top"
-        label_type_to_comment: "Add a comment. Type @ to notify people."
-        label_submit_comment: "Submit comment"
-        changed_on: "changed on"
-        created_on: "created this on"
-        changed: "changed"
-        created: "created"
-        commented: "commented"
+        no_results_title_text: Tiada aktiviti untuk dipaparkan
+        no_results_description_text: "Pilih \"Tunjukkan semua\" untuk menunjukkan semua aktiviti dan ulasan"
+        label_activity_show_all: "Papar semua"
+        label_activity_show_only_comments: "Papar komen sahaja"
+        label_activity_show_only_changes: "Papar perubahan sahaja"
+        label_sort_asc: "Terbaru di bahagian bawah"
+        label_sort_desc: "Terbaru di bahagian atas"
+        label_type_to_comment: "Tambah ulasan. Taip @ untuk memberitahu orang."
+        label_submit_comment: "Hantar komen"
+        changed_on: "ditukar pada"
+        created_on: "mencipta ini pada"
+        changed: "berubah"
+        created: "dicipta"
+        commented: "mengulas"
   admin:
     plugins:
       no_results_title_text: Pada masa ini tiada sebarang plugin yang dipasang.
@@ -47,9 +47,9 @@ ms:
     custom_styles:
       color_theme: "Tema warna"
       color_theme_custom: "(Tersuai)"
-      tab_interface: "Interface"
-      tab_branding: "Branding"
-      tab_pdf_export_styles: "PDF export styles"
+      tab_interface: "Antara muka"
+      tab_branding: "Penjenamaan"
+      tab_pdf_export_styles: "Gaya eksport PDF"
       colors:
         primary-button-color: "Butang utama"
         accent-color: "Aksen"
@@ -91,7 +91,7 @@ ms:
         contact: "Hubungi kami untuk demo"
       enterprise_info_html: "ialah tambahan Enterprise <span class='spot-icon spot-icon_inline spot-icon_enterprise-addons'>."
       upgrade_info: "Sila naik taraf ke pelan berbayar untuk mengaktifkan dan mula menggunakannya dalam pasukan anda."
-    jemalloc_allocator: Jemalloc memory allocator
+    jemalloc_allocator: Pengagih ingatan Jemalloc
     journal_aggregation:
       explanation:
         text: "Tindakan individu pengguna (cth. mengemas kini pakej kerja dua kali) dikumpulkan ke dalam satu tindakan tunggal jika perbezaan umur mereka kurang daripada tempoh masa yang ditetapkan. Mereka akan dipaparkan sebagai tindakan tunggal dalam aplikasi. Ini juga akan menangguhkan pemberitahuan dengan jumlah masa yang sama, mengurangkan bilangan e-mel yang dihantar serta akan memberi kesan kepada penagguhan %{webhook_link}."
@@ -217,29 +217,29 @@ ms:
     admin:
       custom_field_projects:
         is_for_all_blank_slate:
-          heading: For all projects
-          description: This custom field is enabled in all projects since the "For all projects" option is checked. It cannot be deactivated for individual projects.
+          heading: Untuk semua projek
+          description: Medan tersuai ini didayakan dalam semua projek kerana pilihan "Untuk semua projek" ditandakan. Ia tidak boleh dinyahaktifkan untuk projek individu.
       items:
-        actions: "Item actions"
+        actions: "Tindakan item"
         blankslate:
           root:
-            title: "Your list of items is empty"
-            description: "Start by adding items to the custom field of type hierarchy. Each item can be used to create a hierarchy bellow it. To navigate and create sub-items inside a hierarchy click on the created item."
+            title: "Senarai item anda kosong"
+            description: "Mulakan dengan menambahkan item pada medan tersuai hierarki jenis. Setiap item boleh digunakan untuk membuat hierarki di bawahnya. Untuk menavigasi dan mencipta sub-item dalam hierarki klik pada item yang dibuat."
           item:
-            title: This item doesn't have any hierarchy level below
-            description: Add items to this list to create sub-items inside another one
+            title: Item ini tidak mempunyai sebarang tahap hierarki di bawah
+            description: Tambahkan item pada senarai ini untuk membuat sub-item di dalam satu lagi
         placeholder:
-          label: "Item label"
-          short: "Short name"
+          label: "Label item"
+          short: "Nama pendek"
       notice:
-        remember_items_and_projects: "Remember to set items and projects in the respective tabs for this custom field."
+        remember_items_and_projects: "Ingat untuk menetapkan item dan projek dalam tab masing-masing untuk medan tersuai ini."
       hierarchy:
         subitems:
-          zero: no sub-items
+          zero: tiada sub-item
           one: 1 sub-item
-          other: "%{count} sub-items"
+          other: "%{count} sub-item"
     upsale:
-      custom_field_format_hierarchy: "Need a hierarchy in your custom fields for work packages?"
+      custom_field_format_hierarchy: "Perlukan hierarki dalam medan tersuai anda untuk pakej kerja?"
     text_add_new_custom_field: >
       Untuk menambah ruang tersuai ke projek, anda perlu menciptanya terlebih dahulu sebelum anda boleh menambahnya ke projek ini.
     is_enabled_globally: "Adalah diaktifkan secara global"
@@ -250,13 +250,13 @@ ms:
     reorder_confirmation: "Amaran: Susunan semasa nilai yang sedia ada akan hilang. Teruskan?"
     instructions:
       is_required: "Tandakan ruang yang tersuai seperti yang diperlukan. Ini akan buatkan ia wajib untuk isikan ruang tersebut apabila membuat sumber yang baharu atau kemas kini sumber sedia ada."
-      is_required_for_project: "Check to enable this attribute and make it required in all projects. It cannot be deactived for individual projects."
+      is_required_for_project: "Semak untuk mendayakan atribut ini dan jadikan ia diperlukan dalam semua projek. Ia tidak boleh dinyahaktifkan untuk projek individu."
       is_for_all: "Tandakan ruang tersuai sebagai tersedia di semua projek baharu dan sedia ada."
-      multi_select: "Allows the user to assign multiple values to this custom field."
+      multi_select: "Membenarkan pengguna untuk memberikan berbilang nilai kepada medan tersuai ini."
       searchable: "Sertakan nilai-nilai ruangan apabila gunakan fungsi pencarian global."
-      searchable_for_project: "Check to make this attribute available as a filter in project lists."
+      searchable_for_project: "Semak untuk menjadikan atribut ini tersedia sebagai penapis dalam senarai projek."
       editable: "Benarkan ruangan tersebut boleh diedit oleh pengguna sendiri."
-      admin_only: "Check to make this attribute only visible to administrators. Users without admin rights will not be able to view or edit it."
+      admin_only: "Semak untuk menjadikan atribut ini hanya kelihatan kepada pentadbir. Pengguna tanpa hak pentadbir tidak akan dapat melihat atau mengeditnya."
       is_filter: >
         Benarkan ruang tersuai untuk digunakan di penyaring paparan pakej kerja. Perhatikan bahawa hanya "Untuk semua projek" yang dipilih, ruang tersuai akan dipaparkan di paparan global.
     tab:
@@ -266,26 +266,26 @@ ms:
     single: "atau"
   dry_validation:
     errors:
-      int?: "must be an integer."
-      filled?: "must be filled."
-      greater_or_equal_zero: "must be greater or equal to 0."
-      not_found: "not found."
+      int?: "mestilah integer."
+      filled?: "mesti diisi."
+      greater_or_equal_zero: "mestilah lebih besar atau sama dengan 0."
+      not_found: "tidak dijumpai."
       rules:
         item:
-          root_item: "cannot be a root item."
-          not_persisted: "must be an already existing item."
+          root_item: "tidak boleh menjadi punca item."
+          not_persisted: "mestilah item yang sedia ada."
         label:
-          not_unique: "must be unique within the same hierarchy level."
+          not_unique: "mestilah unik dalam tahap hierarki yang sama."
         short:
-          not_unique: "must be unique within the same hierarchy level."
+          not_unique: "mestilah unik dalam tahap hierarki yang sama."
         parent:
-          not_descendant: "must be a descendant of the hierarchy root."
+          not_descendant: "mestilah keturunan akar hierarki."
     rules:
-      depth: "Depth"
+      depth: "Kedalaman"
       item: "Item"
       label: "Label"
-      short: "Short name"
-      parent: "Parent"
+      short: "Nama pendek"
+      parent: "Ibu bapa"
   global_search:
     placeholder: "Cari dalam %{app_title}"
     overwritten_tabs:
@@ -312,7 +312,7 @@ ms:
       work_package_attachments: "Pakej kerja: lampiran"
       work_package_categories: "Pakej kerja: kategori"
       work_package_file_links: "Pakej kerja: pautan fail"
-      work_package_shares: "Work packages: shares"
+      work_package_shares: "Pakej kerja: kongsi"
     delete:
       scheduled: "Pembuangan telah dijadualkan dan dilaksanakan di latar belakang. Anda akan dimaklumkan tentang hasilnya."
       schedule_failed: "Projek tidak dapat dipadam: %{errors}"
@@ -326,14 +326,14 @@ ms:
       no_results_title_text: Tiada projek buat masa ini.
       no_results_content_text: Cipta projek baharu
       search:
-        label: Project name filter
-        placeholder: Search by project name
+        label: Penapis nama projek
+        placeholder: Cari mengikut nama projek
     lists:
       active: "Projek yang aktif"
       my: "Projek saya"
       favored: "Projek kegemaran"
       archived: "Projek yang diarkibkan"
-      shared: "Shared project lists"
+      shared: "Senarai projek yang dikongsi"
       my_lists: "Senarai projek saya"
       new:
         placeholder: "Senarai projek baharu"
@@ -342,6 +342,9 @@ ms:
         text: "Tindakan ini tidak akan memadamkan sebarang projek yang terkandung di dalam senarai. Adakah anda pasti untuk memadamkan senarai projek ini?"
     settings:
       change_identifier: Tukar pengenal
+      actions:
+        label_enable_all: "Dayakan semua"
+        label_disable_all: "Lumpuhkan semua"
       activities:
         no_results_title_text: Tiada aktiviti yang tersedia buat masa ini.
       forums:
@@ -352,18 +355,26 @@ ms:
         no_results_content_text: Cipta kategori pakej kerja baharu
       custom_fields:
         no_results_title_text: Tiada ruangan tersuai tersedia buat masa ini.
+      life_cycle:
+        header:
+          title: "Kitaran hayat projek"
+          description_html: 'Peringkat projek dan gerbang dalam kitaran hayat projek ini akan dipaparkan dalam <a href=%{overview_url} target="_blank">halaman gambaran keseluruhan projek</a> anda dan ditakrifkan dalam <a href=%{admin_settings_url} target= "_blank">tetapan pentadbiran</a> oleh pentadbir contoh. Anda boleh mendayakan atau melumpuhkan atribut individu.'
+        non_defined: "Peringkat mahupun gerbang tidak ditakrifkan pada masa ini."
+        section_header: "Peringkat dan pintu gerbang"
+        step:
+          use_in_project: "Gunakan %{step} dalam projek ini"
+        filter:
+          label: "Cari peringkat projek atau pintu pagar"
       project_custom_fields:
         header:
           title: "Atribut projek"
-          description: 'Atribut projek berikut akan dipaparkan di <a href=%{overview_url} target="_blank"> laman gambaran keseluruhan projek</a> anda di bawah bahagian masing-masing. Anda boleh mengaktifkan atau menyahaktifkan atribut individu. Atribut dan bahagian projek ditakrifkan dalam <a href=%{admin_settings_url} target="_blank">tetapan pentadbiran</a> oleh pentadbir yang bertanggungjawab.'
+          description_html: 'Atribut projek ini akan dipaparkan dalam <a href=%{overview_url} target="_blank">halaman gambaran keseluruhan projek</a> anda di bawah bahagian masing-masing. Anda boleh mendayakan atau melumpuhkan atribut individu. Atribut dan bahagian projek ditakrifkan dalam <a href=%{admin_settings_url} target="_blank">tetapan pentadbiran</a> oleh pentadbir kejadian.'
         filter:
           label: "Cari atribut projek"
         actions:
           label_enable_single: "Aktif dalam projek ini, klik untuk nyahaktifkan"
           label_disable_single: "Tidak aktif dalam projek ini, klik untuk aktifkan"
-          remove_from_project: "Remove from project"
-          label_enable_all: "Aktifkan semua"
-          label_disable_all: "Nyahaktifkan semua"
+          remove_from_project: "Alih keluar daripada projek"
         is_required_blank_slate:
           heading: Diperlukan dalam semua projek
           description: Atribut projek ini telah diaktifkan dalam semua projek sejak pilihan "Diperlukan dalam semua projek" telah ditandakan. Ia tidak boleh dinyahaktifkan untuk projek individu.
@@ -376,6 +387,9 @@ ms:
         no_results_content_text: Cipta versi baharu
       storage:
         no_results_title_text: Tiada ruang cakera terekod tambahan yang digunakan untuk projek ini.
+  project_stage:
+    working_days_count:
+      other: "Tempoh: %{count} hari bekerja"
   lists:
     create:
       success: "Senarai yang diubah suai telah disimpan sebagai senarai baharu."
@@ -447,21 +461,21 @@ ms:
   my:
     access_token:
       create_dialog:
-        header: The %{type} token has been generated
-        warning: Note that this is the only time you will see this token, make sure to copy it now.
+        header: Token %{type} telah dihasilkan
+        warning: Ambil perhatian bahawa ini adalah satu-satunya masa anda akan melihat token ini, pastikan anda menyalinnya sekarang.
       errors:
-        token_name_blank: "Please provide an API token name"
-        token_name_in_use: "This API token name is already in use, please select a different one"
-      new_access_token_dialog_title: "Create new API token"
+        token_name_blank: "Sila berikan nama token API"
+        token_name_in_use: "Nama token API ini sudah digunakan, sila pilih yang lain"
+      new_access_token_dialog_title: "Cipta token API baharu"
       new_access_token_dialog_show_button_text: "Token API"
-      new_access_token_dialog_text_field_placeholder_text: "My API token"
+      new_access_token_dialog_text_field_placeholder_text: "Token API saya"
       new_access_token_dialog_text_field_label: "Nama"
       new_access_token_dialog_submit_button_text: "Cipta"
-      new_access_token_dialog_text: "This token will allow third-party applications to communicate with your instance. To differentiate the new API token, please give it a name."
-      new_access_token_dialog_attention_text: "Treat API tokens like passwords. Anyone with this link will have access to information from this instance, share it only with trusted users."
+      new_access_token_dialog_text: "Token ini akan membenarkan aplikasi pihak ketiga berkomunikasi dengan contoh anda. Untuk membezakan token API baharu, sila beri nama."
+      new_access_token_dialog_attention_text: "Rawat token API seperti kata laluan. Sesiapa sahaja yang mempunyai pautan ini akan mempunyai akses kepada maklumat daripada kejadian ini, berkongsinya hanya dengan pengguna yang dipercayai."
       failed_to_reset_token: "Gagal untuk set semula token akses: %{error}"
-      failed_to_create_token: "Failed to create access token: %{error}"
-      failed_to_revoke_token: "Failed to revoke access token: %{error}"
+      failed_to_create_token: "Gagal membuat token akses: %{error}"
+      failed_to_revoke_token: "Gagal menarik balik token akses: %{error}"
       notice_reset_token: "Token %{type} yang baharu telah dijanakan. Token akses anda ialah:"
       token_value_warning: "Perhatian: Ini adalah satu-satunya masa anda akan melihat token ini, pastikan untuk menyalinnya sekarang."
       no_results_title_text: Tiada token akses tersedia buat masa ini.
@@ -490,8 +504,12 @@ ms:
     groups:
       member_in_these_groups: "Pengguna ini ialah ahli dalam kumpulan berikut buat masa ini:"
       no_results_title_text: Pengguna ini bukan ahli untuk mana-mana kumpulan buat masa ini.
+      summary_with_more: Ahli %{names} dan %{count_link}.
+      more: "%{count} lagi"
+      summary: Ahli %{names}.
     memberships:
       no_results_title_text: Pengguna ini bukan ahli projek buat masa ini.
+    open_profile: "Buka profil"
   page:
     text: "Teks"
   placeholder_users:
@@ -514,13 +532,13 @@ ms:
         Klik untuk menugaskan atau menukar warna untuk keutamaan ini.
         Ia boleh digunakan untuk menyoroti pakej kerja dalam jadual ini.
   reactions:
-    action_title: "React"
-    add_reaction: "Add reaction"
-    react_with: "React with %{reaction}"
-    and_user: "and %{user}"
+    action_title: "Reaksi"
+    add_reaction: "Tambah reaksi"
+    react_with: "Bertindak balas dengan %{reaction}"
+    and_user: "dan %{user}"
     and_others:
-      other: and %{count} others
-    reaction_by: "%{reaction} by"
+      other: dan %{count} yang lain
+    reaction_by: "%{reaction} oleh"
   reportings:
     index:
       no_results_title_text: Tiada laporan status buat masa ini.
@@ -531,13 +549,13 @@ ms:
         Klik untuk menugaskan atau menukar warna status ini.
         Ia ditunjukkan pada butang status dan boleh digunakan untuk menyoroti pakej kerja dalam jadual.
       status_default_text: |-
-        New work packages are by default set to this type. They cannot be read-only.
+        Pakej kerja baharu secara lalai ditetapkan kepada jenis ini. Mereka tidak boleh dibaca sahaja.
       status_excluded_from_totals_text: |-
         Tandakan pilihan ini untuk mengecualikan pakej kerja dengan status ini dari jumlah Kerja, Kerja yang berbaki, dan % Selesai dalam hierarki.
       status_percent_complete_text: |-
-        In <a href="%{href}">status-based progress calculation mode</a>, the % Complete of a work
-        package is automatically set to this value when this status is selected.
-        Ignored in work-based mode.
+        Dalam <a href="%{href}">mod pengiraan kemajuan berasaskan status</a>, % Selesai kerja
+        pakej ditetapkan secara automatik kepada nilai ini apabila status ini dipilih.
+        Diabaikan dalam mod berasaskan kerja.
       status_readonly_html: |
         Tandakan pilihan ini untuk menanda pakej kerja dengan status ini sebagai baca-sahaja.
         Tiada atribut yang boleh diubah dengan pengecualian status.
@@ -552,7 +570,7 @@ ms:
         is_readonly: "Baca-sahaja"
         excluded_from_totals: "Dikecualikan daripada jumlah"
   themes:
-    dark: "Dark"
+    dark: "Gelap"
     light: "Terang"
     light_high_contrast: "Kontras tinggi yang terang"
   types:
@@ -560,18 +578,27 @@ ms:
       no_results_title_text: Tiada jenis buat masa ini.
       no_results_content_text: Cipta jenis baharu
     edit:
-      settings: "Tetapan"
-      form_configuration: "Konfigurasi borang"
+      form_configuration:
+        tab: "Konfigurasi borang"
       more_info_text_html: >
         Edisi Enterprise membenarkan anda untuk menyuaikan borang konfigurasi dengan segala jenis penambahan: <br> <ul class="%{list_styling_class}"> <li><b>Tambah kumpulan atribut baharu</b></li> <li><b>Namakan semula atribut kumpulan</b></li> <li><b>Tambah jadual pakej kerja yang berkaitan</b></li> </ul>
-      projects: "Projek"
-      enabled_projects: "Projek yang diaktifkan"
-      edit_query: "Edit jadual"
-      query_group_placeholder: "Berikan nama kepada jadual berikut"
-      reset: "Set semula ke default"
-      type_color_text: |
-        Warna yang dipilih membezakan jenis-jenis yang berbeza
-        dalam carta Gantt atau jadual pakej kerja. Oleh itu, ianya disarankan untuk menggunakan warna yang kuat.
+      projects:
+        tab: "Projek"
+        enabled_projects: "Projek yang didayakan"
+      settings:
+        tab: "Tetapan"
+        type_color_text: Warna yang dipilih membezakan jenis yang berbeza dalam carta Gantt atau jadual pakej kerja. Oleh itu, disyorkan untuk menggunakan warna yang kuat.
+      subject_configuration:
+        tab: "Konfigurasi subjek"
+        manually_editable_subjects:
+          label: "Subjek boleh diedit secara manual"
+          caption: "Pengguna boleh memasukkan dan mengedit subjek pakej kerja secara manual tanpa sekatan."
+        automatically_generated_subjects:
+          label: "Mata pelajaran yang dijana secara automatik"
+          caption: "Tentukan corak menggunakan atribut dan teks yang dirujuk untuk menjana subjek pakej kerja secara automatik. Pengguna tidak akan dapat mengedit subjek secara manual."
+        pattern:
+          label: "Corak subjek"
+          caption: "Cari atribut atau tambah teks. Untuk mencipta ruang antara elemen, tambahkannya sebagai teks."
   versions:
     overview:
       work_packages_in_archived_projects: "Versi ini dikongsi dengan projek yang diarkibkan yang masih mempunyai pakej kerja ditugaskan ke versi ini. Ini dikira, tetapi tidak akan muncul dalam paparan yang dipautkan."
@@ -594,15 +621,15 @@ ms:
       could_not_be_saved: "Pakej kerja yang berikut tidak dapat disimpan:"
       none_could_be_saved: "Tiada pakej kerja %{total} yang boleh dikemas kini."
       x_out_of_y_could_be_saved: "%{failing} daripada %{total} pakej kerja tidak dapat dikemas kini manakala %{success} boleh."
-      selected_because_descendants: "While %{selected} work packages were selected, in total %{total} work packages are affected which includes descendants."
+      selected_because_descendants: "Walaupun %{selected} pakej kerja dipilih, secara keseluruhan %{total} pakej kerja terjejas yang termasuk keturunan."
       descendant: "keturunan yang dipilih"
     move:
       no_common_statuses_exists: "Tiada status tersedia untuk semua pakej kerja yang terpilih. Status mereka tidak dapat diubah."
       unsupported_for_multiple_projects: "Pindahan/salinan secara pukal tidak disokong untuk pakej kerja dari projek yang berbeza"
       current_type_not_available_in_target_project: >
-        The current type of the work package is not enabled in the target project. Please enable the type in the target project if you'd like it to remain unchanged. Otherwise, select an available type in the target project from the list.
+        Jenis semasa pakej kerja tidak didayakan dalam projek sasaran. Sila dayakan jenis dalam projek sasaran jika anda mahu ia kekal tidak berubah. Jika tidak, pilih jenis yang tersedia dalam projek sasaran daripada senarai.
       bulk_current_type_not_available_in_target_project: >
-        The current types of the work packages aren't enabled in the target project. Please enable the types in the target project if you'd like them to remain unchanged. Otherwise, select an available type in the target project from the list.
+        Jenis semasa pakej kerja tidak didayakan dalam projek sasaran. Sila dayakan jenis dalam projek sasaran jika anda mahu mereka kekal tidak berubah. Jika tidak, pilih jenis yang tersedia dalam projek sasaran daripada senarai.
     sharing:
       missing_workflow_warning:
         title: "Aliran kerja hilang untuk perkongsian pakej kerja"
@@ -626,64 +653,68 @@ ms:
           no_results_title_text: Tiada versi yang tersedia buat masa ini.
   work_package_relations_tab:
     index:
-      action_bar_title: "Add relations to other work packages to create a link between them."
-      no_results_title_text: There are currently no relations available.
-      blankslate_heading: "No relations"
-      blankslate_description: "This work package does not have any relations yet."
-    label_add_x: "Add %{x}"
-    label_edit_x: "Edit %{x}"
-    label_add_description: "Add description"
+      action_bar_title: "Tambahkan perhubungan pada pakej kerja lain untuk membuat pautan antara mereka."
+      no_results_title_text: Pada masa ini tiada hubungan tersedia.
+      blankslate_heading: "Tiada hubungan"
+      blankslate_description: "Pakej kerja ini belum mempunyai apa-apa hubungan lagi."
+    label_add_x: "Tambah %{x}"
+    label_edit_x: "Sunting %{x}"
+    label_add_description: "Tambah penerangan"
+    lag:
+      subject: "Lag"
+      title: "Lag (dalam hari)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
-      label_relates_singular: "related to"
-      label_relates_plural: "related to"
-      label_relates_to_singular: "related to"
-      label_relates_to_plural: "related to"
-      relates_description: "Creates a visible link between the two work packages with no additional effect"
-      relates_to_description: "Creates a visible link between the two work packages with no additional effect"
-      label_precedes_singular: "successor (after)"
-      label_precedes_plural: "successors (after)"
-      precedes_description: "The related work package necessarily needs to start after this one finishes"
-      label_follows_singular: "predecessor (before)"
-      label_follows_plural: "predecessors (before)"
-      follows_description: "The related work package necessarily needs to finish before this one can start"
-      label_child_singular: "child"
-      label_child_plural: "children"
-      child_description: "Makes the related work package a sub-item of the current (parent) work package"
-      label_blocks_singular: "blocks"
-      label_blocks_plural: "blocks"
-      blocks_description: "The related work package cannot be closed until this one is closed first"
-      label_blocked_singular: "blocked by"
-      label_blocked_plural: "blocked by"
-      label_blocked_by_singular: "blocked by"
-      label_blocked__by_plural: "blocked by"
-      blocked_description: "This work package cannot be closed until the related one is closed first"
-      blocked_by_description: "This work package cannot be closed until the related one is closed first"
-      label_duplicates_singular: "duplicates"
-      label_duplicates_plural: "duplicates"
-      duplicates_description: "This is a copy of the related work package"
-      label_duplicated_singular: "duplicated by"
-      label_duplicated_plural: "duplicated by"
-      label_duplicated_by_singular: "duplicated by"
-      label_duplicated_by_plural: "duplicated by"
-      duplicated_by_description: "The related work package is a copy of this"
-      duplicated_description: "The related work package is a copy of this"
-      label_includes_singular: "includes"
-      label_includes_plural: "includes"
-      includes_description: "Marks the related work package as including this one with no additional effect"
-      label_partof_singular: "part of"
-      label_partof_plural: "part of"
-      label_part_of_singular: "part of"
-      label_part_of_plural: "part of"
-      partof_description: "Marks the related work package as being part of this one with no additional effect"
-      part_of_description: "Marks the related work package as being part of this one with no additional effect"
-      label_requires_singular: "requires"
-      label_requires_plural: "requires"
-      requires_description: "Marks the related work package as a requirement to this one"
-      label_required_singular: "required by"
-      label_required_plural: "required by"
-      required_description: "Marks this work package as being a requirement to the related one"
-      label_parent_singular: "parent"
-      label_parent_plural: "parent"
+      label_relates_singular: "berkaitan dengan"
+      label_relates_plural: "berkaitan dengan"
+      label_relates_to_singular: "berkaitan dengan"
+      label_relates_to_plural: "berkaitan dengan"
+      relates_description: "Mencipta pautan yang boleh dilihat antara kedua-dua pakej kerja tanpa kesan tambahan"
+      relates_to_description: "Mencipta pautan yang boleh dilihat antara kedua-dua pakej kerja tanpa kesan tambahan"
+      label_precedes_singular: "pengganti (selepas)"
+      label_precedes_plural: "pengganti (selepas)"
+      precedes_description: "Pakej kerja yang berkaitan semestinya perlu bermula selepas yang ini selesai"
+      label_follows_singular: "pendahulu (sebelum)"
+      label_follows_plural: "pendahulu (sebelum)"
+      follows_description: "Pakej kerja yang berkaitan semestinya perlu diselesaikan sebelum yang ini boleh dimulakan"
+      label_child_singular: "anak"
+      label_child_plural: "kanak-kanak"
+      child_description: "Menjadikan pakej kerja berkaitan sub-item pakej kerja semasa (ibu bapa)."
+      label_blocks_singular: "blok"
+      label_blocks_plural: "blok"
+      blocks_description: "Pakej kerja yang berkaitan tidak boleh ditutup sehingga yang ini ditutup dahulu"
+      label_blocked_singular: "disekat oleh"
+      label_blocked_plural: "disekat oleh"
+      label_blocked_by_singular: "disekat oleh"
+      label_blocked__by_plural: "disekat oleh"
+      blocked_description: "Pakej kerja ini tidak boleh ditutup sehingga yang berkaitan ditutup terlebih dahulu"
+      blocked_by_description: "Pakej kerja ini tidak boleh ditutup sehingga yang berkaitan ditutup terlebih dahulu"
+      label_duplicates_singular: "pendua"
+      label_duplicates_plural: "pendua"
+      duplicates_description: "Ini adalah salinan pakej kerja yang berkaitan"
+      label_duplicated_singular: "digandakan oleh"
+      label_duplicated_plural: "digandakan oleh"
+      label_duplicated_by_singular: "digandakan oleh"
+      label_duplicated_by_plural: "digandakan oleh"
+      duplicated_by_description: "Pakej kerja yang berkaitan adalah salinan ini"
+      duplicated_description: "Pakej kerja yang berkaitan adalah salinan ini"
+      label_includes_singular: "termasuk"
+      label_includes_plural: "termasuk"
+      includes_description: "Menandai pakej kerja yang berkaitan sebagai termasuk yang ini tanpa kesan tambahan"
+      label_partof_singular: "sebahagian daripada"
+      label_partof_plural: "sebahagian daripada"
+      label_part_of_singular: "sebahagian daripada"
+      label_part_of_plural: "sebahagian daripada"
+      partof_description: "Menandai pakej kerja yang berkaitan sebagai sebahagian daripada pakej ini tanpa kesan tambahan"
+      part_of_description: "Menandai pakej kerja yang berkaitan sebagai sebahagian daripada pakej ini tanpa kesan tambahan"
+      label_requires_singular: "memerlukan"
+      label_requires_plural: "memerlukan"
+      requires_description: "Menandai pakej kerja yang berkaitan sebagai keperluan untuk yang ini"
+      label_required_singular: "dikehendaki oleh"
+      label_required_plural: "dikehendaki oleh"
+      required_description: "Tandakan pakej kerja ini sebagai keperluan kepada yang berkaitan"
+      label_parent_singular: "ibu bapa"
+      label_parent_plural: "ibu bapa"
   label_invitation: Jemputan
   account:
     delete: "Padam akaun"
@@ -744,7 +775,7 @@ ms:
         editable: "Boleh diedit"
         field_format: "Format"
         is_filter: "Digunakan sebagai penyaring"
-        is_for_all: "For all projects"
+        is_for_all: "Untuk semua projek"
         is_required: "Diperlukan"
         max_length: "Panjang maksima"
         min_length: "Panjang minimum"
@@ -752,15 +783,15 @@ ms:
         possible_values: "Nilai yang mungkin"
         regexp: "Ungkapan biasa"
         searchable: "Dapat dicari"
-        admin_only: "Admin-only"
+        admin_only: "Admin sahaja"
       custom_value:
         value: "Nilai"
       doorkeeper/application:
         uid: "ID Pelanggan"
         secret: "Rahsia pelanggan"
         owner: "Pemilik"
-        builtin: "Builtin"
-        enabled: "Active"
+        builtin: "terbina"
+        enabled: "Aktif"
         redirect_uri: "Ubah hala URI"
         client_credentials_user_id: "ID Pengguna Kelayakan Pelanggan"
         scopes: "Skop\n"
@@ -824,7 +855,7 @@ ms:
         versions: "Versi"
         work_packages: "Pakej Kerja"
       project_custom_field:
-        is_required: "Required for all projects"
+        is_required: "Diperlukan untuk semua projek"
         custom_field_section: Bahagian
       query:
         column_names: "Kolum"
@@ -837,6 +868,9 @@ ms:
         lag: "Lag"
         from: "Pakej kerja"
         to: "Pakej kerja yang berkaitan"
+      reminder:
+        remind_at_date: "Tarikh"
+        remind_at_time: "Masa"
       repository:
         url: "URL"
       role:
@@ -845,7 +879,7 @@ ms:
         is_closed: "Pakej kerja ditutup"
         is_readonly: "Pakej kerja baca-sahaja"
         excluded_from_totals: "Dikecualikan daripada pengiraan jumlah dalam hierarki"
-        default_done_ratio: "% Complete"
+        default_done_ratio: "% Lengkap"
       time_entry:
         activity: "Aktiviti"
         hours: "Jam"
@@ -878,7 +912,7 @@ ms:
         auto_hide_popups: "Pemberitahuan kejayaan auto-sembunyi"
         warn_on_leaving_unsaved: "Beri amaran kepada saya apabila meninggalkan pakej kerja dengan perubahan yang belum disimpan."
         theme: "Mod"
-        mode_guideline: "Some modes will overwrite custom theme colours for accessibility and legibility. For the full custom theme, please select Light mode."
+        mode_guideline: "Sesetengah mod akan menulis ganti warna tema tersuai untuk kebolehaksesan dan kebolehbacaan. Untuk tema tersuai penuh, sila pilih mod Cahaya."
       version:
         effective_date: "Tarikh selesai"
         sharing: "Perkongsian"
@@ -925,13 +959,14 @@ ms:
       messages:
         accepted: "mesti diterima."
         after: "mesti selepas %{date}."
+        after_today: "mestilah pada masa hadapan."
         after_or_equal_to: "mesti selepas atau sama dengan %{date}."
         before: "mesti sebelum %{date}."
         before_or_equal_to: "mesti sebelum atau sama dengan %{date}."
         blank: "tidak boleh dibiarkan kosong."
         blank_nested: "perlu ada ciri-ciri '%{property}' yang ditetapkan."
         cannot_delete_mapping: "diperlukan. Tidak boleh dipadam."
-        is_for_all_cannot_modify: "is for all projects and can therefore not be modified."
+        is_for_all_cannot_modify: "adalah untuk semua projek dan oleh itu tidak boleh diubah suai."
         cant_link_a_work_package_with_a_descendant: "Pakej kerja tidak boleh dipautkan ke salah satu subtugasnya."
         circular_dependency: "Hubungan ini akan mencipta kebergantungan bulat."
         confirmation: "tidak sepadan dengan %{attribute}."
@@ -962,15 +997,16 @@ ms:
         not_available: "adalah tidak tersedia kerana konfigurasi sistem."
         not_deletable: "tidak dapat dipadamkan."
         not_current_user: "adalah bukan pengguna semasa."
-        not_found: "not found."
+        not_found: "tidak dijumpai."
         not_a_date: "bukan tarikh yang sah."
         not_a_datetime: "bukan tarikh masa yang sah."
         not_a_number: "bukan nombor."
         not_allowed: "adalah tidak sah kerana kekurangan kebenaran."
-        not_json: "is not a valid JSON object."
+        not_json: "bukan objek JSON yang sah."
         not_an_integer: "bukan sebuah integer."
         not_an_iso_date: "bukan tarikh yang sah. Format yang diperlukan: TTTT-BB-HH."
         not_same_project: "tidak tergolong dalam projek yang sama."
+        datetime_must_be_in_future: "mestilah pada masa hadapan."
         odd: "mesti ganjil."
         regex_match_failed: "tidak padan dengan ungkapan biasa %{expression}."
         regex_invalid: "tidak dapat disahkan dengan ungkapan biasa yang berkaitan."
@@ -1010,7 +1046,7 @@ ms:
         custom_fields_project:
           attributes:
             project_ids:
-              blank: "Please select a project."
+              blank: "Sila pilih projek."
         custom_actions:
           only_one_allowed: "(%{name}) hanya satu nilai yang dibenarkan."
           empty: "(%{name}) nilai tidak boleh kosong."
@@ -1042,7 +1078,7 @@ ms:
               blank: "adalah wajib. Sila pilih nama."
               not_unique: "sudah digunakan. Sila pilih nama lain."
         meeting:
-          error_conflict: "Unable to save because the meeting was updated by someone else in the meantime. Please reload the page."
+          error_conflict: "Tidak dapat menyimpan kerana mesyuarat telah dikemas kini oleh orang lain sementara itu. Sila muat semula halaman."
         notifications:
           at_least_one_channel: "Sekurang-kurangnya satu saluran untuk menghantar pemberitahuan perlu ditentukan."
           attributes:
@@ -1083,17 +1119,39 @@ ms:
         project/life_cycle_step_definition:
           attributes:
             type:
-              must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              must_be_a_stage_or_gate: "mestilah sama ada Project::StageDefinition atau Project::GateDefinition"
+              type_and_class_name_mismatch: "mesti sepadan dengan nama kelas yang diintai"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "mestilah Projek::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "mestilah Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
-              must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
-              must_be_a_stage: "must be a Project::Stage"
-              must_be_a_gate: "must be a Project::Gate"
+              must_be_a_stage_or_gate: "mestilah sama ada Project::Stage atau Project::Gate"
+              must_be_a_stage: "mestilah Projek::Pentas"
+              must_be_a_gate: "mestilah Projek::Gate"
+              type_and_class_name_mismatch: "mesti sepadan dengan nama kelas yang diintai"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Tidak boleh menetapkan tarikh tamat kepada Projek::Gate"
+            type:
+              type_and_class_name_mismatch: "mesti Projek::Gate"
+            date:
+              non_continuous_dates: "tidak boleh lebih awal daripada tarikh tamat %{step} sebelumnya."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "tarikh mula mestilah sebelum tarikh tamat."
+              non_continuous_dates: "tidak boleh lebih awal daripada tarikh tamat %{step} sebelumnya."
+              incomplete: "tidak lengkap."
+            type:
+              type_and_class_name_mismatch: "mestilah Projek::Pentas"
         query:
           attributes:
             project:
@@ -1159,7 +1217,7 @@ ms:
         status:
           attributes:
             default_done_ratio:
-              inclusion: "must be between 0 and 100."
+              inclusion: "mestilah antara 0 dan 100."
           readonly_default_exlusive: "tidak dapat diaktifkan untuk status-status yang ditandakan sebagai default."
         time_entry:
           attributes:
@@ -1192,11 +1250,11 @@ ms:
             assigned_to:
               format: "%{message}"
             done_ratio:
-              does_not_match_work_and_remaining_work: "does not match Work and Remaining work"
-              cannot_be_set_when_work_is_zero: "cannot be set when Work is 0h"
-              must_be_set_when_remaining_work_is_set: "required when Remaining work is set."
-              must_be_set_when_work_and_remaining_work_are_set: "required when Work and Remaining work are set."
-              inclusion: "must be between 0 and 100."
+              does_not_match_work_and_remaining_work: "tidak sepadan dengan Kerja dan Baki kerja"
+              cannot_be_set_when_work_is_zero: "tidak boleh ditetapkan apabila Kerja ialah 0j"
+              must_be_set_when_remaining_work_is_set: "diperlukan apabila Baki kerja ditetapkan."
+              must_be_set_when_work_and_remaining_work_are_set: "diperlukan apabila Kerja dan Baki kerja ditetapkan."
+              inclusion: "mestilah antara 0 dan 100."
             due_date:
               not_start_date: "bukan pada tarikh mula, walaupun ini diperlukan untuk pencapaian."
               cannot_be_null: "tidak boleh ditetapkan kepada kosong kerana tarikh mula dan tempoh masa telah diketahui."
@@ -1225,17 +1283,17 @@ ms:
               does_not_exist: "Kategori yang ditentukan tidak wujud."
             estimated_hours:
               not_a_number: "bukan jangka masa yang sah."
-              cant_be_inferior_to_remaining_work: "cannot be lower than Remaining work."
-              must_be_set_when_remaining_work_and_percent_complete_are_set: "required when Remaining work and % Complete are set."
+              cant_be_inferior_to_remaining_work: "tidak boleh lebih rendah daripada Baki kerja."
+              must_be_set_when_remaining_work_and_percent_complete_are_set: "diperlukan apabila Baki kerja dan % Selesai ditetapkan."
             remaining_hours:
               not_a_number: "bukan jangka masa yang sah."
-              cant_exceed_work: "cannot be higher than Work."
-              must_be_set_when_work_is_set: "required when Work is set."
-              must_be_set_when_work_and_percent_complete_are_set: "required when Work and % Complete are set."
+              cant_exceed_work: "tidak boleh lebih tinggi daripada Kerja."
+              must_be_set_when_work_is_set: "diperlukan apabila Kerja ditetapkan."
+              must_be_set_when_work_and_percent_complete_are_set: "diperlukan apabila Kerja dan % Selesai ditetapkan."
               must_be_set_to_zero_hours_when_work_is_set_and_percent_complete_is_100p: >-
-                must be 0h when Work is set and % Complete is 100%.
+                mestilah 0j apabila Kerja ditetapkan dan % Selesai ialah 100%.
               must_be_empty_when_work_is_empty_and_percent_complete_is_100p: >-
-                must be empty when Work is empty and % Complete is 100%.
+                mesti kosong apabila Kerja kosong dan % Selesai ialah 100%.
           readonly_status: "Pakej kerja berada dalam status baca sahaja maka atributnya tidak boleh diubah."
         type:
           attributes:
@@ -1254,7 +1312,7 @@ ms:
               confirmation: "Pengesahan kata laluan tidak sepadan dengan kata laluan."
               format: "%{message}"
             password:
-              weak: "Must contain characters of the following classes (at least %{min_count} of %{all_count}): %{rules}"
+              weak: "Mesti mengandungi aksara kelas berikut (sekurang-kurangnya %{min_count} daripada %{all_count}): %{rules}"
               lowercase: "huruf kecil (cth. 'a')"
               uppercase: "huruf besar (cth. 'A')"
               numeric: "angka (cth. '1')"
@@ -1307,6 +1365,8 @@ ms:
         other: "Pemberitahuan"
       placeholder_user: "Pengguna placeholder"
       project: "Projek"
+      project/gate_definition: "Gerbang"
+      project/stage_definition: "Peringkat"
       project_query:
         other: "Senarai projek"
       query: "Pertanyaan tersuai"
@@ -1314,7 +1374,7 @@ ms:
         other: "Peranan\n"
       status: "Status pakej kerja"
       token/api:
-        other: Access tokens
+        other: Token akses
       type: "Jenis"
       user: "Pengguna"
       version: "Versi"
@@ -1403,6 +1463,7 @@ ms:
     login: "Nama pengguna"
     mail: "E-mel"
     name: "Nama"
+    note: "Nota"
     password: "Kata Laluan"
     priority: "Keutamaan"
     project: "Projek"
@@ -1454,8 +1515,8 @@ ms:
   button_add: "Tambah"
   button_add_comment: "Tambah komen"
   button_add_item_above: "Add item above"
-  button_add_item_below: "Add item below"
-  button_add_sub_item: "Add sub-item"
+  button_add_item_below: "Tambah item di bawah"
+  button_add_sub_item: "Tambah sub-item"
   button_add_member: Tambah ahli
   button_add_watcher: "Tambah pemerhati"
   button_annotate: "Anotasi"
@@ -1489,7 +1550,7 @@ ms:
   button_expand_all: "Kembangkan semua"
   button_favorite: "Tambah ke kegemaran"
   button_filter: "Saring"
-  button_finish_setup: "Finish setup"
+  button_finish_setup: "Selesaikan persediaan"
   button_generate: "Menjana"
   button_list: "Senarai"
   button_lock: "Kunci"
@@ -1499,6 +1560,7 @@ ms:
   button_print: "Cetak"
   button_quote: "Petikan"
   button_remove: Keluarkan
+  button_remove_reminder: "Buang peringatan"
   button_rename: "Namakan semula"
   button_replace: "Ganti"
   button_revoke: "Batalkan"
@@ -1509,6 +1571,7 @@ ms:
   button_save_as: "Simpan sebagai"
   button_apply_changes: "Guna pakai perubahan"
   button_save_back: "Simpan dan kembali"
+  button_set_reminder: "Tetapkan peringatan"
   button_show: "Paparkan"
   button_sort: "Susun"
   button_submit: "Hantar"
@@ -1542,8 +1605,8 @@ ms:
     failure_message: Persetujuan gagal, tidak boleh teruskan.
     title: Persetujuan Pengguna
     decline_warning_message: Anda telah menolak untuk memberi persetujuan dan telah dilog keluar.
-    user_has_consented: The user gave their consent to your [configured consent information text](consent_settings).
-    not_yet_consented: The user has not yet given their consent to your [configured consent information text](consent_settings). They will be reminded the next time they log in.
+    user_has_consented: Pengguna memberikan persetujuan mereka kepada [teks maklumat persetujuan terkonfigurasi](consent_settings) anda.
+    not_yet_consented: Pengguna belum lagi memberikan persetujuan mereka kepada [teks maklumat persetujuan yang dikonfigurasikan](consent_settings) anda. Mereka akan diingatkan apabila mereka log masuk seterusnya.
     contact_mail_instructions: Tentukan alamat e-mel yang boleh dihubungi oleh pengguna untuk membuat permintaan perubahan atau pemindahan data kepada pengawal data.
     contact_your_administrator: Sila hubungi pentadbir anda jika anda mahu akaun anda dipadamkan.
     contact_this_mail_address: Sila hubungi %{mail_address} jika anda mahu akaun anda dipadamkan.
@@ -1696,12 +1759,12 @@ ms:
   direction: ltr
   ee:
     upsale:
+      title: "Alat tambah perusahaan"
+      link_title: "Maklumat lanjut"
       form_configuration:
         description: "Menyuaikan borang konfigurasi dengan segala jenis tambahan ini:"
         add_groups: "Tambah kumpulan atribut baharu"
         rename_groups: "Nama semula kumpulan atribut"
-      project_filters:
-        description_html: "Menyaring dan menyusun ruang tersuai adalah tambahan edisi Enterprise."
   enumeration_activities: "Aktiviti penjejakan masa"
   enumeration_work_package_priorities: "Keutamaan pakej kerja"
   enumeration_reported_project_statuses: "Status projek yang dilaporkan"
@@ -1734,8 +1797,9 @@ ms:
   error_pdf_export_too_many_columns: "Terlalu banyak kolum dipilih untuk eksport PDF. Sila kurangkan bilangan kolum."
   error_pdf_failed_to_export: "Eksport PDF tidak dapat disimpan: %{error}"
   error_token_authenticity: "Tidak dapat mengesahkan token Cross-Site Request Forgery. Adakah anda sedang mencuba untuk menghantar data di pelbagai pelayar atau tab? Sila tutup semua tab dan cuba lagi."
+  error_reminder_not_found: "Peringatan itu tidak ditemui atau telah dimaklumkan tentangnya."
   error_work_package_not_found_in_project: "Pakej kerja tidak ditemui atau tidak tergolong dalam projek ini"
-  error_work_package_id_not_found: "The work package was not found."
+  error_work_package_id_not_found: "Pakej kerja tidak ditemui."
   error_must_be_project_member: "perlu menjadi ahli projek"
   error_migrations_are_pending: "Pemasangan OpenProject anda mempunyai migrasi pangkalan data yang belum selesai. Anda mungkin telah terlepas menjalankan migrasi semasa naik taraf terakhir anda. Sila semak panduan menaik taraf untuk menaikkan taraf pemasangan anda dengan betul."
   error_migrations_visit_upgrade_guides: "Sila kunjungi dokumentasi panduan naik taraf kami"
@@ -1758,7 +1822,7 @@ ms:
   error_menu_item_not_saved: Item menu tidak dapat disimpan
   error_wiki_root_menu_item_conflict: >
     Tidak dapat menamakan semula "%{old_name}" ke "%{new_name}" disebabkan konflik dalam item menu yang dihasilkan dengan item menu yang sedia ada "%{existing_caption}" (%{existing_identifier}).
-  error_external_authentication_failed_message: "An error occurred during external authentication: %{message}"
+  error_external_authentication_failed_message: "Ralat berlaku semasa pengesahan luaran: %{message}"
   error_attribute_not_highlightable: "Atribut tidak boleh disorotkan: %{attributes}"
   events:
     changeset: "Set perubahan telah diedit"
@@ -1778,10 +1842,10 @@ ms:
       subproject: "Subprojek: %{name}"
   export:
     dialog:
-      title: "Export"
-      submit: "Export"
+      title: "Eksport"
+      submit: "Eksport"
       format:
-        label: "File format"
+        label: "Format fail"
         options:
           csv:
             label: "CSV"
@@ -1790,58 +1854,58 @@ ms:
           xls:
             label: "XLS"
       columns:
-        input_label_report: "Add columns to attribute table"
-        input_caption_report: "By default all attributes added as columns in the work package list are selected. Long text fields are not available in the attribute table, but can be displayed below it."
-        input_caption_table: "By default all attributes added as columns in the work package list are selected. Long text fields are not available in table based exports."
+        input_label_report: "Tambahkan lajur pada jadual atribut"
+        input_caption_report: "Secara lalai semua atribut yang ditambahkan sebagai lajur dalam senarai pakej kerja dipilih. Medan teks panjang tidak tersedia dalam jadual atribut, tetapi boleh dipaparkan di bawahnya."
+        input_caption_table: "Secara lalai semua atribut yang ditambahkan sebagai lajur dalam senarai pakej kerja dipilih. Medan teks panjang tidak tersedia dalam eksport berasaskan jadual."
       pdf:
         export_type:
-          label: "PDF export type"
+          label: "Jenis eksport PDF"
           options:
             table:
-              label: "Table"
-              caption: "Export the work packages list in a table with the desired columns."
+              label: "Jadual"
+              caption: "Eksport senarai pakej kerja dalam jadual dengan lajur yang dikehendaki."
             report:
-              label: "Report"
-              caption: "Export the work package on a detailed report of all work packages in the list."
+              label: "Laporan"
+              caption: "Eksport pakej kerja pada laporan terperinci semua pakej kerja dalam senarai."
             gantt:
-              label: "Gantt chart"
-              caption: "Export the work packages list in a Gantt diagram view."
+              label: "Carta Gantt"
+              caption: "Eksport senarai pakej kerja dalam paparan gambar rajah Gantt."
         include_images:
-          label: "Include images"
-          caption: "Exclude images to reduce the size of the PDF export."
+          label: "Sertakan imej"
+          caption: "Kecualikan imej untuk mengurangkan saiz eksport PDF."
         gantt_zoom_levels:
-          label: "Zoom levels"
-          caption: "Select what is the zoom level for dates displayed in the chart."
+          label: "Tahap zum"
+          caption: "Pilih tahap zum untuk tarikh yang dipaparkan dalam carta."
           options:
-            days: "Days"
-            weeks: "Weeks"
-            months: "Months"
-            quarters: "Quarters"
+            days: "Hari"
+            weeks: "Minggu"
+            months: "Bulan"
+            quarters: "Suku Tahun"
         column_width:
-          label: "Table column width"
+          label: "Lebar lajur jadual"
           options:
-            narrow: "Narrow"
-            medium: "Medium"
-            wide: "Wide"
-            very_wide: "Very wide"
+            narrow: "Sempit"
+            medium: "Sedang"
+            wide: "Lebar"
+            very_wide: "Sangat lebar"
         paper_size:
-          label: "Paper size"
-          caption: "Depending on the chart size more than one page might be exported."
+          label: "Saiz kertas"
+          caption: "Bergantung pada saiz carta, lebih daripada satu halaman mungkin dieksport."
         long_text_fields:
-          input_caption: "By default all long text fields are selected."
-          input_label: "Add long text fields"
-          input_placeholder: "Search for long text fields"
-          drag_area_label: "Manage long text fields"
+          input_caption: "Secara lalai semua medan teks panjang dipilih."
+          input_label: "Tambah medan teks yang panjang"
+          input_placeholder: "Cari medan teks yang panjang"
+          drag_area_label: "Urus medan teks yang panjang"
       xls:
         include_relations:
-          label: "Include relations"
-          caption: "This option will create a duplicate of each work package for every relation this has with another work package."
+          label: "Sertakan perhubungan"
+          caption: "Pilihan ini akan membuat pendua bagi setiap pakej kerja untuk setiap hubungan ini dengan pakej kerja yang lain."
         include_descriptions:
-          label: "Include descriptions"
-          caption: "This option will add a description column in raw format."
-    your_work_packages_export: "Work packages are being exported"
-    succeeded: "Export completed"
-    failed: "An error has occurred while trying to export the work packages: %{message}"
+          label: "Sertakan penerangan"
+          caption: "Pilihan ini akan menambah lajur penerangan dalam format mentah."
+    your_work_packages_export: "Pakej kerja sedang dieksport"
+    succeeded: "Eksport selesai"
+    failed: "Ralat telah berlaku semasa cuba mengeksport pakej kerja: %{message}"
     format:
       atom: "Atom"
       csv: "CSV"
@@ -1862,22 +1926,22 @@ ms:
       hours: j
       days: h
   pdf_generator:
-    page_nr_footer: "Page %{page} of %{total}"
+    page_nr_footer: "Halaman %{page} daripada %{total}"
     dialog:
-      title: Generate PDF
-      submit: Generate
+      title: Hasilkan PDF
+      submit: Hasilkan
       header_right:
-        label: Header right
-        caption: Text to be displayed in the right of the header
+        label: Tajuk kanan
+        caption: Teks untuk dipaparkan di sebelah kanan tajuk
       footer_center:
-        label: Footer center
-        caption: Text to be displayed in the center of the footer
+        label: Pusat pengaki
+        caption: Teks untuk dipaparkan di tengah pengaki
       hyphenation:
-        label: Hyphenation
-        caption: Break words between lines to improve text justification and readability.
+        label: Sempang
+        caption: Pecah perkataan antara baris untuk meningkatkan justifikasi teks dan kebolehbacaan.
       paper_size:
-        label: Paper size
-        caption: The size of the paper to use for the PDF.
+        label: Saiz kertas
+        caption: Saiz kertas untuk digunakan untuk PDF.
   extraction:
     available:
       pdftotext: "PdfkeTeks tersedia (pilihan)"
@@ -1930,15 +1994,15 @@ ms:
       progress_mode_changed_to_status_based: "Pengiraan perkembangan dikemas kini"
       status_changed: "Status '%{status_name}'"
       system_update: "Kemas kini sistem OpenProject:"
-      work_package_duplicate_closed: "Duplicate work package updated:"
-      total_percent_complete_mode_changed_to_work_weighted_average: "Calculation of % Complete totals now weighted by Work."
-      total_percent_complete_mode_changed_to_simple_average: "Calculation of % Complete totals now based on a simple average of only % Complete values."
+      work_package_duplicate_closed: "Pakej kerja pendua dikemas kini:"
+      total_percent_complete_mode_changed_to_work_weighted_average: "Pengiraan % Jumlah lengkap kini ditimbang mengikut Kerja."
+      total_percent_complete_mode_changed_to_simple_average: "Pengiraan % Jumlah lengkap sekarang berdasarkan purata mudah hanya % nilai Lengkap."
     cause_descriptions:
       work_package_predecessor_changed_times: dengan perubahan pada pendahulu %{link}
       work_package_parent_changed_times: dengan perubahan pada induk %{link}
       work_package_children_changed_times: dengan perubahan pada anak %{link}
       work_package_related_changed_times: dengan perubahan pada %{link} yang berkaitan
-      work_package_duplicate_closed: The status was automatically updated by the duplicated work package %{link}
+      work_package_duplicate_closed: Status telah dikemas kini secara automatik oleh pakej kerja pendua %{link}
       unaccessable_work_package_changed: dengan perubahan pada pakej kerja yang berkaitan
       working_days_changed:
         changed: "dengan perubahan pada hari bekerja (%{changes})"
@@ -1951,7 +2015,7 @@ ms:
       progress_mode_changed_to_status_based: Mod pengiraan perkembangan ditetapkan kepada berasaskan status
       status_excluded_from_totals_set_to_false_message: kini termasuk dalam jumlah hierarki
       status_excluded_from_totals_set_to_true_message: kini dikeluarkan daripada jumlah hierarki
-      status_percent_complete_changed: "% Complete changed from %{old_value}% to %{new_value}%"
+      status_percent_complete_changed: "% Selesai ditukar daripada %{old_value}% kepada %{new_value}%"
       system_update:
         file_links_journal: >
           Mulai sekarang, aktiviti berkaitan dengan pautan fail (fail-fail yang disimpan di storan luaran) akan muncul dalam tab Aktiviti. Yang berikut mewakili aktiviti berkenaan pautan yang sudah sedia ada:
@@ -1962,9 +2026,9 @@ ms:
         totals_removed_from_childless_work_packages: >-
           Jumlah kerja dan perkembangan dipadam untuk pakej kerja bukan induk secara automatik dengan <a href="%{href}" target="_blank">versi kemas kini</a>. Ini ialah tugasan penyelenggaraan dan boleh diabaikan dengan selamat.
       total_percent_complete_mode_changed_to_work_weighted_average: >-
-        Child work packages without Work are ignored.
+        Pakej kerja kanak-kanak tanpa Kerja diabaikan.
       total_percent_complete_mode_changed_to_simple_average: >-
-        Work values of child work packages are ignored.
+        Nilai kerja pakej kerja kanak-kanak diabaikan.
   links:
     configuration_guide: "Panduan konfigurasi"
     get_in_touch: "Anda mempunyai soalan? Sila hubungi kami."
@@ -2027,6 +2091,7 @@ ms:
       responsible: "Bertanggungjawab"
       shared: "Telah dikongsi"
       watched: "Pemerhati"
+      reminder: "Peringatan"
     facets:
       unread: "Belum dibaca"
       unread_title: "Paparkan yang belum dibaca"
@@ -2064,8 +2129,8 @@ ms:
   label_additional_workflow_transitions_for_assignee: "Peralihan tambahan dibenarkan jika pengguna ialah penerima tugasan"
   label_additional_workflow_transitions_for_author: "Peralihan tambahan dibenarkan apabila pengguna ialah pengarang"
   label_administration: "Pentadbiran"
-  label_interface_colors: "Interface colors"
-  label_interface_colors_description: "These colors control how the application looks. If you modify them the theme will automatically be changed to Custom theme, but we can’t assure the compliance of the accessibility contrast minimums (WCAG 2.1). "
+  label_interface_colors: "Warna antara muka"
+  label_interface_colors_description: "Warna ini mengawal penampilan aplikasi. Jika anda mengubah suainya, tema akan ditukar secara automatik kepada tema Tersuai, tetapi kami tidak dapat memastikan pematuhan kontras kebolehaksesan minimum (WCAG 2.1)."
   label_age: "Umur"
   label_ago: "hari yang lalu"
   label_all: "semua"
@@ -2084,7 +2149,7 @@ ms:
   label_ical_access_key_generation_hint: "Dijanakan secara automatik apabila melanggan kalendar."
   label_ical_access_key_latest: "terkini"
   label_ical_access_key_revoke: "Tarik balik"
-  label_add_column: "Add column"
+  label_add_column: "Tambah lajur"
   label_applied_status: "Status yang dilaksanakan"
   label_archive_project: "Arkib projek"
   label_ascending: "Menaik"
@@ -2098,8 +2163,8 @@ ms:
   label_ldap_auth_source_plural: "Sambungan LDAP"
   label_attribute_expand_text: "Teks yang lengkap untuk '%{attribute}'"
   label_authentication: "Pengesahan"
-  label_authentication_settings: "Authentication settings"
-  label_available_custom_fields_projects: "Available custom fields projects"
+  label_authentication_settings: "Tetapan pengesahan"
+  label_available_custom_fields_projects: "Projek medan tersuai tersedia"
   label_available_global_roles: "Peranan global yang tersedia"
   label_available_project_attributes: "Atribut projek yang tersedia"
   label_available_project_forums: "Forum yang tersedia"
@@ -2111,7 +2176,7 @@ ms:
   label_api_doc: "Dokumentasi API"
   label_backup: "Sandaran"
   label_backup_code: "Kod sandaran"
-  label_basic_details: "Basic details"
+  label_basic_details: "Butiran asas"
   label_between: "antara"
   label_blocked_by: "disekat oleh"
   label_blocks: "blok"
@@ -2130,7 +2195,7 @@ ms:
   label_calendars_and_dates: "Kalendar dan tarikh"
   label_calendar_show: "Paparkan Kalendar"
   label_category: "Kategori"
-  label_completed: Completed
+  label_completed: Selesai
   label_consent_settings: "Persetujuan Pengguna"
   label_wiki_menu_item: Item menu wiki
   label_select_main_menu_item: Pilih item menu utama baharu
@@ -2173,7 +2238,7 @@ ms:
   label_copy_project: "Salin projek"
   label_core_version: "Versi teras"
   label_core_build: "Binaan teras"
-  label_created_by: "Created by %{user}"
+  label_created_by: "Dicipta oleh %{user}"
   label_current_status: "Status semasa"
   label_current_version: "Versi semasa"
   label_custom_field_add_no_type: "Tambah ruangan ini ke jenis pakej kerja"
@@ -2181,7 +2246,7 @@ ms:
   label_custom_field_plural: "Ruang tersuai"
   label_custom_field_default_type: "Jenis kosong"
   label_custom_style: "Reka bentuk"
-  label_custom_style_description: "Choose how OpenProject looks to you with themes, select your default colors to use in the app and how exports look like."
+  label_custom_style_description: "Pilih cara OpenProject melihat kepada anda dengan tema, pilih warna lalai anda untuk digunakan dalam apl dan rupa eksport."
   label_dashboard: "Papan Pemuka"
   label_database_version: "Versi PostgreSQL"
   label_date: "Tarikh"
@@ -2194,8 +2259,10 @@ ms:
   label_default: "Default"
   label_delete_user: "Padam pengguna"
   label_delete_project: "Padam projek"
+  label_delete: "Padam"
   label_deleted: "dipadam"
   label_deleted_custom_field: "(ruang tersuai yang telah dipadam)"
+  label_deleted_custom_item: "(item dipadamkan)"
   label_deleted_custom_option: "(pilihan yang telah dipadam)"
   label_empty_element: "(kosong)"
   label_missing_or_hidden_custom_option: "(nilai yang hilang atau kurang kebenaran untuk mengakses)"
@@ -2232,11 +2299,10 @@ ms:
   label_enterprise_active_users: "%{current}/%{limit} pengguna aktif yang ditempah"
   label_enterprise_edition: "Edisi Enterprise"
   label_enterprise_support: "sokongan Enterprise"
-  label_enterprise_addon: "Tambahan Enterprise"
   label_environment: "Persekitaran"
   label_estimates_and_progress: "Anggaran dan perkembangan"
   label_equals: "ialah"
-  label_equals_with_descendants: "is any with descendants"
+  label_equals_with_descendants: "adalah mana-mana dengan keturunan"
   label_everywhere: "di mana-mana sahaja"
   label_example: "Contoh"
   label_experimental: "Eksperimental"
@@ -2257,7 +2323,7 @@ ms:
   label_file_plural: "Fail-fail"
   label_filter: "Penyaring"
   label_filter_add: "Tambah penyaring"
-  label_filter_by: "Filter by"
+  label_filter_by: "Tapis mengikut"
   label_filter_plural: "Penyaring"
   label_filters_toggle: "Paparkan/sembunyikan penyaring\n"
   label_float: "Terapung"
@@ -2280,7 +2346,7 @@ ms:
   label_here: di sini
   label_hide: "Sembunyi"
   label_history: "Sejarah"
-  label_hierarchy: "Hierarchy"
+  label_hierarchy: "Hierarki"
   label_hierarchy_leaf: "Daun hierarki"
   label_home: "Utama"
   label_subject_or_id: "Subjek atau ID"
@@ -2292,7 +2358,7 @@ ms:
   label_inactive: "Tidak aktif"
   label_incoming_emails: "E-mel masuk"
   label_includes: "termasuk"
-  label_incomplete: Incomplete
+  label_incomplete: Tidak Lengkap
   label_include_sub_projects: Sertakan sub-projek
   label_index_by_date: "Indeks mengikut tarikh"
   label_index_by_title: "Indeks mengikut tajuk"
@@ -2304,13 +2370,13 @@ ms:
   label_introduction_video: "Video pengenalan"
   label_invite_user: "Jemput pengguna"
   label_item: "Item"
-  label_item_plural: "Items"
+  label_item_plural: "Item"
   label_share: "Kongsi"
-  label_share_project_list: "Share project list"
+  label_share_project_list: "Kongsi senarai projek"
   label_share_work_package: "Kongsi pakej kerja"
   label_show_all_registered_users: "Paparkan semua pengguna berdaftar"
-  label_show_less: "Show less"
-  label_show_more: "Show more"
+  label_show_less: "Tunjukkan lebih sedikit"
+  label_show_more: "Tunjukkan lagi"
   label_journal: "Jurnal"
   label_journal_diff: "Perbandingan Deskripsi"
   label_language: "Bahasa"
@@ -2346,7 +2412,7 @@ ms:
   label_custom_favicon: "Favicon tersuai"
   label_custom_touch_icon: "Ikon sentuh tersuai"
   label_logout: "Daftar keluar"
-  label_mapping_for: "Mapping for: %{attribute}"
+  label_mapping_for: "Pemetaan untuk: %{attribute}"
   label_main_menu: "Menu Sampingan"
   label_manage: "Uruskan"
   label_manage_groups: "Urus kumpulan"
@@ -2381,10 +2447,10 @@ ms:
   label_months_from: "bulan dari"
   label_more: "Lagi"
   label_more_than_ago: "lebih dari beberapa hari yang lalu"
-  label_move_column_left: "Move column left"
-  label_move_column_right: "Move column right"
+  label_move_column_left: "Alihkan lajur ke kiri"
+  label_move_column_right: "Alihkan lajur ke kanan"
   label_move_work_package: "Alih pakej kerja"
-  label_my_account: "Account settings"
+  label_my_account: "Tetapan akaun"
   label_my_activity: "Aktiviti saya"
   label_my_account_data: "Data akaun saya"
   label_my_avatar: "Avatar saya"
@@ -2406,17 +2472,18 @@ ms:
   label_next_week: "Minggu hadapan"
   label_no_change_option: "(Tiada perubahan)"
   label_no_data: "Tiada data untuk dipaparkan"
-  label_no_due_date: "no finish date"
-  label_no_start_date: "no start date"
+  label_no_due_date: "tiada tarikh tamat"
+  label_no_start_date: "tiada tarikh mula"
   label_no_parent_page: "Tiada halaman induk"
   label_nothing_display: "Tiada apa untuk dipaparkan"
   label_nobody: "tiada siapa"
-  label_not_configured: "Not configured"
+  label_not_configured: "Tidak dikonfigurasikan"
   label_not_found: "tidak ditemui"
   label_none: "tiada"
   label_none_parentheses: "(tiada)"
   label_not_contains: "tidak mengandungi"
   label_not_equals: "adalah tidak"
+  label_life_cycle_step_plural: "Kitaran hayat projek"
   label_on: "pada"
   label_operator_all: "bukan kosong"
   label_operator_none: "adalah kosong"
@@ -2464,7 +2531,7 @@ ms:
   label_product_version: "Versi produk"
   label_profile: "Profil"
   label_percent_complete: "% Selesai"
-  label_progress_tracking: "Progress tracking"
+  label_progress_tracking: "Penjejakan kemajuan"
   label_project: "Projek"
   label_project_activity: "Aktiviti projek"
   label_project_attribute_plural: "Atribut projek"
@@ -2474,7 +2541,7 @@ ms:
   label_project_latest: "Projek terkini"
   label_project_default_type: "Benarkan jenis kosong"
   label_project_hierarchy: "Hierarki projek"
-  label_project_mappings: "Projects"
+  label_project_mappings: "Projek"
   label_project_new: "Projek baharu"
   label_project_plural: "Projek"
   label_project_list_plural: "Senarai projek"
@@ -2501,13 +2568,13 @@ ms:
   label_related_work_packages: "Pakej kerja yang berkaitan"
   label_relates: "berkait dengan"
   label_relates_to: "berkait dengan"
-  label_relation: "Relation"
-  label_relation_actions: "Relation actions"
+  label_relation: "Tindakan"
+  label_relation_actions: "Tindakan perhubungan"
   label_relation_delete: "Hubungan terpadam"
   label_relation_new: "Hubungan baharu"
   label_release_notes: "Nota keluaran"
   label_remaining_work: "Kerja berbaki"
-  label_remove_column: "Remove column"
+  label_remove_column: "Buang lajur"
   label_remove_columns: "Keluarkan kolum yang dipilih"
   label_renamed: "namakan semula"
   label_reply_plural: "Balasan"
@@ -2518,6 +2585,7 @@ ms:
   label_reporting: "Laporan"
   label_reporting_plural: "Laporan"
   label_repository: "Repositori"
+  label_repository_remove: "Buang repositori"
   label_repository_root: "Akar repositori"
   label_repository_plural: "Repositori"
   label_required: "diperlukan"
@@ -2536,10 +2604,10 @@ ms:
   label_role_plural: "Peranan\n"
   label_role_search: "Tetapkan peranan ke ahli baharu"
   label_scm: "SCM"
-  label_scroll_left: "Scroll left"
-  label_scroll_right: "Scroll right"
+  label_scroll_left: "Skrol kiri"
+  label_scroll_right: "Skrol kanan"
   label_search: "Cari"
-  label_search_by_name: "Search by name"
+  label_search_by_name: "Cari mengikut nama"
   label_send_information: "Hantar kelayakan baharu ke pengguna tersebut"
   label_send_test_email: "Hantar e-mel ujian"
   label_session: "Sesi"
@@ -2548,10 +2616,10 @@ ms:
   label_show_completed_versions: "Paparkan versi lengkap"
   label_columns: "Kolum"
   label_sort: "Susun"
-  label_sort_ascending: "Sort ascending"
+  label_sort_ascending: "Susun menaik"
   label_sort_by: "Susun mengikut %{value}"
   label_sorted_by: "disusun mengikut %{value}"
-  label_sort_descending: "Sort descending"
+  label_sort_descending: "Susun menurun"
   label_sort_higher: "Alihkan ke atas"
   label_sort_highest: "Alih ke paling atas"
   label_sort_lower: "Alih ke bawah"
@@ -2580,6 +2648,7 @@ ms:
   label_this_month: "bulan ini"
   label_this_week: "minggu ini"
   label_this_year: "tahun ini"
+  label_time: "Masa"
   label_time_entry_plural: "Masa yang dihabiskan"
   label_time_entry_activity_plural: "Aktiviti masa yang diluangkan"
   label_title: "Tajuk"
@@ -2615,6 +2684,7 @@ ms:
   label_user_settings: "Tetapan pengguna"
   label_users_settings: "Tetapan pengguna"
   label_version_new: "Versi baharu"
+  label_version_edit: "sunting versi"
   label_version_plural: "Versi-versi"
   label_version_sharing_descendants: "Dengan subprojek"
   label_version_sharing_hierarchy: "Dengan hierarki projek"
@@ -2661,7 +2731,7 @@ ms:
   label_work_package_tracking: "Penjejakan pakej kerja"
   label_work_package_view_all: "Lihat semua pakej kerja"
   label_workflow: "Aliran kerja"
-  label_workflow_copy: "Copy workflow"
+  label_workflow_copy: "Salin aliran kerja"
   label_workflow_plural: "Aliran kerja"
   label_workflow_summary: "Ringkasan"
   label_working_days_and_hours: "Hari dan jam bekerja"
@@ -2751,8 +2821,13 @@ ms:
         prefix: "Diterima kerana tetapan pemberitahuan: %{reason}"
         date_alert_start_date: "Peringatan tarikh"
         date_alert_due_date: "Peringatan tarikh"
+        reminder: "Peringatan"
       see_all: "Lihat semua"
       updated_at: "Dikemas kini pada %{timestamp} oleh %{user}"
+    reminder_notifications:
+      subject: "Peringatan: %{note}"
+      heading: "Anda mempunyai peringatan baharu"
+      note: "Nota: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "Anda boleh %{allowed_actions} pakej kerja ini. Ini akan berubah bergantung kepada peranan projek dan kebenaran anda."
@@ -2900,9 +2975,9 @@ ms:
   notice_locking_conflict: "Sementara itu, maklumat telah dikemas kini oleh sekurang-kurangnya salah satu pengguna lain."
   notice_locking_conflict_additional_information: "Kemas kini tersebut ialah daripada %{users}."
   notice_locking_conflict_reload_page: "Sila muat semula halaman, semak semula perubahan dan terapkan semula kemas kini anda."
-  notice_locking_conflict_warning: "This page has been updated by someone else. To not lose your edits, copy them locally and reload to view the updated version."
-  notice_locking_conflict_danger: "Could not save your changes because of conflicting modifications. To not lose your edits, copy them locally and reload to view the updated version."
-  notice_locking_conflict_action_button: "Discard changes and reload"
+  notice_locking_conflict_warning: "Halaman ini telah dikemas kini oleh orang lain. Untuk tidak kehilangan pengeditan anda, salinnya secara setempat dan muat semula untuk melihat versi yang dikemas kini."
+  notice_locking_conflict_danger: "Tidak dapat menyimpan perubahan anda kerana pengubahsuaian yang bercanggah. Untuk tidak kehilangan pengeditan anda, salinnya secara setempat dan muat semula untuk melihat versi yang dikemas kini."
+  notice_locking_conflict_action_button: "Buang perubahan dan muat semula"
   notice_member_added: Tambah %{name} ke projek.
   notice_members_added: Tambah %{number} pengguna ke projek.
   notice_member_removed: "Keluarkan %{user} dari projek."
@@ -2915,10 +2990,11 @@ ms:
   notice_principals_found_multiple: "Terdapat %{number} hasil ditemui. \n Tab untuk memfokuskan hasil pertama."
   notice_principals_found_single: "Terdapat satu hasil. \n Tab untuk fokuskan."
   notice_project_not_deleted: "Projek tersebut tidak dipadam."
-  notice_project_not_found: "Project not found."
+  notice_project_not_found: "Projek tidak ditemui."
   notice_successful_connection: "Sambungan berjaya."
   notice_successful_create: "Penciptaan berjaya."
   notice_successful_delete: "Pemadaman berjaya."
+  notice_successful_cancel: "Pembatalan yang berjaya."
   notice_successful_update: "Kemas kini berjaya."
   notice_successful_update_custom_fields_added_to_project: |
     Naik taraf berjaya. Jenis ruang tersuai yang aktif telah diaktifkan di borang pakej kerja secara automatik. <a href="%{url}" target="_blank">Lihat lebih lagi</a>.
@@ -2993,7 +3069,8 @@ ms:
   permission_edit_own_messages: "Edit mesej sendiri"
   permission_edit_own_time_entries: "Edit log masa sendiri"
   permission_edit_project: "Edit projek"
-  permission_edit_project_attributes: "Edit project attributes"
+  permission_edit_project_attributes: "Edit atribut projek"
+  permission_edit_project_stages_and_gates: "Edit peringkat projek dan gerbang"
   permission_edit_reportings: "Edit laporan"
   permission_edit_time_entries: "Edit log masa untuk pengguna lain"
   permission_edit_timelines: "Edit garis masa"
@@ -3023,9 +3100,12 @@ ms:
   permission_search_project: "Cari projek"
   permission_select_custom_fields: "Pilih ruang tersuai"
   permission_select_project_custom_fields: "Pilih atribut projek"
+  permission_select_project_life_cycle: "Pilih peringkat projek dan gerbang"
+  permission_select_project_life_cycle_explanation: "Aktifkan/Nyahaktifkan peringkat dan pintu dalam projek. Membolehkan pengguna memilih kitaran hayat yang sesuai untuk projek kerana peringkat dan pintu yang tidak aktif tidak akan kelihatan dalam halaman gambaran keseluruhan projek mahupun senarai projek."
   permission_select_project_modules: "Pilih modul projek"
   permission_share_work_packages: "Kongsi pakej kerja"
   permission_manage_types: "Pilih jenis"
+  permission_manage_own_reminders: "Buat peringatan sendiri"
   permission_view_project: "Lihat projek"
   permission_view_changesets: "Lihat semakan repositori dalam OpenProject"
   permission_view_commit_author_statistics: "Lihat statistik pengarang komit"
@@ -3039,13 +3119,14 @@ ms:
   permission_view_shared_work_packages: "Lihat perkongsian pakej kerja"
   permission_view_time_entries: "Lihat masa yang digunakan"
   permission_view_timelines: "Lihat garis masa"
-  permission_view_user_email: "View users' mail addresses"
+  permission_view_user_email: "Lihat alamat mel pengguna"
   permission_view_wiki_edits: "Lihat sejarah wiki"
   permission_view_wiki_pages: "Lihat wiki"
   permission_work_package_assigned: "Menjadi penerima tugasan/bertanggungjawab"
   permission_work_package_assigned_explanation: "Pakej kerja boleh ditugaskan kepada pengguna dan kumpulan yang memegang peranan ini dalam projek yang berkaitan"
   permission_view_project_activity: "Lihat aktiviti projek"
-  permission_view_project_attributes: "View project attributes"
+  permission_view_project_attributes: "Lihat atribut projek"
+  permission_view_project_stages_and_gates: "Lihat peringkat projek dan pintu pagar"
   permission_save_bcf_queries: "Simpan pertanyaan BCF"
   permission_manage_public_bcf_queries: "Urus pertanyaan BCF awam"
   permission_edit_attribute_help_texts: "Edit atribut teks bantuan"
@@ -3270,14 +3351,14 @@ ms:
   setting_default_language: "Bahasa default"
   setting_default_projects_modules: "Modul yang diaktifkan secara default untuk projek baharu"
   setting_default_projects_public: "Projek baharu adalah awam secara default"
-  setting_disable_password_login: "Disable password authentication"
+  setting_disable_password_login: "Lumpuhkan pengesahan kata laluan"
   setting_diff_max_lines_displayed: "Jumlah maksimum baris perbezaan yang dipaparkan"
-  setting_omniauth_direct_login_provider: "Direct login SSO provider"
+  setting_omniauth_direct_login_provider: "Pembekal SSO log masuk terus"
   setting_display_subprojects_work_packages: "Paparkan subprojek pakej kerja di projek utama secara default"
-  setting_duration_format: "Duration format"
-  setting_duration_format_hours_only: "Hours only"
-  setting_duration_format_days_and_hours: "Days and hours"
-  setting_duration_format_instructions: "This defines how Work, Remaining work, and Time spent durations are displayed."
+  setting_duration_format: "Format tempoh"
+  setting_duration_format_hours_only: "Jam sahaja"
+  setting_duration_format_days_and_hours: "Hari dan jam"
+  setting_duration_format_instructions: "Ini mentakrifkan cara Tempoh Kerja, Baki kerja dan Masa yang dihabiskan dipaparkan."
   setting_emails_footer: "Pengaki e-mel"
   setting_emails_header: "Pengepala e-mel"
   setting_email_login: "Guna e-mel untuk log masuk"
@@ -3290,17 +3371,17 @@ ms:
   setting_host_name: "Nama hos"
   setting_hours_per_day: "Jam sehari"
   setting_hours_per_day_explanation: >-
-    This defines what is considered a "day" when displaying duration in days and hours (for example, if a day is 8 hours, 32 hours would be 4 days).
+    Ini mentakrifkan perkara yang dianggap sebagai "hari" apabila memaparkan tempoh dalam hari dan jam (contohnya, jika sehari ialah 8 jam, 32 jam ialah 4 hari).
   setting_invitation_expiration_days: "Pengaktifan e-mel tamat tempoh selepas"
-  setting_work_package_done_ratio: "Progress calculation mode"
+  setting_work_package_done_ratio: "Mod pengiraan kemajuan"
   setting_work_package_done_ratio_field: "Berasaskan kerja"
   setting_work_package_done_ratio_field_caption_html: >-
-    <i>% Complete</i> can be freely set to any value. If you optionally enter a value for <i>Work</i>, <i>Remaining work</i> will automatically be derived.
+    <i>% Lengkap</i> boleh ditetapkan secara bebas kepada sebarang nilai. Jika anda secara pilihan memasukkan nilai untuk <i>Kerja</i>, <i>Kerja yang tinggal</i> akan diperoleh secara automatik.
   setting_work_package_done_ratio_status: "Berasaskan status"
   setting_work_package_done_ratio_status_caption_html: >-
-    Each status has a <i>% Complete</i> value associated with it. Changing status will change <i>% Complete</i>.
+    Setiap status mempunyai nilai <i>% Lengkap</i> yang dikaitkan dengannya. Menukar status akan berubah <i>% Selesai</i>.
   setting_work_package_done_ratio_explanation_html: >
-    In <b>work-based</b> mode, % Complete can be freely set to any value. If you optionally enter a value for Work, Remaining work will automatically be derived. In <b>status-based</b> mode, each status has a % Complete value associated with it. Changing status will change % Complete.
+    Dalam mod <b>berasaskan kerja</b>, % Selesai boleh ditetapkan secara bebas kepada sebarang nilai. Jika anda secara pilihan memasukkan nilai untuk Kerja, Kerja yang selebihnya akan diperoleh secara automatik. Dalam mod <b>berasaskan status</b>, setiap status mempunyai % nilai Lengkap yang dikaitkan dengannya. Menukar status akan berubah % Selesai.
   setting_work_package_properties: "Ciri-ciri pakej kerja"
   setting_work_package_startdate_is_adddate: "Guna tarikh semasa sebagai tarikh mula untuk pakej kerja baharu"
   setting_work_packages_projects_export_limit: "Pakej kerja / Had eksport projek"
@@ -3319,13 +3400,13 @@ ms:
   setting_password_min_length: "Panjang minimum"
   setting_password_min_adhered_rules: "Bilangan minimum kelas yang diperlukan"
   setting_per_page_options: "Pilihan objek setiap halaman"
-  setting_percent_complete_on_status_closed: "% Complete when status is closed"
-  setting_percent_complete_on_status_closed_no_change: "No change"
+  setting_percent_complete_on_status_closed: "% Lengkap apabila status ditutup"
+  setting_percent_complete_on_status_closed_no_change: "Tiada perubahan"
   setting_percent_complete_on_status_closed_no_change_caption_html: >-
-    The value of <i>% Complete</i> will not change even when a work package is closed.
-  setting_percent_complete_on_status_closed_set_100p: "Automatically set to 100%"
+    Nilai <i>% Selesai</i> tidak akan berubah walaupun pakej kerja ditutup.
+  setting_percent_complete_on_status_closed_set_100p: "Ditetapkan secara automatik kepada 100%"
   setting_percent_complete_on_status_closed_set_100p_caption: >-
-    A closed work package is considered complete.
+    Pakej kerja tertutup dianggap lengkap.
   setting_plain_text_mail: "Teks mel biasa (tiada HTML)"
   setting_protocol: "Protokol"
   setting_project_gantt_query: "Paparan Gantt portfolio projek"
@@ -3349,13 +3430,13 @@ ms:
   setting_sys_api_enabled: "Mengaktifkan pengurusan repositori perkhidmatan web"
   setting_sys_api_description: "Perkhidmatan web pengurusan repositori menyediakan integrasi dan kebenaran pengguna untuk mengakses repositori."
   setting_time_format: "Masa"
-  setting_total_percent_complete_mode: "Calculation of % Complete hierarchy totals"
-  setting_total_percent_complete_mode_work_weighted_average: "Weighted by work"
+  setting_total_percent_complete_mode: "Pengiraan % Jumlah hierarki lengkap"
+  setting_total_percent_complete_mode_work_weighted_average: "Diberatkan oleh kerja"
   setting_total_percent_complete_mode_work_weighted_average_caption_html: >-
-    The <i>total % Complete</i> will be weighted against the <i>Work</i> of each work package in the hierarchy. Work packages without <i>Work</i> will be ignored.
-  setting_total_percent_complete_mode_simple_average: "Simple average"
+    <i>Jumlah % Selesai</i> akan ditimbang dengan <i>Kerja</i> setiap pakej kerja dalam hierarki. Pakej kerja tanpa <i>Kerja</i> akan diabaikan.
+  setting_total_percent_complete_mode_simple_average: "Purata yang ringkas"
   setting_total_percent_complete_mode_simple_average_caption_html: >-
-    <i>Work</i> is ignored and the <i>total % Complete</i> will be a simple average of <i>% Complete</i> values of work packages in the hierarchy.
+    <i>Kerja</i> diabaikan dan <i>jumlah % Selesai</i> akan menjadi purata mudah daripada nilai <i>% Selesai</i> bagi pakej kerja dalam hierarki.
   setting_accessibility_mode_for_anonymous: "Mengaktifkan mod kebolehcapaian untuk pengguna anonim"
   setting_user_format: "Format nama pengguna"
   setting_user_default_timezone: "Zon masa default pengguna"
@@ -3371,7 +3452,7 @@ ms:
     authentication:
       single_sign_on: "Single Sign-On"
       omniauth_direct_login_hint_html: >
-        If this option is active, login requests will redirect to the configured omniauth provider. The login dropdown and sign-in page will be disabled. <br/> <strong>Note:</strong> Unless you also disable password logins, with this option enabled, users can still log in internally by visiting the <code>%{internal_path}</code> login page.
+        Jika pilihan ini aktif, permintaan log masuk akan mengubah hala ke penyedia omniaut yang dikonfigurasikan. Halaman lungsur turun dan log masuk log masuk akan dilumpuhkan. <br/> <strong>Nota:</strong> Melainkan anda juga melumpuhkan log masuk kata laluan, dengan pilihan ini didayakan, pengguna masih boleh log masuk secara dalaman dengan melawati halaman log masuk <code>%{internal_path}</code>.
     attachments:
       whitelist_text_html: >
         Jelaskan senarai sambungan fail yang sah dan/atau jenis mime bagi fail yang telah dimuat naik. <br/> Masukkan sambungan fail (cth., <code>%{ext_example}</code>) atau jenis mime (cth., <code>%{mime_example}</code>). <br/> Tinggalkan kosong untuk benarkan sebarang jenis fail untuk dimuat naik. Pelbagai nilai juga dibenarkan. (satu baris untuk setiap nilai)
@@ -3699,25 +3780,25 @@ ms:
     progress:
       label_note: "Perhatian:"
       modal:
-        work_based_help_text: "Each field is automatically calculated from the two others when possible."
+        work_based_help_text: "Setiap medan dikira secara automatik daripada dua yang lain apabila boleh."
         status_based_help_text: "% Selesai ditetapkan oleh status pakej kerja."
         migration_warning_text: "Dalam mod pengiraan perkembangan berdasarkan kerja, % Selesai tidak boleh ditetapkan secara manual dan ianya terikat kepada Kerja. Nilai sedia ada tersebut telah disimpan tetapi tidak boleh diedit. Sila input Kerja dahulu."
       derivation_hints:
         done_ratio:
-          cleared_because_remaining_work_is_empty: "Cleared because Remaining work is empty."
-          cleared_because_work_is_0h: "Cleared because Work is 0h."
-          derived: "Derived from Work and Remaining work."
+          cleared_because_remaining_work_is_empty: "Dikosongkan kerana Baki kerja kosong."
+          cleared_because_work_is_0h: "Dikosongkan kerana Kerja ialah 0j."
+          derived: "Berasal daripada Kerja dan Baki kerja."
         estimated_hours:
-          cleared_because_remaining_work_is_empty: "Cleared because Remaining work is empty."
-          derived: "Derived from Remaining work and % Complete."
-          same_as_remaining_work: "Set to same value as Remaining work."
+          cleared_because_remaining_work_is_empty: "Dikosongkan kerana Baki kerja kosong."
+          derived: "Berasal daripada Baki kerja dan % Selesai."
+          same_as_remaining_work: "Tetapkan kepada nilai yang sama seperti Baki kerja."
         remaining_hours:
-          cleared_because_work_is_empty: "Cleared because Work is empty."
-          cleared_because_percent_complete_is_empty: "Cleared because % Complete is empty."
-          decreased_by_delta_like_work: "Decreased by %{delta}, matching the reduction in Work."
-          derived: "Derived from Work and % Complete."
-          increased_by_delta_like_work: "Increased by %{delta}, matching the increase in Work."
-          same_as_work: "Set to same value as Work."
+          cleared_because_work_is_empty: "Dikosongkan kerana Kerja kosong."
+          cleared_because_percent_complete_is_empty: "Dikosongkan kerana % Selesai kosong."
+          decreased_by_delta_like_work: "Dikurangkan sebanyak %{delta}, sepadan dengan pengurangan dalam Kerja."
+          derived: "Diperolehi daripada Kerja dan % Selesai."
+          increased_by_delta_like_work: "Ditingkatkan sebanyak %{delta}, sepadan dengan peningkatan dalam Kerja."
+          same_as_work: "Tetapkan kepada nilai yang sama seperti Kerja."
     permissions:
       comment: "Komen"
       comment_description: "Boleh lihat dan komen berkenaan pakej kerja ini."
@@ -3725,6 +3806,12 @@ ms:
       edit_description: "Boleh lihat, komen dan edit pakej kerja ini."
       view: "Lihat"
       view_description: "Boleh papar pakej kerja ini."
+    reminders:
+      label_remind_at: "Tarikh"
+      note_placeholder: "Mengapa anda menetapkan peringatan ini?"
+      success_creation_message: "Peringatan berjaya ditetapkan. Anda akan menerima pemberitahuan untuk pakej kerja ini pada masa yang dipilih."
+      success_update_message: "Peringatan berjaya dikemas kini."
+      success_deletion_message: "Peringatan berjaya dipadamkan."
   sharing:
     count:
       zero: "0 pengguna"
@@ -3739,7 +3826,7 @@ ms:
       group: "Kumpulan"
       role: "Peranan"
       type: "Jenis"
-    denied: "You don't have permissions to share %{entities}."
+    denied: "Anda tidak mempunyai kebenaran untuk berkongsi %{entities}."
     label_search: "Cari pengguna untuk jemput"
     label_search_placeholder: "Cari mengikut pengguna atau alamat e-mel"
     label_toggle_all: "Tukar semua perkongsian"
@@ -3747,15 +3834,15 @@ ms:
     share: "Kongsi"
     text_empty_search_description: "Tiada pengguna dengan kriteria penyaring semasa."
     text_empty_search_header: "Kami tidak menemui keputusan yang sepadan."
-    text_empty_state_description: "The %{entity} has not been shared with anyone yet."
+    text_empty_state_description: "%{entity} belum lagi dikongsi dengan sesiapa."
     text_empty_state_header: "Tidak dikongsikan"
-    text_user_limit_reached: "Adding additional users will exceed the current limit. Please contact an administrator to increase the user limit to ensure external users are able to access this %{entity}."
-    text_user_limit_reached_admins: 'Adding additional users will exceed the current limit. Please <a href="%{upgrade_url}">upgrade your plan</a> to be able to add more users.'
+    text_user_limit_reached: "Menambah pengguna tambahan akan melebihi had semasa. Sila hubungi pentadbir untuk meningkatkan had pengguna bagi memastikan pengguna luar dapat mengakses %{entity} ini."
+    text_user_limit_reached_admins: 'Menambah pengguna tambahan akan melebihi had semasa. Sila <a href="%{upgrade_url}">tingkatkan rancangan anda</a> untuk dapat menambah lebih ramai pengguna.'
     warning_user_limit_reached: >
-      Adding additional users will exceed the current limit. Please contact an administrator to increase the user limit to ensure external users are able to access this %{entity}.
+      Menambah pengguna tambahan akan melebihi had semasa. Sila hubungi pentadbir untuk meningkatkan had pengguna bagi memastikan pengguna luar dapat mengakses %{entity} ini.
     warning_user_limit_reached_admin: >
-      Adding additional users will exceed the current limit. Please <a href="%{upgrade_url}">upgrade your plan</a> to be able to ensure external users are able to access this %{entity}.
-    warning_no_selected_user: "Please select users to share this %{entity} with"
+      Menambah pengguna tambahan akan melebihi had semasa. Sila <a href="%{upgrade_url}">naik taraf pelan anda</a> untuk memastikan pengguna luar dapat mengakses %{entity}.
+    warning_no_selected_user: "Sila pilih pengguna untuk berkongsi %{entity} ini"
     warning_locked_user: "Pengguna %{user} telah dikunci dan tidak boleh dikongsi"
     user_details:
       locked: "Pengguna yang dikunci"
@@ -3770,28 +3857,28 @@ ms:
       additional_privileges_project_or_group: "Mungkin mempunyai keistimewaan tambahan (sebagai ahli projek atau kumpulan)"
     project_queries:
       publishing_denied: "Anda tidak mempunyai kebenaran untuk mengubah senarai projek ke tatapan awam."
-      access_warning: "Users will only see the projects they have access to. Sharing project lists does not impact individual project permissions."
+      access_warning: "Pengguna hanya akan melihat projek yang mereka ada akses. Perkongsian senarai projek tidak memberi kesan kepada kebenaran projek individu."
       user_details:
         owner: "Pemilik senarai"
-        can_view_because_public: "Can already view because list is shared with everyone"
-        can_manage_public_lists: "Can edit due to global permissions"
+        can_view_because_public: "Sudah boleh lihat kerana senarai dikongsi dengan semua orang"
+        can_manage_public_lists: "Boleh mengedit kerana kebenaran global"
       public_flag:
-        label: "Share with everyone at %{instance_name}"
-        caption: "Everyone can view this project list. Those with global edit permissions can modify it."
+        label: "Kongsi dengan semua orang di %{instance_name}"
+        caption: "Semua orang boleh melihat senarai projek ini. Mereka yang mempunyai kebenaran edit global boleh mengubah suainya."
       blank_state:
         public:
-          header: "Shared with everyone"
-          description: "Everyone can view this project list. You can also add individual users with extra permissions."
+          header: "Dikongsi dengan semua orang"
+          description: "Semua orang boleh melihat senarai projek ini. Anda juga boleh menambah pengguna individu dengan kebenaran tambahan."
         private:
-          header: "Not shared: Private"
-          description: "This project list has not been shared with anyone yet. Only you can access this list."
+          header: "Tidak dikongsi: Persendirian"
+          description: "Senarai projek ini belum lagi dikongsi dengan sesiapa. Hanya anda boleh mengakses senarai ini."
       permissions:
         view: "Lihat"
-        view_description: "Can view this project list."
+        view_description: "Boleh lihat senarai projek ini."
         edit: "Edit"
-        edit_description: "Can view, share and edit this project list."
+        edit_description: "Boleh melihat, berkongsi dan mengedit senarai projek ini."
       upsale:
-        message: "Sharing project lists with individual users is an enterprise add-on."
+        message: "Berkongsi senarai projek dengan pengguna individu ialah alat tambah perusahaan."
   working_days:
     info: >
       Hari yang tidak dipilih akan dilangkau semasa penjadualan pakej kerja (dan tidak termasuk dalam kiraan hari). Ini boleh digantikan di peringkat pakej-kerja.
@@ -3908,16 +3995,16 @@ ms:
     close_warning: "Abaikan amaran ini."
   oauth:
     application:
-      builtin: Built-in instance application
-      confidential: Confidential
+      builtin: Aplikasi contoh terbina dalam
+      confidential: Sulit
       singular: "Aplikasi OAuth"
       plural: "Aplikasi OAuth"
       named: "'%{name}' aplikasi OAuth"
       new: "Aplikasi OAuth baharu"
-      non_confidential: Non confidential
+      non_confidential: Tidak sulit
       default_scopes: "(Skop default)"
       instructions:
-        enabled: "Enable this application, allowing users to perform authorization grants with it."
+        enabled: "Dayakan aplikasi ini, membenarkan pengguna melaksanakan pemberian kebenaran dengannya."
         name: "Nama aplikasi anda. Ini akan dipaparkan ke pengguna lain selepas kebenaran."
         redirect_uri_html: >
           URL yang dibenarkan membenarkan pengguna boleh diubah hala. Satu entri setiap baris. <br/> Jika anda mendaftar aplikasi desktop, gunakan URL berikut.
@@ -3927,9 +4014,9 @@ ms:
         register_intro: "Jika anda sedang membangunkan aplikasi pelanggan API OAuth untuk OpenProject, anda boleh mendaftarkannya menggunakan borang ini untuk semua pengguna menggunakannya."
         default_scopes: ""
     header:
-      builtin_applications: Built-in OAuth applications
-      other_applications: Other OAuth applications
-    empty_application_lists: No OAuth applications have been registered.
+      builtin_applications: Aplikasi OAuth terbina dalam
+      other_applications: Aplikasi OAuth lain
+    empty_application_lists: Tiada aplikasi OAuth telah didaftarkan.
     client_id: "ID pelanggan"
     client_secret_notice: >
       Ini adalah satu-satunya masa di mana kita boleh mencetak rahsia pelanggan, sila catat dan simpankan ia dengan selamat. Ia perlu diperlakukan sebagai sebuah kata laluan dan tidak boleh dipulihkan oleh OpenProject pada masa kemudian.
diff --git a/config/locales/crowdin/ne.yml b/config/locales/crowdin/ne.yml
index 5b040dc205f0..afb543c108b3 100644
--- a/config/locales/crowdin/ne.yml
+++ b/config/locales/crowdin/ne.yml
@@ -343,6 +343,9 @@ ne:
         text: "This action will not delete any project the list contains. Are you sure you want to delete this project list?"
     settings:
       change_identifier: Change identifier
+      actions:
+        label_enable_all: "Enable all"
+        label_disable_all: "Disable all"
       activities:
         no_results_title_text: There are currently no activities available.
       forums:
@@ -353,18 +356,26 @@ ne:
         no_results_content_text: Create a new work package category
       custom_fields:
         no_results_title_text: There are currently no custom fields available.
+      life_cycle:
+        header:
+          title: "Project lifecycle"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "Neither stages nor gates are currently defined."
+        section_header: "Stages and gates"
+        step:
+          use_in_project: "Use %{step} in this project"
+        filter:
+          label: "Search project stage or gate"
       project_custom_fields:
         header:
           title: "Project attributes"
-          description: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
+          description_html: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
         filter:
           label: "Search project attribute"
         actions:
           label_enable_single: "Active in this project, click to disable"
           label_disable_single: "Inactive in this project, click to enable"
           remove_from_project: "Remove from project"
-          label_enable_all: "Enable all"
-          label_disable_all: "Disable all"
         is_required_blank_slate:
           heading: Required in all projects
           description: This project attribute is activated in all projects since the "Required in all projects" option is checked. It cannot be deactivated for individual projects.
@@ -377,6 +388,10 @@ ne:
         no_results_content_text: Create a new version
       storage:
         no_results_title_text: There is no additional recorded disk space consumed by this project.
+  project_stage:
+    working_days_count:
+      one: "Duration: %{count} working day"
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "The modified list has been saved as a new list"
@@ -497,8 +512,12 @@ ne:
     groups:
       member_in_these_groups: "This user is currently a member of the following groups:"
       no_results_title_text: This user is currently not a member in any group.
+      summary_with_more: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary: Member of %{names}.
     memberships:
       no_results_title_text: This user is currently not a member of a project.
+    open_profile: "Open profile"
   page:
     text: "Text"
   placeholder_users:
@@ -569,18 +588,27 @@ ne:
       no_results_title_text: There are currently no types.
       no_results_content_text: Create a new type
     edit:
-      settings: "Settings"
-      form_configuration: "Form configuration"
+      form_configuration:
+        tab: "Form configuration"
       more_info_text_html: >
         Enterprise edition allows you to customize form configuration with these additional add-ons: <br> <ul class="%{list_styling_class}"> <li><b>Add new attribute groups</b></li> <li><b>Rename attribute groups</b></li> <li><b>Add a table of related work packages</b></li> </ul>
-      projects: "Projects"
-      enabled_projects: "Enabled projects"
-      edit_query: "तालिका सम्पादन गर्नुहोस्"
-      query_group_placeholder: "तालिकालाई नाम दिनुहोस्"
-      reset: "Reset to defaults"
-      type_color_text: |
-        The selected color distinguishes different types
-        in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      projects:
+        tab: "Projects"
+        enabled_projects: "Enabled projects"
+      settings:
+        tab: "Settings"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Subject configuration"
+        manually_editable_subjects:
+          label: "Manually editable subjects"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automatically generated subjects"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Subject pattern"
+          caption: "Search for an attribute or add text. To create a space between elements add it as a text."
   versions:
     overview:
       work_packages_in_archived_projects: "The version is shared with archived projects which still have work packages assigned to this version. These are counted, but will not appear in the linked views."
@@ -643,6 +671,10 @@ ne:
     label_add_x: "Add %{x}"
     label_edit_x: "Edit %{x}"
     label_add_description: "Add description"
+    lag:
+      subject: "Lag"
+      title: "Lag (in days)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
       label_relates_singular: "related to"
       label_relates_plural: "related to"
@@ -847,6 +879,9 @@ ne:
         lag: "Lag"
         from: "Work package"
         to: "Related work package"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Time"
       repository:
         url: "URL"
       role:
@@ -935,6 +970,7 @@ ne:
       messages:
         accepted: "must be accepted."
         after: "must be after %{date}."
+        after_today: "must be in the future."
         after_or_equal_to: "must be after or equal to %{date}."
         before: "must be before %{date}."
         before_or_equal_to: "must be before or equal to %{date}."
@@ -981,6 +1017,7 @@ ne:
         not_an_integer: "is not an integer."
         not_an_iso_date: "is not a valid date. Required format: YYYY-MM-DD."
         not_same_project: "doesn't belong to the same project."
+        datetime_must_be_in_future: "must be in the future."
         odd: "must be odd."
         regex_match_failed: "does not match the regular expression %{expression}."
         regex_invalid: "could not be validated with the associated regular expression."
@@ -1094,16 +1131,38 @@ ne:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "start date must be before the end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "is incomplete."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1320,6 +1379,8 @@ ne:
         other: "Notifications"
       placeholder_user: "Placeholder user"
       project: "Project"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         one: "Project list"
         other: "Project lists"
@@ -1423,6 +1484,7 @@ ne:
     login: "Username"
     mail: "Email"
     name: "Name"
+    note: "Note"
     password: "Password"
     priority: "Priority"
     project: "Project"
@@ -1519,6 +1581,7 @@ ne:
   button_print: "Print"
   button_quote: "Quote"
   button_remove: Remove
+  button_remove_reminder: "Remove reminder"
   button_rename: "Rename"
   button_replace: "Replace"
   button_revoke: "रद्द गर्नुहोस्"
@@ -1529,6 +1592,7 @@ ne:
   button_save_as: "Save as"
   button_apply_changes: "Apply changes"
   button_save_back: "Save and back"
+  button_set_reminder: "Set reminder"
   button_show: "Show"
   button_sort: "Sort"
   button_submit: "Submit"
@@ -1734,12 +1798,12 @@ ne:
   direction: ltr
   ee:
     upsale:
+      title: "Enterprise add-on"
+      link_title: "More information"
       form_configuration:
         description: "Customize the form configuration with these additional add-ons:"
         add_groups: "Add new attribute groups"
         rename_groups: "Rename attributes groups"
-      project_filters:
-        description_html: "Filtering and sorting on custom fields is an Enterprise edition add-on."
   enumeration_activities: "समय ट्र्याकिंग गतिविधिहरू"
   enumeration_work_package_priorities: "Work package priorities"
   enumeration_reported_project_statuses: "Reported project status"
@@ -1772,6 +1836,7 @@ ne:
   error_pdf_export_too_many_columns: "Too many columns selected for the PDF export. Please reduce the number of columns."
   error_pdf_failed_to_export: "The PDF export could not be saved: %{error}"
   error_token_authenticity: "Unable to verify Cross-Site Request Forgery token. Did you try to submit data on multiple browsers or tabs? Please close all tabs and try again."
+  error_reminder_not_found: "The reminder was not found or was already notified about."
   error_work_package_not_found_in_project: "The work package was not found or does not belong to this project"
   error_work_package_id_not_found: "The work package was not found."
   error_must_be_project_member: "must be project member"
@@ -2065,6 +2130,7 @@ ne:
       responsible: "Accountable"
       shared: "Shared"
       watched: "Watcher"
+      reminder: "Reminder"
     facets:
       unread: "Unread"
       unread_title: "Show unread"
@@ -2232,8 +2298,10 @@ ne:
   label_default: "Default"
   label_delete_user: "Delete user"
   label_delete_project: "Delete project"
+  label_delete: "Delete"
   label_deleted: "deleted"
   label_deleted_custom_field: "(deleted custom field)"
+  label_deleted_custom_item: "(deleted item)"
   label_deleted_custom_option: "(deleted option)"
   label_empty_element: "(empty)"
   label_missing_or_hidden_custom_option: "(missing value or lacking permissions to access)"
@@ -2270,7 +2338,6 @@ ne:
   label_enterprise_active_users: "%{current}/%{limit} booked active users"
   label_enterprise_edition: "Enterprise edition"
   label_enterprise_support: "Enterprise support"
-  label_enterprise_addon: "Enterprise add-on"
   label_environment: "Environment"
   label_estimates_and_progress: "Estimates and progress"
   label_equals: "is"
@@ -2455,6 +2522,7 @@ ne:
   label_none_parentheses: "(none)"
   label_not_contains: "doesn't contain"
   label_not_equals: "is not"
+  label_life_cycle_step_plural: "Project lifecycle"
   label_on: "on"
   label_operator_all: "is not empty"
   label_operator_none: "is empty"
@@ -2556,6 +2624,7 @@ ne:
   label_reporting: "Reporting"
   label_reporting_plural: "Reportings"
   label_repository: "Repository"
+  label_repository_remove: "Remove repository"
   label_repository_root: "Repository root"
   label_repository_plural: "Repositories"
   label_required: "required"
@@ -2618,6 +2687,7 @@ ne:
   label_this_month: "this month"
   label_this_week: "this week"
   label_this_year: "this year"
+  label_time: "Time"
   label_time_entry_plural: "Spent time"
   label_time_entry_activity_plural: "Spent time activities"
   label_title: "Title"
@@ -2653,6 +2723,7 @@ ne:
   label_user_settings: "User settings"
   label_users_settings: "Users settings"
   label_version_new: "New version"
+  label_version_edit: "Edit version"
   label_version_plural: "Versions"
   label_version_sharing_descendants: "With subprojects"
   label_version_sharing_hierarchy: "With project hierarchy"
@@ -2790,8 +2861,13 @@ ne:
         prefix: "Received because of the notification setting: %{reason}"
         date_alert_start_date: "Date alert"
         date_alert_due_date: "Date alert"
+        reminder: "Reminder"
       see_all: "See all"
       updated_at: "Updated at %{timestamp} by %{user}"
+    reminder_notifications:
+      subject: "Reminder: %{note}"
+      heading: "You have a new reminder"
+      note: "Note: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "You may %{allowed_actions} this work package. This can change depending on your project role and permissions."
@@ -2958,6 +3034,7 @@ ne:
   notice_successful_connection: "Successful connection."
   notice_successful_create: "Successful creation."
   notice_successful_delete: "Successful deletion."
+  notice_successful_cancel: "Successful cancellation."
   notice_successful_update: "Successful update."
   notice_successful_update_custom_fields_added_to_project: |
     Successful update. The custom fields of the activated types are automatically activated
@@ -3035,6 +3112,7 @@ ne:
   permission_edit_own_time_entries: "Edit own time logs"
   permission_edit_project: "Edit project"
   permission_edit_project_attributes: "Edit project attributes"
+  permission_edit_project_stages_and_gates: "Edit project stages and gates"
   permission_edit_reportings: "Edit reportings"
   permission_edit_time_entries: "Edit time logs for other users"
   permission_edit_timelines: "Edit timelines"
@@ -3064,9 +3142,12 @@ ne:
   permission_search_project: "Search project"
   permission_select_custom_fields: "Select custom fields"
   permission_select_project_custom_fields: "Select project attributes"
+  permission_select_project_life_cycle: "Select project stages and gates"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "Select project modules"
   permission_share_work_packages: "Share work packages"
   permission_manage_types: "Select types"
+  permission_manage_own_reminders: "Create own reminders"
   permission_view_project: "View projects"
   permission_view_changesets: "View repository revisions in OpenProject"
   permission_view_commit_author_statistics: "View commit author statistics"
@@ -3087,6 +3168,7 @@ ne:
   permission_work_package_assigned_explanation: "Work packages can be assigned to users and groups in possession of this role in the respective project"
   permission_view_project_activity: "View project activity"
   permission_view_project_attributes: "View project attributes"
+  permission_view_project_stages_and_gates: "View project stages and gates"
   permission_save_bcf_queries: "Save BCF queries"
   permission_manage_public_bcf_queries: "Manage public BCF queries"
   permission_edit_attribute_help_texts: "Edit attribute help texts"
@@ -3767,6 +3849,12 @@ ne:
       edit_description: "Can view, comment and edit this work package."
       view: "View"
       view_description: "Can view this work package."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Why are you setting this reminder?"
+      success_creation_message: "Reminder set successfully. You will receive a notification for this work package at the chosen time."
+      success_update_message: "Reminder updated successfully."
+      success_deletion_message: "Reminder deleted successfully."
   sharing:
     count:
       zero: "0 users"
diff --git a/config/locales/crowdin/nl.yml b/config/locales/crowdin/nl.yml
index 75b55c4db08d..0e3ec80ace05 100644
--- a/config/locales/crowdin/nl.yml
+++ b/config/locales/crowdin/nl.yml
@@ -26,7 +26,7 @@ nl:
       no_results_title_text: Er is geen activiteit voor deze projecten binnen deze periode.
     work_packages:
       activity_tab:
-        no_results_title_text: No activity to display
+        no_results_title_text: Geen activiteit om weer te geven
         no_results_description_text: "Kies \"Alles tonen\" om alle activiteiten en opmerkingen te tonen"
         label_activity_show_all: "Alles tonen"
         label_activity_show_only_comments: "Alleen opmerkingen tonen"
@@ -225,19 +225,19 @@ nl:
             description: "Begin met het toevoegen van items aan het aangepaste veld van het type hiërarchie. Elk item kan gebruikt worden om een hiërarchie eronder te maken. Om te navigeren en subitems aan te maken binnen een hiërarchie klikt u op het aangemaakte item."
           item:
             title: Dit item heeft geen onderstaand hiërarchie niveau
-            description: Add items to this list to create sub-items inside another one
+            description: Voeg items aan deze lijst toe om sub-items binnen een andere lijst te maken
         placeholder:
           label: "Item label"
-          short: "Short name"
+          short: "Verkorte Naam"
       notice:
-        remember_items_and_projects: "Remember to set items and projects in the respective tabs for this custom field."
+        remember_items_and_projects: "Vergeet niet om items en projecten in te stellen op de respectievelijke tabbladen voor dit aangepaste veld."
       hierarchy:
         subitems:
-          zero: no sub-items
-          one: 1 sub-item
-          other: "%{count} sub-items"
+          zero: geen subitems
+          one: 1 subitem
+          other: "%{count} subitems"
     upsale:
-      custom_field_format_hierarchy: "Need a hierarchy in your custom fields for work packages?"
+      custom_field_format_hierarchy: "Hebt u een hiërarchie nodig in uw aangepaste velden voor werkpakketten?"
     text_add_new_custom_field: >
       Om de nieuwe aangepaste velden toevoegen aan een project moet u deze eerst maken voordat u ze aan dit project toevoegen kunt.
     is_enabled_globally: "Is ingeschakeld Op het hoofdniveau"
@@ -248,7 +248,7 @@ nl:
     reorder_confirmation: "Waarschuwing: De huidige volgorde van beschikbare waarden zal verloren gaan. Doorgaan?"
     instructions:
       is_required: "Mark the custom field as required. This will make it mandatory to fill in the field when creating new or updating existing resources."
-      is_required_for_project: "Check to enable this attribute and make it required in all projects. It cannot be deactived for individual projects."
+      is_required_for_project: "Vink aan om dit attribuut te activeren en het in alle projecten vereist te maken. Het kan niet worden gedeactiveerd voor individuele projecten."
       is_for_all: "Mark the custom field as available in all existing and new projects."
       multi_select: "Allows the user to assign multiple values to this custom field."
       searchable: "Include the field values when using the global search functionality."
@@ -340,6 +340,9 @@ nl:
         text: "Deze actie verwijdert geen enkel project dat de lijst bevat. Weet u zeker dat u deze projectlijst wilt verwijderen?"
     settings:
       change_identifier: Change identifier
+      actions:
+        label_enable_all: "Alles inschakelen"
+        label_disable_all: "Alles uitschakelen"
       activities:
         no_results_title_text: Er zijn momenteel geen activiteiten beschikbaar.
       forums:
@@ -350,18 +353,26 @@ nl:
         no_results_content_text: Maak een nieuwe werkpakket categorie
       custom_fields:
         no_results_title_text: Momenteel zijn er geen aangepaste velden beschikbaar.
+      life_cycle:
+        header:
+          title: "Project levenscyclus"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "Neither stages nor gates are currently defined."
+        section_header: "Stages and gates"
+        step:
+          use_in_project: "Use %{step} in this project"
+        filter:
+          label: "Search project stage or gate"
       project_custom_fields:
         header:
           title: "Project attributes"
-          description: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
+          description_html: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
         filter:
           label: "Search project attribute"
         actions:
           label_enable_single: "Actief in dit project, klik om uit te schakelen"
           label_disable_single: "Inactief in dit project, klik om in te schakelen"
           remove_from_project: "Remove from project"
-          label_enable_all: "Alles inschakelen"
-          label_disable_all: "Disable all"
         is_required_blank_slate:
           heading: Vereist in alle projecten
           description: This project attribute is activated in all projects since the "Required in all projects" option is checked. It cannot be deactivated for individual projects.
@@ -374,6 +385,10 @@ nl:
         no_results_content_text: Maak een nieuwe versie
       storage:
         no_results_title_text: Er is geen extra opgenomen schijfruimte verbruikt door dit project.
+  project_stage:
+    working_days_count:
+      one: "Duration: %{count} working day"
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "De gewijzigde lijst is opgeslagen als een nieuwe lijst"
@@ -494,8 +509,12 @@ nl:
     groups:
       member_in_these_groups: "Deze gebruiker is momenteel lid van de volgende groepen:"
       no_results_title_text: Deze gebruiker is momenteel geen lid in een groep.
+      summary_with_more: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary: Member of %{names}.
     memberships:
       no_results_title_text: Deze gebruiker is momenteel geen lid van een project.
+    open_profile: "Open profile"
   page:
     text: "Tekst"
   placeholder_users:
@@ -566,18 +585,27 @@ nl:
       no_results_title_text: Er zijn momenteel geen types.
       no_results_content_text: Maak een nieuw type
     edit:
-      settings: "Instellingen"
-      form_configuration: "Formulierconfiguratie"
+      form_configuration:
+        tab: "Form configuration"
       more_info_text_html: >
         Enterprise edition allows you to customize form configuration with these additional add-ons: <br> <ul class="%{list_styling_class}"> <li><b>Add new attribute groups</b></li> <li><b>Rename attribute groups</b></li> <li><b>Add a table of related work packages</b></li> </ul>
-      projects: "Projecten"
-      enabled_projects: "Ingeschakelde projecten"
-      edit_query: "Tabel bewerken"
-      query_group_placeholder: "Geef de tabel een naam"
-      reset: "Standaardinstellingen herstellen"
-      type_color_text: |
-        De geselecteerde kleur onderscheidt verschillende types
-        in Gantt grafieken of werkpakketten tabellen. Het wordt daarom aangeraden om een sterke kleur te gebruiken.
+      projects:
+        tab: "Projects"
+        enabled_projects: "Enabled projects"
+      settings:
+        tab: "Settings"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Subject configuration"
+        manually_editable_subjects:
+          label: "Manually editable subjects"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automatically generated subjects"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Subject pattern"
+          caption: "Search for an attribute or add text. To create a space between elements add it as a text."
   versions:
     overview:
       work_packages_in_archived_projects: "The version is shared with archived projects which still have work packages assigned to this version. These are counted, but will not appear in the linked views."
@@ -640,6 +668,10 @@ nl:
     label_add_x: "Add %{x}"
     label_edit_x: "Edit %{x}"
     label_add_description: "Add description"
+    lag:
+      subject: "Lag"
+      title: "Lag (in days)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
       label_relates_singular: "related to"
       label_relates_plural: "related to"
@@ -844,6 +876,9 @@ nl:
         lag: "Vertraging"
         from: "Werkpakket"
         to: "Verwante werkpakket"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Time"
       repository:
         url: "URL"
       role:
@@ -932,6 +967,7 @@ nl:
       messages:
         accepted: "moet geaccepteerd worden."
         after: "moet na %{date} zijn."
+        after_today: "must be in the future."
         after_or_equal_to: "moet gelijk aan of na %{date} zijn."
         before: "moet voor %{date} zijn."
         before_or_equal_to: "moet voor of gelijk zijn aan %{date}."
@@ -978,6 +1014,7 @@ nl:
         not_an_integer: "is niet een geheel getal."
         not_an_iso_date: "is geen geldige datum. Vereist formaat: JJJJ-MM-DD."
         not_same_project: "hoort niet bij hetzelfde project."
+        datetime_must_be_in_future: "must be in the future."
         odd: "moet oneven zijn."
         regex_match_failed: "does not match the regular expression %{expression}."
         regex_invalid: "kon niet worden gevalideerd met de bijbehorende reguliere expressie."
@@ -1091,16 +1128,38 @@ nl:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "start date must be before the end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "is incomplete."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1317,6 +1376,8 @@ nl:
         other: "Meldingen"
       placeholder_user: "Tijdelijke gebruiker"
       project: "Project"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         one: "Projectlijst"
         other: "Projectlijsten"
@@ -1420,6 +1481,7 @@ nl:
     login: "Gebruikersnaam"
     mail: "E-mail"
     name: "Naam"
+    note: "Note"
     password: "Wachtwoord"
     priority: "Prioriteit"
     project: "Project"
@@ -1516,6 +1578,7 @@ nl:
   button_print: "Afdrukken"
   button_quote: "Citeer"
   button_remove: Verwijder
+  button_remove_reminder: "Remove reminder"
   button_rename: "Naam wijzigen"
   button_replace: "Vervang"
   button_revoke: "Intrekken"
@@ -1526,6 +1589,7 @@ nl:
   button_save_as: "Opslaan als"
   button_apply_changes: "Veranderingen doorvoeren"
   button_save_back: "Opslaan en terug"
+  button_set_reminder: "Set reminder"
   button_show: "Toon"
   button_sort: "Sorteren"
   button_submit: "Verzenden"
@@ -1731,12 +1795,12 @@ nl:
   direction: LTR
   ee:
     upsale:
+      title: "Enterprise add-on"
+      link_title: "More information"
       form_configuration:
         description: "Customize the form configuration with these additional add-ons:"
         add_groups: "Toevoegen van nieuwe attribuutgroepen"
         rename_groups: "Attribuutgroepen hernoemen"
-      project_filters:
-        description_html: "Filtering and sorting on custom fields is an Enterprise edition add-on."
   enumeration_activities: "Activiteiten voor het bijhouden van tijd"
   enumeration_work_package_priorities: "Werkpakket prioriteiten"
   enumeration_reported_project_statuses: "Gerapporteerde projectstatus"
@@ -1769,6 +1833,7 @@ nl:
   error_pdf_export_too_many_columns: "Te veel kolommen geselecteerd voor het exporteren naar PDF. Beperk het aantal kolommen."
   error_pdf_failed_to_export: "De pdf export kan niet worden opgeslagen:%{error}"
   error_token_authenticity: "Niet in staat om de Cross-Site Request Forgery token te valideren. Heeft u geprobeert gegevens op meerdere browsers of tabbladen wilt indienen? Sluit alle tabbladen en probeer het opnieuw."
+  error_reminder_not_found: "The reminder was not found or was already notified about."
   error_work_package_not_found_in_project: "Het werkpakket werd niet gevonden of maakt geen deel uit van dit project"
   error_work_package_id_not_found: "Het werkpakket is niet gevonden."
   error_must_be_project_member: "moet een project lid zijn"
@@ -2062,6 +2127,7 @@ nl:
       responsible: "Verantwoording afleggen"
       shared: "Gedeeld"
       watched: "Kijker"
+      reminder: "Reminder"
     facets:
       unread: "Ongelezen"
       unread_title: "Toon ongelezen"
@@ -2229,8 +2295,10 @@ nl:
   label_default: "Standaard"
   label_delete_user: "Gebruiker verwijderen"
   label_delete_project: "Verwijder project"
+  label_delete: "Delete"
   label_deleted: "verwijderd"
   label_deleted_custom_field: "(verwijderde aangepast veld)"
+  label_deleted_custom_item: "(deleted item)"
   label_deleted_custom_option: "(verwijderde optie)"
   label_empty_element: "(leeg)"
   label_missing_or_hidden_custom_option: "(ontbrekende waarde of ontbrekende machtigingen voor toegang)"
@@ -2267,7 +2335,6 @@ nl:
   label_enterprise_active_users: "%{current}/%{limit} gereserveerd actieve gebruikers"
   label_enterprise_edition: "Enterprise edition"
   label_enterprise_support: "Ondernemingsondersteuning"
-  label_enterprise_addon: "Enterprise add-on"
   label_environment: "Omgeving"
   label_estimates_and_progress: "Estimates and progress"
   label_equals: "is"
@@ -2452,6 +2519,7 @@ nl:
   label_none_parentheses: "(geen)"
   label_not_contains: "bevat geen"
   label_not_equals: "is niet"
+  label_life_cycle_step_plural: "Project lifecycle"
   label_on: "op"
   label_operator_all: "is niet leeg"
   label_operator_none: "is leeg"
@@ -2553,6 +2621,7 @@ nl:
   label_reporting: "Rapporteren"
   label_reporting_plural: "Rapporteringen"
   label_repository: "Repository"
+  label_repository_remove: "Remove repository"
   label_repository_root: "Opslagplaats root"
   label_repository_plural: "Repositories"
   label_required: "vereist"
@@ -2615,6 +2684,7 @@ nl:
   label_this_month: "Deze maand"
   label_this_week: "deze week"
   label_this_year: "Dit jaar"
+  label_time: "Time"
   label_time_entry_plural: "Bestede tijd"
   label_time_entry_activity_plural: "Spent time activities"
   label_title: "Titel"
@@ -2650,6 +2720,7 @@ nl:
   label_user_settings: "Gebruikersinstellingen"
   label_users_settings: "Gebruikersinstellingen"
   label_version_new: "Nieuwe versie"
+  label_version_edit: "Edit version"
   label_version_plural: "Versies"
   label_version_sharing_descendants: "Met subprojecten"
   label_version_sharing_hierarchy: "Met projecthiërarchie"
@@ -2787,8 +2858,13 @@ nl:
         prefix: "Ontvangen vanwege de meldingsinstelling: %{reason}"
         date_alert_start_date: "Date alert"
         date_alert_due_date: "Date alert"
+        reminder: "Reminder"
       see_all: "Alles bekijken"
       updated_at: "Bijgewerkt op %{timestamp} door %{user}"
+    reminder_notifications:
+      subject: "Reminder: %{note}"
+      heading: "You have a new reminder"
+      note: "Note: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "You may %{allowed_actions} this work package. This can change depending on your project role and permissions."
@@ -2954,6 +3030,7 @@ nl:
   notice_successful_connection: "Geslaagde verbinding."
   notice_successful_create: "Aanmaak geslaagd."
   notice_successful_delete: "Verwijdering geslaagd."
+  notice_successful_cancel: "Successful cancellation."
   notice_successful_update: "Succesvolle wijziging."
   notice_successful_update_custom_fields_added_to_project: |
     Succesvolle update. Aangepaste velden van de geactiveerde types worden automatisch geactiveerd
@@ -3031,6 +3108,7 @@ nl:
   permission_edit_own_time_entries: "Bewerk de logboeken van de eigen tijd"
   permission_edit_project: "Project bewerken"
   permission_edit_project_attributes: "Edit project attributes"
+  permission_edit_project_stages_and_gates: "Edit project stages and gates"
   permission_edit_reportings: "Rapporteringen bewerken"
   permission_edit_time_entries: "Bewerk tijdregistraties voor andere gebruikers"
   permission_edit_timelines: "Bewerken van tijdlijnen"
@@ -3060,9 +3138,12 @@ nl:
   permission_search_project: "Search project"
   permission_select_custom_fields: "Aangepaste velden selecteren"
   permission_select_project_custom_fields: "Select project attributes"
+  permission_select_project_life_cycle: "Select project stages and gates"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "Selecteer project modules"
   permission_share_work_packages: "Share work packages"
   permission_manage_types: "Selecteer typen"
+  permission_manage_own_reminders: "Create own reminders"
   permission_view_project: "Bekijk projecten"
   permission_view_changesets: "Bekijk opslagplaats wijzigingen in OpenProject"
   permission_view_commit_author_statistics: "Bekijk de commit auteur statistieken"
@@ -3083,6 +3164,7 @@ nl:
   permission_work_package_assigned_explanation: "Werkpakketten kunnen worden toegewezen aan gebruikers en groepen met deze rol in het respectieve project"
   permission_view_project_activity: "Projectactiviteit bekijken"
   permission_view_project_attributes: "View project attributes"
+  permission_view_project_stages_and_gates: "View project stages and gates"
   permission_save_bcf_queries: "Save BCF queries"
   permission_manage_public_bcf_queries: "Manage public BCF queries"
   permission_edit_attribute_help_texts: "De helpteksten van attributen bewerken"
@@ -3762,6 +3844,12 @@ nl:
       edit_description: "Kan dit werkpakket bekijken, becommentariëren en bewerken."
       view: "Weergeven"
       view_description: "Can view this work package."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Why are you setting this reminder?"
+      success_creation_message: "Reminder set successfully. You will receive a notification for this work package at the chosen time."
+      success_update_message: "Reminder updated successfully."
+      success_deletion_message: "Reminder deleted successfully."
   sharing:
     count:
       zero: "0 users"
diff --git a/config/locales/crowdin/no.yml b/config/locales/crowdin/no.yml
index f1a16d598145..b63f8f192b51 100644
--- a/config/locales/crowdin/no.yml
+++ b/config/locales/crowdin/no.yml
@@ -343,6 +343,9 @@
         text: "Denne handlingen vil ikke slette noen av prosjektene på listen. Er du sikker på at du vil slette denne prosjektlisten?"
     settings:
       change_identifier: Endre identifier
+      actions:
+        label_enable_all: "Enable all"
+        label_disable_all: "Disable all"
       activities:
         no_results_title_text: Det er for tiden ingen aktiviteter tilgjengelig.
       forums:
@@ -353,18 +356,26 @@
         no_results_content_text: Opprett en ny kategori for arbeidspakker
       custom_fields:
         no_results_title_text: Det er ingen egendefinerte felt tilgjengelig.
+      life_cycle:
+        header:
+          title: "Project lifecycle"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "Neither stages nor gates are currently defined."
+        section_header: "Stages and gates"
+        step:
+          use_in_project: "Use %{step} in this project"
+        filter:
+          label: "Search project stage or gate"
       project_custom_fields:
         header:
           title: "Prosjektegenskaper"
-          description: 'Disse prosjektegenskapene vil bli vist i din <a href=%{overview_url} target="_blank">oversiktsside for prosjekt</a> under deres respektive seksjoner.  Du kan aktivere eller deaktivere individuelle egenskaper.  Prosjektegenskaper og seksjoner er definert i  <a href=%{admin_settings_url} target="_blank">administrasjonsinnstillingene</a> av en administrator.'
+          description_html: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
         filter:
           label: "Søk etter prosjektegenskap"
         actions:
           label_enable_single: "Aktivert i dette prosjektet, klikk for å deaktivere"
           label_disable_single: "Deaktivert i dette prosjektet, klikk for å aktivere"
           remove_from_project: "Remove from project"
-          label_enable_all: "Aktiver alle"
-          label_disable_all: "Deaktiver alle"
         is_required_blank_slate:
           heading: Påkrevd i alle prosjekter
           description: Prosjektattributten er aktivert i alle prosjekter fordi "Påkrevd i alle prosjekter"-alternativet er valgt. Attributten kan ikke deaktiveres for hvert enkelt prosjekt.
@@ -377,6 +388,10 @@
         no_results_content_text: Lag en ny versjon
       storage:
         no_results_title_text: Det er ingen ekstra registrert diskplass brukt av dette prosjektet.
+  project_stage:
+    working_days_count:
+      one: "Duration: %{count} working day"
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "Den endrede listen er lagret som en ny liste"
@@ -497,8 +512,12 @@
     groups:
       member_in_these_groups: "Denne brukeren er for øyeblikket medlem av følgende grupper:"
       no_results_title_text: Denne brukeren er for øyeblikket ikke medlem i noen gruppe.
+      summary_with_more: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary: Member of %{names}.
     memberships:
       no_results_title_text: Denne brukeren er for øyeblikket ikke medlem av et prosjekt.
+    open_profile: "Open profile"
   page:
     text: "Tekst"
   placeholder_users:
@@ -568,18 +587,27 @@
       no_results_title_text: Det finnes for øyeblikket ingen typer.
       no_results_content_text: Lag en ny type
     edit:
-      settings: "Innstillinger"
-      form_configuration: "Skjema konfigurering"
+      form_configuration:
+        tab: "Form configuration"
       more_info_text_html: >
         Enterprise versjonen gir deg mulighet til å tilpasse konfigurasjon av skjemaer med disse utvidelsene: <br><ul class="%{list_styling_class}">Legg til nye egenskaps-grupper</b></li><li><b>Endre navn på egenskapsgrupper</b></li><li><b>Legg til en tabell over relaterte arbeidspakker</b></li></ul>
-      projects: "Prosjekter"
-      enabled_projects: "Aktiverte prosjekter"
-      edit_query: "Rediger tabell"
-      query_group_placeholder: "Gi tabellen et navn"
-      reset: "Tilbakestill til standard"
-      type_color_text: |
-        Den valgte fargen skiller ulike typer
-        i Gantt-diagrammer eller arbeidspakketabeller. Det er derfor anbefalt å bruke en sterk farge.
+      projects:
+        tab: "Projects"
+        enabled_projects: "Enabled projects"
+      settings:
+        tab: "Settings"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Subject configuration"
+        manually_editable_subjects:
+          label: "Manually editable subjects"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automatically generated subjects"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Subject pattern"
+          caption: "Search for an attribute or add text. To create a space between elements add it as a text."
   versions:
     overview:
       work_packages_in_archived_projects: "Versjonen er delt med arkiverte prosjekter som fortsatt har arbeidspakker tilordnet denne versjonen. Disse er tellt, men vil ikke vises i de koblede visningene."
@@ -642,6 +670,10 @@
     label_add_x: "Add %{x}"
     label_edit_x: "Edit %{x}"
     label_add_description: "Add description"
+    lag:
+      subject: "Lag"
+      title: "Lag (in days)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
       label_relates_singular: "related to"
       label_relates_plural: "related to"
@@ -846,6 +878,9 @@
         lag: "Forsinkelse"
         from: "Arbeidspakke"
         to: "Relatert arbeidspakke"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Time"
       repository:
         url: "URL"
       role:
@@ -934,6 +969,7 @@
       messages:
         accepted: "må aksepteres"
         after: "må være etter %{date}."
+        after_today: "must be in the future."
         after_or_equal_to: "må være etter eller lik %{date}."
         before: "må være før %{date}."
         before_or_equal_to: "må være før eller lik %{date}."
@@ -980,6 +1016,7 @@
         not_an_integer: "er ikke et heltall."
         not_an_iso_date: "er ikke en gyldig dato. Påkrevd format: ÅÅÅÅ-MM-DD."
         not_same_project: "hører ikke til samme prosjekt."
+        datetime_must_be_in_future: "must be in the future."
         odd: "må være oddetall."
         regex_match_failed: "samsvarer ikke med det regulære uttrykket %{expression}."
         regex_invalid: "kunne ikke valideres med det tilhørende regulære uttrykket."
@@ -1093,16 +1130,38 @@
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "start date must be before the end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "is incomplete."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1319,6 +1378,8 @@
         other: "Varsler"
       placeholder_user: "Plassholder bruker"
       project: "Prosjekt"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         one: "Project list"
         other: "Prosjektlister"
@@ -1422,6 +1483,7 @@
     login: "Brukernavn"
     mail: "E-post"
     name: "Navn"
+    note: "Note"
     password: "Passord"
     priority: "Prioritet"
     project: "Prosjekt"
@@ -1518,6 +1580,7 @@
   button_print: "Skriv ut"
   button_quote: "Sitèr"
   button_remove: Fjern
+  button_remove_reminder: "Remove reminder"
   button_rename: "Endre navn"
   button_replace: "Erstatt"
   button_revoke: "Tilbakekall"
@@ -1528,6 +1591,7 @@
   button_save_as: "Lagre som"
   button_apply_changes: "Bruk endringer"
   button_save_back: "Lagre og tilbake"
+  button_set_reminder: "Set reminder"
   button_show: "Vis"
   button_sort: "Sortèr"
   button_submit: "Lagre"
@@ -1733,12 +1797,12 @@
   direction: LTR
   ee:
     upsale:
+      title: "Enterprise add-on"
+      link_title: "More information"
       form_configuration:
         description: "Tilpass skjemakonfigurasjonen med disse ekstra utvidelsene:"
         add_groups: "Legg til nye attributtgrupper"
         rename_groups: "Endre attributtgrupper"
-      project_filters:
-        description_html: "Filtrering og sortering på egendefinerte felter er en utvidelse i Enterprise feltet."
   enumeration_activities: "Tidregistrering aktiviteter"
   enumeration_work_package_priorities: "Prioritering av arbeidspakker"
   enumeration_reported_project_statuses: "Rapportert prosjektstatus"
@@ -1771,6 +1835,7 @@
   error_pdf_export_too_many_columns: "For mange kolonner valgt for PDF eksport. Reduser antall kolonner."
   error_pdf_failed_to_export: "PDF-eksporten kunne ikke lagres: %{error}"
   error_token_authenticity: "Kan ikke bekrefte Cross-Site Request Forgery token. Har du prøvd å sende inn data i flere nettlesere eller faner? Vennligst lukk alle fanene og prøv igjen."
+  error_reminder_not_found: "The reminder was not found or was already notified about."
   error_work_package_not_found_in_project: "Arbeidspakken ble ikke funnet eller tilhører ikke dette prosjektet"
   error_work_package_id_not_found: "Arbeidspakken ble ikke funnet."
   error_must_be_project_member: "må være prosjektmedlem"
@@ -2064,6 +2129,7 @@
       responsible: "Ansvarlig"
       shared: "Delt"
       watched: "Overvåker"
+      reminder: "Reminder"
     facets:
       unread: "Ulest"
       unread_title: "Vis ulest"
@@ -2231,8 +2297,10 @@
   label_default: "Standard"
   label_delete_user: "Slett bruker"
   label_delete_project: "Slett prosjekt"
+  label_delete: "Delete"
   label_deleted: "slettet"
   label_deleted_custom_field: "(slettet egendefinert felt)"
+  label_deleted_custom_item: "(deleted item)"
   label_deleted_custom_option: "(slettet alternativ)"
   label_empty_element: "(tom)"
   label_missing_or_hidden_custom_option: "(manglende verdi eller manglende rettigheter)"
@@ -2269,7 +2337,6 @@
   label_enterprise_active_users: "%{current}/%{limit} bookede brukere"
   label_enterprise_edition: "Enterprise Edition"
   label_enterprise_support: "Bedriftsstøtte"
-  label_enterprise_addon: "Enterprise utvidelse"
   label_environment: "Miljø"
   label_estimates_and_progress: "Estimater og fremdrift"
   label_equals: "er"
@@ -2454,6 +2521,7 @@
   label_none_parentheses: "(ingen)"
   label_not_contains: "inneholder ikke"
   label_not_equals: "er ikke"
+  label_life_cycle_step_plural: "Project lifecycle"
   label_on: "på"
   label_operator_all: "er ikke tom"
   label_operator_none: "er tom"
@@ -2555,6 +2623,7 @@
   label_reporting: "Rapportering"
   label_reporting_plural: "Rapporteringer"
   label_repository: "Pakkebrønn"
+  label_repository_remove: "Remove repository"
   label_repository_root: "Kodelager rot"
   label_repository_plural: "Pakkebrønner"
   label_required: "påkrevd"
@@ -2617,6 +2686,7 @@
   label_this_month: "denne måneden"
   label_this_week: "denne uken"
   label_this_year: "dette året"
+  label_time: "Time"
   label_time_entry_plural: "Tid brukt"
   label_time_entry_activity_plural: "Brukt tid aktivitet"
   label_title: "Tittel"
@@ -2652,6 +2722,7 @@
   label_user_settings: "Brukerinnstillinger"
   label_users_settings: "Brukerinnstillinger"
   label_version_new: "Ny versjon"
+  label_version_edit: "Edit version"
   label_version_plural: "Versjoner"
   label_version_sharing_descendants: "Med underprosjekter"
   label_version_sharing_hierarchy: "Med prosjekthierarkiet"
@@ -2789,8 +2860,13 @@
         prefix: "Mottatt pga. varslingsinnstilling: %{reason}"
         date_alert_start_date: "Dato varsel"
         date_alert_due_date: "Dato varsel"
+        reminder: "Reminder"
       see_all: "Se alle"
       updated_at: "Oppdatert %{timestamp} av %{user}"
+    reminder_notifications:
+      subject: "Reminder: %{note}"
+      heading: "You have a new reminder"
+      note: "Note: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "Du kan %{allowed_actions} denne arbeidspakken. Dette kan endre avhengig av din prosjektrolle og tillatelser."
@@ -2957,6 +3033,7 @@
   notice_successful_connection: "Vellykket tilkobling."
   notice_successful_create: "Opprettelsen var vellykket."
   notice_successful_delete: "Slettingen var vellykket."
+  notice_successful_cancel: "Successful cancellation."
   notice_successful_update: "Oppdateringen var vellykket."
   notice_successful_update_custom_fields_added_to_project: |
     Vellykket oppdatering. Spesifikke felter for aktiverte typer blir automatisk aktivert
@@ -3034,6 +3111,7 @@
   permission_edit_own_time_entries: "Rediger egne tidsrapporter"
   permission_edit_project: "Rediger prosjekt"
   permission_edit_project_attributes: "Rediger prosjektattributter"
+  permission_edit_project_stages_and_gates: "Edit project stages and gates"
   permission_edit_reportings: "Rediger rapporteringer"
   permission_edit_time_entries: "Rediger tidslogger for andre brukere"
   permission_edit_timelines: "Rediger tidslinjer"
@@ -3063,9 +3141,12 @@
   permission_search_project: "Søk i prosjekt"
   permission_select_custom_fields: "Velg egendefinerte felt"
   permission_select_project_custom_fields: "Velg prosjektegenskaper"
+  permission_select_project_life_cycle: "Select project stages and gates"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "Velg prosjektmoduler"
   permission_share_work_packages: "Del arbeidspakker"
   permission_manage_types: "Velg typer"
+  permission_manage_own_reminders: "Create own reminders"
   permission_view_project: "Vis prosjekter"
   permission_view_changesets: "Se revideringer av lagringssteder i OpenProject"
   permission_view_commit_author_statistics: "Vis statistikk over forfatterbidrag"
@@ -3086,6 +3167,7 @@
   permission_work_package_assigned_explanation: "Arbeidspakker kan tildeles brukere og grupper med denne rollen i det respektive prosjektet"
   permission_view_project_activity: "Vis prosjektaktivitet"
   permission_view_project_attributes: "Vis prosjektattributter"
+  permission_view_project_stages_and_gates: "View project stages and gates"
   permission_save_bcf_queries: "Lagre BCF-spørringer"
   permission_manage_public_bcf_queries: "Administrere offentlige BCF-spørringer"
   permission_edit_attribute_help_texts: "Rediger hjelpetekster for egenskap"
@@ -3766,6 +3848,12 @@
       edit_description: "Kan vise, kommentere og redigere denne arbeidspakken."
       view: "Vis"
       view_description: "Kan se denne arbeidspakken."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Why are you setting this reminder?"
+      success_creation_message: "Reminder set successfully. You will receive a notification for this work package at the chosen time."
+      success_update_message: "Reminder updated successfully."
+      success_deletion_message: "Reminder deleted successfully."
   sharing:
     count:
       zero: "0 brukere"
diff --git a/config/locales/crowdin/pl.yml b/config/locales/crowdin/pl.yml
index 5e36b00fea26..dc49aa95e9d5 100644
--- a/config/locales/crowdin/pl.yml
+++ b/config/locales/crowdin/pl.yml
@@ -340,6 +340,9 @@ pl:
         text: "To działanie nie spowoduje usunięcia żadnego projektu znajdującego się na liście. Czy na pewno chcesz usunąć tę listę projektów?"
     settings:
       change_identifier: Identyfikator zmiany
+      actions:
+        label_enable_all: "Włącz wszystkie"
+        label_disable_all: "Wyłącz wszystkie"
       activities:
         no_results_title_text: Nie ma dostępnych żadnych aktywności.
       forums:
@@ -350,18 +353,26 @@ pl:
         no_results_content_text: Utwórz nową kategorię zadania
       custom_fields:
         no_results_title_text: Nie ma dostępnych pól niestandardowych.
+      life_cycle:
+        header:
+          title: "Cykl życia projektu"
+          description_html: 'Te etapy i bramki w cyklu życia projektu będą wyświetlane na <a href=%{overview_url} target="_blank">stronie przeglądu projektu</a> i są definiowane w <a href=%{admin_settings_url} target="_blank">ustawieniach administracyjnych</a> przez administratora wystąpienia. Poszczególne atrybuty można włączyć lub wyłączyć.'
+        non_defined: "Ani etapy, ani bramki nie są obecnie zdefiniowane."
+        section_header: "Etapy i bramki"
+        step:
+          use_in_project: "Użyj kroku %{step} w tym projekcie"
+        filter:
+          label: "Wyszukaj etap lub brankę projektu"
       project_custom_fields:
         header:
           title: "Atrybuty projektu"
-          description: 'Te atrybuty projektu będą wyświetlane w odpowiednich sekcjach Twojej <a href=%{overview_url} target="_blank">strony przeglądu projektu</a>. Możesz włączyć lub wyłączyć poszczególne atrybuty. Atrybuty i sekcje projektu są definiowane w <a href=%{admin_settings_url} target="_blank">ustawieniach administracyjnych</a> przez administratora wystąpienia. '
+          description_html: 'Te atrybuty projektu będą wyświetlane w odpowiednich sekcjach Twojej <a href=%{overview_url} target="_blank">strony przeglądu projektu</a>. Możesz włączyć lub wyłączyć poszczególne atrybuty. Atrybuty i sekcje projektu są definiowane w <a href=%{admin_settings_url} target="_blank">ustawieniach administracyjnych</a> przez administratora wystąpienia. '
         filter:
           label: "Wyszukaj atrybut projektu"
         actions:
           label_enable_single: "Aktywne w tym projekcie, kliknij, aby wyłączyć"
           label_disable_single: "Nieaktywne w tym projekcie, kliknij, aby włączyć"
           remove_from_project: "Usuń z projektu"
-          label_enable_all: "Włącz wszystkie"
-          label_disable_all: "Wyłącz wszystkie"
         is_required_blank_slate:
           heading: Wymagane we wszystkich projektach
           description: Ten atrybut projektu jest aktywowany we wszystkich projektach, ponieważ zaznaczona jest opcja „Wymagane we wszystkich projektach”. Nie można go dezaktywować dla poszczególnych projektów.
@@ -374,6 +385,12 @@ pl:
         no_results_content_text: Utwórz nową wersję projektu
       storage:
         no_results_title_text: Nie ma dodatkowego zarejestrowanego miejsca na dysku zużytego przez ten projekt.
+  project_stage:
+    working_days_count:
+      one: "Czas trwania: %{count} dzień roboczy"
+      few: "Czas trwania: %{count} dni robocze"
+      many: "Czas trwania: %{count} dni roboczych"
+      other: "Czas trwania: %{count} dnia roboczego"
   lists:
     create:
       success: "Zmodyfikowana lista została zapisana jako nowa lista"
@@ -506,8 +523,12 @@ pl:
     groups:
       member_in_these_groups: "Ten użytkownik jest obecnie członkiem następujących grup:"
       no_results_title_text: Ten użytkownik nie jest obecnie członkiem żadnej grupy.
+      summary_with_more: Członek %{names} i %{count_link}.
+      more: "%{count} więcej"
+      summary: Członek %{names}.
     memberships:
       no_results_title_text: Użytkownik jeszcze nie jest członkiem projektu.
+    open_profile: "Otwórz profil"
   page:
     text: "Tekst"
   placeholder_users:
@@ -580,18 +601,27 @@ pl:
       no_results_title_text: Nie ma jeszcze żadnych typów.
       no_results_content_text: Utwórz nowy typ
     edit:
-      settings: "Ustawienia"
-      form_configuration: "Konfiguracja formularza"
+      form_configuration:
+        tab: "Konfiguracja formularza"
       more_info_text_html: >
         Wersja Enterprise pozwala dostosować konfigurację formularza za pomocą tych dodatków: <br> <ul class="%{list_styling_class}"> <li><b>Dodaj nowe grupy atrybutów</b></li> <li><b>Zmień nazwę grup atrybutów</b></li> <li><b>Dodaj tabelę powiązanych pakietów roboczych</b></li> </ul>
-      projects: "Projekty"
-      enabled_projects: "Aktywne projekty"
-      edit_query: "Edytuj tabelę"
-      query_group_placeholder: "Nadaj nazwę tabeli"
-      reset: "Resetuj do ustawień domyślnych"
-      type_color_text: |
-        Wybrany kolor odróżnia różne typy
-        na wykresach Gantta lub w tabelach pakietów roboczych. W związku z tym zalecane jest stosowanie mocnego koloru.
+      projects:
+        tab: "Projekty"
+        enabled_projects: "Aktywne projekty"
+      settings:
+        tab: "Ustawienia"
+        type_color_text: Wybrany kolor odróżnia różne typy na wykresach Gantta lub w tabelach pakietów roboczych. W związku z tym zalecane jest stosowanie mocnego koloru.
+      subject_configuration:
+        tab: "Konfiguracja tematu"
+        manually_editable_subjects:
+          label: "Ręcznie edytowane tematy"
+          caption: "Użytkownicy mogą bez ograniczeń ręcznie wprowadzać i edytować tematy pakietów roboczych."
+        automatically_generated_subjects:
+          label: "Automatycznie generowane tematy"
+          caption: "Zdefiniuj wzorzec za pomocą wywoływanych atrybutów i tekstu, aby automatycznie generować tematy pakietów roboczych. Użytkownicy nie będą mogli ręcznie edytować tematów."
+        pattern:
+          label: "Wzorzec tematu"
+          caption: "Wyszukaj atrybut lub dodaj tekst. Aby utworzyć odstęp między elementami, dodaj go jako tekst."
   versions:
     overview:
       work_packages_in_archived_projects: "Wersja jest udostępniona z zarchiwizowanymi projektami, które nadal mają pakiety robocze przypisane do tej wersji. Są one liczone, ale nie pojawią się w powiązanych widokach."
@@ -656,6 +686,10 @@ pl:
     label_add_x: "Dodaj %{x}"
     label_edit_x: "Edytuj %{x}"
     label_add_description: "Dodaj opis"
+    lag:
+      subject: "Opóźnienie"
+      title: "Opóźnienie (w dniach)"
+      caption: "Minimalna liczba dni roboczych wymagana między dwoma pakietami roboczymi."
     relations:
       label_relates_singular: "ma relację z"
       label_relates_plural: "ma relację z"
@@ -671,7 +705,7 @@ pl:
       follows_description: "Powiązany pakiet roboczy musi koniecznie zostać ukończony przed rozpoczęciem tego pakietu"
       label_child_singular: "element podrzędny"
       label_child_plural: "elementy podrzędne"
-      child_description: "Makes the related work package a sub-item of the current (parent) work package"
+      child_description: "Ustawia powiązany pakiet roboczy jako element podrzędny bieżącego (nadrzędnego) pakietu roboczego"
       label_blocks_singular: "blok"
       label_blocks_plural: "bloki"
       blocks_description: "Powiązany pakiet roboczy nie może zostać zamknięty, dopóki najpierw nie zostanie zamknięty ten pakiet roboczy"
@@ -860,6 +894,9 @@ pl:
         lag: "Opóźnienie"
         from: "Zadanie"
         to: "Powiązanie zadania"
+      reminder:
+        remind_at_date: "Data"
+        remind_at_time: "Godzina"
       repository:
         url: "ADRES URL"
       role:
@@ -948,6 +985,7 @@ pl:
       messages:
         accepted: "musi być zaakceptowane."
         after: "musi być po %{date}."
+        after_today: "musi przypadać w przyszłości."
         after_or_equal_to: "musi być po lub równe %{date}."
         before: "musi być przed %{date}."
         before_or_equal_to: "musi być przed lub równe %{date}."
@@ -994,6 +1032,7 @@ pl:
         not_an_integer: "nie jest liczbą całkowitą."
         not_an_iso_date: "wprowadzono nieprawidłową datę. Wymagany format: RRRR-MM-DD."
         not_same_project: "nie należy do tego samego projektu."
+        datetime_must_be_in_future: "musi przypadać w przyszłości."
         odd: "musi być nieparzyste."
         regex_match_failed: "nie pasuje do wyrażenia regularnego %{expression}."
         regex_invalid: "nie może być zastosowany z zastosowanym wyrażeniem regularnym."
@@ -1107,16 +1146,38 @@ pl:
           attributes:
             type:
               must_be_a_stage_or_gate: "musi mieć wartość Project::StageDefinition albo Project::GateDefinition"
+              type_and_class_name_mismatch: "musi być zgodna z nazwą tworzonego wystąpienia klasy"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "musi mieć wartość Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "musi mieć wartość Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "musi mieć wartość Project::Stage albo Project::Gate"
               must_be_a_stage: "musi mieć wartość Project::Stage"
               must_be_a_gate: "musi mieć wartość Project::Gate"
+              type_and_class_name_mismatch: "musi odpowiadać nazwie tworzonego wystąpienia klasy"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Nie można przypisać „end_date” do Project::Gate"
+              end_date_not_allowed: "Nie można przypisać daty zakończenia do Project::Gate"
+            type:
+              type_and_class_name_mismatch: "musi mieć wartość Project::Gate"
+            date:
+              non_continuous_dates: "nie może być wcześniejsza niż data zakończenia poprzedniego %{step}."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "data rozpoczęcia musi być wcześniejsza niż data zakończenia."
+              non_continuous_dates: "nie może być wcześniejsza niż data zakończenia poprzedniego %{step}."
+              incomplete: "jest niekompletny."
+            type:
+              type_and_class_name_mismatch: "musi mieć wartość Project::Stage"
         query:
           attributes:
             project:
@@ -1339,6 +1400,8 @@ pl:
         other: "Powiadomień"
       placeholder_user: "Użytkownik zastępczy"
       project: "Projekt"
+      project/gate_definition: "Bramka"
+      project/stage_definition: "Etap"
       project_query:
         one: "Lista projektów"
         few: "Listy projektów"
@@ -1456,6 +1519,7 @@ pl:
     login: "Nazwa użytkownika"
     mail: "Adres e-mail"
     name: "Nazwa"
+    note: "Uwaga"
     password: "Hasło"
     priority: "Priorytet"
     project: "Projekt"
@@ -1552,6 +1616,7 @@ pl:
   button_print: "Drukuj"
   button_quote: "Cytat"
   button_remove: Usuń
+  button_remove_reminder: "Usuń przypomnienie"
   button_rename: "Zmień nazwę"
   button_replace: "Zastąp"
   button_revoke: "Unieważnij"
@@ -1562,6 +1627,7 @@ pl:
   button_save_as: "Zapisz jako"
   button_apply_changes: "Zastosuj zmiany"
   button_save_back: "Zapisz i wróć"
+  button_set_reminder: "Ustaw przypomnienie"
   button_show: "Pokaż"
   button_sort: "Sortowanie"
   button_submit: "Prześlij"
@@ -1803,12 +1869,12 @@ pl:
   direction: ltr
   ee:
     upsale:
+      title: "Dodatek wersji Enterprise"
+      link_title: "Więcej informacji"
       form_configuration:
         description: "Dostosuj konfigurację formularza za pomocą tych dodatków:"
         add_groups: "Dodaj nowe grupy atrybutów"
         rename_groups: "Zmień grupy atrybutów"
-      project_filters:
-        description_html: "Filtrowanie i sortowanie pól niestandardowych jest dodatkiem dla wersji Enterprise."
   enumeration_activities: "Działania śledzenia czasu"
   enumeration_work_package_priorities: "Priorytety pakietów roboczych"
   enumeration_reported_project_statuses: "Status zgłoszonego projektu"
@@ -1841,6 +1907,7 @@ pl:
   error_pdf_export_too_many_columns: "Wybrano zbyt dużo kolumn do eksportu PDF. Zmniejsz liczbę kolumn."
   error_pdf_failed_to_export: "Nie można było zapisać eksportu PDF: %{error}"
   error_token_authenticity: "Nie można zweryfikować tokenu Cross-Site Request Forgery. Czy podjęto próbę przesłania danych w wielu przeglądarkach lub z wielu kart? Zamknij wszystkie karty i spróbuj ponownie."
+  error_reminder_not_found: "Nie znaleziono przypomnienia lub już o nim powiadomiono."
   error_work_package_not_found_in_project: "Pakiet roboczy nie został znaleziony lub nie należy do tego projektu"
   error_work_package_id_not_found: "Nie znaleziono pakietu roboczego."
   error_must_be_project_member: "musi być członkiem projektu"
@@ -2134,6 +2201,7 @@ pl:
       responsible: "Osoba odpowiedzialna"
       shared: "Udostępniono"
       watched: "Obserwator"
+      reminder: "Przypomnienie"
     facets:
       unread: "Nieprzeczytane"
       unread_title: "Pokaż nieprzeczytane"
@@ -2301,8 +2369,10 @@ pl:
   label_default: "Domyślnie"
   label_delete_user: "Usuń użytkownika"
   label_delete_project: "Usuń projekt"
+  label_delete: "Usuń"
   label_deleted: "Usunięty"
   label_deleted_custom_field: "(usunięte pole niestandardowe)"
+  label_deleted_custom_item: "(usunięty element)"
   label_deleted_custom_option: "(opcja usunięta)"
   label_empty_element: "(pusty)"
   label_missing_or_hidden_custom_option: "(brakująca wartość lub brak uprawnień do dostępu)"
@@ -2339,7 +2409,6 @@ pl:
   label_enterprise_active_users: "%{current}/%{limit} zarejestrowanych aktywnych użytkowników"
   label_enterprise_edition: "Wersja Enterprise"
   label_enterprise_support: "Wsparcie Enterprise"
-  label_enterprise_addon: "Dodatek wersji Enterprise"
   label_environment: "Środowisko"
   label_estimates_and_progress: "Szacunki i postęp"
   label_equals: "jest"
@@ -2524,6 +2593,7 @@ pl:
   label_none_parentheses: "(brak)"
   label_not_contains: "nie zawierają"
   label_not_equals: "nie jest"
+  label_life_cycle_step_plural: "Cykl życia projektu"
   label_on: "wł"
   label_operator_all: "nie jest puste"
   label_operator_none: "jest puste"
@@ -2625,6 +2695,7 @@ pl:
   label_reporting: "Zgłoszenie"
   label_reporting_plural: "Zgłoszenia"
   label_repository: "Repozytorium"
+  label_repository_remove: "Usuń repozytorium"
   label_repository_root: "Główne repozytorium"
   label_repository_plural: "Repozytoria"
   label_required: "wymagane"
@@ -2687,6 +2758,7 @@ pl:
   label_this_month: "ten miesiąc"
   label_this_week: "ten tydzień"
   label_this_year: "ten rok"
+  label_time: "Czas"
   label_time_entry_plural: "Czas pracy"
   label_time_entry_activity_plural: "Czas spędzony na aktywności"
   label_title: "Tytuł"
@@ -2722,6 +2794,7 @@ pl:
   label_user_settings: "Ustawienia użytkownika"
   label_users_settings: "Ustawienia użytkowników"
   label_version_new: "Nowa wersja"
+  label_version_edit: "Edytuj wersję"
   label_version_plural: "Wersje"
   label_version_sharing_descendants: "Z podprojektami"
   label_version_sharing_hierarchy: "Z hierarchią projektu"
@@ -2861,8 +2934,13 @@ pl:
         prefix: "Otrzymano z powodu ustawienia powiadomienia: %{reason}"
         date_alert_start_date: "Alert dotyczący daty"
         date_alert_due_date: "Alert dotyczący daty"
+        reminder: "Przypomnienie"
       see_all: "Zobacz wszystkie"
       updated_at: "Zaktualizowano %{timestamp}, autor %{user} "
+    reminder_notifications:
+      subject: "Przypomnienie: %{note}"
+      heading: "Masz nowe przypomnienie"
+      note: "Uwaga: „%{note}”"
     sharing:
       work_packages:
         allowed_actions: "Możesz %{allowed_actions} ten pakiet roboczy. Może się to zmienić w zależności od Twojej roli w projekcie i uprawnień."
@@ -3028,6 +3106,7 @@ pl:
   notice_successful_connection: "Połączenie zakończone sukcesem."
   notice_successful_create: "Tworzenie zakończone sukcesem."
   notice_successful_delete: "Usuwanie zakończone sukcesem."
+  notice_successful_cancel: "Anulowanie powiodło się."
   notice_successful_update: "Aktualizacja zakończona sukcesem."
   notice_successful_update_custom_fields_added_to_project: |
     Pomyślna aktualizacja. Pola własne aktywowanych typów są automatycznie włączane
@@ -3107,6 +3186,7 @@ pl:
   permission_edit_own_time_entries: "Edycja własnych wpisów dziennika"
   permission_edit_project: "Edycja projektu"
   permission_edit_project_attributes: "Edytuj atrybuty projektu"
+  permission_edit_project_stages_and_gates: "Edytuj etapy i bramki projektu"
   permission_edit_reportings: "Edycja raportów"
   permission_edit_time_entries: "Edycja dzienników czasu pracy dla innych użytkowników"
   permission_edit_timelines: "Edycja osi czasu"
@@ -3136,9 +3216,12 @@ pl:
   permission_search_project: "Wyszukaj projekt"
   permission_select_custom_fields: "Wybierz pola niestandardowe"
   permission_select_project_custom_fields: "Wybierz atrybuty projektu"
+  permission_select_project_life_cycle: "Wybierz etapy i bramki projektu"
+  permission_select_project_life_cycle_explanation: "Aktywuj/dezaktywuj etapy i bramki w projekcie. Umożliwia użytkownikowi wybranie cyklu życia odpowiedniego dla projektu, ponieważ nieaktywne etapy i bramki nie będą widoczne na stronie przeglądu projektu ani na liście projektów."
   permission_select_project_modules: "Wybieranie modułów projektu"
   permission_share_work_packages: "Udostępnij pakiety robocze"
   permission_manage_types: "Select types"
+  permission_manage_own_reminders: "Tworzenie własnych przypomnień"
   permission_view_project: "Wyświetl projekty"
   permission_view_changesets: "Zobacz repozytorium poprawek OpenProject"
   permission_view_commit_author_statistics: "Widok statystyk autorów"
@@ -3159,6 +3242,7 @@ pl:
   permission_work_package_assigned_explanation: "Pakiety robocze mogą być przypisane do użytkowników i grup znajdujących się w posiadaniu tej roli w odpowiednim projekcie"
   permission_view_project_activity: "Wyświetl aktywność projektu"
   permission_view_project_attributes: "Wyświetl atrybuty projektu"
+  permission_view_project_stages_and_gates: "Wyświetlanie etapów i bramek projektu"
   permission_save_bcf_queries: "Zapisz zapytania BCF"
   permission_manage_public_bcf_queries: "Zarządzanie publicznymi zapytaniami BCF"
   permission_edit_attribute_help_texts: "Edytuj teksty pomocy dotyczące atrybutów"
@@ -3839,6 +3923,12 @@ pl:
       edit_description: "Może wyświetlać, komentować i edytować ten pakiet roboczy."
       view: "Wyświetlanie"
       view_description: "Może wyświetlić ten pakiet roboczy."
+    reminders:
+      label_remind_at: "Data"
+      note_placeholder: "Dlaczego ustawiasz to przypomnienie?"
+      success_creation_message: "Przypomnienie zostało ustawione. W wybranym terminie otrzymasz powiadomienie dotyczące tego pakietu roboczego."
+      success_update_message: "Przypomnienie zostało zaktualizowane."
+      success_deletion_message: "Przypomnienie zostało usunięte."
   sharing:
     count:
       zero: "0 użytkowników"
diff --git a/config/locales/crowdin/pt-BR.yml b/config/locales/crowdin/pt-BR.yml
index 148fe1d04f06..ca49a78a590c 100644
--- a/config/locales/crowdin/pt-BR.yml
+++ b/config/locales/crowdin/pt-BR.yml
@@ -342,6 +342,9 @@ pt-BR:
         text: "Esta ação não excluirá nenhum projeto contido na lista. Você tem certeza de que deseja excluir esta lista de projetos?"
     settings:
       change_identifier: Mudar identificador
+      actions:
+        label_enable_all: "Habilitar todos"
+        label_disable_all: "Desativar tudo"
       activities:
         no_results_title_text: Atualmente, não há atividades disponíveis.
       forums:
@@ -352,18 +355,26 @@ pt-BR:
         no_results_content_text: Criar uma nova categoria de pacote de trabalho
       custom_fields:
         no_results_title_text: Não há campos personalizados disponíveis.
+      life_cycle:
+        header:
+          title: "Ciclo de vida do projeto"
+          description_html: 'Essas fases e marcos no ciclo de vida do projeto serão exibidos na sua <a href=%{overview_url} target="_blank">página de visão geral do projeto</a> e são definidos nas <a href=%{admin_settings_url} target="_blank">configurações de administração</a> pelo administrador da instância. Você pode ativar ou desativar atributos individuais.'
+        non_defined: "Nem fases nem marcos estão atualmente definidos."
+        section_header: "Fases e marcos"
+        step:
+          use_in_project: "Use %{step} neste projeto"
+        filter:
+          label: "Pesquisar fase ou marco do projeto"
       project_custom_fields:
         header:
           title: "Atributos do projeto"
-          description: 'Esses atributos do projeto serão exibidos na sua <a href=%{overview_url} target="_blank">página de visão geral do projeto</a>, cada um na seção correspondente. Você pode ativar ou desativar atributos individualmente. Os atributos e seções do projeto são configurados nas <a href=%{admin_settings_url} target="_blank">configurações de administração</a> pelo responsável pela administração da instância.'
+          description_html: 'Esses atributos do projeto aparecerão na sua <a href=%{overview_url} target="_blank">página de visão geral do projeto</a>, organizados em suas respectivas seções. Você pode habilitar ou desabilitar atributos individuais. As seções e os atributos do projeto são definidos nas <a href=%{admin_settings_url} target="_blank">configurações de administração</a> pelo administrador da instância. '
         filter:
           label: "Pesquisar atributo do projeto"
         actions:
           label_enable_single: "Ativo neste projeto, clique para desativar"
           label_disable_single: "Inativo neste projeto, clique para ativar"
           remove_from_project: "Remover do projeto"
-          label_enable_all: "Ativar tudo"
-          label_disable_all: "Desativar tudo"
         is_required_blank_slate:
           heading: Obrigatório em todos os projetos
           description: Este atributo do projeto está ativado em todos os projetos porque a opção "Obrigatório em todos os projetos" está selecionada. Ele não pode ser desativado em projetos individuais.
@@ -376,6 +387,10 @@ pt-BR:
         no_results_content_text: Criar uma nova versão
       storage:
         no_results_title_text: Não há espaço adicional gravado em disco que seja consumido por este projeto.
+  project_stage:
+    working_days_count:
+      one: "Duração: %{count} dia útil"
+      other: "Duração: %{count} dias úteis"
   lists:
     create:
       success: "A lista modificada foi salva como uma nova lista"
@@ -496,8 +511,12 @@ pt-BR:
     groups:
       member_in_these_groups: "No momento, este usuário é um membro dos seguintes grupos: "
       no_results_title_text: No momento, este usuário não é membro de nenhum grupo.
+      summary_with_more: Membro de %{names} e %{count_link}.
+      more: "%{count} a mais"
+      summary: Membro do %{names}.
     memberships:
       no_results_title_text: Atualmente, este usuário não é um membro de um projeto.
+    open_profile: "Abrir perfil"
   page:
     text: "Texto"
   placeholder_users:
@@ -566,18 +585,27 @@ pt-BR:
       no_results_title_text: Atualmente, não há nenhum tipo.
       no_results_content_text: Criar um novo tipo
     edit:
-      settings: "Configurações"
-      form_configuration: "Configuração do formulário"
+      form_configuration:
+        tab: "Configuração do formulário"
       more_info_text_html: >
         A edição Enterprise permite a personalização da configuração do formulário com estes complementos adicionais: <br> <ul class="%{list_styling_class}"> <li><b>Adicionar novos grupos de atributos</b></li> <li><b>Renomear grupos de atributos</b></li> <li><b>Adicionar uma tabela de pacotes de trabalho relacionados</b></li> </ul>
-      projects: "Projetos"
-      enabled_projects: "Projetos habilitados"
-      edit_query: "Editar tabela"
-      query_group_placeholder: "Nomear tabela"
-      reset: "Redefinir para os padrões"
-      type_color_text: |
-        A cor selecionada distingue os tipos diferentes
-        nas tabelas de Gantt ou tabelas dos pacotes de trabalho. Recomenda-se o uso de uma cor forte.
+      projects:
+        tab: "Projetos"
+        enabled_projects: "Projetos habilitados"
+      settings:
+        tab: "Configurações"
+        type_color_text: A cor selecionada distingue os tipos diferentes nas tabelas de Gantt ou tabelas dos pacotes de trabalho. Recomenda-se o uso de uma cor forte.
+      subject_configuration:
+        tab: "Configuração de assunto"
+        manually_editable_subjects:
+          label: "Assuntos editáveis manualmente"
+          caption: "Os usuários podem inserir e editar manualmente os tópicos dos pacotes de trabalho sem restrições."
+        automatically_generated_subjects:
+          label: "Tópicos gerados automaticamente"
+          caption: "Defina um padrão usando atributos referenciados e texto para gerar automaticamente os tópicos dos pacotes de trabalho. Os usuários não poderão editar os tópicos manualmente."
+        pattern:
+          label: "Padrão de assunto"
+          caption: "Pesquise um atributo ou adicione texto. Para inserir um espaço entre os elementos, adicione-o como texto."
   versions:
     overview:
       work_packages_in_archived_projects: "A versão é compartilhada com projetos arquivados que ainda possuem pacotes de trabalho atribuídos a esta versão. Eles são contados, mas não aparecerão nas exibições vinculadas."
@@ -640,6 +668,10 @@ pt-BR:
     label_add_x: "Adicionar %{x}"
     label_edit_x: "Editar %{x}"
     label_add_description: "Adicionar descrição"
+    lag:
+      subject: "Atraso"
+      title: "Atraso (em dias)"
+      caption: "O número mínimo de dias úteis a ser mantido entre os dois pacotes de trabalho."
     relations:
       label_relates_singular: "relacionado a"
       label_relates_plural: "relacionado a"
@@ -655,7 +687,7 @@ pt-BR:
       follows_description: "O pacote de trabalho relacionado deve ser finalizado antes que este possa ser iniciado"
       label_child_singular: "filho"
       label_child_plural: "filhos"
-      child_description: "Makes the related work package a sub-item of the current (parent) work package"
+      child_description: "Torna o pacote de trabalho relacionado uma subtarefa do pacote de trabalho atual (pai)"
       label_blocks_singular: "blocos"
       label_blocks_plural: "blocos"
       blocks_description: "O pacote de trabalho relacionado não pode ser concluído até que este seja concluído primeiro"
@@ -844,6 +876,9 @@ pt-BR:
         lag: "Atraso"
         from: "Pacote de trabalho"
         to: "Pacote de trabalho relacionado"
+      reminder:
+        remind_at_date: "Data"
+        remind_at_time: "Hora"
       repository:
         url: "URL"
       role:
@@ -932,6 +967,7 @@ pt-BR:
       messages:
         accepted: "deve ser aceito."
         after: "deve ser depois de %{date}."
+        after_today: "deve ser no futuro."
         after_or_equal_to: "deve ser depois ou igual a %{date}."
         before: "deve ser antes de %{date}."
         before_or_equal_to: "deve ser antes ou igual a %{date}."
@@ -978,6 +1014,7 @@ pt-BR:
         not_an_integer: "não é um número inteiro."
         not_an_iso_date: "não é uma data válida. Formato exigido: AAAA-MM-DD."
         not_same_project: "não pertence ao mesmo projeto."
+        datetime_must_be_in_future: "deve ser no futuro."
         odd: "deve ser ímpar."
         regex_match_failed: "não corresponde à expressão regular %{expression}."
         regex_invalid: "não pode ser validado com a expressão regular associada."
@@ -1091,16 +1128,38 @@ pt-BR:
           attributes:
             type:
               must_be_a_stage_or_gate: "deve ser Project::StageDefinition ou Project::GateDefinition"
+              type_and_class_name_mismatch: "deve corresponder ao nome da classe instanciada"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "deve ser um Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "deve ser um Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "deve ser Project::Stage ou Project::Gate"
               must_be_a_stage: "deve ser um Project::Stage"
               must_be_a_gate: "deve ser um Project::Gate"
+              type_and_class_name_mismatch: "deve corresponder ao nome da classe instanciada"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Não é possível atribuir end_date a um Project::Gate"
+              end_date_not_allowed: "Não é possível atribuir data de término a um Project::Gate"
+            type:
+              type_and_class_name_mismatch: "deve ser um Project::Gate"
+            date:
+              non_continuous_dates: "não pode ser anterior à data de término do %{step} anterior."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "a data inicial deve ser anterior à data final."
+              non_continuous_dates: "não pode ser anterior à data de término do %{step} anterior."
+              incomplete: "está incompleto."
+            type:
+              type_and_class_name_mismatch: "deve ser um Project::Stage"
         query:
           attributes:
             project:
@@ -1317,6 +1376,8 @@ pt-BR:
         other: "Notificações"
       placeholder_user: "Usuário do espaço reservado"
       project: "Projeto"
+      project/gate_definition: "Portão"
+      project/stage_definition: "Fase"
       project_query:
         one: "Lista de projetos"
         other: "Listas de projeto"
@@ -1420,6 +1481,7 @@ pt-BR:
     login: "Nome de usuário"
     mail: "E-mail"
     name: "Nome"
+    note: "Nota"
     password: "Senha"
     priority: "Prioridade"
     project: "Projeto"
@@ -1516,6 +1578,7 @@ pt-BR:
   button_print: "Imprimir"
   button_quote: "Citar"
   button_remove: Remover
+  button_remove_reminder: "Remover lembrete"
   button_rename: "Renomear"
   button_replace: "Substituir"
   button_revoke: "Revogar"
@@ -1526,6 +1589,7 @@ pt-BR:
   button_save_as: "Salvar como"
   button_apply_changes: "Aplicar as alterações"
   button_save_back: "Salvar e voltar"
+  button_set_reminder: "Definir lembrete"
   button_show: "Mostrar"
   button_sort: "Ordenar"
   button_submit: "Enviar"
@@ -1731,12 +1795,12 @@ pt-BR:
   direction: da esquerda para a direita
   ee:
     upsale:
+      title: "Complemento empresarial"
+      link_title: "Mais informações"
       form_configuration:
         description: "Personalize a configuração do formulário com estes complementos adicionais:"
         add_groups: "Adicionar novos grupos de atributos"
         rename_groups: "Renomear grupos de atributos"
-      project_filters:
-        description_html: "Filtrar e ordenar em campos personalizados é um complemento da edição Enterprise."
   enumeration_activities: "Atividades de controle de tempo"
   enumeration_work_package_priorities: "Prioridades do pacote de trabalho"
   enumeration_reported_project_statuses: "Situação de projeto comunicada"
@@ -1769,6 +1833,7 @@ pt-BR:
   error_pdf_export_too_many_columns: "Muitas colunas selecionadas para a exportação para PDF. Reduza o número de colunas."
   error_pdf_failed_to_export: "Não foi possível salvar a exportação do PDF: %{error}"
   error_token_authenticity: "Não foi possível verificar o token de Falsificação de Solicitação Entre Sites. Você tentou enviar dados em vários navegadores ou abas? Por favor, feche todas as abas e tente novamente."
+  error_reminder_not_found: "O lembrete não foi encontrado ou já foi notificado."
   error_work_package_not_found_in_project: "O pacote de trabalho não foi encontrado ou não pertence a este projeto"
   error_work_package_id_not_found: "O pacote de trabalho não foi encontrado."
   error_must_be_project_member: "deve ser membro do projeto"
@@ -2062,6 +2127,7 @@ pt-BR:
       responsible: "Responsável"
       shared: "Compartilhado"
       watched: "Observador"
+      reminder: "Reminder"
     facets:
       unread: "Não lido"
       unread_title: "Exibir não lidos"
@@ -2229,8 +2295,10 @@ pt-BR:
   label_default: "Padrão"
   label_delete_user: "Excluir usuário"
   label_delete_project: "Excluir projeto"
+  label_delete: "Excluir"
   label_deleted: "excluído"
   label_deleted_custom_field: "(campo personalizado excluído)"
+  label_deleted_custom_item: "(item excluído)"
   label_deleted_custom_option: "(opção excluída)"
   label_empty_element: "(vazio)"
   label_missing_or_hidden_custom_option: "(algum valor faltando ou falta permissões para acessar)"
@@ -2267,7 +2335,6 @@ pt-BR:
   label_enterprise_active_users: "%{current}/%{limit} usuários ativos reservados"
   label_enterprise_edition: "Edição Enterprise"
   label_enterprise_support: "Suporte corporativo"
-  label_enterprise_addon: "Complemento empresarial"
   label_environment: "Ambiente"
   label_estimates_and_progress: "Estimativas e progresso"
   label_equals: "é"
@@ -2452,6 +2519,7 @@ pt-BR:
   label_none_parentheses: "(nenhum)"
   label_not_contains: "não contém"
   label_not_equals: "não é"
+  label_life_cycle_step_plural: "Ciclo de vida do projeto"
   label_on: "ligado"
   label_operator_all: "não está vazio"
   label_operator_none: "está vazio"
@@ -2553,6 +2621,7 @@ pt-BR:
   label_reporting: "Relatório"
   label_reporting_plural: "Relatórios"
   label_repository: "Repositório"
+  label_repository_remove: "Remover repositório"
   label_repository_root: "Raiz do repositório"
   label_repository_plural: "Repositórios"
   label_required: "requerido"
@@ -2615,6 +2684,7 @@ pt-BR:
   label_this_month: "este mês"
   label_this_week: "esta semana"
   label_this_year: "este ano"
+  label_time: "Horário"
   label_time_entry_plural: "Tempo gasto"
   label_time_entry_activity_plural: "Tempo investido em atividades"
   label_title: "Título"
@@ -2650,6 +2720,7 @@ pt-BR:
   label_user_settings: "Configurações do usuário"
   label_users_settings: "Configurações de usuário"
   label_version_new: "Nova versão"
+  label_version_edit: "Editar versão"
   label_version_plural: "Versões"
   label_version_sharing_descendants: "Com subprojetos"
   label_version_sharing_hierarchy: "Com a hierarquia do projeto"
@@ -2787,8 +2858,13 @@ pt-BR:
         prefix: "Recebido devido à configuração de notificação: %{reason}"
         date_alert_start_date: "Alerta de data"
         date_alert_due_date: "Alerta de data"
+        reminder: "Reminder"
       see_all: "Ver todas"
       updated_at: "Atualizado em %{timestamp} por %{user}"
+    reminder_notifications:
+      subject: "Lembrete: %{note}"
+      heading: "Você possui um novo lembrete"
+      note: "Nota: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "Você pode %{allowed_actions} este pacote de trabalho. Isso pode mudar dependendo da sua função e permissões do projeto."
@@ -2954,6 +3030,7 @@ pt-BR:
   notice_successful_connection: "Conectado com sucesso."
   notice_successful_create: "Criado com sucesso."
   notice_successful_delete: "Exclusão bem sucedida."
+  notice_successful_cancel: "Cancelamento bem-sucedido."
   notice_successful_update: "Atualizado com sucesso."
   notice_successful_update_custom_fields_added_to_project: |
     Atualização bem-sucedida. Os campos personalizados dos tipos ativados são ativados automaticamente
@@ -3031,6 +3108,7 @@ pt-BR:
   permission_edit_own_time_entries: "Editar os próprios registros de tempo"
   permission_edit_project: "Editar projeto"
   permission_edit_project_attributes: "Editar atributos do projeto"
+  permission_edit_project_stages_and_gates: "Editar fases e marcos do projeto"
   permission_edit_reportings: "Editar relatórios"
   permission_edit_time_entries: "Editar registro de hora para outros usuários"
   permission_edit_timelines: "Editar cronogramas"
@@ -3060,9 +3138,12 @@ pt-BR:
   permission_search_project: "Buscar projeto"
   permission_select_custom_fields: "Selecionar campos personalizados"
   permission_select_project_custom_fields: "Selecione os atributos do projeto"
+  permission_select_project_life_cycle: "Selecionar fases e marcos do projeto"
+  permission_select_project_life_cycle_explanation: "Ative ou desative os estágios e marcos de um projeto. Isso permite que o usuário selecione o ciclo de vida adequado para o projeto, pois os estágios e marcos desativados não serão exibidos na página de visão geral nem na lista de projetos."
   permission_select_project_modules: "Selecionar módulos do projeto"
   permission_share_work_packages: "Compartilhar pacotes de trabalho"
   permission_manage_types: "Selecionar tipos"
+  permission_manage_own_reminders: "Criar seus próprios lembretes"
   permission_view_project: "Visualizar projetos"
   permission_view_changesets: "Revisões do repositório vistas no OpenProject"
   permission_view_commit_author_statistics: "Ver estatísticas de commits do autor"
@@ -3083,6 +3164,7 @@ pt-BR:
   permission_work_package_assigned_explanation: "Pacotes de trabalho podem ser atribuídos a usuários e grupos em posse deste papel no respectivo projeto"
   permission_view_project_activity: "Visualizar a atividade do projeto"
   permission_view_project_attributes: "Visualizar atributos do projeto"
+  permission_view_project_stages_and_gates: "Visualizar fases e marcos do projeto"
   permission_save_bcf_queries: "Salvar consultas a BCF"
   permission_manage_public_bcf_queries: "Gerenciar consultas públicas a BCF"
   permission_edit_attribute_help_texts: "Editar textos de ajuda do atributos"
@@ -3762,6 +3844,12 @@ pt-BR:
       edit_description: "Pode visualizar, comentar e editar este pacote de trabalho."
       view: "Ver"
       view_description: "Pode visualizar este pacote de trabalho."
+    reminders:
+      label_remind_at: "Data"
+      note_placeholder: "Por que você está configurando este lembrete?"
+      success_creation_message: "Lembrete definido com sucesso. Você receberá uma notificação para este pacote de trabalho no horário selecionado."
+      success_update_message: "Lembrete atualizado com sucesso."
+      success_deletion_message: "Lembrete excluído com sucesso."
   sharing:
     count:
       zero: "0 usuários"
diff --git a/config/locales/crowdin/pt-PT.yml b/config/locales/crowdin/pt-PT.yml
index 5e650425594d..be8162ba65f8 100644
--- a/config/locales/crowdin/pt-PT.yml
+++ b/config/locales/crowdin/pt-PT.yml
@@ -341,6 +341,9 @@ pt-PT:
         text: "Esta ação não eliminará qualquer projeto que a lista contenha. Tem a certeza de que pretende eliminar esta lista de projectos?"
     settings:
       change_identifier: Mudar identificador
+      actions:
+        label_enable_all: "Ativar tudo"
+        label_disable_all: "Desativar tudo"
       activities:
         no_results_title_text: Atualmente, não existem atividades disponíveis.
       forums:
@@ -351,18 +354,26 @@ pt-PT:
         no_results_content_text: Criar uma nova categoria de pacote de trabalho
       custom_fields:
         no_results_title_text: Atualmente não existem campos personalizados disponíveis.
+      life_cycle:
+        header:
+          title: "Ciclo de vida do projeto"
+          description_html: 'Estas fases e portas do projeto no ciclo de vida do projeto serão apresentadas na sua <a href=%{overview_url} target="_blank">página de visão geral do projeto</a> e são definidas nas <a href=%{admin_settings_url} target="_blank">definições de administração</a> pelo administrador da instância. Pode ativar ou desativar atributos individuais.'
+        non_defined: "Atualmente, não estão definidas nem as fases nem as portas."
+        section_header: "Fases e portas"
+        step:
+          use_in_project: "Utilize %{step} neste projeto"
+        filter:
+          label: "Pesquisar fase ou porta do projeto"
       project_custom_fields:
         header:
           title: "Atributos do projeto"
-          description: 'Estes atributos do projeto serão apresentados na sua <a href=%{overview_url} target="_blank">página de visão geral do projeto</a> nas respetivas secções. Pode ativar ou desativar atributos individuais. Os atributos e as secções do projeto estão definidos nas <a href=%{admin_settings_url} target="_blank">definições de administração</a> pelo administrador da instância. '
+          description_html: 'Estes atributos do projeto serão apresentados na sua <a href=%{overview_url} target="_blank">página de visão geral do projeto</a> nas respetivas secções. Pode ativar ou desativar atributos individuais. Os atributos e as secções do projeto estão definidos nas <a href=%{admin_settings_url} target="_blank">definições de administração</a> pelo administrador da instância. '
         filter:
           label: "Pesquisar atributo do projeto"
         actions:
           label_enable_single: "Ativo neste projeto, clique para desativar"
           label_disable_single: "Inativo neste projeto, clique para ativar"
           remove_from_project: "Remover do projeto"
-          label_enable_all: "Ativar tudo"
-          label_disable_all: "Desativar tudo"
         is_required_blank_slate:
           heading: Necessário em todos os projetos
           description: Este atributo de projeto é ativado em todos os projetos, uma vez que a opção "Necessário em todos os projetos" está assinalada. Não pode ser desativado para projetos individuais.
@@ -375,6 +386,10 @@ pt-PT:
         no_results_content_text: Crie uma nova versão
       storage:
         no_results_title_text: Não há espaço adicional gravado em disco que seja consumido por este projeto.
+  project_stage:
+    working_days_count:
+      one: "Duração: %{count} dia útil"
+      other: "Duração: %{count} dias úteis"
   lists:
     create:
       success: "A lista modificada foi guardada como uma nova lista"
@@ -495,8 +510,12 @@ pt-PT:
     groups:
       member_in_these_groups: "Atualmente, este utilizador é membro dos seguintes grupos:"
       no_results_title_text: Este utilizador atualmente não é um membro de nenhum grupo.
+      summary_with_more: Membro de %{names} e %{count_link}.
+      more: "mais %{count}"
+      summary: Membro de %{names}.
     memberships:
       no_results_title_text: Este utilizador atualmente não é um membro de um projeto.
+    open_profile: "Abrir perfil"
   page:
     text: "Conteúdo"
   placeholder_users:
@@ -566,18 +585,27 @@ pt-PT:
       no_results_title_text: Atualmente, não existem tipos.
       no_results_content_text: Crie um novo tipo
     edit:
-      settings: "Definições"
-      form_configuration: "Configuração do formulário"
+      form_configuration:
+        tab: "Configuração do formulário"
       more_info_text_html: >
         A edição Enterprise permite personalizar a configuração do formulário com estes complementos adicionais: <br> <ul class="%{list_styling_class}"> <li><b>Adicionar novos grupos de atributos</b></li> <li><b>Renomear grupos de atributos</b></li> <li><b>Adicionar uma tabela de pacotes de trabalho relacionados</b></li> </ul>
-      projects: "Projetos"
-      enabled_projects: "Projetos ativados"
-      edit_query: "Editar tabela"
-      query_group_placeholder: "Dê um nome à tabela"
-      reset: "Repor predefinições"
-      type_color_text: |
-        A cor selecionada distingue diferentes tipos
-        em gráficos de Gantt ou tabelas de pacotes de trabalho. Portanto é recomendado usar uma cor forte.
+      projects:
+        tab: "Projetos"
+        enabled_projects: "Projetos ativados"
+      settings:
+        tab: "Definições"
+        type_color_text: A cor selecionada distingue diferentes tipos em gráficos de Gantt ou tabelas de pacotes de trabalho. Portanto é recomendado usar uma cor forte.
+      subject_configuration:
+        tab: "Configuração do tema"
+        manually_editable_subjects:
+          label: "Temas editáveis manualmente"
+          caption: "Os utilizadores podem introduzir e editar manualmente os temas dos pacotes de trabalho sem restrições."
+        automatically_generated_subjects:
+          label: "Temas gerados automaticamente"
+          caption: "Defina um padrão ao utilizar atributos referenciados e texto para gerar automaticamente temas dod pacotes de trabalho. Os utilizadores não poderão editar manualmente os temas."
+        pattern:
+          label: "Padrão do tema"
+          caption: "Procure um atributo ou adicione texto. Para criar um espaço entre elementos, adicione-o como um texto."
   versions:
     overview:
       work_packages_in_archived_projects: "A versão é partilhada com projetos arquivados que ainda têm pacotes de trabalho atribuídos a esta versão. Estes são contabilizados, mas não irão aparecer nas vistas vinculadas."
@@ -640,6 +668,10 @@ pt-PT:
     label_add_x: "Adicionar %{x}"
     label_edit_x: "Editar %{x}"
     label_add_description: "Adicionar descrição"
+    lag:
+      subject: "Desfasamento"
+      title: "Desfasamento (em dias)"
+      caption: "O número mínimo de dias úteis a manter entre os dois pacotes de trabalho."
     relations:
       label_relates_singular: "relacionado com"
       label_relates_plural: "relacionado com"
@@ -655,7 +687,7 @@ pt-PT:
       follows_description: "O pacote de trabalho relacionado tem necessariamente de ser iniciado antes deste começar"
       label_child_singular: "secundário"
       label_child_plural: "secundários"
-      child_description: "Makes the related work package a sub-item of the current (parent) work package"
+      child_description: "Torna o pacote de trabalho relacionado num subitem do pacote de trabalho atual (principal)"
       label_blocks_singular: "bloqueia"
       label_blocks_plural: "bloqueia"
       blocks_description: "O pacote de trabalho relacionado não pode ser encerrado até que este seja encerrado primeiro"
@@ -844,6 +876,9 @@ pt-PT:
         lag: "Atraso"
         from: "Pacote de trabalho"
         to: "Tarefas Relacionadas"
+      reminder:
+        remind_at_date: "Data"
+        remind_at_time: "Hora"
       repository:
         url: "URL"
       role:
@@ -932,6 +967,7 @@ pt-PT:
       messages:
         accepted: "deve ser aceite."
         after: "deve ser depois %{date}."
+        after_today: "tem de estar no futuro."
         after_or_equal_to: "tem de ser depois ou igual a %{date}."
         before: "tem de ser anterior a %{date}."
         before_or_equal_to: "deve ser antes ou igual a %{date}."
@@ -978,6 +1014,7 @@ pt-PT:
         not_an_integer: "não é um número inteiro."
         not_an_iso_date: "não é uma data válida. Formato exigido: AAAA-MM-DD."
         not_same_project: "não pertence ao mesmo projeto."
+        datetime_must_be_in_future: "tem de estar no futuro."
         odd: "deve ser ímpar."
         regex_match_failed: "não corresponde à expressão regular %{expression}."
         regex_invalid: "não pode ser validado com a expressão regular associada."
@@ -1091,16 +1128,38 @@ pt-PT:
           attributes:
             type:
               must_be_a_stage_or_gate: "tem de ser Project::StageDefinition ou Project::GateDefinition"
+              type_and_class_name_mismatch: "tem de corresponder ao nome da classe instanciada"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "tem de ser um Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "tem de ser um Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "tem de ser Project::Stage ou Project::Gate"
               must_be_a_stage: "tem de ser um Project::Stage"
               must_be_a_gate: "tem de ser um Project::Gate"
+              type_and_class_name_mismatch: "tem de corresponder ao nome da classe instanciada"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Não é possível atribuir `end_date` a um Project::Gate"
+              end_date_not_allowed: "Não é possível atribuir uma data de fim a um Project::Gate"
+            type:
+              type_and_class_name_mismatch: "tem de ser um Project::Gate"
+            date:
+              non_continuous_dates: "não pode ser anterior à data de fim do %{step} anterior."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "a data de início tem de ser anterior à data de fim."
+              non_continuous_dates: "não pode ser anterior à data de fim do %{step} anterior."
+              incomplete: "está incompleto."
+            type:
+              type_and_class_name_mismatch: "tem de ser um Project::Stage"
         query:
           attributes:
             project:
@@ -1317,6 +1376,8 @@ pt-PT:
         other: "Notificações"
       placeholder_user: "Utilizador de espaço reservado"
       project: "Projecto"
+      project/gate_definition: "Porta"
+      project/stage_definition: "Fase"
       project_query:
         one: "Lista de projetos"
         other: "Listas de projetos"
@@ -1420,6 +1481,7 @@ pt-PT:
     login: "Nome do Utilizador"
     mail: "E-mail"
     name: "Nome"
+    note: "Nota"
     password: "Senha"
     priority: "Prioridade"
     project: "Projecto"
@@ -1516,6 +1578,7 @@ pt-PT:
   button_print: "Imprimir"
   button_quote: "Citar"
   button_remove: Remover
+  button_remove_reminder: "Remover lembrete"
   button_rename: "Alterar o nome"
   button_replace: "Substituir"
   button_revoke: "Revogar"
@@ -1526,6 +1589,7 @@ pt-PT:
   button_save_as: "Guardar como"
   button_apply_changes: "Aplicar alterações"
   button_save_back: "Salvar e voltar"
+  button_set_reminder: "Definir lembrete"
   button_show: "Mostrar"
   button_sort: "Ordenar"
   button_submit: "Enviar"
@@ -1731,12 +1795,12 @@ pt-PT:
   direction: lTR
   ee:
     upsale:
+      title: "Suplemento Enterprise"
+      link_title: "Mais informação"
       form_configuration:
         description: "Personalize a configuração do formulário com estes complementos adicionais:"
         add_groups: "Adicionar novos grupos de atributos"
         rename_groups: "Mudar o nome de grupos de atributos"
-      project_filters:
-        description_html: "Filtrar e ordenar os campos personalizados é um complemento da edição Enterprise."
   enumeration_activities: "Atividades de controlo de tempo"
   enumeration_work_package_priorities: "Prioridades de tarefas"
   enumeration_reported_project_statuses: "Estado do projeto reportado"
@@ -1769,6 +1833,7 @@ pt-PT:
   error_pdf_export_too_many_columns: "Demasiadas colunas selecionadas para a exportação PDF. Reduza o número de colunas."
   error_pdf_failed_to_export: "Não foi possível guardar a exportação de PDF: %{error}"
   error_token_authenticity: "Não é possível verificar o token de Cross-Site Request Forgery. Tentou enviar dados em vários navegadores ou abas? Feche todas as abas e tente novamente."
+  error_reminder_not_found: "O lembrete não foi encontrado ou já foi notificado."
   error_work_package_not_found_in_project: "A tarefa não foi encontrada ou não pertence a este projecto"
   error_work_package_id_not_found: "O pacote de trabalho não foi encontrado."
   error_must_be_project_member: "deve ser membro do projeto"
@@ -2062,6 +2127,7 @@ pt-PT:
       responsible: "Responsável"
       shared: "Partilhado"
       watched: "Observador"
+      reminder: "Lembrete"
     facets:
       unread: "Não lidas"
       unread_title: "Mostrar não lidas"
@@ -2229,8 +2295,10 @@ pt-PT:
   label_default: "Predefinido"
   label_delete_user: "Apagar utilizador"
   label_delete_project: "Apagar projeto"
+  label_delete: "Eliminar"
   label_deleted: "eliminado"
   label_deleted_custom_field: "(campo personalizado apagado)"
+  label_deleted_custom_item: "(item eliminado)"
   label_deleted_custom_option: "(opção eliminada)"
   label_empty_element: "(vazio)"
   label_missing_or_hidden_custom_option: "(faltam valores ou permissões para acessar)"
@@ -2267,7 +2335,6 @@ pt-PT:
   label_enterprise_active_users: "%{current}/%{limit} utilizadores ativos reservados"
   label_enterprise_edition: "Edição Enterprise"
   label_enterprise_support: "Suporte Enterprise"
-  label_enterprise_addon: "Suplemento Enterprise"
   label_environment: "Ambiente"
   label_estimates_and_progress: "Estimativas e progresso"
   label_equals: "é"
@@ -2452,6 +2519,7 @@ pt-PT:
   label_none_parentheses: "(nenhum)"
   label_not_contains: "não contém"
   label_not_equals: "não é"
+  label_life_cycle_step_plural: "Ciclo de vida do projeto"
   label_on: "on"
   label_operator_all: "não está vazio"
   label_operator_none: "está vazio"
@@ -2553,6 +2621,7 @@ pt-PT:
   label_reporting: "A reportar"
   label_reporting_plural: "Comunicações"
   label_repository: "Repositório"
+  label_repository_remove: "Remover repositório"
   label_repository_root: "Raiz do repositório"
   label_repository_plural: "Repositórios"
   label_required: "necessário"
@@ -2615,6 +2684,7 @@ pt-PT:
   label_this_month: "este mês"
   label_this_week: "esta semana"
   label_this_year: "este ano"
+  label_time: "Hora"
   label_time_entry_plural: "Tempo usado"
   label_time_entry_activity_plural: "Tempo despendido em atividades"
   label_title: "Título"
@@ -2650,6 +2720,7 @@ pt-PT:
   label_user_settings: "Definições do utilizador"
   label_users_settings: "Definições do utilizador"
   label_version_new: "Nova versão"
+  label_version_edit: "Editar versão"
   label_version_plural: "Versões"
   label_version_sharing_descendants: "Com subprojetos"
   label_version_sharing_hierarchy: "Com a hierarquia do projecto"
@@ -2787,8 +2858,13 @@ pt-PT:
         prefix: "Recebido devido à configuração de notificações: %{reason}"
         date_alert_start_date: "Alerta de data"
         date_alert_due_date: "Alerta de data"
+        reminder: "Lembrete"
       see_all: "Ver tudo"
       updated_at: "Atualizado a %{timestamp} por %{user}"
+    reminder_notifications:
+      subject: "Lembrete: %{note}"
+      heading: "Tem um novo lembrete"
+      note: "Nota: \"%{note}\""
     sharing:
       work_packages:
         allowed_actions: "Você pode %{allowed_actions} este pacote de trabalho. Isso pode mudar dependendo da sua função e permissões do projeto."
@@ -2954,6 +3030,7 @@ pt-PT:
   notice_successful_connection: "Ligação bem sucedida."
   notice_successful_create: "Criado com sucesso."
   notice_successful_delete: "Eliminado com sucesso."
+  notice_successful_cancel: "Cancelamento bem-sucedido."
   notice_successful_update: "Actualizado com sucesso."
   notice_successful_update_custom_fields_added_to_project: |
     Atualização bem-sucedida. Os campos personalizados dos tipos ativados são ativados automaticamente
@@ -3031,6 +3108,7 @@ pt-PT:
   permission_edit_own_time_entries: "Editar registos pessoais de horas"
   permission_edit_project: "Editar projeto"
   permission_edit_project_attributes: "Editar atributos do projeto"
+  permission_edit_project_stages_and_gates: "Editar fases e portas do projeto"
   permission_edit_reportings: "Editar comunicações"
   permission_edit_time_entries: "Editar registos de tempo para outros utilizadores"
   permission_edit_timelines: "Editar cronogramas"
@@ -3060,9 +3138,12 @@ pt-PT:
   permission_search_project: "Pesquisar projeto"
   permission_select_custom_fields: "Escolher campos adicionais..."
   permission_select_project_custom_fields: "Selecionar atributos do projeto"
+  permission_select_project_life_cycle: "Selecionar fases e portas do projeto"
+  permission_select_project_life_cycle_explanation: "Ativar/desativar as fases e as portas de um projeto. Permite ao utilizador selecionar o ciclo de vida adequado para o projeto, uma vez que as fases e as portas inativas não serão visíveis na página de visão geral do projeto nem na lista de projetos."
   permission_select_project_modules: "Selecione módulos do projeto"
   permission_share_work_packages: "Compartilhar pacotes de trabalho"
   permission_manage_types: "Selecione tipos"
+  permission_manage_own_reminders: "Crie os seus próprios lembretes"
   permission_view_project: "Ver projetos"
   permission_view_changesets: "Revisões de vista de repositório em OpenProject"
   permission_view_commit_author_statistics: "Ver estatísticas de commits do autor"
@@ -3083,6 +3164,7 @@ pt-PT:
   permission_work_package_assigned_explanation: "Os pacotes de trabalho podem ser atribuídos a utilizadores e grupos com deste papel nos respetivos projetos"
   permission_view_project_activity: "Ver atividade do projeto"
   permission_view_project_attributes: "Ver atributos do projeto"
+  permission_view_project_stages_and_gates: "Ver fases e portas do projeto"
   permission_save_bcf_queries: "Guardar consultas BCF"
   permission_manage_public_bcf_queries: "Gerir consultas BCF públicas"
   permission_edit_attribute_help_texts: "Editar textos de ajuda de atributos"
@@ -3761,6 +3843,12 @@ pt-PT:
       edit_description: "Pode ver, comentar e editar este pacote de trabalho."
       view: "Ver"
       view_description: "Pode ver este pacote de trabalho."
+    reminders:
+      label_remind_at: "Data"
+      note_placeholder: "Porque está a definir este lembrete?"
+      success_creation_message: "Lembrete definido com sucesso. Irá receber uma notificação para este pacote de trabalho na hora selecionada."
+      success_update_message: "Lembrete atualizado com sucesso."
+      success_deletion_message: "Lembrete eliminado com sucesso."
   sharing:
     count:
       zero: "0 utilizadores"
diff --git a/config/locales/crowdin/ro.yml b/config/locales/crowdin/ro.yml
index 1caa50adbbc9..d95c85e5666e 100644
--- a/config/locales/crowdin/ro.yml
+++ b/config/locales/crowdin/ro.yml
@@ -33,7 +33,7 @@ ro:
         label_activity_show_only_changes: "Arată doar modificările"
         label_sort_asc: "Cele mai noi jos"
         label_sort_desc: "Cele mai noi sus"
-        label_type_to_comment: "Add a comment. Type @ to notify people."
+        label_type_to_comment: "Adaugă un comentariu. Tastează @ pentru a notifica persoane."
         label_submit_comment: "Submit comment"
         changed_on: "changed on"
         created_on: "a creat-o pe"
@@ -343,6 +343,9 @@ ro:
         text: "This action will not delete any project the list contains. Are you sure you want to delete this project list?"
     settings:
       change_identifier: Schimbă identificatorul
+      actions:
+        label_enable_all: "Enable all"
+        label_disable_all: "Disable all"
       activities:
         no_results_title_text: În acest moment nu există activități disponibile.
       forums:
@@ -353,18 +356,26 @@ ro:
         no_results_content_text: Creează categorie nouă de pachete de lucru
       custom_fields:
         no_results_title_text: În acest moment nu există câmpuri personalizate disponibile.
+      life_cycle:
+        header:
+          title: "Project lifecycle"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "Neither stages nor gates are currently defined."
+        section_header: "Stages and gates"
+        step:
+          use_in_project: "Use %{step} in this project"
+        filter:
+          label: "Search project stage or gate"
       project_custom_fields:
         header:
           title: "Atributele proiectului"
-          description: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
+          description_html: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
         filter:
           label: "Caută atribut proiect"
         actions:
           label_enable_single: "Active in this project, click to disable"
           label_disable_single: "Inactive in this project, click to enable"
           remove_from_project: "Elimină din proiect"
-          label_enable_all: "Activează tot"
-          label_disable_all: "Dezactivează tot"
         is_required_blank_slate:
           heading: Obligatoriu în toate proiectele
           description: Acest atribut de proiect este activat în toate proiectele deoarece opțiunea "Obligatoriu în toate proiectele" este bifată. Acesta nu poate fi dezactivat pentru proiecte individuale.
@@ -377,6 +388,11 @@ ro:
         no_results_content_text: Creează versiune nouă
       storage:
         no_results_title_text: Acest proiect nu consumă spațiu suplimentar pe disc.
+  project_stage:
+    working_days_count:
+      one: "Duration: %{count} working day"
+      few: "Duration: %{count} working days"
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "The modified list has been saved as a new list"
@@ -503,8 +519,12 @@ ro:
     groups:
       member_in_these_groups: "Acest utilizator este în prezent membru al următoarelor grupuri:"
       no_results_title_text: Acest utilizator nu este în prezent membru în niciun grup.
+      summary_with_more: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary: Member of %{names}.
     memberships:
       no_results_title_text: Acest utilizator nu este în acest moment participant în vreun proiect.
+    open_profile: "Open profile"
   page:
     text: "Text"
   placeholder_users:
@@ -576,18 +596,27 @@ ro:
       no_results_title_text: În acest moment nu există tipuri.
       no_results_content_text: Creează tip nou
     edit:
-      settings: "Setări"
-      form_configuration: "Configurare formular"
+      form_configuration:
+        tab: "Form configuration"
       more_info_text_html: >
         Ediția Enterprise îți permite să personalizezi configurația formularului cu aceste suplimente: <br> <ul class="%{list_styling_class}"> <li><b>Adăugarea de noi grupuri de atribute</b></li> <li><b>Redenumirea grupurilor de atribute</b></li> <li><b>Adaugă un tabel cu pachetele de lucru aferente</b></li> </ul>
-      projects: "Proiecte"
-      enabled_projects: "Proiecte activate"
-      edit_query: "Editează tabelul"
-      query_group_placeholder: "Dați un nume tabelului"
-      reset: "Resetare AVATAR implicit"
-      type_color_text: |
-        Culoarea selectată distinge diferite tipuri
-        în graficele Gantt sau tabelele pachetelor de lucru. Prin urmare, este recomandat să folosești o culoare puternică.
+      projects:
+        tab: "Projects"
+        enabled_projects: "Enabled projects"
+      settings:
+        tab: "Settings"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Subject configuration"
+        manually_editable_subjects:
+          label: "Manually editable subjects"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automatically generated subjects"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Subject pattern"
+          caption: "Search for an attribute or add text. To create a space between elements add it as a text."
   versions:
     overview:
       work_packages_in_archived_projects: "The version is shared with archived projects which still have work packages assigned to this version. These are counted, but will not appear in the linked views."
@@ -650,7 +679,11 @@ ro:
       blankslate_description: "Acest pachet de lucru nu are încă o relație."
     label_add_x: "Adaugă %{x}"
     label_edit_x: "Editează %{x}"
-    label_add_description: "Add description"
+    label_add_description: "Adaugă descriere"
+    lag:
+      subject: "Întârziere"
+      title: "Întârziere (în zile)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
       label_relates_singular: "asociat cu"
       label_relates_plural: "asociat cu"
@@ -694,14 +727,14 @@ ro:
       label_part_of_plural: "parte din"
       partof_description: "Marchează pachetul de lucru asociat ca incluzând acesta, fără niciun efect suplimentar"
       part_of_description: "Marchează pachetul de lucru asociat ca făcând parte din acesta fără niciun efect suplimentar"
-      label_requires_singular: "requires"
-      label_requires_plural: "requires"
+      label_requires_singular: "necesită"
+      label_requires_plural: "necesită"
       requires_description: "Marchează pachetul de lucru asociat ca o cerință pentru acesta"
-      label_required_singular: "required by"
-      label_required_plural: "required by"
+      label_required_singular: "cerut de"
+      label_required_plural: "cerut de"
       required_description: "Marchează acest pachet de lucru ca fiind o cerință pentru cel asociat"
-      label_parent_singular: "parent"
-      label_parent_plural: "parent"
+      label_parent_singular: "părinte"
+      label_parent_plural: "părinte"
   label_invitation: Invitație
   account:
     delete: "Ştergere cont"
@@ -852,9 +885,12 @@ ro:
         filters: "Filtre"
         timeline_labels: "Etichete de cronologie"
       relation:
-        lag: "Lag"
+        lag: "Întârziere"
         from: "Pachet de lucru"
         to: "Pachet de lucru asociat"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Time"
       repository:
         url: "URL"
       role:
@@ -943,6 +979,7 @@ ro:
       messages:
         accepted: "trebuie acceptat."
         after: "trebuie să fie după %{date}."
+        after_today: "must be in the future."
         after_or_equal_to: "trebuie să fie după sau în %{date}."
         before: "trebuie să fie înainte de %{date}."
         before_or_equal_to: "trebuie să fie înainte sau în %{date}."
@@ -989,6 +1026,7 @@ ro:
         not_an_integer: "nu este un întreg."
         not_an_iso_date: "nu este o dată validă. Formatul necesar: AAAA-MM-ZZ."
         not_same_project: "nu aparține aceluiași proiect."
+        datetime_must_be_in_future: "must be in the future."
         odd: "trebuie să fie impar."
         regex_match_failed: "does not match the regular expression %{expression}."
         regex_invalid: "nu a putut fi validată cu expresia regulată asociată."
@@ -1102,16 +1140,38 @@ ro:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "start date must be before the end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "is incomplete."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1331,6 +1391,8 @@ ro:
         other: "Notificări"
       placeholder_user: "Utilizator Placeholder"
       project: "Proiect"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         one: "Project list"
         few: "Project lists"
@@ -1441,6 +1503,7 @@ ro:
     login: "Utilizator"
     mail: "E-mail"
     name: "Nume"
+    note: "Note"
     password: "Parolă"
     priority: "Prioritate"
     project: "Proiect"
@@ -1537,6 +1600,7 @@ ro:
   button_print: "Tipărește"
   button_quote: "Citare"
   button_remove: Eliminare
+  button_remove_reminder: "Remove reminder"
   button_rename: "Redenumește"
   button_replace: "Înlocuiește"
   button_revoke: "Revocă"
@@ -1547,6 +1611,7 @@ ro:
   button_save_as: "Salvează ca"
   button_apply_changes: "Aplică modificările"
   button_save_back: "Salvează și înapoi"
+  button_set_reminder: "Set reminder"
   button_show: "Afişare"
   button_sort: "Sortare"
   button_submit: "Trimitere"
@@ -1770,12 +1835,12 @@ ro:
   direction: ltr
   ee:
     upsale:
+      title: "Enterprise add-on"
+      link_title: "More information"
       form_configuration:
         description: "Personalizați configurația formularului cu aceste add-on-uri suplimentare:"
         add_groups: "Adaugă noi grupuri de atribut"
         rename_groups: "Redenumește atribute grupuri"
-      project_filters:
-        description_html: "Filtrarea și sortarea pe câmpuri personalizate este un supliment al ediției Enterprise."
   enumeration_activities: "Activități de urmărire timp activate"
   enumeration_work_package_priorities: "Priorități pentru pachetele de lucru"
   enumeration_reported_project_statuses: "Stările proiectului raportat"
@@ -1808,6 +1873,7 @@ ro:
   error_pdf_export_too_many_columns: "Prea multe coloane selectate pentru exportul PDF. Vă rugăm să reduceți numărul de coloane."
   error_pdf_failed_to_export: "Exportul pdf nu poate fi salvat: %{error}"
   error_token_authenticity: "Nu se poate verifica tokenul Cross-Site Request Forgery. Ați încercat să trimiteți datele pe mai multe browsere sau tab-uri? Vă rugăm să închideți toate filele și să încercați din nou."
+  error_reminder_not_found: "The reminder was not found or was already notified about."
   error_work_package_not_found_in_project: "Pachetul de lucru nu a fost găsit sau nu aparține acestui proiect"
   error_work_package_id_not_found: "Pachetul de lucru nu a fost găsit."
   error_must_be_project_member: "trebuie să fie membru al proiectului"
@@ -1908,7 +1974,7 @@ ro:
           drag_area_label: "Manage long text fields"
       xls:
         include_relations:
-          label: "Include relations"
+          label: "Include relații"
           caption: "Această opțiune va crea un duplicat al fiecărui pachet de lucru pentru fiecare relație pe care acesta o are cu un alt pachet de lucru."
         include_descriptions:
           label: "Include descriptions"
@@ -2101,6 +2167,7 @@ ro:
       responsible: "Responsabil"
       shared: "Partajat"
       watched: "Observator"
+      reminder: "Reminder"
     facets:
       unread: "Necitite"
       unread_title: "Afișare necitite"
@@ -2268,8 +2335,10 @@ ro:
   label_default: "Implicit"
   label_delete_user: "Șterge utilizator"
   label_delete_project: "Ștergeți proiectul"
+  label_delete: "Delete"
   label_deleted: "șters"
   label_deleted_custom_field: "(câmp personalizat șters)"
+  label_deleted_custom_item: "(deleted item)"
   label_deleted_custom_option: "(opțiune eliminată)"
   label_empty_element: "(gol)"
   label_missing_or_hidden_custom_option: "(valoare lipsă sau lipsa permisiunilor de acces)"
@@ -2306,7 +2375,6 @@ ro:
   label_enterprise_active_users: "%{current}/%{limit} numărul de utilizatori activi rezervați"
   label_enterprise_edition: "Ediția Enterprise"
   label_enterprise_support: "Enterprise support"
-  label_enterprise_addon: "Enterprise add-on"
   label_environment: "Mediu"
   label_estimates_and_progress: "Estimări și progrese"
   label_equals: "este"
@@ -2491,6 +2559,7 @@ ro:
   label_none_parentheses: "(nimic)"
   label_not_contains: "nu conține"
   label_not_equals: "nu este"
+  label_life_cycle_step_plural: "Project lifecycle"
   label_on: "pe"
   label_operator_all: "nu este gol"
   label_operator_none: "este gol"
@@ -2575,8 +2644,8 @@ ro:
   label_related_work_packages: "Pachete de lucru asociate"
   label_relates: "asociat cu"
   label_relates_to: "asociat cu"
-  label_relation: "Relation"
-  label_relation_actions: "Relation actions"
+  label_relation: "Relație"
+  label_relation_actions: "Acțiuni relație"
   label_relation_delete: "Ștergere relație"
   label_relation_new: "Relație nouă"
   label_release_notes: "Note privind lansarea noii versiuni"
@@ -2592,6 +2661,7 @@ ro:
   label_reporting: "Raportare"
   label_reporting_plural: "Raportări"
   label_repository: "Repo"
+  label_repository_remove: "Remove repository"
   label_repository_root: "Rădăcina repo-ului"
   label_repository_plural: "Repo-uri"
   label_required: "obligatoriu"
@@ -2654,6 +2724,7 @@ ro:
   label_this_month: "luna curentă"
   label_this_week: "săptămâna curentă"
   label_this_year: "anul curent"
+  label_time: "Time"
   label_time_entry_plural: "Timp consumat"
   label_time_entry_activity_plural: "Activități timp consumat"
   label_title: "Titlu"
@@ -2689,6 +2760,7 @@ ro:
   label_user_settings: "Setări utilizator"
   label_users_settings: "Users settings"
   label_version_new: "Versiune nouă"
+  label_version_edit: "Edit version"
   label_version_plural: "Versiuni"
   label_version_sharing_descendants: "Cu subproiecte"
   label_version_sharing_hierarchy: "Cu ierarhia de proiect"
@@ -2827,8 +2899,13 @@ ro:
         prefix: "Primită din cauza setării de notificare: %{reason}"
         date_alert_start_date: "Alertă dată"
         date_alert_due_date: "Alertă de dată"
+        reminder: "Reminder"
       see_all: "Vezi tot"
       updated_at: "Actualizat în %{timestamp} de %{user}"
+    reminder_notifications:
+      subject: "Reminder: %{note}"
+      heading: "You have a new reminder"
+      note: "Note: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "You may %{allowed_actions} this work package. This can change depending on your project role and permissions."
@@ -2994,6 +3071,7 @@ ro:
   notice_successful_connection: "Conectare reușită."
   notice_successful_create: "Creare reuşită."
   notice_successful_delete: "Ştergere reuşită."
+  notice_successful_cancel: "Successful cancellation."
   notice_successful_update: "Actualizare reușită."
   notice_successful_update_custom_fields_added_to_project: |
     Actualizare reușită. Câmpurile personalizate ale tipurilor activate sunt activate automat
@@ -3072,6 +3150,7 @@ ro:
   permission_edit_own_time_entries: "Editare jurnale de timp proprii"
   permission_edit_project: "Editare proiect"
   permission_edit_project_attributes: "Edit project attributes"
+  permission_edit_project_stages_and_gates: "Edit project stages and gates"
   permission_edit_reportings: "Editare raportări"
   permission_edit_time_entries: "Editați jurnalele de timp pentru alți utilizatori"
   permission_edit_timelines: "Editare linii de timp"
@@ -3101,9 +3180,12 @@ ro:
   permission_search_project: "Caută proiect"
   permission_select_custom_fields: "Selectează câmpuri personalizate"
   permission_select_project_custom_fields: "Select project attributes"
+  permission_select_project_life_cycle: "Select project stages and gates"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "Selectare module proiect"
   permission_share_work_packages: "Partajare pachete de lucru"
   permission_manage_types: "Selectare tipuri"
+  permission_manage_own_reminders: "Create own reminders"
   permission_view_project: "Vezi proiecte"
   permission_view_changesets: "Vizualizare revizii repo în OpenProject"
   permission_view_commit_author_statistics: "Vizualizare statistici autor înregistrări"
@@ -3124,6 +3206,7 @@ ro:
   permission_work_package_assigned_explanation: "Pachetele de lucru pot fi atribuite utilizatorilor și grupurilor care dețin acest rol în proiectul respectiv"
   permission_view_project_activity: "Vezi activitate proiect"
   permission_view_project_attributes: "Vezi atribute proiect"
+  permission_view_project_stages_and_gates: "View project stages and gates"
   permission_save_bcf_queries: "Save BCF queries"
   permission_manage_public_bcf_queries: "Manage public BCF queries"
   permission_edit_attribute_help_texts: "Edit attribute help texts"
@@ -3805,6 +3888,12 @@ ro:
       edit_description: "Can view, comment and edit this work package."
       view: "Vizualizează"
       view_description: "Can view this work package."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Why are you setting this reminder?"
+      success_creation_message: "Reminder set successfully. You will receive a notification for this work package at the chosen time."
+      success_update_message: "Reminder updated successfully."
+      success_deletion_message: "Reminder deleted successfully."
   sharing:
     count:
       zero: "0 users"
diff --git a/config/locales/crowdin/ru.seeders.yml b/config/locales/crowdin/ru.seeders.yml
index a57c7fbefa62..132eb9097c39 100644
--- a/config/locales/crowdin/ru.seeders.yml
+++ b/config/locales/crowdin/ru.seeders.yml
@@ -486,7 +486,7 @@ ru:
           name: Другие
       types:
         item_0:
-          name: Задание
+          name: Задача
         item_1:
           name: Веха
         item_2:
diff --git a/config/locales/crowdin/ru.yml b/config/locales/crowdin/ru.yml
index 62a4c9597d26..2bdbee1bca0c 100644
--- a/config/locales/crowdin/ru.yml
+++ b/config/locales/crowdin/ru.yml
@@ -342,6 +342,9 @@ ru:
         text: "Это действие не приведет к удалению ни одного проекта, содержащегося в списке. Вы уверены, что хотите удалить этот список проектов?"
     settings:
       change_identifier: Идентификатор изменений
+      actions:
+        label_enable_all: "Включить всё"
+        label_disable_all: "Выключить всё"
       activities:
         no_results_title_text: В настоящее время никакой активности.
       forums:
@@ -352,18 +355,26 @@ ru:
         no_results_content_text: Создать новую категорию пакета работ
       custom_fields:
         no_results_title_text: Нет доступных настраиваемых полей.
+      life_cycle:
+        header:
+          title: "Жизненный цикл проекта"
+          description_html: 'Эти этапы и стадии жизненного цикла проекта будут отображаться на <a href=%{overview_url} target="_blank">странице обзора проекта</a> и определяться в <a href=%{admin_settings_url} target="_blank">настройках администрирования</a> OpenProject. Вы можете включать или отключать отдельные атрибуты.'
+        non_defined: "В настоящее время не определены ни этапы, ни стадии."
+        section_header: "Этапы и стадии"
+        step:
+          use_in_project: "Использовано %{step} в этом проекте"
+        filter:
+          label: "Поиск этапа или стадии проекта"
       project_custom_fields:
         header:
           title: "Атрибуты проекта"
-          description: 'Эти атрибуты проекта будут отображаться на Вашей <a href=%{overview_url} target="_blank">странице обзора проекта</a> в соответствующих разделах. Вы можете включить или отключить отдельные атрибуты. Атрибуты проекта и разделы определяются в <a href=%{admin_settings_url} target="_blank">настройках администрирования</a> администратором экземпляра.'
+          description_html: 'Эти атрибуты проекта будут отображаться на <a href=%{overview_url} target="_blank">странице обзора проекта</a> в соответствующих разделах. Вы можете включить или отключить отдельные атрибуты. Атрибуты проекта и разделы определяются в <a href=%{admin_settings_url} target="_blank">настройках администрирования</a> OpenProject. '
         filter:
           label: "Поиск атрибута проекта"
         actions:
           label_enable_single: "Активно в этом проекте, нажмите для отключения"
           label_disable_single: "Неактивно в этом проекте, нажмите для включения"
           remove_from_project: "Удалить из проекта"
-          label_enable_all: "Включить всё"
-          label_disable_all: "Выключить всё"
         is_required_blank_slate:
           heading: Требуется во всех проектах
           description: Этот атрибут проекта активирован во всех проектах, поскольку установлен флажок «Требуется во всех проектах». Его нельзя отключить для отдельных проектов.
@@ -376,6 +387,12 @@ ru:
         no_results_content_text: Создать новую версию
       storage:
         no_results_title_text: Для этого проекта дополнительного дискового пространства не требуется.
+  project_stage:
+    working_days_count:
+      one: "Продолжительность: %{count} рабочий день"
+      few: "Duration: %{count} working days"
+      many: "Duration: %{count} working days"
+      other: "Продолжительность: %{count} рабочих дней"
   lists:
     create:
       success: "Измененный список был сохранен как новый"
@@ -508,8 +525,12 @@ ru:
     groups:
       member_in_these_groups: "Этот пользователь в настоящее время является членом следующих групп:"
       no_results_title_text: Этот пользователь в настоящее время не является членом какой-либо группы.
+      summary_with_more: Член %{names} и %{count_link}.
+      more: "ещё %{count}"
+      summary: Член %{names}.
     memberships:
       no_results_title_text: Этот пользователь в данный момент в проекте не участвует.
+    open_profile: "Открыть профиль"
   page:
     text: "Текст"
   placeholder_users:
@@ -582,18 +603,27 @@ ru:
       no_results_title_text: В данный момент типы отсутствуют.
       no_results_content_text: Создать новый тип
     edit:
-      settings: "Настройки"
-      form_configuration: "Настройка форм"
+      form_configuration:
+        tab: "Настройка формы"
       more_info_text_html: >
         Корпоративная редакция позволяет настроить конфигурацию форм с этими дополнительными возможностями: <br> <ul class="%{list_styling_class}"> <li><b>Добавить новые группы атрибутов</b></li> <li><b>Переименовать группы атрибутов</b></li> </ul>
-      projects: "Проекты"
-      enabled_projects: "Доступные проекты"
-      edit_query: "Изменить таблицу"
-      query_group_placeholder: "Дайте таблице название"
-      reset: "Восстановить значения по умолчанию"
-      type_color_text: |
-        Выбранный цвет выделяет разные типы
-        в диаграммах Ганта или таблицах пакетов работ. Поэтому рекомендуется использовать насыщенный цвет.
+      projects:
+        tab: "Проекты"
+        enabled_projects: "Включенные проекты"
+      settings:
+        tab: "Настройки"
+        type_color_text: "Выбранный цвет выделяет разные типы\nна диаграммах Ганта или таблицах пакетов работ. Поэтому рекомендуется использовать насыщенный цвет."
+      subject_configuration:
+        tab: "Настройка темы"
+        manually_editable_subjects:
+          label: "Вручную редактируемые темы"
+          caption: "Пользователи могут вручную вводить и редактировать темы пакетов работ без ограничений."
+        automatically_generated_subjects:
+          label: "Автоматически созданные темы"
+          caption: "Определите шаблон, используя атрибуты ссылок и текст, чтобы автоматически генерировать темы пакетов работ. Пользователи не смогут вручную редактировать темы."
+        pattern:
+          label: "Шаблон темы"
+          caption: "Поиск атрибута или добавление текста. Чтобы создать пробел между элементами, добавьте его в виде текста."
   versions:
     overview:
       work_packages_in_archived_projects: "Эта версия используется совместно с архивными проектами, в которых все еще есть рабочие пакеты, назначенные на эту версию. Они учитываются, но не отображаются в связанных представлениях."
@@ -658,6 +688,10 @@ ru:
     label_add_x: "Добавить %{x}"
     label_edit_x: "Редактировать %{x}"
     label_add_description: "Добавить описание"
+    lag:
+      subject: "Отставание"
+      title: "Отставание (в днях)"
+      caption: "Минимальное количество рабочих дней, которое должно быть между двумя пакетами работ."
     relations:
       label_relates_singular: "связан с"
       label_relates_plural: "связаны с"
@@ -862,6 +896,9 @@ ru:
         lag: "Задержка"
         from: "Пакет работ"
         to: "Похожий пакет работ"
+      reminder:
+        remind_at_date: "Дата"
+        remind_at_time: "Время"
       repository:
         url: "URL"
       role:
@@ -950,6 +987,7 @@ ru:
       messages:
         accepted: "нужно подтвердить."
         after: "должно быть после %{date}."
+        after_today: "должно быть в будущем."
         after_or_equal_to: "должна быть после или ровно %{date}."
         before: "должны быть до %{date}."
         before_or_equal_to: "должны быть до или ровно %{date}."
@@ -996,6 +1034,7 @@ ru:
         not_an_integer: "не является целым числом."
         not_an_iso_date: "недопустимая дата. Требуемый формат: гггг-мм-дд."
         not_same_project: "не принадлежит тому же проекту."
+        datetime_must_be_in_future: "должно быть в будущем."
         odd: "должно быть нечетным."
         regex_match_failed: "не соответствует регулярному выражению %{expression}."
         regex_invalid: "не может быть проверен связанным регулярным выражением."
@@ -1109,16 +1148,38 @@ ru:
           attributes:
             type:
               must_be_a_stage_or_gate: "должен быть либо Project::StageDefinition, либо Project::GateDefinition"
+              type_and_class_name_mismatch: "должно совпадать с именем созданного экземпляра класса"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "должно быть Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "должно быть Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "должен быть либо Project::Stage, либо Project::Gate"
               must_be_a_stage: "должен быть Project::Stage"
               must_be_a_gate: "должен быть Project::Stage"
+              type_and_class_name_mismatch: "должно совпадать с именем созданного экземпляра класса"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Невозможно присвоить `end_date` проекту Project::Gate"
+              end_date_not_allowed: "Невозможно назначить дату окончания для Project::Gate"
+            type:
+              type_and_class_name_mismatch: "должно быть Project::Gate"
+            date:
+              non_continuous_dates: "не может быть раньше, чем дата окончания предыдущего %{step}."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "дата начала должна быть раньше даты окончания."
+              non_continuous_dates: "не может быть раньше, чем дата окончания предыдущего %{step}."
+              incomplete: "неполный."
+            type:
+              type_and_class_name_mismatch: "должно быть Project::Stage"
         query:
           attributes:
             project:
@@ -1341,6 +1402,8 @@ ru:
         other: "Уведомлений"
       placeholder_user: "Пользователь-заполнитель"
       project: "Проект"
+      project/gate_definition: "Стадия"
+      project/stage_definition: "Этап"
       project_query:
         one: "Список проектов"
         few: "Списки проектов"
@@ -1458,6 +1521,7 @@ ru:
     login: "Имя пользователя"
     mail: "Электронная почта"
     name: "Имя"
+    note: "Заметка"
     password: "Пароль"
     priority: "Приоритет"
     project: "Проект"
@@ -1554,6 +1618,7 @@ ru:
   button_print: "Печать"
   button_quote: "Цитата"
   button_remove: Удалить
+  button_remove_reminder: "Удалить напоминание"
   button_rename: "Переименовать"
   button_replace: "Заменить"
   button_revoke: "Отозвать"
@@ -1564,6 +1629,7 @@ ru:
   button_save_as: "Сохранить как"
   button_apply_changes: "Применить изменения"
   button_save_back: "Сохранить и вернуться"
+  button_set_reminder: "Установить напоминание"
   button_show: "Показать"
   button_sort: "Сортировать"
   button_submit: "Отправить"
@@ -1805,12 +1871,12 @@ ru:
   direction: Слева направо
   ee:
     upsale:
+      title: "Корпоративное дополнение"
+      link_title: "Дополнительная информация"
       form_configuration:
         description: "Настройте конфигурацию формы с помощью этих дополнительных дополнений:"
         add_groups: "Добавить новую группу атрибутов"
         rename_groups: "Переименовать группу атрибутов"
-      project_filters:
-        description_html: "Фильтрация и сортировка по настраиваемым полям - это функция корпоративной версии."
   enumeration_activities: "Отслеживание времени"
   enumeration_work_package_priorities: "Приоритеты пакета работ"
   enumeration_reported_project_statuses: "Перечень отчетов о статусах проекта"
@@ -1843,6 +1909,7 @@ ru:
   error_pdf_export_too_many_columns: "Для экспорта в PDF-файл выбрано слишком много столбцов. Пожалуйста, сократите количество столбцов."
   error_pdf_failed_to_export: "Не удалось сохранить экспорт в PDF: %{error}"
   error_token_authenticity: "Не удалось проверить CSRF-токен. Возможно, вы попытались отправить данные сразу из нескольких браузеров или вкладок. Закройте все вкладки и попробуйте снова."
+  error_reminder_not_found: "Напоминание не было найдено или о нем уже было сообщено."
   error_work_package_not_found_in_project: "Пакет работ не найден или не принадлежит к этому проекту"
   error_work_package_id_not_found: "Пакет работ не найден."
   error_must_be_project_member: "должен быть участник проекта"
@@ -2136,6 +2203,7 @@ ru:
       responsible: "Ответственный"
       shared: "Общий доступ"
       watched: "Наблюдатель"
+      reminder: "Напоминания"
     facets:
       unread: "Непрочтено"
       unread_title: "Показать непрочитанные"
@@ -2303,8 +2371,10 @@ ru:
   label_default: "по умолчанию"
   label_delete_user: "Удалить пользователя"
   label_delete_project: "Удалить проект"
+  label_delete: "Удалить"
   label_deleted: "Удалено"
   label_deleted_custom_field: "(удалено настраиваемое поле)"
+  label_deleted_custom_item: "(удалено)"
   label_deleted_custom_option: "(удалённая опция)"
   label_empty_element: "(пусто)"
   label_missing_or_hidden_custom_option: "(отсутствует значение или недостаточно прав для доступа)"
@@ -2341,7 +2411,6 @@ ru:
   label_enterprise_active_users: "%{current}/%{limit} забронировано активных пользователей"
   label_enterprise_edition: "Корпоративная версия"
   label_enterprise_support: "Поддержка корпоративной версии"
-  label_enterprise_addon: "Корпоративное дополнение"
   label_environment: "Переменные среды"
   label_estimates_and_progress: "Оценки и прогресс"
   label_equals: "—"
@@ -2526,6 +2595,7 @@ ru:
   label_none_parentheses: "(нет)"
   label_not_contains: "не содержит"
   label_not_equals: "не"
+  label_life_cycle_step_plural: "Жизненный цикл проекта"
   label_on: "на"
   label_operator_all: "не пусто"
   label_operator_none: "пусто"
@@ -2573,7 +2643,7 @@ ru:
   label_product_version: "Версия продукта"
   label_profile: "Профиль"
   label_percent_complete: "% Готово"
-  label_progress_tracking: "Прогресс отслеживания"
+  label_progress_tracking: "Отслеживание прогресса"
   label_project: "Проект"
   label_project_activity: "Деятельность"
   label_project_attribute_plural: "Атрибуты проекта"
@@ -2627,6 +2697,7 @@ ru:
   label_reporting: "Отчетность"
   label_reporting_plural: "Отчетности"
   label_repository: "Репозиторий"
+  label_repository_remove: "Удалить репозиторий"
   label_repository_root: "Корень хранилища"
   label_repository_plural: "Репозитории"
   label_required: "требуется"
@@ -2689,6 +2760,7 @@ ru:
   label_this_month: "в этом месяце"
   label_this_week: "на этой неделе"
   label_this_year: "в этом году"
+  label_time: "Время"
   label_time_entry_plural: "Затраченное время"
   label_time_entry_activity_plural: "Потраченное время"
   label_title: "Заголовок"
@@ -2724,6 +2796,7 @@ ru:
   label_user_settings: "Настройки пользователя"
   label_users_settings: "Настройки пользователей"
   label_version_new: "Новый этап"
+  label_version_edit: "Изменить версию"
   label_version_plural: "Этапы"
   label_version_sharing_descendants: "С подпроектами"
   label_version_sharing_hierarchy: "С иерархией проектов"
@@ -2863,8 +2936,13 @@ ru:
         prefix: "Получено из-за настройки уведомления: %{reason}"
         date_alert_start_date: "Дата оповещения"
         date_alert_due_date: "Дата оповещения"
+        reminder: "Напоминание"
       see_all: "Показать все"
       updated_at: "Обновлено в %{timestamp} пользователем %{user}"
+    reminder_notifications:
+      subject: "Напоминание: %{note}"
+      heading: "У вас новое напоминание"
+      note: "Примечание: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "Вы можете %{allowed_actions} этот пакет работ. Это может измениться в зависимости от роли и разрешений вашего проекта."
@@ -3030,6 +3108,7 @@ ru:
   notice_successful_connection: "Подключение выполнено."
   notice_successful_create: "Создание выполнено."
   notice_successful_delete: "Удаление выполнено."
+  notice_successful_cancel: "Отмена прошла успешно."
   notice_successful_update: "Обновление выполнено."
   notice_successful_update_custom_fields_added_to_project: |
     Успешное обновление. Пользовательские поля активированных типов автоматически активируются
@@ -3109,6 +3188,7 @@ ru:
   permission_edit_own_time_entries: "Редактировать собственные учетные записи о времени"
   permission_edit_project: "Редактировать проект"
   permission_edit_project_attributes: "Редактирование атрибутов проекта"
+  permission_edit_project_stages_and_gates: "Редактировать этапы и стадии проекта"
   permission_edit_reportings: "Редактировать отчеты"
   permission_edit_time_entries: "Править трудозатраты других пользователей"
   permission_edit_timelines: "Редактировать графики"
@@ -3138,9 +3218,12 @@ ru:
   permission_search_project: "Поиск проекта"
   permission_select_custom_fields: "Выберите настраиваемые поля"
   permission_select_project_custom_fields: "Выберите атрибуты проекта"
+  permission_select_project_life_cycle: "Выберите этапы и стадии проекта"
+  permission_select_project_life_cycle_explanation: "Активировать/деактивировать этапы и стадии в проекте. Позволяет пользователю выбрать жизненный цикл, подходящий для данного проекта, поскольку неактивные этапы и стадии не будут видны ни на странице обзора проекта, ни в списке проектов."
   permission_select_project_modules: "Выбор модулей проекта"
   permission_share_work_packages: "Поделиться пакетами работ"
   permission_manage_types: "Выберите типы"
+  permission_manage_own_reminders: "Создать собственные напоминания"
   permission_view_project: "Просмотр проектов"
   permission_view_changesets: "Просмотр изменений репозитория в OpenProject"
   permission_view_commit_author_statistics: "Посмотреть статистику автора, внесшего свою часть работы"
@@ -3161,6 +3244,7 @@ ru:
   permission_work_package_assigned_explanation: "Пакеты работ могут быть привязаны к пользователям и группам в зависимости от этой роли в рамках соответствующего проекта"
   permission_view_project_activity: "Просмотр деятельности по проекту"
   permission_view_project_attributes: "Просмотр атрибутов проекта"
+  permission_view_project_stages_and_gates: "Просмотр этапов и стадий проекта"
   permission_save_bcf_queries: "Сохранить запросы BCF"
   permission_manage_public_bcf_queries: "Управление публичными BCF запросами"
   permission_edit_attribute_help_texts: "Редактировать атрибут справки"
@@ -3840,6 +3924,12 @@ ru:
       edit_description: "Может просматривать, комментировать и редактировать этот пакет работ."
       view: "Просматривать"
       view_description: "Может просматривать этот пакет работ."
+    reminders:
+      label_remind_at: "Дата"
+      note_placeholder: "Причина установки напоминания"
+      success_creation_message: "Напоминание установлено. Вы получите уведомление о данном пакете работ в выбранное время."
+      success_update_message: "Напоминание успешно обновлено."
+      success_deletion_message: "Напоминание успешно удалено."
   sharing:
     count:
       zero: "0 пользователей"
diff --git a/config/locales/crowdin/rw.yml b/config/locales/crowdin/rw.yml
index b93007abd1ae..af29c84918c7 100644
--- a/config/locales/crowdin/rw.yml
+++ b/config/locales/crowdin/rw.yml
@@ -343,6 +343,9 @@ rw:
         text: "This action will not delete any project the list contains. Are you sure you want to delete this project list?"
     settings:
       change_identifier: Change identifier
+      actions:
+        label_enable_all: "Enable all"
+        label_disable_all: "Disable all"
       activities:
         no_results_title_text: There are currently no activities available.
       forums:
@@ -353,18 +356,26 @@ rw:
         no_results_content_text: Create a new work package category
       custom_fields:
         no_results_title_text: There are currently no custom fields available.
+      life_cycle:
+        header:
+          title: "Project lifecycle"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "Neither stages nor gates are currently defined."
+        section_header: "Stages and gates"
+        step:
+          use_in_project: "Use %{step} in this project"
+        filter:
+          label: "Search project stage or gate"
       project_custom_fields:
         header:
           title: "Project attributes"
-          description: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
+          description_html: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
         filter:
           label: "Search project attribute"
         actions:
           label_enable_single: "Active in this project, click to disable"
           label_disable_single: "Inactive in this project, click to enable"
           remove_from_project: "Remove from project"
-          label_enable_all: "Enable all"
-          label_disable_all: "Disable all"
         is_required_blank_slate:
           heading: Required in all projects
           description: This project attribute is activated in all projects since the "Required in all projects" option is checked. It cannot be deactivated for individual projects.
@@ -377,6 +388,10 @@ rw:
         no_results_content_text: Create a new version
       storage:
         no_results_title_text: There is no additional recorded disk space consumed by this project.
+  project_stage:
+    working_days_count:
+      one: "Duration: %{count} working day"
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "The modified list has been saved as a new list"
@@ -497,8 +512,12 @@ rw:
     groups:
       member_in_these_groups: "This user is currently a member of the following groups:"
       no_results_title_text: This user is currently not a member in any group.
+      summary_with_more: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary: Member of %{names}.
     memberships:
       no_results_title_text: This user is currently not a member of a project.
+    open_profile: "Open profile"
   page:
     text: "Text"
   placeholder_users:
@@ -569,18 +588,27 @@ rw:
       no_results_title_text: There are currently no types.
       no_results_content_text: Create a new type
     edit:
-      settings: "Settings"
-      form_configuration: "Form configuration"
+      form_configuration:
+        tab: "Form configuration"
       more_info_text_html: >
         Enterprise edition allows you to customize form configuration with these additional add-ons: <br> <ul class="%{list_styling_class}"> <li><b>Add new attribute groups</b></li> <li><b>Rename attribute groups</b></li> <li><b>Add a table of related work packages</b></li> </ul>
-      projects: "Projects"
-      enabled_projects: "Enabled projects"
-      edit_query: "Edit table"
-      query_group_placeholder: "Give the table a name"
-      reset: "Reset to defaults"
-      type_color_text: |
-        The selected color distinguishes different types
-        in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      projects:
+        tab: "Projects"
+        enabled_projects: "Enabled projects"
+      settings:
+        tab: "Settings"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Subject configuration"
+        manually_editable_subjects:
+          label: "Manually editable subjects"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automatically generated subjects"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Subject pattern"
+          caption: "Search for an attribute or add text. To create a space between elements add it as a text."
   versions:
     overview:
       work_packages_in_archived_projects: "The version is shared with archived projects which still have work packages assigned to this version. These are counted, but will not appear in the linked views."
@@ -643,6 +671,10 @@ rw:
     label_add_x: "Add %{x}"
     label_edit_x: "Edit %{x}"
     label_add_description: "Add description"
+    lag:
+      subject: "Lag"
+      title: "Lag (in days)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
       label_relates_singular: "related to"
       label_relates_plural: "related to"
@@ -847,6 +879,9 @@ rw:
         lag: "Lag"
         from: "Work package"
         to: "Related work package"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Time"
       repository:
         url: "URL"
       role:
@@ -935,6 +970,7 @@ rw:
       messages:
         accepted: "must be accepted."
         after: "must be after %{date}."
+        after_today: "must be in the future."
         after_or_equal_to: "must be after or equal to %{date}."
         before: "must be before %{date}."
         before_or_equal_to: "must be before or equal to %{date}."
@@ -981,6 +1017,7 @@ rw:
         not_an_integer: "is not an integer."
         not_an_iso_date: "is not a valid date. Required format: YYYY-MM-DD."
         not_same_project: "doesn't belong to the same project."
+        datetime_must_be_in_future: "must be in the future."
         odd: "must be odd."
         regex_match_failed: "does not match the regular expression %{expression}."
         regex_invalid: "could not be validated with the associated regular expression."
@@ -1094,16 +1131,38 @@ rw:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "start date must be before the end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "is incomplete."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1320,6 +1379,8 @@ rw:
         other: "Notifications"
       placeholder_user: "Placeholder user"
       project: "Project"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         one: "Project list"
         other: "Project lists"
@@ -1423,6 +1484,7 @@ rw:
     login: "Username"
     mail: "Email"
     name: "Name"
+    note: "Note"
     password: "Password"
     priority: "Priority"
     project: "Project"
@@ -1519,6 +1581,7 @@ rw:
   button_print: "Print"
   button_quote: "Quote"
   button_remove: Remove
+  button_remove_reminder: "Remove reminder"
   button_rename: "Rename"
   button_replace: "Replace"
   button_revoke: "Revoke"
@@ -1529,6 +1592,7 @@ rw:
   button_save_as: "Save as"
   button_apply_changes: "Apply changes"
   button_save_back: "Save and back"
+  button_set_reminder: "Set reminder"
   button_show: "Show"
   button_sort: "Sort"
   button_submit: "Submit"
@@ -1734,12 +1798,12 @@ rw:
   direction: ltr
   ee:
     upsale:
+      title: "Enterprise add-on"
+      link_title: "More information"
       form_configuration:
         description: "Customize the form configuration with these additional add-ons:"
         add_groups: "Add new attribute groups"
         rename_groups: "Rename attributes groups"
-      project_filters:
-        description_html: "Filtering and sorting on custom fields is an Enterprise edition add-on."
   enumeration_activities: "Time tracking activities"
   enumeration_work_package_priorities: "Work package priorities"
   enumeration_reported_project_statuses: "Reported project status"
@@ -1772,6 +1836,7 @@ rw:
   error_pdf_export_too_many_columns: "Too many columns selected for the PDF export. Please reduce the number of columns."
   error_pdf_failed_to_export: "The PDF export could not be saved: %{error}"
   error_token_authenticity: "Unable to verify Cross-Site Request Forgery token. Did you try to submit data on multiple browsers or tabs? Please close all tabs and try again."
+  error_reminder_not_found: "The reminder was not found or was already notified about."
   error_work_package_not_found_in_project: "The work package was not found or does not belong to this project"
   error_work_package_id_not_found: "The work package was not found."
   error_must_be_project_member: "must be project member"
@@ -2065,6 +2130,7 @@ rw:
       responsible: "Accountable"
       shared: "Shared"
       watched: "Watcher"
+      reminder: "Reminder"
     facets:
       unread: "Unread"
       unread_title: "Show unread"
@@ -2232,8 +2298,10 @@ rw:
   label_default: "Default"
   label_delete_user: "Delete user"
   label_delete_project: "Delete project"
+  label_delete: "Delete"
   label_deleted: "deleted"
   label_deleted_custom_field: "(deleted custom field)"
+  label_deleted_custom_item: "(deleted item)"
   label_deleted_custom_option: "(deleted option)"
   label_empty_element: "(empty)"
   label_missing_or_hidden_custom_option: "(missing value or lacking permissions to access)"
@@ -2270,7 +2338,6 @@ rw:
   label_enterprise_active_users: "%{current}/%{limit} booked active users"
   label_enterprise_edition: "Enterprise edition"
   label_enterprise_support: "Enterprise support"
-  label_enterprise_addon: "Enterprise add-on"
   label_environment: "Environment"
   label_estimates_and_progress: "Estimates and progress"
   label_equals: "is"
@@ -2455,6 +2522,7 @@ rw:
   label_none_parentheses: "(none)"
   label_not_contains: "doesn't contain"
   label_not_equals: "is not"
+  label_life_cycle_step_plural: "Project lifecycle"
   label_on: "on"
   label_operator_all: "is not empty"
   label_operator_none: "is empty"
@@ -2556,6 +2624,7 @@ rw:
   label_reporting: "Reporting"
   label_reporting_plural: "Reportings"
   label_repository: "Repository"
+  label_repository_remove: "Remove repository"
   label_repository_root: "Repository root"
   label_repository_plural: "Repositories"
   label_required: "required"
@@ -2618,6 +2687,7 @@ rw:
   label_this_month: "this month"
   label_this_week: "this week"
   label_this_year: "this year"
+  label_time: "Time"
   label_time_entry_plural: "Spent time"
   label_time_entry_activity_plural: "Spent time activities"
   label_title: "Title"
@@ -2653,6 +2723,7 @@ rw:
   label_user_settings: "User settings"
   label_users_settings: "Users settings"
   label_version_new: "New version"
+  label_version_edit: "Edit version"
   label_version_plural: "Versions"
   label_version_sharing_descendants: "With subprojects"
   label_version_sharing_hierarchy: "With project hierarchy"
@@ -2790,8 +2861,13 @@ rw:
         prefix: "Received because of the notification setting: %{reason}"
         date_alert_start_date: "Date alert"
         date_alert_due_date: "Date alert"
+        reminder: "Reminder"
       see_all: "See all"
       updated_at: "Updated at %{timestamp} by %{user}"
+    reminder_notifications:
+      subject: "Reminder: %{note}"
+      heading: "You have a new reminder"
+      note: "Note: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "You may %{allowed_actions} this work package. This can change depending on your project role and permissions."
@@ -2958,6 +3034,7 @@ rw:
   notice_successful_connection: "Successful connection."
   notice_successful_create: "Successful creation."
   notice_successful_delete: "Successful deletion."
+  notice_successful_cancel: "Successful cancellation."
   notice_successful_update: "Successful update."
   notice_successful_update_custom_fields_added_to_project: |
     Successful update. The custom fields of the activated types are automatically activated
@@ -3035,6 +3112,7 @@ rw:
   permission_edit_own_time_entries: "Edit own time logs"
   permission_edit_project: "Edit project"
   permission_edit_project_attributes: "Edit project attributes"
+  permission_edit_project_stages_and_gates: "Edit project stages and gates"
   permission_edit_reportings: "Edit reportings"
   permission_edit_time_entries: "Edit time logs for other users"
   permission_edit_timelines: "Edit timelines"
@@ -3064,9 +3142,12 @@ rw:
   permission_search_project: "Search project"
   permission_select_custom_fields: "Select custom fields"
   permission_select_project_custom_fields: "Select project attributes"
+  permission_select_project_life_cycle: "Select project stages and gates"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "Select project modules"
   permission_share_work_packages: "Share work packages"
   permission_manage_types: "Select types"
+  permission_manage_own_reminders: "Create own reminders"
   permission_view_project: "View projects"
   permission_view_changesets: "View repository revisions in OpenProject"
   permission_view_commit_author_statistics: "View commit author statistics"
@@ -3087,6 +3168,7 @@ rw:
   permission_work_package_assigned_explanation: "Work packages can be assigned to users and groups in possession of this role in the respective project"
   permission_view_project_activity: "View project activity"
   permission_view_project_attributes: "View project attributes"
+  permission_view_project_stages_and_gates: "View project stages and gates"
   permission_save_bcf_queries: "Save BCF queries"
   permission_manage_public_bcf_queries: "Manage public BCF queries"
   permission_edit_attribute_help_texts: "Edit attribute help texts"
@@ -3767,6 +3849,12 @@ rw:
       edit_description: "Can view, comment and edit this work package."
       view: "View"
       view_description: "Can view this work package."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Why are you setting this reminder?"
+      success_creation_message: "Reminder set successfully. You will receive a notification for this work package at the chosen time."
+      success_update_message: "Reminder updated successfully."
+      success_deletion_message: "Reminder deleted successfully."
   sharing:
     count:
       zero: "0 users"
diff --git a/config/locales/crowdin/si.yml b/config/locales/crowdin/si.yml
index bdc1ea76e4d6..eec1994ddd22 100644
--- a/config/locales/crowdin/si.yml
+++ b/config/locales/crowdin/si.yml
@@ -343,6 +343,9 @@ si:
         text: "This action will not delete any project the list contains. Are you sure you want to delete this project list?"
     settings:
       change_identifier: Change identifier
+      actions:
+        label_enable_all: "Enable all"
+        label_disable_all: "Disable all"
       activities:
         no_results_title_text: දැනට කිසිදු ක්රියාකාරකමක් නොමැත.
       forums:
@@ -353,18 +356,26 @@ si:
         no_results_content_text: නව වැඩ පැකේජ ප්රවර්ගයක් සාදන්න
       custom_fields:
         no_results_title_text: දැනට පවතින අභිරුචි ක්ෂේත්ර නොමැත.
+      life_cycle:
+        header:
+          title: "Project lifecycle"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "Neither stages nor gates are currently defined."
+        section_header: "Stages and gates"
+        step:
+          use_in_project: "Use %{step} in this project"
+        filter:
+          label: "Search project stage or gate"
       project_custom_fields:
         header:
           title: "Project attributes"
-          description: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
+          description_html: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
         filter:
           label: "Search project attribute"
         actions:
           label_enable_single: "Active in this project, click to disable"
           label_disable_single: "Inactive in this project, click to enable"
           remove_from_project: "Remove from project"
-          label_enable_all: "Enable all"
-          label_disable_all: "Disable all"
         is_required_blank_slate:
           heading: Required in all projects
           description: This project attribute is activated in all projects since the "Required in all projects" option is checked. It cannot be deactivated for individual projects.
@@ -377,6 +388,10 @@ si:
         no_results_content_text: නව අනුවාදයක් සාදන්න
       storage:
         no_results_title_text: There is no additional recorded disk space consumed by this project.
+  project_stage:
+    working_days_count:
+      one: "Duration: %{count} working day"
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "The modified list has been saved as a new list"
@@ -497,8 +512,12 @@ si:
     groups:
       member_in_these_groups: "This user is currently a member of the following groups:"
       no_results_title_text: This user is currently not a member in any group.
+      summary_with_more: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary: Member of %{names}.
     memberships:
       no_results_title_text: මෙම පරිශීලකයා දැනට ව්යාපෘතියක සාමාජිකයෙකු නොවේ.
+    open_profile: "Open profile"
   page:
     text: "පෙළ"
   placeholder_users:
@@ -569,18 +588,27 @@ si:
       no_results_title_text: දැනට වර්ග නොමැත.
       no_results_content_text: නව වර්ගයක් සාදන්න
     edit:
-      settings: "සැකසුම්"
-      form_configuration: "ආකෘති වින්යාසය"
+      form_configuration:
+        tab: "Form configuration"
       more_info_text_html: >
         Enterprise edition allows you to customize form configuration with these additional add-ons: <br> <ul class="%{list_styling_class}"> <li><b>Add new attribute groups</b></li> <li><b>Rename attribute groups</b></li> <li><b>Add a table of related work packages</b></li> </ul>
-      projects: "ව්‍යාපෘති"
-      enabled_projects: "සබල කළ ව්‍යාපෘති"
-      edit_query: "වගුව සංස්කරණය"
-      query_group_placeholder: "මේසයට නමක් දෙන්න"
-      reset: "පැහැර හැරීම් නැවත සකසන්න"
-      type_color_text: |
-        The selected color distinguishes different types
-        in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      projects:
+        tab: "Projects"
+        enabled_projects: "Enabled projects"
+      settings:
+        tab: "Settings"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Subject configuration"
+        manually_editable_subjects:
+          label: "Manually editable subjects"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automatically generated subjects"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Subject pattern"
+          caption: "Search for an attribute or add text. To create a space between elements add it as a text."
   versions:
     overview:
       work_packages_in_archived_projects: "The version is shared with archived projects which still have work packages assigned to this version. These are counted, but will not appear in the linked views."
@@ -643,6 +671,10 @@ si:
     label_add_x: "Add %{x}"
     label_edit_x: "Edit %{x}"
     label_add_description: "Add description"
+    lag:
+      subject: "Lag"
+      title: "Lag (in days)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
       label_relates_singular: "related to"
       label_relates_plural: "related to"
@@ -847,6 +879,9 @@ si:
         lag: "Lag"
         from: "වැඩ පැකේජය"
         to: "අදාළ වැඩ පැකේජය"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Time"
       repository:
         url: "සැ. නි."
       role:
@@ -935,6 +970,7 @@ si:
       messages:
         accepted: "පිළිගත යුතුය."
         after: "must be after %{date}."
+        after_today: "must be in the future."
         after_or_equal_to: "%{date}ට පසුව හෝ සමාන විය යුතුය."
         before: "must be before %{date}."
         before_or_equal_to: "%{date}ට පෙර හෝ සමාන විය යුතුය."
@@ -981,6 +1017,7 @@ si:
         not_an_integer: "පූර්ණ සංඛ්යාලයක් නොවේ."
         not_an_iso_date: "වලංගු දිනයක් නොවේ. අවශ්ය ආකෘතිය: YYY-MM-DD."
         not_same_project: "එකම ව්යාපෘතියට අයත් නොවේ."
+        datetime_must_be_in_future: "must be in the future."
         odd: "අමුතු විය යුතුය."
         regex_match_failed: "does not match the regular expression %{expression}."
         regex_invalid: "ආශ්රිත නිත්ය ප්රකාශනය සමඟ වලංගු කළ නොහැකි විය."
@@ -1094,16 +1131,38 @@ si:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "start date must be before the end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "is incomplete."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1320,6 +1379,8 @@ si:
         other: "Notifications"
       placeholder_user: "Placeholder user"
       project: "ව්යාපෘති"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         one: "Project list"
         other: "Project lists"
@@ -1423,6 +1484,7 @@ si:
     login: "පරිශීලක නාමය"
     mail: "ඊ-තැපැල්"
     name: "නම"
+    note: "Note"
     password: "මුරපදය"
     priority: "ප්රමුඛතාව"
     project: "ව්යාපෘති"
@@ -1519,6 +1581,7 @@ si:
   button_print: "මුද්රණය"
   button_quote: "උපුටා"
   button_remove: ඉවත් කරන්න
+  button_remove_reminder: "Remove reminder"
   button_rename: "නැවත නම් කරන්න"
   button_replace: "ප්රතිස්ථාපනය කරන්න"
   button_revoke: "අවලංගු"
@@ -1529,6 +1592,7 @@ si:
   button_save_as: "ලෙස සුරකින්න"
   button_apply_changes: "Apply changes"
   button_save_back: "සුරකින්න සහ නැවත"
+  button_set_reminder: "Set reminder"
   button_show: "පෙන්වන්න"
   button_sort: "වර්ග"
   button_submit: "ඉදිරිපත් කරන්න"
@@ -1734,12 +1798,12 @@ si:
   direction: LTR
   ee:
     upsale:
+      title: "Enterprise add-on"
+      link_title: "More information"
       form_configuration:
         description: "Customize the form configuration with these additional add-ons:"
         add_groups: "නව ගුණාංග කණ්ඩායම් එකතු කරන්න"
         rename_groups: "ගුණාංග කණ්ඩායම් නැවත නම් කරන්න"
-      project_filters:
-        description_html: "Filtering and sorting on custom fields is an Enterprise edition add-on."
   enumeration_activities: "කාලය සොයා ගැනීමේ ක්රියාකාරකම්"
   enumeration_work_package_priorities: "වැඩ පැකේජ ප්රමුඛතා"
   enumeration_reported_project_statuses: "වාර්තා කරන ලද ව්යාපෘති තත්ත්වය"
@@ -1772,6 +1836,7 @@ si:
   error_pdf_export_too_many_columns: "PDF අපනයනය සඳහා තෝරාගෙන ඇති තීරු බොහොමයක්. කරුණාකර තීරු ගණන අඩු කරන්න."
   error_pdf_failed_to_export: "PDF අපනයනය සුරැකිය නොහැකි විය: %{error}"
   error_token_authenticity: "හරස් අඩවි ඉල්ලීම් ව්යාජ ටෝකනය සත්යාපනය කිරීමට නොහැකි විය. ඔබ බහු බ්රව්සර් හෝ ටැබ් මත දත්ත ඉදිරිපත් කිරීමට උත්සාහ කළාද? කරුණාකර සියලුම ටැබ් වසා නැවත උත්සාහ කරන්න."
+  error_reminder_not_found: "The reminder was not found or was already notified about."
   error_work_package_not_found_in_project: "වැඩ පැකේජය සොයාගත නොහැකි හෝ මෙම ව්යාපෘතියට අයත් නොවේ"
   error_work_package_id_not_found: "The work package was not found."
   error_must_be_project_member: "ව්යාපෘති සාමාජිකයෙකු විය යුතුය"
@@ -2065,6 +2130,7 @@ si:
       responsible: "වගවීම"
       shared: "Shared"
       watched: "මුරකරු"
+      reminder: "Reminder"
     facets:
       unread: "Unread"
       unread_title: "Show unread"
@@ -2232,8 +2298,10 @@ si:
   label_default: "පෙරනිමි"
   label_delete_user: "පරිශීලක මකන්න"
   label_delete_project: "ව්යාපෘතිය මකන්න"
+  label_delete: "Delete"
   label_deleted: "මකා දැමූ"
   label_deleted_custom_field: "(මකා දමන ලද අභිරුචි ක්ෂේත්රය)"
+  label_deleted_custom_item: "(deleted item)"
   label_deleted_custom_option: "(deleted option)"
   label_empty_element: "(හිස්)"
   label_missing_or_hidden_custom_option: "(missing value or lacking permissions to access)"
@@ -2270,7 +2338,6 @@ si:
   label_enterprise_active_users: "%{current}/%{limit} වෙන් කර ඇති සක්රීය පරිශීලකයින්"
   label_enterprise_edition: "Enterprise edition"
   label_enterprise_support: "Enterprise support"
-  label_enterprise_addon: "Enterprise add-on"
   label_environment: "පරිසරය"
   label_estimates_and_progress: "Estimates and progress"
   label_equals: "වේ"
@@ -2455,6 +2522,7 @@ si:
   label_none_parentheses: "(කිසිවක් නැත)"
   label_not_contains: "අඩංගු නොවේ"
   label_not_equals: "නැත"
+  label_life_cycle_step_plural: "Project lifecycle"
   label_on: "මත"
   label_operator_all: "is not empty"
   label_operator_none: "is empty"
@@ -2556,6 +2624,7 @@ si:
   label_reporting: "වාර්තාකරණය"
   label_reporting_plural: "වාර්තා"
   label_repository: "ගබඩාව"
+  label_repository_remove: "Remove repository"
   label_repository_root: "ගබඩාව මූල"
   label_repository_plural: "ගබඩාවලදී"
   label_required: "අවශ්ය"
@@ -2618,6 +2687,7 @@ si:
   label_this_month: "මෙම මාසය"
   label_this_week: "මේ සතියේ"
   label_this_year: "මේ වසරේ"
+  label_time: "Time"
   label_time_entry_plural: "වැය කළ කාලය"
   label_time_entry_activity_plural: "Spent time activities"
   label_title: "මාතෘකාව"
@@ -2653,6 +2723,7 @@ si:
   label_user_settings: "පරිශීලක සැකසුම්"
   label_users_settings: "Users settings"
   label_version_new: "නව අනුවාදය"
+  label_version_edit: "Edit version"
   label_version_plural: "අනුවාද"
   label_version_sharing_descendants: "උප ව්යාපෘති සමඟ"
   label_version_sharing_hierarchy: "ව්යාපෘති ධූරාවලිය සමඟ"
@@ -2790,8 +2861,13 @@ si:
         prefix: "Received because of the notification setting: %{reason}"
         date_alert_start_date: "Date alert"
         date_alert_due_date: "Date alert"
+        reminder: "Reminder"
       see_all: "See all"
       updated_at: "Updated at %{timestamp} by %{user}"
+    reminder_notifications:
+      subject: "Reminder: %{note}"
+      heading: "You have a new reminder"
+      note: "Note: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "You may %{allowed_actions} this work package. This can change depending on your project role and permissions."
@@ -2958,6 +3034,7 @@ si:
   notice_successful_connection: "සාර්ථක සම්බන්ධතාවයක්."
   notice_successful_create: "සාර්ථක නිර්මාණය."
   notice_successful_delete: "සාර්ථක මකාදැමීම."
+  notice_successful_cancel: "Successful cancellation."
   notice_successful_update: "සාර්ථක යාවත්කාලීන කිරීම."
   notice_successful_update_custom_fields_added_to_project: |
     Successful update. The custom fields of the activated types are automatically activated
@@ -3035,6 +3112,7 @@ si:
   permission_edit_own_time_entries: "ම කාලය ලඝු-සටහන් සංස්කරණය"
   permission_edit_project: "ව්යාපෘතිය සංස්කරණය කරන්න"
   permission_edit_project_attributes: "Edit project attributes"
+  permission_edit_project_stages_and_gates: "Edit project stages and gates"
   permission_edit_reportings: "වාර්තා සංස්කරණය කරන්න"
   permission_edit_time_entries: "Edit time logs for other users"
   permission_edit_timelines: "කාලනියමයන් සංස්කරණය කරන්න"
@@ -3064,9 +3142,12 @@ si:
   permission_search_project: "Search project"
   permission_select_custom_fields: "Select custom fields"
   permission_select_project_custom_fields: "Select project attributes"
+  permission_select_project_life_cycle: "Select project stages and gates"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "ව්යාපෘති මොඩියුල තෝරන්න"
   permission_share_work_packages: "Share work packages"
   permission_manage_types: "වර්ග තෝරන්න"
+  permission_manage_own_reminders: "Create own reminders"
   permission_view_project: "View projects"
   permission_view_changesets: "OpenProject හි නිධි සංශෝධන බලන්න"
   permission_view_commit_author_statistics: "කතෘ සංඛ්යා ලේඛන බලන්න"
@@ -3087,6 +3168,7 @@ si:
   permission_work_package_assigned_explanation: "අදාළ ව්යාපෘතියේ මෙම කාර්යභාරය සතුව ඇති පරිශීලකයින්ට සහ කණ්ඩායම්වලට වැඩ පැකේජ පැවරිය හැකිය"
   permission_view_project_activity: "View project activity"
   permission_view_project_attributes: "View project attributes"
+  permission_view_project_stages_and_gates: "View project stages and gates"
   permission_save_bcf_queries: "Save BCF queries"
   permission_manage_public_bcf_queries: "Manage public BCF queries"
   permission_edit_attribute_help_texts: "Edit attribute help texts"
@@ -3767,6 +3849,12 @@ si:
       edit_description: "Can view, comment and edit this work package."
       view: "දැක්ම"
       view_description: "Can view this work package."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Why are you setting this reminder?"
+      success_creation_message: "Reminder set successfully. You will receive a notification for this work package at the chosen time."
+      success_update_message: "Reminder updated successfully."
+      success_deletion_message: "Reminder deleted successfully."
   sharing:
     count:
       zero: "0 users"
diff --git a/config/locales/crowdin/sk.yml b/config/locales/crowdin/sk.yml
index bf7f576cf95a..4da9cd1b7f31 100644
--- a/config/locales/crowdin/sk.yml
+++ b/config/locales/crowdin/sk.yml
@@ -343,6 +343,9 @@ sk:
         text: "This action will not delete any project the list contains. Are you sure you want to delete this project list?"
     settings:
       change_identifier: Change identifier
+      actions:
+        label_enable_all: "Enable all"
+        label_disable_all: "Disable all"
       activities:
         no_results_title_text: Momentálne neexistujú žiadne aktivity.
       forums:
@@ -353,18 +356,26 @@ sk:
         no_results_content_text: Vytvoriť novú kategóriu pracovného balíka
       custom_fields:
         no_results_title_text: Momentálne nie sú k dispozícii žiadne vlastné polia.
+      life_cycle:
+        header:
+          title: "Project lifecycle"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "Neither stages nor gates are currently defined."
+        section_header: "Stages and gates"
+        step:
+          use_in_project: "Use %{step} in this project"
+        filter:
+          label: "Search project stage or gate"
       project_custom_fields:
         header:
           title: "Project attributes"
-          description: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
+          description_html: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
         filter:
           label: "Search project attribute"
         actions:
           label_enable_single: "Active in this project, click to disable"
           label_disable_single: "Inactive in this project, click to enable"
           remove_from_project: "Remove from project"
-          label_enable_all: "Enable all"
-          label_disable_all: "Disable all"
         is_required_blank_slate:
           heading: Required in all projects
           description: This project attribute is activated in all projects since the "Required in all projects" option is checked. It cannot be deactivated for individual projects.
@@ -377,6 +388,12 @@ sk:
         no_results_content_text: Vytvoriť novú verziu
       storage:
         no_results_title_text: There is no additional recorded disk space consumed by this project.
+  project_stage:
+    working_days_count:
+      one: "Duration: %{count} working day"
+      few: "Duration: %{count} working days"
+      many: "Duration: %{count} working days"
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "The modified list has been saved as a new list"
@@ -509,8 +526,12 @@ sk:
     groups:
       member_in_these_groups: "This user is currently a member of the following groups:"
       no_results_title_text: This user is currently not a member in any group.
+      summary_with_more: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary: Member of %{names}.
     memberships:
       no_results_title_text: Tento používateľ nie je v súčasnosti členom projektu.
+    open_profile: "Open profile"
   page:
     text: "Text"
   placeholder_users:
@@ -583,18 +604,27 @@ sk:
       no_results_title_text: Momentálne neexistujú žiadne typy.
       no_results_content_text: Vytvoriť nový typ
     edit:
-      settings: "Nastavenia"
-      form_configuration: "Konfigurácia formulára"
+      form_configuration:
+        tab: "Form configuration"
       more_info_text_html: >
         Enterprise edition allows you to customize form configuration with these additional add-ons: <br> <ul class="%{list_styling_class}"> <li><b>Add new attribute groups</b></li> <li><b>Rename attribute groups</b></li> <li><b>Add a table of related work packages</b></li> </ul>
-      projects: "Projekty"
-      enabled_projects: "Povolené projekty"
-      edit_query: "Upraviť tabuľku"
-      query_group_placeholder: "Zadajte názov tabuľky"
-      reset: "Obnoviť predvolené"
-      type_color_text: |
-        The selected color distinguishes different types
-        in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      projects:
+        tab: "Projects"
+        enabled_projects: "Enabled projects"
+      settings:
+        tab: "Settings"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Subject configuration"
+        manually_editable_subjects:
+          label: "Manually editable subjects"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automatically generated subjects"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Subject pattern"
+          caption: "Search for an attribute or add text. To create a space between elements add it as a text."
   versions:
     overview:
       work_packages_in_archived_projects: "The version is shared with archived projects which still have work packages assigned to this version. These are counted, but will not appear in the linked views."
@@ -659,6 +689,10 @@ sk:
     label_add_x: "Add %{x}"
     label_edit_x: "Edit %{x}"
     label_add_description: "Add description"
+    lag:
+      subject: "Lag"
+      title: "Lag (in days)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
       label_relates_singular: "related to"
       label_relates_plural: "related to"
@@ -863,6 +897,9 @@ sk:
         lag: "Lag"
         from: "Pracovný balíček"
         to: "Súvisiaci pracovný balíček"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Time"
       repository:
         url: "URL adresa"
       role:
@@ -951,6 +988,7 @@ sk:
       messages:
         accepted: "musí byť akceptovaný."
         after: "musí byť po termíne %{date}."
+        after_today: "must be in the future."
         after_or_equal_to: "musí byť po alebo rovné termínu %{date}."
         before: "musí byť pred termínom %{date}."
         before_or_equal_to: "musí byť pred alebo rovné termínu %{date}."
@@ -997,6 +1035,7 @@ sk:
         not_an_integer: "nie je celé číslo."
         not_an_iso_date: "nie je platný dátum. Požadovaný formát: RRRR-MM-DD."
         not_same_project: "nepodlieha rovnakému projektu."
+        datetime_must_be_in_future: "must be in the future."
         odd: "musí byť nepárne."
         regex_match_failed: "does not match the regular expression %{expression}."
         regex_invalid: "nebolo možné overiť s príslušným regulárnym výrazom."
@@ -1110,16 +1149,38 @@ sk:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "start date must be before the end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "is incomplete."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1342,6 +1403,8 @@ sk:
         other: "Notifications"
       placeholder_user: "Placeholder user"
       project: "Projekt"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         one: "Project list"
         few: "Project lists"
@@ -1459,6 +1522,7 @@ sk:
     login: "Používateľské meno"
     mail: "E-mail"
     name: "Názov"
+    note: "Note"
     password: "Heslo"
     priority: "Priorita"
     project: "Projekt"
@@ -1555,6 +1619,7 @@ sk:
   button_print: "Tlač"
   button_quote: "Citovať"
   button_remove: Vymazať
+  button_remove_reminder: "Remove reminder"
   button_rename: "Premenovať"
   button_replace: "Nahradiť"
   button_revoke: "Odvolať"
@@ -1565,6 +1630,7 @@ sk:
   button_save_as: "Uložiť ako"
   button_apply_changes: "Apply changes"
   button_save_back: "Uloženie a návrat"
+  button_set_reminder: "Set reminder"
   button_show: "Ukázať"
   button_sort: "Zoradiť"
   button_submit: "Odoslať"
@@ -1806,12 +1872,12 @@ sk:
   direction: zľava doprava
   ee:
     upsale:
+      title: "Enterprise add-on"
+      link_title: "More information"
       form_configuration:
         description: "Customize the form configuration with these additional add-ons:"
         add_groups: "Pridajte nové skupiny atribútov"
         rename_groups: "Premenovať skupiny atribútov"
-      project_filters:
-        description_html: "Filtering and sorting on custom fields is an Enterprise edition add-on."
   enumeration_activities: "Time tracking activities"
   enumeration_work_package_priorities: "Priority Pracovného balíka"
   enumeration_reported_project_statuses: "Nahlásený stav projektu"
@@ -1844,6 +1910,7 @@ sk:
   error_pdf_export_too_many_columns: "Vybraných príliš veľa stĺpcov pre export do PDF. Znížte počet stĺpcov."
   error_pdf_failed_to_export: "PDF export nie je možné uložiť: %{error}"
   error_token_authenticity: "Nepodarilo sa overiť Token medzi lokalitami. Ak ste sa pokúsili uložiť údaje na viaceré karty alebo prehliadače, zatvorte ich a opätovne načítajte túto stránku a skúste to znova."
+  error_reminder_not_found: "The reminder was not found or was already notified about."
   error_work_package_not_found_in_project: "Pracovný balíček nebol nájdený alebo nepatrí k tomuto projektu"
   error_work_package_id_not_found: "The work package was not found."
   error_must_be_project_member: "musíte byť členom projektu"
@@ -2137,6 +2204,7 @@ sk:
       responsible: "Zodpovedný"
       shared: "Shared"
       watched: "Pozorovateľ"
+      reminder: "Reminder"
     facets:
       unread: "Unread"
       unread_title: "Show unread"
@@ -2304,8 +2372,10 @@ sk:
   label_default: "Predvolený"
   label_delete_user: "Zmazať užívateľa"
   label_delete_project: "Vymazať projekt"
+  label_delete: "Delete"
   label_deleted: "odstránené"
   label_deleted_custom_field: "(odstrániť vlastné pole)"
+  label_deleted_custom_item: "(deleted item)"
   label_deleted_custom_option: "(deleted option)"
   label_empty_element: "(prázdny)"
   label_missing_or_hidden_custom_option: "(missing value or lacking permissions to access)"
@@ -2342,7 +2412,6 @@ sk:
   label_enterprise_active_users: "%{current}/%{limit} rezervovaných aktívnych užívateľov"
   label_enterprise_edition: "Enterprise edition"
   label_enterprise_support: "Enterprise support"
-  label_enterprise_addon: "Enterprise add-on"
   label_environment: "Prostredie"
   label_estimates_and_progress: "Estimates and progress"
   label_equals: "je"
@@ -2527,6 +2596,7 @@ sk:
   label_none_parentheses: "(žiadny)"
   label_not_contains: "neobsahuje"
   label_not_equals: "nie je"
+  label_life_cycle_step_plural: "Project lifecycle"
   label_on: "dňa"
   label_operator_all: "is not empty"
   label_operator_none: "is empty"
@@ -2628,6 +2698,7 @@ sk:
   label_reporting: "Reporting"
   label_reporting_plural: "Reportings"
   label_repository: "Repozitár"
+  label_repository_remove: "Remove repository"
   label_repository_root: "Koreňové úložisko"
   label_repository_plural: "Repozitáre"
   label_required: "požadované"
@@ -2690,6 +2761,7 @@ sk:
   label_this_month: "Tento mesiac"
   label_this_week: "tento týždeň"
   label_this_year: "Tento rok"
+  label_time: "Time"
   label_time_entry_plural: "Strávený čas"
   label_time_entry_activity_plural: "Spent time activities"
   label_title: "Nadpis"
@@ -2725,6 +2797,7 @@ sk:
   label_user_settings: "User settings"
   label_users_settings: "Users settings"
   label_version_new: "Nová verzia"
+  label_version_edit: "Edit version"
   label_version_plural: "Verzie"
   label_version_sharing_descendants: "S podprojektmi"
   label_version_sharing_hierarchy: "S hierarchiou projektu"
@@ -2864,8 +2937,13 @@ sk:
         prefix: "Received because of the notification setting: %{reason}"
         date_alert_start_date: "Date alert"
         date_alert_due_date: "Date alert"
+        reminder: "Reminder"
       see_all: "See all"
       updated_at: "Updated at %{timestamp} by %{user}"
+    reminder_notifications:
+      subject: "Reminder: %{note}"
+      heading: "You have a new reminder"
+      note: "Note: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "You may %{allowed_actions} this work package. This can change depending on your project role and permissions."
@@ -3031,6 +3109,7 @@ sk:
   notice_successful_connection: "Úspešne pripojené."
   notice_successful_create: "Úspešne vytvorené."
   notice_successful_delete: "Úspešne zmazané."
+  notice_successful_cancel: "Successful cancellation."
   notice_successful_update: "Úspešne aktualizované."
   notice_successful_update_custom_fields_added_to_project: |
     Successful update. The custom fields of the activated types are automatically activated
@@ -3110,6 +3189,7 @@ sk:
   permission_edit_own_time_entries: "Upraviť vlastné časové záznamy"
   permission_edit_project: "Upraviť projekt"
   permission_edit_project_attributes: "Edit project attributes"
+  permission_edit_project_stages_and_gates: "Edit project stages and gates"
   permission_edit_reportings: "Upraviť prehľady"
   permission_edit_time_entries: "Edit time logs for other users"
   permission_edit_timelines: "Úprava časovej osi"
@@ -3139,9 +3219,12 @@ sk:
   permission_search_project: "Search project"
   permission_select_custom_fields: "Select custom fields"
   permission_select_project_custom_fields: "Select project attributes"
+  permission_select_project_life_cycle: "Select project stages and gates"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "Vyberte moduly projektu"
   permission_share_work_packages: "Share work packages"
   permission_manage_types: "Vyberte typy"
+  permission_manage_own_reminders: "Create own reminders"
   permission_view_project: "View projects"
   permission_view_changesets: "Zobraziť revízie úložiska v programe OpenProject"
   permission_view_commit_author_statistics: "Zobraziť štatistiky o odovzdávkach do repozitára za autora"
@@ -3162,6 +3245,7 @@ sk:
   permission_work_package_assigned_explanation: "Pracovné balíčky môžu byť pridelené užívateľom a skupinám, ktoré majú v príslušnom projekte túto úlohu"
   permission_view_project_activity: "View project activity"
   permission_view_project_attributes: "View project attributes"
+  permission_view_project_stages_and_gates: "View project stages and gates"
   permission_save_bcf_queries: "Save BCF queries"
   permission_manage_public_bcf_queries: "Manage public BCF queries"
   permission_edit_attribute_help_texts: "Edit attribute help texts"
@@ -3844,6 +3928,12 @@ sk:
       edit_description: "Can view, comment and edit this work package."
       view: "Zobraziť"
       view_description: "Can view this work package."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Why are you setting this reminder?"
+      success_creation_message: "Reminder set successfully. You will receive a notification for this work package at the chosen time."
+      success_update_message: "Reminder updated successfully."
+      success_deletion_message: "Reminder deleted successfully."
   sharing:
     count:
       zero: "0 users"
diff --git a/config/locales/crowdin/sl.yml b/config/locales/crowdin/sl.yml
index 7d39dc73e878..db25af889d8f 100644
--- a/config/locales/crowdin/sl.yml
+++ b/config/locales/crowdin/sl.yml
@@ -342,6 +342,9 @@ sl:
         text: "This action will not delete any project the list contains. Are you sure you want to delete this project list?"
     settings:
       change_identifier: Zamenjaj identifikator
+      actions:
+        label_enable_all: "Enable all"
+        label_disable_all: "Disable all"
       activities:
         no_results_title_text: Trenutno ni na voljo nobenih aktivnosti.
       forums:
@@ -352,18 +355,26 @@ sl:
         no_results_content_text: Ustvari novo kategorijo delovnega paketa
       custom_fields:
         no_results_title_text: Nobeno polje po meri trenutno ni na voljo.
+      life_cycle:
+        header:
+          title: "Project lifecycle"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "Neither stages nor gates are currently defined."
+        section_header: "Stages and gates"
+        step:
+          use_in_project: "Use %{step} in this project"
+        filter:
+          label: "Search project stage or gate"
       project_custom_fields:
         header:
           title: "Project attributes"
-          description: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
+          description_html: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
         filter:
           label: "Search project attribute"
         actions:
           label_enable_single: "Active in this project, click to disable"
           label_disable_single: "Inactive in this project, click to enable"
           remove_from_project: "Remove from project"
-          label_enable_all: "Enable all"
-          label_disable_all: "Disable all"
         is_required_blank_slate:
           heading: Required in all projects
           description: This project attribute is activated in all projects since the "Required in all projects" option is checked. It cannot be deactivated for individual projects.
@@ -376,6 +387,12 @@ sl:
         no_results_content_text: Ustvari novo različico
       storage:
         no_results_title_text: There is no additional recorded disk space consumed by this project.
+  project_stage:
+    working_days_count:
+      one: "Duration: %{count} working day"
+      two: "Duration: %{count} working days"
+      few: "Duration: %{count} working days"
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "The modified list has been saved as a new list"
@@ -508,8 +525,12 @@ sl:
     groups:
       member_in_these_groups: "Ta uporabnik je trenutno član naslednjih skupin:"
       no_results_title_text: Ta uporabnik trenutno ni član v nobeni skupini.
+      summary_with_more: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary: Member of %{names}.
     memberships:
       no_results_title_text: Ta uporabnik trenutno ni član projekta.
+    open_profile: "Open profile"
   page:
     text: "Besedilo"
   placeholder_users:
@@ -581,17 +602,27 @@ sl:
       no_results_title_text: Trenutno ni vrst.
       no_results_content_text: Ustvarite novo vrsto
     edit:
-      settings: "Nastavitve"
-      form_configuration: "Konfiguracija obrazca"
+      form_configuration:
+        tab: "Form configuration"
       more_info_text_html: >
         Enterprise edition allows you to customize form configuration with these additional add-ons: <br> <ul class="%{list_styling_class}"> <li><b>Add new attribute groups</b></li> <li><b>Rename attribute groups</b></li> <li><b>Add a table of related work packages</b></li> </ul>
-      projects: "Projekti"
-      enabled_projects: "Omogočeni projekti"
-      edit_query: "Uredi tabelo"
-      query_group_placeholder: "Poimenujte tabelo"
-      reset: "Ponastavi na privzete vrednosti"
-      type_color_text: |
-        Izbrana barva razlikuje različne vrste v Ganttovih diagramih ali tabelah delovnih paketov. Zato je priporočljivo uporabiti močno barvo.
+      projects:
+        tab: "Projects"
+        enabled_projects: "Enabled projects"
+      settings:
+        tab: "Settings"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Subject configuration"
+        manually_editable_subjects:
+          label: "Manually editable subjects"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automatically generated subjects"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Subject pattern"
+          caption: "Search for an attribute or add text. To create a space between elements add it as a text."
   versions:
     overview:
       work_packages_in_archived_projects: "The version is shared with archived projects which still have work packages assigned to this version. These are counted, but will not appear in the linked views."
@@ -656,6 +687,10 @@ sl:
     label_add_x: "Add %{x}"
     label_edit_x: "Edit %{x}"
     label_add_description: "Add description"
+    lag:
+      subject: "Lag"
+      title: "Lag (in days)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
       label_relates_singular: "related to"
       label_relates_plural: "related to"
@@ -860,6 +895,9 @@ sl:
         lag: "Lag"
         from: "Zahtevek"
         to: "Soroden zahtevek"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Time"
       repository:
         url: "URL"
       role:
@@ -948,6 +986,7 @@ sl:
       messages:
         accepted: "mora biti sprejeto."
         after: "mora biti po %{date}."
+        after_today: "must be in the future."
         after_or_equal_to: "mora biti po ali enako %{date}."
         before: "mora biti pred %{date}."
         before_or_equal_to: "mora biti pred ali enako %{date}."
@@ -994,6 +1033,7 @@ sl:
         not_an_integer: "ni celo število. "
         not_an_iso_date: "neveljaven čas. Potreben format: YYYY-MM-DD."
         not_same_project: "ne pripada istemu projektu"
+        datetime_must_be_in_future: "must be in the future."
         odd: "mora biti liho. "
         regex_match_failed: "does not match the regular expression %{expression}."
         regex_invalid: "ni bilo mogoče potrditi s pripadajočim stalnim izrazom."
@@ -1107,16 +1147,38 @@ sl:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "start date must be before the end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "is incomplete."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1339,6 +1401,8 @@ sl:
         other: "Notifications"
       placeholder_user: "Nadomestni uporabnik"
       project: "Projekt"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         one: "Project list"
         two: "Project lists"
@@ -1456,6 +1520,7 @@ sl:
     login: "Uporabniško ime"
     mail: "E-pošta"
     name: "Ime"
+    note: "Note"
     password: "Geslo"
     priority: "Prioriteta"
     project: "Projekt"
@@ -1552,6 +1617,7 @@ sl:
   button_print: "Natisni"
   button_quote: "Citiraj"
   button_remove: Odstrani
+  button_remove_reminder: "Remove reminder"
   button_rename: "Preimenuj"
   button_replace: "Zamenjaj"
   button_revoke: "Prekliči"
@@ -1562,6 +1628,7 @@ sl:
   button_save_as: "Shrani kot"
   button_apply_changes: "Apply changes"
   button_save_back: "Shrani in nazaj"
+  button_set_reminder: "Set reminder"
   button_show: "Pokaži"
   button_sort: "Razvrsti"
   button_submit: "Potrdi"
@@ -1803,12 +1870,12 @@ sl:
   direction: ltr
   ee:
     upsale:
+      title: "Enterprise add-on"
+      link_title: "More information"
       form_configuration:
         description: "Customize the form configuration with these additional add-ons:"
         add_groups: "Dodajte nove skupine atributov"
         rename_groups: "Preimenujte skupine atributov"
-      project_filters:
-        description_html: "Filtering and sorting on custom fields is an Enterprise edition add-on."
   enumeration_activities: "Dejavnosti spremljanja časa"
   enumeration_work_package_priorities: "Prednostne naloge delovnega paketa"
   enumeration_reported_project_statuses: "Poročano stanje projekta"
@@ -1841,6 +1908,7 @@ sl:
   error_pdf_export_too_many_columns: "Za izvoz PDF je izbranih preveč stolpcev. Zmanjšajte število stolpcev."
   error_pdf_failed_to_export: "Izvoza PDF ni bilo mogoče shraniti: %{error}"
   error_token_authenticity: "Ni mogoče preveriti žetona ponarejanja zahteve na več mestih. Ste poskušali predložiti podatke v več brskalnikih ali zavihkih? Zaprite vse zavihke in poskusite znova.\n"
+  error_reminder_not_found: "The reminder was not found or was already notified about."
   error_work_package_not_found_in_project: "Delovnega paketa/ zahtevka ni bilo mogoče najti ali ne spada v ta projekt"
   error_work_package_id_not_found: "The work package was not found."
   error_must_be_project_member: "mora biti član projekta"
@@ -2134,6 +2202,7 @@ sl:
       responsible: "Odgovorni"
       shared: "Shared"
       watched: "Opazovalec"
+      reminder: "Reminder"
     facets:
       unread: "Neprebrano"
       unread_title: "Pokaži neprebrano"
@@ -2301,8 +2370,10 @@ sl:
   label_default: "Privzeto"
   label_delete_user: "Brisanje uporabnika"
   label_delete_project: "Brisanje projekta"
+  label_delete: "Delete"
   label_deleted: "Izbrisano"
   label_deleted_custom_field: "(izbrisano polje po meri)"
+  label_deleted_custom_item: "(deleted item)"
   label_deleted_custom_option: "(izbrisana možnost)"
   label_empty_element: "(prazno)"
   label_missing_or_hidden_custom_option: "(missing value or lacking permissions to access)"
@@ -2339,7 +2410,6 @@ sl:
   label_enterprise_active_users: "%{current} /%{limit} rezervirani aktivni uporabniki"
   label_enterprise_edition: "Enterprise edition"
   label_enterprise_support: "Enterprise support"
-  label_enterprise_addon: "Enterprise add-on"
   label_environment: "Okolje"
   label_estimates_and_progress: "Estimates and progress"
   label_equals: "je"
@@ -2524,6 +2594,7 @@ sl:
   label_none_parentheses: "(brez)"
   label_not_contains: "ne vsebuje"
   label_not_equals: "ni"
+  label_life_cycle_step_plural: "Project lifecycle"
   label_on: "vključeno"
   label_operator_all: "is not empty"
   label_operator_none: "is empty"
@@ -2625,6 +2696,7 @@ sl:
   label_reporting: "Poročanje"
   label_reporting_plural: "Poročanja"
   label_repository: "Repozitorij"
+  label_repository_remove: "Remove repository"
   label_repository_root: "Izvor/koren repozitorija"
   label_repository_plural: "Repozitoriji"
   label_required: "Zahtevano"
@@ -2687,6 +2759,7 @@ sl:
   label_this_month: "Ta mesec"
   label_this_week: "ta teden"
   label_this_year: "to leto"
+  label_time: "Time"
   label_time_entry_plural: "Porabljen čas"
   label_time_entry_activity_plural: "Spent time activities"
   label_title: "Naslov"
@@ -2722,6 +2795,7 @@ sl:
   label_user_settings: "Uporabniške nastavitve"
   label_users_settings: "Users settings"
   label_version_new: "Nova različica"
+  label_version_edit: "Edit version"
   label_version_plural: "Različice"
   label_version_sharing_descendants: "S podprojekti"
   label_version_sharing_hierarchy: "S projektno hierarhijo"
@@ -2861,8 +2935,13 @@ sl:
         prefix: "Received because of the notification setting: %{reason}"
         date_alert_start_date: "Date alert"
         date_alert_due_date: "Date alert"
+        reminder: "Reminder"
       see_all: "See all"
       updated_at: "Spremenjeno ob %{timestamp} od %{user}"
+    reminder_notifications:
+      subject: "Reminder: %{note}"
+      heading: "You have a new reminder"
+      note: "Note: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "You may %{allowed_actions} this work package. This can change depending on your project role and permissions."
@@ -3029,6 +3108,7 @@ sl:
   notice_successful_connection: "Povezava uspela."
   notice_successful_create: "Ustvarjanje uspelo."
   notice_successful_delete: "Uspešen izbris."
+  notice_successful_cancel: "Successful cancellation."
   notice_successful_update: "Posodobitev uspela."
   notice_successful_update_custom_fields_added_to_project: |
     Successful update. The custom fields of the activated types are automatically activated
@@ -3108,6 +3188,7 @@ sl:
   permission_edit_own_time_entries: "Uredi svoje dnevnike"
   permission_edit_project: "Uredi projekt"
   permission_edit_project_attributes: "Edit project attributes"
+  permission_edit_project_stages_and_gates: "Edit project stages and gates"
   permission_edit_reportings: "Uredi poročila"
   permission_edit_time_entries: "Edit time logs for other users"
   permission_edit_timelines: "Uredi časovnice"
@@ -3137,9 +3218,12 @@ sl:
   permission_search_project: "Search project"
   permission_select_custom_fields: "Select custom fields"
   permission_select_project_custom_fields: "Select project attributes"
+  permission_select_project_life_cycle: "Select project stages and gates"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "Izberi module projekta"
   permission_share_work_packages: "Share work packages"
   permission_manage_types: "Izberi vrste"
+  permission_manage_own_reminders: "Create own reminders"
   permission_view_project: "View projects"
   permission_view_changesets: "Oglejte si revizije repozitorija v OpenProject"
   permission_view_commit_author_statistics: "Oglejte si statistiko avtorjev"
@@ -3160,6 +3244,7 @@ sl:
   permission_work_package_assigned_explanation: "Delovni paketi se lahko dodelijo uporabnikom in skupinam, ki imajo to vlogo v posameznem projektu"
   permission_view_project_activity: "View project activity"
   permission_view_project_attributes: "View project attributes"
+  permission_view_project_stages_and_gates: "View project stages and gates"
   permission_save_bcf_queries: "Save BCF queries"
   permission_manage_public_bcf_queries: "Manage public BCF queries"
   permission_edit_attribute_help_texts: "Edit attribute help texts"
@@ -3841,6 +3926,12 @@ sl:
       edit_description: "Can view, comment and edit this work package."
       view: "Ogled"
       view_description: "Can view this work package."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Why are you setting this reminder?"
+      success_creation_message: "Reminder set successfully. You will receive a notification for this work package at the chosen time."
+      success_update_message: "Reminder updated successfully."
+      success_deletion_message: "Reminder deleted successfully."
   sharing:
     count:
       zero: "0 users"
diff --git a/config/locales/crowdin/sr.yml b/config/locales/crowdin/sr.yml
index acae690149c5..cd235bc8c8ee 100644
--- a/config/locales/crowdin/sr.yml
+++ b/config/locales/crowdin/sr.yml
@@ -343,6 +343,9 @@ sr:
         text: "This action will not delete any project the list contains. Are you sure you want to delete this project list?"
     settings:
       change_identifier: Change identifier
+      actions:
+        label_enable_all: "Enable all"
+        label_disable_all: "Disable all"
       activities:
         no_results_title_text: There are currently no activities available.
       forums:
@@ -353,18 +356,26 @@ sr:
         no_results_content_text: Create a new work package category
       custom_fields:
         no_results_title_text: There are currently no custom fields available.
+      life_cycle:
+        header:
+          title: "Project lifecycle"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "Neither stages nor gates are currently defined."
+        section_header: "Stages and gates"
+        step:
+          use_in_project: "Use %{step} in this project"
+        filter:
+          label: "Search project stage or gate"
       project_custom_fields:
         header:
           title: "Project attributes"
-          description: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
+          description_html: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
         filter:
           label: "Search project attribute"
         actions:
           label_enable_single: "Active in this project, click to disable"
           label_disable_single: "Inactive in this project, click to enable"
           remove_from_project: "Remove from project"
-          label_enable_all: "Enable all"
-          label_disable_all: "Disable all"
         is_required_blank_slate:
           heading: Required in all projects
           description: This project attribute is activated in all projects since the "Required in all projects" option is checked. It cannot be deactivated for individual projects.
@@ -377,6 +388,11 @@ sr:
         no_results_content_text: Create a new version
       storage:
         no_results_title_text: There is no additional recorded disk space consumed by this project.
+  project_stage:
+    working_days_count:
+      one: "Duration: %{count} working day"
+      few: "Duration: %{count} working days"
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "The modified list has been saved as a new list"
@@ -503,8 +519,12 @@ sr:
     groups:
       member_in_these_groups: "This user is currently a member of the following groups:"
       no_results_title_text: This user is currently not a member in any group.
+      summary_with_more: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary: Member of %{names}.
     memberships:
       no_results_title_text: This user is currently not a member of a project.
+    open_profile: "Open profile"
   page:
     text: "Text"
   placeholder_users:
@@ -576,18 +596,27 @@ sr:
       no_results_title_text: There are currently no types.
       no_results_content_text: Create a new type
     edit:
-      settings: "Settings"
-      form_configuration: "Form configuration"
+      form_configuration:
+        tab: "Form configuration"
       more_info_text_html: >
         Enterprise edition allows you to customize form configuration with these additional add-ons: <br> <ul class="%{list_styling_class}"> <li><b>Add new attribute groups</b></li> <li><b>Rename attribute groups</b></li> <li><b>Add a table of related work packages</b></li> </ul>
-      projects: "Projects"
-      enabled_projects: "Enabled projects"
-      edit_query: "Edit table"
-      query_group_placeholder: "Give the table a name"
-      reset: "Reset to defaults"
-      type_color_text: |
-        The selected color distinguishes different types
-        in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      projects:
+        tab: "Projects"
+        enabled_projects: "Enabled projects"
+      settings:
+        tab: "Settings"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Subject configuration"
+        manually_editable_subjects:
+          label: "Manually editable subjects"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automatically generated subjects"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Subject pattern"
+          caption: "Search for an attribute or add text. To create a space between elements add it as a text."
   versions:
     overview:
       work_packages_in_archived_projects: "The version is shared with archived projects which still have work packages assigned to this version. These are counted, but will not appear in the linked views."
@@ -651,6 +680,10 @@ sr:
     label_add_x: "Add %{x}"
     label_edit_x: "Edit %{x}"
     label_add_description: "Add description"
+    lag:
+      subject: "Lag"
+      title: "Lag (in days)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
       label_relates_singular: "related to"
       label_relates_plural: "related to"
@@ -855,6 +888,9 @@ sr:
         lag: "Lag"
         from: "Work package"
         to: "Related work package"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Time"
       repository:
         url: "URL"
       role:
@@ -943,6 +979,7 @@ sr:
       messages:
         accepted: "must be accepted."
         after: "must be after %{date}."
+        after_today: "must be in the future."
         after_or_equal_to: "must be after or equal to %{date}."
         before: "must be before %{date}."
         before_or_equal_to: "must be before or equal to %{date}."
@@ -989,6 +1026,7 @@ sr:
         not_an_integer: "is not an integer."
         not_an_iso_date: "is not a valid date. Required format: YYYY-MM-DD."
         not_same_project: "doesn't belong to the same project."
+        datetime_must_be_in_future: "must be in the future."
         odd: "must be odd."
         regex_match_failed: "does not match the regular expression %{expression}."
         regex_invalid: "could not be validated with the associated regular expression."
@@ -1102,16 +1140,38 @@ sr:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "start date must be before the end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "is incomplete."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1331,6 +1391,8 @@ sr:
         other: "Notifications"
       placeholder_user: "Placeholder user"
       project: "Project"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         one: "Project list"
         few: "Project lists"
@@ -1441,6 +1503,7 @@ sr:
     login: "Username"
     mail: "Email"
     name: "Name"
+    note: "Note"
     password: "Password"
     priority: "Priority"
     project: "Project"
@@ -1537,6 +1600,7 @@ sr:
   button_print: "Print"
   button_quote: "Quote"
   button_remove: Remove
+  button_remove_reminder: "Remove reminder"
   button_rename: "Rename"
   button_replace: "Replace"
   button_revoke: "Revoke"
@@ -1547,6 +1611,7 @@ sr:
   button_save_as: "Save as"
   button_apply_changes: "Apply changes"
   button_save_back: "Save and back"
+  button_set_reminder: "Set reminder"
   button_show: "Show"
   button_sort: "Sort"
   button_submit: "Submit"
@@ -1770,12 +1835,12 @@ sr:
   direction: ltr
   ee:
     upsale:
+      title: "Enterprise add-on"
+      link_title: "More information"
       form_configuration:
         description: "Customize the form configuration with these additional add-ons:"
         add_groups: "Add new attribute groups"
         rename_groups: "Rename attributes groups"
-      project_filters:
-        description_html: "Filtering and sorting on custom fields is an Enterprise edition add-on."
   enumeration_activities: "Time tracking activities"
   enumeration_work_package_priorities: "Work package priorities"
   enumeration_reported_project_statuses: "Reported project status"
@@ -1808,6 +1873,7 @@ sr:
   error_pdf_export_too_many_columns: "Too many columns selected for the PDF export. Please reduce the number of columns."
   error_pdf_failed_to_export: "The PDF export could not be saved: %{error}"
   error_token_authenticity: "Unable to verify Cross-Site Request Forgery token. Did you try to submit data on multiple browsers or tabs? Please close all tabs and try again."
+  error_reminder_not_found: "The reminder was not found or was already notified about."
   error_work_package_not_found_in_project: "The work package was not found or does not belong to this project"
   error_work_package_id_not_found: "The work package was not found."
   error_must_be_project_member: "must be project member"
@@ -2101,6 +2167,7 @@ sr:
       responsible: "Accountable"
       shared: "Shared"
       watched: "Watcher"
+      reminder: "Reminder"
     facets:
       unread: "Unread"
       unread_title: "Show unread"
@@ -2268,8 +2335,10 @@ sr:
   label_default: "Default"
   label_delete_user: "Delete user"
   label_delete_project: "Delete project"
+  label_delete: "Delete"
   label_deleted: "deleted"
   label_deleted_custom_field: "(deleted custom field)"
+  label_deleted_custom_item: "(deleted item)"
   label_deleted_custom_option: "(deleted option)"
   label_empty_element: "(empty)"
   label_missing_or_hidden_custom_option: "(missing value or lacking permissions to access)"
@@ -2306,7 +2375,6 @@ sr:
   label_enterprise_active_users: "%{current}/%{limit} booked active users"
   label_enterprise_edition: "Enterprise edition"
   label_enterprise_support: "Enterprise support"
-  label_enterprise_addon: "Enterprise add-on"
   label_environment: "Environment"
   label_estimates_and_progress: "Estimates and progress"
   label_equals: "is"
@@ -2491,6 +2559,7 @@ sr:
   label_none_parentheses: "(none)"
   label_not_contains: "doesn't contain"
   label_not_equals: "is not"
+  label_life_cycle_step_plural: "Project lifecycle"
   label_on: "on"
   label_operator_all: "is not empty"
   label_operator_none: "is empty"
@@ -2592,6 +2661,7 @@ sr:
   label_reporting: "Reporting"
   label_reporting_plural: "Reportings"
   label_repository: "Repository"
+  label_repository_remove: "Remove repository"
   label_repository_root: "Repository root"
   label_repository_plural: "Repositories"
   label_required: "required"
@@ -2654,6 +2724,7 @@ sr:
   label_this_month: "this month"
   label_this_week: "this week"
   label_this_year: "this year"
+  label_time: "Time"
   label_time_entry_plural: "Spent time"
   label_time_entry_activity_plural: "Spent time activities"
   label_title: "Title"
@@ -2689,6 +2760,7 @@ sr:
   label_user_settings: "User settings"
   label_users_settings: "Users settings"
   label_version_new: "New version"
+  label_version_edit: "Edit version"
   label_version_plural: "Versions"
   label_version_sharing_descendants: "With subprojects"
   label_version_sharing_hierarchy: "With project hierarchy"
@@ -2827,8 +2899,13 @@ sr:
         prefix: "Received because of the notification setting: %{reason}"
         date_alert_start_date: "Date alert"
         date_alert_due_date: "Date alert"
+        reminder: "Reminder"
       see_all: "See all"
       updated_at: "Updated at %{timestamp} by %{user}"
+    reminder_notifications:
+      subject: "Reminder: %{note}"
+      heading: "You have a new reminder"
+      note: "Note: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "You may %{allowed_actions} this work package. This can change depending on your project role and permissions."
@@ -2995,6 +3072,7 @@ sr:
   notice_successful_connection: "Successful connection."
   notice_successful_create: "Successful creation."
   notice_successful_delete: "Successful deletion."
+  notice_successful_cancel: "Successful cancellation."
   notice_successful_update: "Successful update."
   notice_successful_update_custom_fields_added_to_project: |
     Successful update. The custom fields of the activated types are automatically activated
@@ -3073,6 +3151,7 @@ sr:
   permission_edit_own_time_entries: "Edit own time logs"
   permission_edit_project: "Edit project"
   permission_edit_project_attributes: "Edit project attributes"
+  permission_edit_project_stages_and_gates: "Edit project stages and gates"
   permission_edit_reportings: "Edit reportings"
   permission_edit_time_entries: "Edit time logs for other users"
   permission_edit_timelines: "Edit timelines"
@@ -3102,9 +3181,12 @@ sr:
   permission_search_project: "Search project"
   permission_select_custom_fields: "Select custom fields"
   permission_select_project_custom_fields: "Select project attributes"
+  permission_select_project_life_cycle: "Select project stages and gates"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "Select project modules"
   permission_share_work_packages: "Share work packages"
   permission_manage_types: "Select types"
+  permission_manage_own_reminders: "Create own reminders"
   permission_view_project: "View projects"
   permission_view_changesets: "View repository revisions in OpenProject"
   permission_view_commit_author_statistics: "View commit author statistics"
@@ -3125,6 +3207,7 @@ sr:
   permission_work_package_assigned_explanation: "Work packages can be assigned to users and groups in possession of this role in the respective project"
   permission_view_project_activity: "View project activity"
   permission_view_project_attributes: "View project attributes"
+  permission_view_project_stages_and_gates: "View project stages and gates"
   permission_save_bcf_queries: "Save BCF queries"
   permission_manage_public_bcf_queries: "Manage public BCF queries"
   permission_edit_attribute_help_texts: "Edit attribute help texts"
@@ -3806,6 +3889,12 @@ sr:
       edit_description: "Can view, comment and edit this work package."
       view: "View"
       view_description: "Can view this work package."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Why are you setting this reminder?"
+      success_creation_message: "Reminder set successfully. You will receive a notification for this work package at the chosen time."
+      success_update_message: "Reminder updated successfully."
+      success_deletion_message: "Reminder deleted successfully."
   sharing:
     count:
       zero: "0 users"
diff --git a/config/locales/crowdin/sv.yml b/config/locales/crowdin/sv.yml
index 661bd78f0e80..4149a0570d27 100644
--- a/config/locales/crowdin/sv.yml
+++ b/config/locales/crowdin/sv.yml
@@ -343,6 +343,9 @@ sv:
         text: "This action will not delete any project the list contains. Are you sure you want to delete this project list?"
     settings:
       change_identifier: Change identifier
+      actions:
+        label_enable_all: "Enable all"
+        label_disable_all: "Disable all"
       activities:
         no_results_title_text: Det finns för närvarande inga tillgängliga aktiviteter.
       forums:
@@ -353,18 +356,26 @@ sv:
         no_results_content_text: Skapa en ny kategori för arbetspaket
       custom_fields:
         no_results_title_text: Det finns för närvarande inga anpassade fält tillgängliga.
+      life_cycle:
+        header:
+          title: "Project lifecycle"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "Neither stages nor gates are currently defined."
+        section_header: "Stages and gates"
+        step:
+          use_in_project: "Use %{step} in this project"
+        filter:
+          label: "Search project stage or gate"
       project_custom_fields:
         header:
           title: "Project attributes"
-          description: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
+          description_html: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
         filter:
           label: "Search project attribute"
         actions:
           label_enable_single: "Active in this project, click to disable"
           label_disable_single: "Inactive in this project, click to enable"
           remove_from_project: "Remove from project"
-          label_enable_all: "Enable all"
-          label_disable_all: "Disable all"
         is_required_blank_slate:
           heading: Required in all projects
           description: This project attribute is activated in all projects since the "Required in all projects" option is checked. It cannot be deactivated for individual projects.
@@ -377,6 +388,10 @@ sv:
         no_results_content_text: Skapa en ny version
       storage:
         no_results_title_text: There is no additional recorded disk space consumed by this project.
+  project_stage:
+    working_days_count:
+      one: "Duration: %{count} working day"
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "The modified list has been saved as a new list"
@@ -497,8 +512,12 @@ sv:
     groups:
       member_in_these_groups: "This user is currently a member of the following groups:"
       no_results_title_text: This user is currently not a member in any group.
+      summary_with_more: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary: Member of %{names}.
     memberships:
       no_results_title_text: Denna användare är för närvarande inte medlem i något projekt.
+    open_profile: "Open profile"
   page:
     text: "Text"
   placeholder_users:
@@ -568,18 +587,27 @@ sv:
       no_results_title_text: Det finns för närvarande inga typer.
       no_results_content_text: Skapa ny typ
     edit:
-      settings: "Inställningar"
-      form_configuration: "Ställ in formulär"
+      form_configuration:
+        tab: "Form configuration"
       more_info_text_html: >
         Enterprise edition allows you to customize form configuration with these additional add-ons: <br> <ul class="%{list_styling_class}"> <li><b>Add new attribute groups</b></li> <li><b>Rename attribute groups</b></li> <li><b>Add a table of related work packages</b></li> </ul>
-      projects: "Projekt"
-      enabled_projects: "Aktiverade projekt"
-      edit_query: "Redigera tabell"
-      query_group_placeholder: "Ge tabellen ett namn"
-      reset: "Återställ standardinställningar"
-      type_color_text: |
-        The selected color distinguishes different types
-        in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      projects:
+        tab: "Projects"
+        enabled_projects: "Enabled projects"
+      settings:
+        tab: "Settings"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Subject configuration"
+        manually_editable_subjects:
+          label: "Manually editable subjects"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automatically generated subjects"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Subject pattern"
+          caption: "Search for an attribute or add text. To create a space between elements add it as a text."
   versions:
     overview:
       work_packages_in_archived_projects: "The version is shared with archived projects which still have work packages assigned to this version. These are counted, but will not appear in the linked views."
@@ -642,6 +670,10 @@ sv:
     label_add_x: "Add %{x}"
     label_edit_x: "Edit %{x}"
     label_add_description: "Add description"
+    lag:
+      subject: "Lag"
+      title: "Lag (in days)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
       label_relates_singular: "related to"
       label_relates_plural: "related to"
@@ -846,6 +878,9 @@ sv:
         lag: "Lag"
         from: "Arbetspaket"
         to: "Relaterat arbetspaketet"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Time"
       repository:
         url: "URL"
       role:
@@ -934,6 +969,7 @@ sv:
       messages:
         accepted: "måste accepteras."
         after: "måste vara efter %{date}."
+        after_today: "must be in the future."
         after_or_equal_to: "måste vara efter eller lika med %{date}."
         before: "måste vara innan %{date}."
         before_or_equal_to: "måste vara före eller lika med %{date}."
@@ -980,6 +1016,7 @@ sv:
         not_an_integer: "är inte ett heltal."
         not_an_iso_date: "är inte ett giltigt datum. Använd formatet ÅÅÅÅ-MM-DD."
         not_same_project: "tillhör inte samma projekt."
+        datetime_must_be_in_future: "must be in the future."
         odd: "måste vara udda."
         regex_match_failed: "does not match the regular expression %{expression}."
         regex_invalid: "kunde inte valideras med det associerade reguljära uttrycket."
@@ -1093,16 +1130,38 @@ sv:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "start date must be before the end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "is incomplete."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1319,6 +1378,8 @@ sv:
         other: "Notifications"
       placeholder_user: "Placeholder user"
       project: "Projekt"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         one: "Projektlista"
         other: "Projektlistor"
@@ -1422,6 +1483,7 @@ sv:
     login: "Användarnamn"
     mail: "E-post"
     name: "Namn"
+    note: "Note"
     password: "Lösenord"
     priority: "Prioritet"
     project: "Projekt"
@@ -1518,6 +1580,7 @@ sv:
   button_print: "Skriv ut"
   button_quote: "Citat"
   button_remove: Ta bort
+  button_remove_reminder: "Remove reminder"
   button_rename: "Ändra namn"
   button_replace: "Ersätt"
   button_revoke: "Återkalla"
@@ -1528,6 +1591,7 @@ sv:
   button_save_as: "Spara som"
   button_apply_changes: "Apply changes"
   button_save_back: "Spara och återgå"
+  button_set_reminder: "Set reminder"
   button_show: "Visa"
   button_sort: "Sortera"
   button_submit: "Skicka"
@@ -1733,12 +1797,12 @@ sv:
   direction: Från vänster till höger
   ee:
     upsale:
+      title: "Enterprise add-on"
+      link_title: "More information"
       form_configuration:
         description: "Customize the form configuration with these additional add-ons:"
         add_groups: "Lägg till nya attributgrupper"
         rename_groups: "Byt namn på attributgrupper"
-      project_filters:
-        description_html: "Filtering and sorting on custom fields is an Enterprise edition add-on."
   enumeration_activities: "Time tracking activities"
   enumeration_work_package_priorities: "Arbetspaketsprioritering"
   enumeration_reported_project_statuses: "Rapporterad projektstatus"
@@ -1771,6 +1835,7 @@ sv:
   error_pdf_export_too_many_columns: "För många kolumner har markerats för PDF-export. Vänlogen minska antalet kolumner."
   error_pdf_failed_to_export: "PDF-exporten kunde inte sparas: %{error}"
   error_token_authenticity: "Det gick inte att verifiera Forgery token. Försökte du skicka data på flera webbläsare eller flikar? Stäng alla flikar och försök igen."
+  error_reminder_not_found: "The reminder was not found or was already notified about."
   error_work_package_not_found_in_project: "Arbetspaketet hittades inte eller hör inte till detta projekt"
   error_work_package_id_not_found: "The work package was not found."
   error_must_be_project_member: "måste vara projektmedlem"
@@ -2064,6 +2129,7 @@ sv:
       responsible: "Huvudansvarig"
       shared: "Shared"
       watched: "Bevakare"
+      reminder: "Reminder"
     facets:
       unread: "Unread"
       unread_title: "Show unread"
@@ -2231,8 +2297,10 @@ sv:
   label_default: "Standard"
   label_delete_user: "Radera användare"
   label_delete_project: "Ta bort projekt"
+  label_delete: "Delete"
   label_deleted: "raderad"
   label_deleted_custom_field: "(raderat anpassat fält)"
+  label_deleted_custom_item: "(deleted item)"
   label_deleted_custom_option: "(deleted option)"
   label_empty_element: "(tom)"
   label_missing_or_hidden_custom_option: "(missing value or lacking permissions to access)"
@@ -2269,7 +2337,6 @@ sv:
   label_enterprise_active_users: "%{current}/%{limit} tilldelade aktiva användare"
   label_enterprise_edition: "Enterprise edition"
   label_enterprise_support: "Enterprise support"
-  label_enterprise_addon: "Enterprise add-on"
   label_environment: "Miljö"
   label_estimates_and_progress: "Estimates and progress"
   label_equals: "är"
@@ -2454,6 +2521,7 @@ sv:
   label_none_parentheses: "(ingen)"
   label_not_contains: "innehåller inte"
   label_not_equals: "är inte"
+  label_life_cycle_step_plural: "Project lifecycle"
   label_on: "på"
   label_operator_all: "is not empty"
   label_operator_none: "is empty"
@@ -2555,6 +2623,7 @@ sv:
   label_reporting: "Rapporterar"
   label_reporting_plural: "Rapporter"
   label_repository: "Versionsarkiv"
+  label_repository_remove: "Remove repository"
   label_repository_root: "Sökväg till databasen"
   label_repository_plural: "Versionsarkiv"
   label_required: "obligatorisk"
@@ -2617,6 +2686,7 @@ sv:
   label_this_month: "denna månad"
   label_this_week: "denna vecka"
   label_this_year: "i år"
+  label_time: "Time"
   label_time_entry_plural: "Förbrukad tid"
   label_time_entry_activity_plural: "Spent time activities"
   label_title: "Titel"
@@ -2652,6 +2722,7 @@ sv:
   label_user_settings: "Användarinställningar"
   label_users_settings: "Användarinställningar"
   label_version_new: "Ny version"
+  label_version_edit: "Edit version"
   label_version_plural: "Versioner"
   label_version_sharing_descendants: "Med delprojekt"
   label_version_sharing_hierarchy: "Med projekthierarkin"
@@ -2789,8 +2860,13 @@ sv:
         prefix: "Received because of the notification setting: %{reason}"
         date_alert_start_date: "Date alert"
         date_alert_due_date: "Date alert"
+        reminder: "Reminder"
       see_all: "See all"
       updated_at: "Updated at %{timestamp} by %{user}"
+    reminder_notifications:
+      subject: "Reminder: %{note}"
+      heading: "You have a new reminder"
+      note: "Note: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "You may %{allowed_actions} this work package. This can change depending on your project role and permissions."
@@ -2957,6 +3033,7 @@ sv:
   notice_successful_connection: "Lyckad anslutning."
   notice_successful_create: "Skapades utan problem."
   notice_successful_delete: "Raderades utan problem."
+  notice_successful_cancel: "Successful cancellation."
   notice_successful_update: "Uppdaterades utan problem."
   notice_successful_update_custom_fields_added_to_project: |
     Successful update. The custom fields of the activated types are automatically activated
@@ -3034,6 +3111,7 @@ sv:
   permission_edit_own_time_entries: "Redigera egna tidrapporter"
   permission_edit_project: "Redigera projekt"
   permission_edit_project_attributes: "Edit project attributes"
+  permission_edit_project_stages_and_gates: "Edit project stages and gates"
   permission_edit_reportings: "Redigera rapporter"
   permission_edit_time_entries: "Edit time logs for other users"
   permission_edit_timelines: "Redigera tidslinjer"
@@ -3063,9 +3141,12 @@ sv:
   permission_search_project: "Search project"
   permission_select_custom_fields: "Välj anpassade fält"
   permission_select_project_custom_fields: "Select project attributes"
+  permission_select_project_life_cycle: "Select project stages and gates"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "Välj projektmoduler"
   permission_share_work_packages: "Share work packages"
   permission_manage_types: "Välj typer"
+  permission_manage_own_reminders: "Create own reminders"
   permission_view_project: "View projects"
   permission_view_changesets: "Visa databasrevisioner i OpenProject"
   permission_view_commit_author_statistics: "Visa statistik över incheckningar per författare"
@@ -3086,6 +3167,7 @@ sv:
   permission_work_package_assigned_explanation: "Arbetspaket kan tilldelas användare och grupper som har denna roll i respektive projektet"
   permission_view_project_activity: "View project activity"
   permission_view_project_attributes: "View project attributes"
+  permission_view_project_stages_and_gates: "View project stages and gates"
   permission_save_bcf_queries: "Save BCF queries"
   permission_manage_public_bcf_queries: "Manage public BCF queries"
   permission_edit_attribute_help_texts: "Edit attribute help texts"
@@ -3763,6 +3845,12 @@ sv:
       edit_description: "Can view, comment and edit this work package."
       view: "Vy"
       view_description: "Can view this work package."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Why are you setting this reminder?"
+      success_creation_message: "Reminder set successfully. You will receive a notification for this work package at the chosen time."
+      success_update_message: "Reminder updated successfully."
+      success_deletion_message: "Reminder deleted successfully."
   sharing:
     count:
       zero: "0 användare"
diff --git a/config/locales/crowdin/th.yml b/config/locales/crowdin/th.yml
index b761d9d5bc8e..f1da6a17c876 100644
--- a/config/locales/crowdin/th.yml
+++ b/config/locales/crowdin/th.yml
@@ -343,6 +343,9 @@ th:
         text: "This action will not delete any project the list contains. Are you sure you want to delete this project list?"
     settings:
       change_identifier: เปลี่ยน ตัวระบุ
+      actions:
+        label_enable_all: "Enable all"
+        label_disable_all: "Disable all"
       activities:
         no_results_title_text: There are currently no activities available.
       forums:
@@ -353,18 +356,26 @@ th:
         no_results_content_text: Create a new work package category
       custom_fields:
         no_results_title_text: There are currently no custom fields available.
+      life_cycle:
+        header:
+          title: "Project lifecycle"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "Neither stages nor gates are currently defined."
+        section_header: "Stages and gates"
+        step:
+          use_in_project: "Use %{step} in this project"
+        filter:
+          label: "Search project stage or gate"
       project_custom_fields:
         header:
           title: "Project attributes"
-          description: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
+          description_html: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
         filter:
           label: "Search project attribute"
         actions:
           label_enable_single: "Active in this project, click to disable"
           label_disable_single: "Inactive in this project, click to enable"
           remove_from_project: "Remove from project"
-          label_enable_all: "Enable all"
-          label_disable_all: "Disable all"
         is_required_blank_slate:
           heading: Required in all projects
           description: This project attribute is activated in all projects since the "Required in all projects" option is checked. It cannot be deactivated for individual projects.
@@ -377,6 +388,9 @@ th:
         no_results_content_text: สร้างรุ่นใหม่
       storage:
         no_results_title_text: ไม่มีการระบุ พื้นที่ดิสก์ ไว้ในโปรเจ็กต์นี้
+  project_stage:
+    working_days_count:
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "The modified list has been saved as a new list"
@@ -491,8 +505,12 @@ th:
     groups:
       member_in_these_groups: "This user is currently a member of the following groups:"
       no_results_title_text: This user is currently not a member in any group.
+      summary_with_more: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary: Member of %{names}.
     memberships:
       no_results_title_text: This user is currently not a member of a project.
+    open_profile: "Open profile"
   page:
     text: "ข้อความ"
   placeholder_users:
@@ -562,18 +580,27 @@ th:
       no_results_title_text: There are currently no types.
       no_results_content_text: Create a new type
     edit:
-      settings: "การตั้งค่า"
-      form_configuration: "Form configuration"
+      form_configuration:
+        tab: "Form configuration"
       more_info_text_html: >
         Enterprise edition allows you to customize form configuration with these additional add-ons: <br> <ul class="%{list_styling_class}"> <li><b>Add new attribute groups</b></li> <li><b>Rename attribute groups</b></li> <li><b>Add a table of related work packages</b></li> </ul>
-      projects: "โครงการ"
-      enabled_projects: "Enabled projects"
-      edit_query: "แก้ไขตาราง"
-      query_group_placeholder: "Give the table a name"
-      reset: "Reset to defaults"
-      type_color_text: |
-        The selected color distinguishes different types
-        in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      projects:
+        tab: "Projects"
+        enabled_projects: "Enabled projects"
+      settings:
+        tab: "Settings"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Subject configuration"
+        manually_editable_subjects:
+          label: "Manually editable subjects"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automatically generated subjects"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Subject pattern"
+          caption: "Search for an attribute or add text. To create a space between elements add it as a text."
   versions:
     overview:
       work_packages_in_archived_projects: "The version is shared with archived projects which still have work packages assigned to this version. These are counted, but will not appear in the linked views."
@@ -635,6 +662,10 @@ th:
     label_add_x: "Add %{x}"
     label_edit_x: "Edit %{x}"
     label_add_description: "Add description"
+    lag:
+      subject: "Lag"
+      title: "Lag (in days)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
       label_relates_singular: "related to"
       label_relates_plural: "related to"
@@ -839,6 +870,9 @@ th:
         lag: "Lag"
         from: "ชุดภารกิจ"
         to: "ชุดภารกิจที่เกี่ยวข้อง"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Time"
       repository:
         url: "URL"
       role:
@@ -927,6 +961,7 @@ th:
       messages:
         accepted: "must be accepted."
         after: "must be after %{date}."
+        after_today: "must be in the future."
         after_or_equal_to: "must be after or equal to %{date}."
         before: "must be before %{date}."
         before_or_equal_to: "must be before or equal to %{date}."
@@ -973,6 +1008,7 @@ th:
         not_an_integer: "is not an integer."
         not_an_iso_date: "is not a valid date. Required format: YYYY-MM-DD."
         not_same_project: "doesn't belong to the same project."
+        datetime_must_be_in_future: "must be in the future."
         odd: "must be odd."
         regex_match_failed: "does not match the regular expression %{expression}."
         regex_invalid: "could not be validated with the associated regular expression."
@@ -1086,16 +1122,38 @@ th:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "start date must be before the end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "is incomplete."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1309,6 +1367,8 @@ th:
         other: "Notifications"
       placeholder_user: "Placeholder user"
       project: "โครงการ"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         other: "Project lists"
       query: "การสอบถามที่กำหนดเอง"
@@ -1405,6 +1465,7 @@ th:
     login: "Username"
     mail: "อีเมล"
     name: "ชื่อ"
+    note: "Note"
     password: "รหัสผ่าน"
     priority: "ระดับความสำคัญ"
     project: "โครงการ"
@@ -1501,6 +1562,7 @@ th:
   button_print: "Print"
   button_quote: "อ้างถึง"
   button_remove: Remove
+  button_remove_reminder: "Remove reminder"
   button_rename: "เปลี่ยนชื่อ"
   button_replace: "Replace"
   button_revoke: "Revoke"
@@ -1511,6 +1573,7 @@ th:
   button_save_as: "บันทึกเป็น"
   button_apply_changes: "Apply changes"
   button_save_back: "Save and back"
+  button_set_reminder: "Set reminder"
   button_show: "แสดง"
   button_sort: "เรียงลำดับ"
   button_submit: "ส่งข้อมูล"
@@ -1698,12 +1761,12 @@ th:
   direction: ltr
   ee:
     upsale:
+      title: "Enterprise add-on"
+      link_title: "More information"
       form_configuration:
         description: "Customize the form configuration with these additional add-ons:"
         add_groups: "Add new attribute groups"
         rename_groups: "Rename attributes groups"
-      project_filters:
-        description_html: "Filtering and sorting on custom fields is an Enterprise edition add-on."
   enumeration_activities: "Time tracking activities"
   enumeration_work_package_priorities: "ระดับความสำคัญของชุดภารกิจ"
   enumeration_reported_project_statuses: "สถานะโครงการที่รายงานแล้ว"
@@ -1736,6 +1799,7 @@ th:
   error_pdf_export_too_many_columns: "Too many columns selected for the PDF export. Please reduce the number of columns."
   error_pdf_failed_to_export: "The PDF export could not be saved: %{error}"
   error_token_authenticity: "Unable to verify Cross-Site Request Forgery token. Did you try to submit data on multiple browsers or tabs? Please close all tabs and try again."
+  error_reminder_not_found: "The reminder was not found or was already notified about."
   error_work_package_not_found_in_project: "ไม่พบชุดภารกิจ หรือชุดภารกิจไม่ได้เป็นของโครงการนี้"
   error_work_package_id_not_found: "The work package was not found."
   error_must_be_project_member: "ต้องเป็นสมาชิกโครงการ"
@@ -2029,6 +2093,7 @@ th:
       responsible: "Accountable"
       shared: "Shared"
       watched: "ผู้ดูข้อมูล"
+      reminder: "Reminder"
     facets:
       unread: "Unread"
       unread_title: "Show unread"
@@ -2196,8 +2261,10 @@ th:
   label_default: "ค่าเริ่มต้น"
   label_delete_user: "Delete user"
   label_delete_project: "Delete project"
+  label_delete: "Delete"
   label_deleted: "ถูกลบ"
   label_deleted_custom_field: "(ฟิลด์ที่กำหนดเองที่ถูกลบ)"
+  label_deleted_custom_item: "(deleted item)"
   label_deleted_custom_option: "(deleted option)"
   label_empty_element: "(ว่าง)"
   label_missing_or_hidden_custom_option: "(missing value or lacking permissions to access)"
@@ -2234,7 +2301,6 @@ th:
   label_enterprise_active_users: "%{current}/%{limit} booked active users"
   label_enterprise_edition: "Enterprise edition"
   label_enterprise_support: "Enterprise support"
-  label_enterprise_addon: "Enterprise add-on"
   label_environment: "สภาพแวดล้อม"
   label_estimates_and_progress: "Estimates and progress"
   label_equals: "เป็น"
@@ -2419,6 +2485,7 @@ th:
   label_none_parentheses: "(ไม่มี)"
   label_not_contains: "ไม่ประกอบด้วยการ"
   label_not_equals: "ไม่"
+  label_life_cycle_step_plural: "Project lifecycle"
   label_on: "on"
   label_operator_all: "is not empty"
   label_operator_none: "is empty"
@@ -2520,6 +2587,7 @@ th:
   label_reporting: "รายงาน"
   label_reporting_plural: "Reportings"
   label_repository: "ที่เก็บข้อมูล"
+  label_repository_remove: "Remove repository"
   label_repository_root: "Repository root"
   label_repository_plural: "ที่เก็บ"
   label_required: "required"
@@ -2582,6 +2650,7 @@ th:
   label_this_month: "เดือนนี้"
   label_this_week: "สัปดาห์นี้"
   label_this_year: "ปีนี้"
+  label_time: "Time"
   label_time_entry_plural: "เวลาที่ใช้"
   label_time_entry_activity_plural: "Spent time activities"
   label_title: "ชื่อเรื่อง"
@@ -2617,6 +2686,7 @@ th:
   label_user_settings: "User settings"
   label_users_settings: "Users settings"
   label_version_new: "เวอร์ชั่นใหม่"
+  label_version_edit: "Edit version"
   label_version_plural: "เวอร์ชั่น"
   label_version_sharing_descendants: "พร้อมด้วยโครงการย่อย"
   label_version_sharing_hierarchy: "พร้อมด้วยลำดับชั้นของโครงการ"
@@ -2753,8 +2823,13 @@ th:
         prefix: "Received because of the notification setting: %{reason}"
         date_alert_start_date: "Date alert"
         date_alert_due_date: "Date alert"
+        reminder: "Reminder"
       see_all: "See all"
       updated_at: "Updated at %{timestamp} by %{user}"
+    reminder_notifications:
+      subject: "Reminder: %{note}"
+      heading: "You have a new reminder"
+      note: "Note: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "You may %{allowed_actions} this work package. This can change depending on your project role and permissions."
@@ -2921,6 +2996,7 @@ th:
   notice_successful_connection: "การเชื่อมต่อสำเร็จ"
   notice_successful_create: "สร้างเรียบร้อยแล้ว"
   notice_successful_delete: "ลบเรียบร้อยแล้ว"
+  notice_successful_cancel: "Successful cancellation."
   notice_successful_update: "ปรับปรุงข้อมูลเรียบร้อยแล้ว"
   notice_successful_update_custom_fields_added_to_project: |
     Successful update. The custom fields of the activated types are automatically activated
@@ -2997,6 +3073,7 @@ th:
   permission_edit_own_time_entries: "แก้ไขบันทึกเวลาของตนเอง"
   permission_edit_project: "แก้ไขโครงการ"
   permission_edit_project_attributes: "Edit project attributes"
+  permission_edit_project_stages_and_gates: "Edit project stages and gates"
   permission_edit_reportings: "แก้ไขรายงาน"
   permission_edit_time_entries: "Edit time logs for other users"
   permission_edit_timelines: "แก้ไขแผนภูมิเวลา"
@@ -3026,9 +3103,12 @@ th:
   permission_search_project: "Search project"
   permission_select_custom_fields: "Select custom fields"
   permission_select_project_custom_fields: "Select project attributes"
+  permission_select_project_life_cycle: "Select project stages and gates"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "เลือกโมดูลของโครงการ"
   permission_share_work_packages: "Share work packages"
   permission_manage_types: "เลือกชนิด"
+  permission_manage_own_reminders: "Create own reminders"
   permission_view_project: "View projects"
   permission_view_changesets: "View repository revisions in OpenProject"
   permission_view_commit_author_statistics: "ดูการส่งมอบสถิติผู้เขียน"
@@ -3049,6 +3129,7 @@ th:
   permission_work_package_assigned_explanation: "Work packages can be assigned to users and groups in possession of this role in the respective project"
   permission_view_project_activity: "View project activity"
   permission_view_project_attributes: "View project attributes"
+  permission_view_project_stages_and_gates: "View project stages and gates"
   permission_save_bcf_queries: "Save BCF queries"
   permission_manage_public_bcf_queries: "Manage public BCF queries"
   permission_edit_attribute_help_texts: "Edit attribute help texts"
@@ -3728,6 +3809,12 @@ th:
       edit_description: "Can view, comment and edit this work package."
       view: "ดู"
       view_description: "Can view this work package."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Why are you setting this reminder?"
+      success_creation_message: "Reminder set successfully. You will receive a notification for this work package at the chosen time."
+      success_update_message: "Reminder updated successfully."
+      success_deletion_message: "Reminder deleted successfully."
   sharing:
     count:
       zero: "0 users"
diff --git a/config/locales/crowdin/tr.yml b/config/locales/crowdin/tr.yml
index 3bf204f5ebb5..61f99a52c208 100644
--- a/config/locales/crowdin/tr.yml
+++ b/config/locales/crowdin/tr.yml
@@ -343,6 +343,9 @@ tr:
         text: "This action will not delete any project the list contains. Are you sure you want to delete this project list?"
     settings:
       change_identifier: Dil Tanımlayıcı değiştir
+      actions:
+        label_enable_all: "Enable all"
+        label_disable_all: "Disable all"
       activities:
         no_results_title_text: Şu anda hiç bir etkinlik mevcut değil.
       forums:
@@ -353,18 +356,26 @@ tr:
         no_results_content_text: Yeni bir iş paketi kategorisi oluştur
       custom_fields:
         no_results_title_text: Şu anda kullanılabilir özel alan bulunmamakta.
+      life_cycle:
+        header:
+          title: "Project lifecycle"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "Neither stages nor gates are currently defined."
+        section_header: "Stages and gates"
+        step:
+          use_in_project: "Use %{step} in this project"
+        filter:
+          label: "Search project stage or gate"
       project_custom_fields:
         header:
           title: "Proje öznitelikleri"
-          description: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
+          description_html: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
         filter:
           label: "Proje özniteliğini ara"
         actions:
           label_enable_single: "Active in this project, click to disable"
           label_disable_single: "Inactive in this project, click to enable"
           remove_from_project: "Remove from project"
-          label_enable_all: "Tümünü etkinleştir"
-          label_disable_all: "Tümünü devre dışı bırak"
         is_required_blank_slate:
           heading: Tüm projelerde zorunludur
           description: '"Tüm projelerde zorunlu" seçeneği işaretli olduğu için bu proje niteliği tüm projelerde etkindir. Projeler için bağımsız olarak devre dışı bırakılamaz.'
@@ -377,6 +388,10 @@ tr:
         no_results_content_text: Yeni bir versiyon oluştur
       storage:
         no_results_title_text: Bu proje tarafından tüketilen ek kayıtlı disk alanı yoktur.
+  project_stage:
+    working_days_count:
+      one: "Duration: %{count} working day"
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "The modified list has been saved as a new list"
@@ -497,8 +512,12 @@ tr:
     groups:
       member_in_these_groups: "Bu kullanıcı şu anda aşağıdaki grupların bir üyesidir:"
       no_results_title_text: Bu kullanıcı şu anda hiçbir gruba üye değil.
+      summary_with_more: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary: Member of %{names}.
     memberships:
       no_results_title_text: Bu kullanıcı şuan için bir proje üyesi değil.
+    open_profile: "Open profile"
   page:
     text: "Metin"
   placeholder_users:
@@ -568,17 +587,27 @@ tr:
       no_results_title_text: Şu anda hiç tip yok.
       no_results_content_text: Yeni tip oluştur
     edit:
-      settings: "Ayarlar"
-      form_configuration: "Formu yapılandırma"
+      form_configuration:
+        tab: "Form configuration"
       more_info_text_html: >
         Enterprise sürümü, form yapılandırmasını şu ek eklentilerle özelleştirmenize olanak tanır: <br> <ul class="%{list_styling_class}"> <li><b>Yeni özellik grupları ekleyin</b></li> <li> <b>Öznitelik gruplarını yeniden adlandırın</b></li> <li><b>İlgili iş paketleri tablosu ekleyin</b></li> </ul>
-      projects: "Projeler"
-      enabled_projects: "Etkin projeler"
-      edit_query: "Tabloyu düzenle"
-      query_group_placeholder: "Tabloya bir ad verin"
-      reset: "Varsayılanlara geri yükle"
-      type_color_text: |
-        Seçilen renk, Gantt şemalarında veya iş paketleri tablolarında farklı türleri ayırt eder. Bu nedenle güçlü bir renk kullanılması önerilir.
+      projects:
+        tab: "Projects"
+        enabled_projects: "Enabled projects"
+      settings:
+        tab: "Settings"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Subject configuration"
+        manually_editable_subjects:
+          label: "Manually editable subjects"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automatically generated subjects"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Subject pattern"
+          caption: "Search for an attribute or add text. To create a space between elements add it as a text."
   versions:
     overview:
       work_packages_in_archived_projects: "Sürüm, hala bu sürüme atanmış iş paketleri olan arşivlenmiş projelerle paylaşılmakta. Bunlar sayılır, ancak bağlantılı görünümlerde gösterilmez."
@@ -641,6 +670,10 @@ tr:
     label_add_x: "Add %{x}"
     label_edit_x: "Edit %{x}"
     label_add_description: "Add description"
+    lag:
+      subject: "Lag"
+      title: "Lag (in days)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
       label_relates_singular: "related to"
       label_relates_plural: "related to"
@@ -845,6 +878,9 @@ tr:
         lag: "Gecikme"
         from: "İş paketi"
         to: "İlgili iş paketi"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Time"
       repository:
         url: "URL"
       role:
@@ -933,6 +969,7 @@ tr:
       messages:
         accepted: "kabul edilmelidir."
         after: "%{date} sonra olması gerekir."
+        after_today: "must be in the future."
         after_or_equal_to: "%{date} için eşit veya sonra olmalı."
         before: "%{date}'dan daha önce olması gerekir."
         before_or_equal_to: "%{date}} tarihinden önce veya ona eşit olmalıdır."
@@ -979,6 +1016,7 @@ tr:
         not_an_integer: "bir tamsayı değil."
         not_an_iso_date: "geçerli bir tarih değil. Gerekli biçim:: YYYY-AA-GG."
         not_same_project: "aynı projeye ait değil."
+        datetime_must_be_in_future: "must be in the future."
         odd: "tek sayı olmalı."
         regex_match_failed: "%{expression} düzenli ifadesiyle eşleşmiyor."
         regex_invalid: "atanmış düzenli ifadeler ile doğrulanamadı."
@@ -1092,16 +1130,38 @@ tr:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "start date must be before the end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "is incomplete."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1318,6 +1378,8 @@ tr:
         other: "Bildirimler"
       placeholder_user: "Yer tutucu kullanıcı"
       project: "Proje"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         one: "Project list"
         other: "Project lists"
@@ -1421,6 +1483,7 @@ tr:
     login: "Kullanıcı adı"
     mail: "Eposta"
     name: "İsim"
+    note: "Note"
     password: "Parola"
     priority: "Öncelik"
     project: "Proje"
@@ -1517,6 +1580,7 @@ tr:
   button_print: "Yazdır"
   button_quote: "Alıntı"
   button_remove: Kaldır
+  button_remove_reminder: "Remove reminder"
   button_rename: "Yeniden adlandır"
   button_replace: "Değiştir"
   button_revoke: "İptal etmek"
@@ -1527,6 +1591,7 @@ tr:
   button_save_as: "Farklı Kaydet"
   button_apply_changes: "Değişiklikleri uygula"
   button_save_back: "Kaydet ve geri dön"
+  button_set_reminder: "Set reminder"
   button_show: "Göster"
   button_sort: "Sırala"
   button_submit: "Gönder"
@@ -1732,12 +1797,12 @@ tr:
   direction: soldan sağa
   ee:
     upsale:
+      title: "Enterprise add-on"
+      link_title: "More information"
       form_configuration:
         description: "Bu ek eklentilerle form yapılandırmasını özelleştirin:"
         add_groups: "Yeni öznitelik grubu ekleyin"
         rename_groups: "Öznitelik grubunun adını değiştirin"
-      project_filters:
-        description_html: "Özel alanlarda filtreleme ve sıralama, bir Enterprise sürümü eklentisidir."
   enumeration_activities: "Zaman izleme faaliyetleri"
   enumeration_work_package_priorities: "İş paketi öncelikleri"
   enumeration_reported_project_statuses: "Bildirilen proje durumları"
@@ -1770,6 +1835,7 @@ tr:
   error_pdf_export_too_many_columns: "PDF Dışa Aktarma için çok fazla sütun seçili. Sütun sayısını azaltın."
   error_pdf_failed_to_export: "PDF çıktısı kaydedilemedi: %{error}"
   error_token_authenticity: "Siteler Arası İstek Sahteciliği belirteci doğrulanamadı. Birden fazla tarayıcı veya sekme hakkında veri göndermeyi denediniz mi? Lütfen tüm sekmeleri kapatın ve tekrar deneyin"
+  error_reminder_not_found: "The reminder was not found or was already notified about."
   error_work_package_not_found_in_project: "Iş paketi bulunamadı veya bu projeye ait değil"
   error_work_package_id_not_found: "İş paketi bulunamadı."
   error_must_be_project_member: "projesi üyesi olmalıdır"
@@ -2063,6 +2129,7 @@ tr:
       responsible: "Sorumlu"
       shared: "Shared"
       watched: "Takipçi"
+      reminder: "Reminder"
     facets:
       unread: "okunmamış"
       unread_title: "Okunmayanları göster"
@@ -2230,8 +2297,10 @@ tr:
   label_default: "Varsayılan"
   label_delete_user: "Kullanıcıyı sil"
   label_delete_project: "Projeyi sil"
+  label_delete: "Delete"
   label_deleted: "silindi"
   label_deleted_custom_field: "(özel alan silindi)"
+  label_deleted_custom_item: "(deleted item)"
   label_deleted_custom_option: "(silinen seçenek)"
   label_empty_element: "(boş)"
   label_missing_or_hidden_custom_option: "(eksik değer veya erişim izinleri eksik)"
@@ -2268,7 +2337,6 @@ tr:
   label_enterprise_active_users: "%{current}/%{limit} aktif kullanıcı rezervasyonu"
   label_enterprise_edition: "Enterprise sürüm"
   label_enterprise_support: "Enterprise support"
-  label_enterprise_addon: "Enterprise add-on"
   label_environment: "Ortam"
   label_estimates_and_progress: "Estimates and progress"
   label_equals: "şuysa"
@@ -2453,6 +2521,7 @@ tr:
   label_none_parentheses: "(yok)"
   label_not_contains: "içermiyor"
   label_not_equals: "değildir"
+  label_life_cycle_step_plural: "Project lifecycle"
   label_on: "açık"
   label_operator_all: "boş değil"
   label_operator_none: "boş"
@@ -2554,6 +2623,7 @@ tr:
   label_reporting: "Raporlama"
   label_reporting_plural: "Raporlamalar"
   label_repository: "Depo"
+  label_repository_remove: "Remove repository"
   label_repository_root: "Depo kökü"
   label_repository_plural: "Depolar"
   label_required: "gerekli"
@@ -2616,6 +2686,7 @@ tr:
   label_this_month: "bu ay"
   label_this_week: "bu hafta"
   label_this_year: "bu yıl"
+  label_time: "Time"
   label_time_entry_plural: "Harcanan zaman"
   label_time_entry_activity_plural: "Spent time activities"
   label_title: "Başlık"
@@ -2651,6 +2722,7 @@ tr:
   label_user_settings: "Kullanıcı ayarları"
   label_users_settings: "Users settings"
   label_version_new: "Yeni sürüm"
+  label_version_edit: "Edit version"
   label_version_plural: "Sürümler"
   label_version_sharing_descendants: "Alt projeler ile"
   label_version_sharing_hierarchy: "Proje hiyerarşisi ile"
@@ -2788,8 +2860,13 @@ tr:
         prefix: "Bildirim ayarı nedeniyle alındı: %{reason}"
         date_alert_start_date: "Tarih uyarısı"
         date_alert_due_date: "Tarih uyarısı"
+        reminder: "Reminder"
       see_all: "Tümünü gör"
       updated_at: "%{timestamp} tarihinde %{user} tarafından güncellendi"
+    reminder_notifications:
+      subject: "Reminder: %{note}"
+      heading: "You have a new reminder"
+      note: "Note: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "You may %{allowed_actions} this work package. This can change depending on your project role and permissions."
@@ -2955,6 +3032,7 @@ tr:
   notice_successful_connection: "Bağlantı başarılı."
   notice_successful_create: "Oluşturma başarılı."
   notice_successful_delete: "Silme başarılı."
+  notice_successful_cancel: "Successful cancellation."
   notice_successful_update: "Güncelleme başarılı."
   notice_successful_update_custom_fields_added_to_project: |
     Başarılı güncelleme. Etkinleştirilen türlerin özel alanları, iş paketi formunda otomatik olarak etkinleştirilir. <a href="%{url}" target="_blank">Daha fazlasını görün</a>.
@@ -3031,6 +3109,7 @@ tr:
   permission_edit_own_time_entries: "Kendi zaman kayıtlarını düzenlemek"
   permission_edit_project: "Proje düzenleme"
   permission_edit_project_attributes: "Edit project attributes"
+  permission_edit_project_stages_and_gates: "Edit project stages and gates"
   permission_edit_reportings: "Raporlamayı düzenlemek"
   permission_edit_time_entries: "Diğer kullanıcılar için zaman günlüklerini düzenleyin"
   permission_edit_timelines: "Zaman akışını düzenlemek"
@@ -3060,9 +3139,12 @@ tr:
   permission_search_project: "Search project"
   permission_select_custom_fields: "Özel alanları seçin"
   permission_select_project_custom_fields: "Select project attributes"
+  permission_select_project_life_cycle: "Select project stages and gates"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "Proje modülleri seçmek"
   permission_share_work_packages: "Share work packages"
   permission_manage_types: "İş paketi türlerini seçmek"
+  permission_manage_own_reminders: "Create own reminders"
   permission_view_project: "View projects"
   permission_view_changesets: "OpenProject'de depo revizyonlarını görüntüle"
   permission_view_commit_author_statistics: "Yazar istatistiklerini inceleyin"
@@ -3083,6 +3165,7 @@ tr:
   permission_work_package_assigned_explanation: "İşpaketleri bağlı projedeki rollere göre kullanıcı ve gruplara atanabilir"
   permission_view_project_activity: "View project activity"
   permission_view_project_attributes: "View project attributes"
+  permission_view_project_stages_and_gates: "View project stages and gates"
   permission_save_bcf_queries: "Save BCF queries"
   permission_manage_public_bcf_queries: "Manage public BCF queries"
   permission_edit_attribute_help_texts: "Edit attribute help texts"
@@ -3762,6 +3845,12 @@ tr:
       edit_description: "Can view, comment and edit this work package."
       view: "Göster"
       view_description: "Can view this work package."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Why are you setting this reminder?"
+      success_creation_message: "Reminder set successfully. You will receive a notification for this work package at the chosen time."
+      success_update_message: "Reminder updated successfully."
+      success_deletion_message: "Reminder deleted successfully."
   sharing:
     count:
       zero: "0 users"
diff --git a/config/locales/crowdin/uk.yml b/config/locales/crowdin/uk.yml
index f8f08d4c0127..19ffa470231b 100644
--- a/config/locales/crowdin/uk.yml
+++ b/config/locales/crowdin/uk.yml
@@ -338,6 +338,9 @@ uk:
         text: "Ця дія не призведе до видалення жодного проєкту зі списку. Справді видалити цей список проєктів?"
     settings:
       change_identifier: Ідентифікатор змін
+      actions:
+        label_enable_all: "Увімкнути все"
+        label_disable_all: "Вимкнути все"
       activities:
         no_results_title_text: Наразі немає доступних заходів.
       forums:
@@ -348,18 +351,26 @@ uk:
         no_results_content_text: Створіть нову категорію робочих пакетів
       custom_fields:
         no_results_title_text: Наразі немає спеціальних полів.
+      life_cycle:
+        header:
+          title: "Життєвий цикл проєкту"
+          description_html: 'Ці етапи й контрольні точки життєвого циклу проєкту відображатимуться на <a href=%{overview_url} target="_blank">сторінці огляду проєкту</a>. Їх визначає адміністратор екземпляра в <a href=%{admin_settings_url} target="_blank">параметрах адміністрування</a>. Ви можете ввімкнути або вимкнути окремі атрибути.'
+        non_defined: "Зараз не визначено ні етапи, ні контрольні точки."
+        section_header: "Етапи й контрольні точки"
+        step:
+          use_in_project: "Використати %{step} у цьому проєкті"
+        filter:
+          label: "Пошук етапу або контрольної точки проєкту"
       project_custom_fields:
         header:
           title: "Атрибути проєкту"
-          description: 'Ці атрибути проєкту відображатимуться на вашій <a href=%{overview_url} target="_blank">сторінці огляду проєкту</a></a> у відповідних розділах. Ви можете ввімкнути або вимкнути окремі атрибути. Атрибути проєкту й розділи визначає адміністратор екземпляра в <a href=%{admin_settings_url} target="_blank">налаштуваннях адміністрування</a>. '
+          description_html: 'Ці атрибути проєкту відображатимуться на <a href=%{overview_url} target="_blank">сторінці огляду проєкту</a> у відповідних розділах. Ви можете ввімкнути або вимкнути окремі атрибути. Атрибути проєкту й розділи визначає адміністратор екземпляра в <a href=%{admin_settings_url} target="_blank">параметрах адміністрування</a>. '
         filter:
           label: "Пошук атрибутів проєкту"
         actions:
           label_enable_single: "Увімкнено в цьому проєкті; натисніть, щоб вимкнути"
           label_disable_single: "Вимкнено в цьому проєкті; натисніть, щоб увімкнути"
           remove_from_project: "Вилучити з проєкту"
-          label_enable_all: "Увімкнути все"
-          label_disable_all: "Вимкнути все"
         is_required_blank_slate:
           heading: Обов’язково для всіх проєктів
           description: Цей атрибут проєкту активовано в усіх проєктах, оскільки встановлено прапорець «Обов’язково для всіх проєктів». Його не можна деактивувати для окремих проєктів.
@@ -372,6 +383,12 @@ uk:
         no_results_content_text: Створіть нову версію
       storage:
         no_results_title_text: Цей проєкт не потребує додаткового дискового простору.
+  project_stage:
+    working_days_count:
+      one: "Тривалість: %{count} робочий день"
+      few: "Тривалість: %{count} робочі дні"
+      many: "Тривалість: %{count} робочих днів"
+      other: "Тривалість: %{count} робочого дня"
   lists:
     create:
       success: "Змінений список збережено як новий"
@@ -504,8 +521,12 @@ uk:
     groups:
       member_in_these_groups: "Зараз цей користувач — учасник таких груп:"
       no_results_title_text: Цей користувач зараз не належить до жодної групи.
+      summary_with_more: Учасник %{names} і ще %{count_link}.
+      more: "Ще %{count}"
+      summary: Учасник %{names}.
     memberships:
       no_results_title_text: Цей користувач наразі не є учасником проекту.
+    open_profile: "Відкрити профіль"
   page:
     text: "Текст"
   placeholder_users:
@@ -576,18 +597,27 @@ uk:
       no_results_title_text: Наразі немає типів.
       no_results_content_text: Створіть новий тип
     edit:
-      settings: "Налаштування"
-      form_configuration: "Конфігурація форми"
+      form_configuration:
+        tab: "Конфігурація форми"
       more_info_text_html: >
         У версії Enterprise можна персоналізувати конфігурацію форми за допомогою таких додаткових доповнень: <br> <ul class="%{list_styling_class}">Додавання нових груп атрибутів</b></li> <li><b>Перейменування груп атрибутів</b></li> <li><b>Додавання таблиці пов’язаних пакетів робіт</b></li> </ul>
-      projects: "Проекти"
-      enabled_projects: "Включені проекти"
-      edit_query: "Редагувати таблицю"
-      query_group_placeholder: "Найменувати таблицю"
-      reset: "Скинути на типові значення"
-      type_color_text: |
-        Обраний колір відрізняє різні типи
-        у Gantt графіках чи робочих блоках. Отож рекомендуємо використовувати насичений колір.
+      projects:
+        tab: "Проєкти"
+        enabled_projects: "Включені проєкти"
+      settings:
+        tab: "Налаштування"
+        type_color_text: "Цей колір використовується для виділення різних типів \nна діаграмах Ґанта або в таблицях пакетів робіт. Тому рекомендуємо вибрати насичений колір."
+      subject_configuration:
+        tab: "Конфігурація теми"
+        manually_editable_subjects:
+          label: "Теми, які можна редагувати вручну"
+          caption: "Користувачі можуть самостійно вводити й редагувати теми пакетів робіт без обмежень."
+        automatically_generated_subjects:
+          label: "Автоматично згенеровані теми"
+          caption: "Визначте шаблон, використовуючи атрибути й текст, щоб теми пакетів робіт створювались автоматично. Користувачі не зможуть редагувати теми."
+        pattern:
+          label: "Шаблон теми"
+          caption: "Знайдіть атрибут або додайте текст. Проміжок між елементами потрібно додавати як текст."
   versions:
     overview:
       work_packages_in_archived_projects: "Доступ до цієї версії надано в архівних проєктах, які досі містять пакети робіт, призначені цій версії. Їх враховано, але вони не відображаються в пов’язаних поданнях."
@@ -652,6 +682,10 @@ uk:
     label_add_x: "Додати %{x}"
     label_edit_x: "Редагувати %{x}"
     label_add_description: "Додати опис"
+    lag:
+      subject: "Затримка"
+      title: "Затримка (у днях)"
+      caption: "Мінімальна кількість робочих днів між двома пакетами робіт."
     relations:
       label_relates_singular: "зв’язано з"
       label_relates_plural: "зв’язано з"
@@ -667,7 +701,7 @@ uk:
       follows_description: "Зв’язаний пакет робіт обов’язково має завершуватися перед початком цього"
       label_child_singular: "дочірній елемент"
       label_child_plural: "дочірні елементи"
-      child_description: "Makes the related work package a sub-item of the current (parent) work package"
+      child_description: "Вкладає звʼязаний пакет робіт як піделемент поточного (батьківського) пакета робіт"
       label_blocks_singular: "блоки"
       label_blocks_plural: "блоки"
       blocks_description: "Звʼязаний пакет робіт можна закрити лише після закриття цього"
@@ -856,6 +890,9 @@ uk:
         lag: "Затримка"
         from: "Пакет робіт"
         to: "Пов'язаний робочий пакет"
+      reminder:
+        remind_at_date: "Дата"
+        remind_at_time: "Час"
       repository:
         url: "Посилання"
       role:
@@ -944,6 +981,7 @@ uk:
       messages:
         accepted: "повинні бути прийняті."
         after: "має бути після %{date}"
+        after_today: "має бути в майбутньому."
         after_or_equal_to: "має бути після або рівним %{date}"
         before: "має бути раніше %{date}"
         before_or_equal_to: "має бути до або  %{date}"
@@ -990,6 +1028,7 @@ uk:
         not_an_integer: "не є цілим числом"
         not_an_iso_date: "не є дійсною датою. Необхідний формат: YYYY-MM-DD."
         not_same_project: "не належить до одного проекту."
+        datetime_must_be_in_future: "має бути в майбутньому."
         odd: "має бути непарним."
         regex_match_failed: "не збігається з регулярним виразом %{expression}."
         regex_invalid: "неможливо перевірити з відповідним регулярним виразом."
@@ -1103,16 +1142,38 @@ uk:
           attributes:
             type:
               must_be_a_stage_or_gate: "має бути Project::StageDefinition або Project::GateDefinition"
+              type_and_class_name_mismatch: "має збігатися з іменем створеного класу"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "має бути Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "має бути Project::GateDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "має бути Project::Stage або Project::Gate"
               must_be_a_stage: "має бути Project::Stage"
               must_be_a_gate: "має бути Project::Gate"
+              type_and_class_name_mismatch: "має збігатися з іменем створеного класу"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Неможливо призначити `end_date` для проєкту Project::Gate"
+              end_date_not_allowed: "Неможливо призначити дату закінчення для Project::Gate"
+            type:
+              type_and_class_name_mismatch: "має бути Project::Gate"
+            date:
+              non_continuous_dates: "не може передувати даті закінчення попереднього %{step}."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "дата початку має передувати даті закінчення."
+              non_continuous_dates: "не може передувати даті закінчення попереднього %{step}."
+              incomplete: "неповний."
+            type:
+              type_and_class_name_mismatch: "має бути Project::Stage"
         query:
           attributes:
             project:
@@ -1335,6 +1396,8 @@ uk:
         other: "Сповіщення"
       placeholder_user: "Прототип користувача"
       project: "Проект"
+      project/gate_definition: "Контрольна точка"
+      project/stage_definition: "Етап"
       project_query:
         one: "Список проєктів"
         few: "Списки проєктів"
@@ -1452,6 +1515,7 @@ uk:
     login: "Ім'я користувача"
     mail: "Електронна пошта"
     name: "Ім’я"
+    note: "Примітка"
     password: "Пароль"
     priority: "Пріоритет"
     project: "Проект"
@@ -1548,6 +1612,7 @@ uk:
   button_print: "Друкувати"
   button_quote: "Цитата"
   button_remove: Видалити
+  button_remove_reminder: "Вилучити нагадування"
   button_rename: "Перейменувати"
   button_replace: "Замінити"
   button_revoke: "Скасувати"
@@ -1558,6 +1623,7 @@ uk:
   button_save_as: "Зберегти як"
   button_apply_changes: "Застосувати зміни"
   button_save_back: "Зберегти та повернутися назад"
+  button_set_reminder: "Установити нагадування"
   button_show: "Показати"
   button_sort: "Сортувати"
   button_submit: "Підтвердити"
@@ -1799,12 +1865,12 @@ uk:
   direction: зліва направо
   ee:
     upsale:
+      title: "Доповнення версії Enterprise"
+      link_title: "Додаткові відомості"
       form_configuration:
         description: "Налаштуйте конфігурацію форми за допомогою цих додаткових доповнень:"
         add_groups: "Додати нові групи атрибутів"
         rename_groups: "Перейменувати групи атрибутів"
-      project_filters:
-        description_html: "Фільтрування і сортування за користувацькими полями доступне як доповнення версії Enterprise."
   enumeration_activities: "Дії щодо відстеження часу"
   enumeration_work_package_priorities: "Пріоритети робочого пакету"
   enumeration_reported_project_statuses: "Повідомлення про статус проекту"
@@ -1837,6 +1903,7 @@ uk:
   error_pdf_export_too_many_columns: "Для експорту PDF-файлу вибрано занадто багато стовпців. Скоротіть кількість стовпців."
   error_pdf_failed_to_export: "Експорт PDF не вдалося зберегти: %{error}"
   error_token_authenticity: "Неможливо підтвердити маркер підробки для запиту між сайтами. Чи спробували ви надіслати дані для кількох веб-переглядачів або вкладок? Закрийте всі вкладки та повторіть спробу."
+  error_reminder_not_found: "Нагадування не знайдено, або сповіщення вже надіслано."
   error_work_package_not_found_in_project: "Робочий пакет не був знайдений або не належить до цього проекту"
   error_work_package_id_not_found: "Пакет робіт не знайдено."
   error_must_be_project_member: "повинен бути учасником проекту"
@@ -2130,6 +2197,7 @@ uk:
       responsible: "Відповідальний"
       shared: "У спільному доступі"
       watched: "Спостерігач"
+      reminder: "Нагадування"
     facets:
       unread: "Непрочитані"
       unread_title: "Показати непрочитані"
@@ -2297,8 +2365,10 @@ uk:
   label_default: "За замовчуванням"
   label_delete_user: "Видалити користувача"
   label_delete_project: "Видалити проект"
+  label_delete: "Видалити"
   label_deleted: "вилучено "
   label_deleted_custom_field: "(видалено спеціальне поле)"
+  label_deleted_custom_item: "(видалений елемент)"
   label_deleted_custom_option: "(параметр видалення)"
   label_empty_element: "(пусто)"
   label_missing_or_hidden_custom_option: "(відсутнє значення або бракує дозволів для доступу)"
@@ -2335,7 +2405,6 @@ uk:
   label_enterprise_active_users: "%{current}/%{limit} зареєстровано активних користувачів"
   label_enterprise_edition: "Версія Enterprise"
   label_enterprise_support: "Корпоративна підтримка"
-  label_enterprise_addon: "Доповнення версії Enterprise"
   label_environment: "Навколишнє середовище"
   label_estimates_and_progress: "Оцінки й прогрес виконання"
   label_equals: "є"
@@ -2520,6 +2589,7 @@ uk:
   label_none_parentheses: "(нічого)"
   label_not_contains: "не містить"
   label_not_equals: "немає"
+  label_life_cycle_step_plural: "Життєвий цикл проєкту"
   label_on: "на"
   label_operator_all: "вказано"
   label_operator_none: "не вказано"
@@ -2621,6 +2691,7 @@ uk:
   label_reporting: "Звітність"
   label_reporting_plural: "Звітність"
   label_repository: "Репозиторій"
+  label_repository_remove: "Вилучити репозиторій"
   label_repository_root: "Корень сховища"
   label_repository_plural: "Репозиторії"
   label_required: "вимагається"
@@ -2683,6 +2754,7 @@ uk:
   label_this_month: "цього місяця"
   label_this_week: "цього тижня"
   label_this_year: "цей рік"
+  label_time: "Час"
   label_time_entry_plural: "Трудовитрати"
   label_time_entry_activity_plural: "Завдання з обліком часу"
   label_title: "Назва"
@@ -2718,6 +2790,7 @@ uk:
   label_user_settings: "Налаштування користувача"
   label_users_settings: "Налаштування користувачів"
   label_version_new: "Нова версія"
+  label_version_edit: "Редагувати версію"
   label_version_plural: "Версії"
   label_version_sharing_descendants: "З підпроектами"
   label_version_sharing_hierarchy: "Ієрархія проектів"
@@ -2857,8 +2930,13 @@ uk:
         prefix: "Отримано через налаштування сповіщень: %{reason}"
         date_alert_start_date: "Оповіщення про дату"
         date_alert_due_date: "Оповіщення про дату"
+        reminder: "Нагадування"
       see_all: "Показати всі"
       updated_at: "Оновлено о %{timestamp} користувачем %{user}"
+    reminder_notifications:
+      subject: "Нагадування: %{note}"
+      heading: "У вас нове нагадування"
+      note: "Примітка: \"%{note}\""
     sharing:
       work_packages:
         allowed_actions: "Ви можете %{allowed_actions} у цьому пакеті робіт, але це залежить від вашої ролі й дозволів у проєкті."
@@ -3024,6 +3102,7 @@ uk:
   notice_successful_connection: "Підключення успішно встановлене."
   notice_successful_create: "Створення успішно завершене."
   notice_successful_delete: "Видалення успішно завершене."
+  notice_successful_cancel: "Успішно видалено."
   notice_successful_update: "Успішно оновлено."
   notice_successful_update_custom_fields_added_to_project: |
     Оновлення завершено. Користувацькі поля активованих типів автоматично активовано у формі пакета робіт. <a href="%{url}" target="_blank">Докладніше</a>.
@@ -3102,6 +3181,7 @@ uk:
   permission_edit_own_time_entries: "Редагування власного обліку часу"
   permission_edit_project: "Редагувати проект"
   permission_edit_project_attributes: " Редагувати атрибути проєкту"
+  permission_edit_project_stages_and_gates: "Редагування етапів і контрольних точок проєкту"
   permission_edit_reportings: "Редагування звітів"
   permission_edit_time_entries: "Редагувати журнали часу для інших користувачів"
   permission_edit_timelines: "Змінити часові рамки"
@@ -3131,9 +3211,12 @@ uk:
   permission_search_project: "Пошук проєктів"
   permission_select_custom_fields: "Вибирати власні поля"
   permission_select_project_custom_fields: "Виберіть атрибути проєкту"
+  permission_select_project_life_cycle: "Вибір етапів і контрольних точок проєкту"
+  permission_select_project_life_cycle_explanation: "Активувати / деактивувати етапи й контрольні точки в проєкті. Дає змогу користувачу вибрати відповідний життєвий цикл для проєкту, оскільки неактивні етапи й контрольні точки не відображатимуться на сторінці огляду проєкту й у списку проєктів."
   permission_select_project_modules: "Вибір модулів проекту"
   permission_share_work_packages: "Надати доступ до пакетів робіт"
   permission_manage_types: "Виберіть типи"
+  permission_manage_own_reminders: "Створюйте власні нагадування"
   permission_view_project: "Перегляд проєктів"
   permission_view_changesets: "Перегляд змін репозиторію (сховища) в OpenProject"
   permission_view_commit_author_statistics: "Перегляд статистики комітів автора"
@@ -3154,6 +3237,7 @@ uk:
   permission_work_package_assigned_explanation: "Робочі пакети можуть бути призначені користувачам і групам, які володіють цією роллю у відповідному проекті"
   permission_view_project_activity: "Перегляд активності в проєкті"
   permission_view_project_attributes: "Переглянути атрибути проєкту"
+  permission_view_project_stages_and_gates: "Перегляд етапів і контрольних точок проєкту"
   permission_save_bcf_queries: "Зберігання запитів BCF"
   permission_manage_public_bcf_queries: "Керування загальнодоступними запитами BCF"
   permission_edit_attribute_help_texts: "Редагування текстів довідки для атрибутів"
@@ -3835,6 +3919,12 @@ uk:
       edit_description: "Може переглядати, коментувати й редагувати цей пакет робіт."
       view: "Перегляд"
       view_description: "Може переглядати цей пакет робіт."
+    reminders:
+      label_remind_at: "Дата"
+      note_placeholder: "Навіщо ви встановлюєте це нагадування?"
+      success_creation_message: "Нагадування встановлено. Ви отримаєте сповіщення про цей пакет робіт у вибраний час."
+      success_update_message: "Нагадування оновлено."
+      success_deletion_message: "Нагадування видалено."
   sharing:
     count:
       zero: "0 користувачів"
diff --git a/config/locales/crowdin/uz.yml b/config/locales/crowdin/uz.yml
index f149d3a36ba8..e05006448684 100644
--- a/config/locales/crowdin/uz.yml
+++ b/config/locales/crowdin/uz.yml
@@ -343,6 +343,9 @@ uz:
         text: "This action will not delete any project the list contains. Are you sure you want to delete this project list?"
     settings:
       change_identifier: Change identifier
+      actions:
+        label_enable_all: "Enable all"
+        label_disable_all: "Disable all"
       activities:
         no_results_title_text: There are currently no activities available.
       forums:
@@ -353,18 +356,26 @@ uz:
         no_results_content_text: Create a new work package category
       custom_fields:
         no_results_title_text: There are currently no custom fields available.
+      life_cycle:
+        header:
+          title: "Project lifecycle"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "Neither stages nor gates are currently defined."
+        section_header: "Stages and gates"
+        step:
+          use_in_project: "Use %{step} in this project"
+        filter:
+          label: "Search project stage or gate"
       project_custom_fields:
         header:
           title: "Project attributes"
-          description: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
+          description_html: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
         filter:
           label: "Search project attribute"
         actions:
           label_enable_single: "Active in this project, click to disable"
           label_disable_single: "Inactive in this project, click to enable"
           remove_from_project: "Remove from project"
-          label_enable_all: "Enable all"
-          label_disable_all: "Disable all"
         is_required_blank_slate:
           heading: Required in all projects
           description: This project attribute is activated in all projects since the "Required in all projects" option is checked. It cannot be deactivated for individual projects.
@@ -377,6 +388,10 @@ uz:
         no_results_content_text: Create a new version
       storage:
         no_results_title_text: There is no additional recorded disk space consumed by this project.
+  project_stage:
+    working_days_count:
+      one: "Duration: %{count} working day"
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "The modified list has been saved as a new list"
@@ -497,8 +512,12 @@ uz:
     groups:
       member_in_these_groups: "This user is currently a member of the following groups:"
       no_results_title_text: This user is currently not a member in any group.
+      summary_with_more: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary: Member of %{names}.
     memberships:
       no_results_title_text: This user is currently not a member of a project.
+    open_profile: "Open profile"
   page:
     text: "Text"
   placeholder_users:
@@ -569,18 +588,27 @@ uz:
       no_results_title_text: There are currently no types.
       no_results_content_text: Create a new type
     edit:
-      settings: "Settings"
-      form_configuration: "Form configuration"
+      form_configuration:
+        tab: "Form configuration"
       more_info_text_html: >
         Enterprise edition allows you to customize form configuration with these additional add-ons: <br> <ul class="%{list_styling_class}"> <li><b>Add new attribute groups</b></li> <li><b>Rename attribute groups</b></li> <li><b>Add a table of related work packages</b></li> </ul>
-      projects: "Projects"
-      enabled_projects: "Enabled projects"
-      edit_query: "Edit table"
-      query_group_placeholder: "Give the table a name"
-      reset: "Reset to defaults"
-      type_color_text: |
-        The selected color distinguishes different types
-        in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      projects:
+        tab: "Projects"
+        enabled_projects: "Enabled projects"
+      settings:
+        tab: "Settings"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Subject configuration"
+        manually_editable_subjects:
+          label: "Manually editable subjects"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automatically generated subjects"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Subject pattern"
+          caption: "Search for an attribute or add text. To create a space between elements add it as a text."
   versions:
     overview:
       work_packages_in_archived_projects: "The version is shared with archived projects which still have work packages assigned to this version. These are counted, but will not appear in the linked views."
@@ -643,6 +671,10 @@ uz:
     label_add_x: "Add %{x}"
     label_edit_x: "Edit %{x}"
     label_add_description: "Add description"
+    lag:
+      subject: "Lag"
+      title: "Lag (in days)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
       label_relates_singular: "related to"
       label_relates_plural: "related to"
@@ -847,6 +879,9 @@ uz:
         lag: "Lag"
         from: "Work package"
         to: "Related work package"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Time"
       repository:
         url: "URL"
       role:
@@ -935,6 +970,7 @@ uz:
       messages:
         accepted: "must be accepted."
         after: "must be after %{date}."
+        after_today: "must be in the future."
         after_or_equal_to: "must be after or equal to %{date}."
         before: "must be before %{date}."
         before_or_equal_to: "must be before or equal to %{date}."
@@ -981,6 +1017,7 @@ uz:
         not_an_integer: "is not an integer."
         not_an_iso_date: "is not a valid date. Required format: YYYY-MM-DD."
         not_same_project: "doesn't belong to the same project."
+        datetime_must_be_in_future: "must be in the future."
         odd: "must be odd."
         regex_match_failed: "does not match the regular expression %{expression}."
         regex_invalid: "could not be validated with the associated regular expression."
@@ -1094,16 +1131,38 @@ uz:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "start date must be before the end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "is incomplete."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1320,6 +1379,8 @@ uz:
         other: "Notifications"
       placeholder_user: "Placeholder user"
       project: "Project"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         one: "Project list"
         other: "Project lists"
@@ -1423,6 +1484,7 @@ uz:
     login: "Username"
     mail: "Email"
     name: "Name"
+    note: "Note"
     password: "Password"
     priority: "Priority"
     project: "Project"
@@ -1519,6 +1581,7 @@ uz:
   button_print: "Print"
   button_quote: "Quote"
   button_remove: Remove
+  button_remove_reminder: "Remove reminder"
   button_rename: "Rename"
   button_replace: "Replace"
   button_revoke: "Revoke"
@@ -1529,6 +1592,7 @@ uz:
   button_save_as: "Save as"
   button_apply_changes: "Apply changes"
   button_save_back: "Save and back"
+  button_set_reminder: "Set reminder"
   button_show: "Show"
   button_sort: "Sort"
   button_submit: "Submit"
@@ -1734,12 +1798,12 @@ uz:
   direction: ltr
   ee:
     upsale:
+      title: "Enterprise add-on"
+      link_title: "More information"
       form_configuration:
         description: "Customize the form configuration with these additional add-ons:"
         add_groups: "Add new attribute groups"
         rename_groups: "Rename attributes groups"
-      project_filters:
-        description_html: "Filtering and sorting on custom fields is an Enterprise edition add-on."
   enumeration_activities: "Time tracking activities"
   enumeration_work_package_priorities: "Work package priorities"
   enumeration_reported_project_statuses: "Reported project status"
@@ -1772,6 +1836,7 @@ uz:
   error_pdf_export_too_many_columns: "Too many columns selected for the PDF export. Please reduce the number of columns."
   error_pdf_failed_to_export: "The PDF export could not be saved: %{error}"
   error_token_authenticity: "Unable to verify Cross-Site Request Forgery token. Did you try to submit data on multiple browsers or tabs? Please close all tabs and try again."
+  error_reminder_not_found: "The reminder was not found or was already notified about."
   error_work_package_not_found_in_project: "The work package was not found or does not belong to this project"
   error_work_package_id_not_found: "The work package was not found."
   error_must_be_project_member: "must be project member"
@@ -2065,6 +2130,7 @@ uz:
       responsible: "Accountable"
       shared: "Shared"
       watched: "Watcher"
+      reminder: "Reminder"
     facets:
       unread: "Unread"
       unread_title: "Show unread"
@@ -2232,8 +2298,10 @@ uz:
   label_default: "Default"
   label_delete_user: "Delete user"
   label_delete_project: "Delete project"
+  label_delete: "Delete"
   label_deleted: "deleted"
   label_deleted_custom_field: "(deleted custom field)"
+  label_deleted_custom_item: "(deleted item)"
   label_deleted_custom_option: "(deleted option)"
   label_empty_element: "(empty)"
   label_missing_or_hidden_custom_option: "(missing value or lacking permissions to access)"
@@ -2270,7 +2338,6 @@ uz:
   label_enterprise_active_users: "%{current}/%{limit} booked active users"
   label_enterprise_edition: "Enterprise edition"
   label_enterprise_support: "Enterprise support"
-  label_enterprise_addon: "Enterprise add-on"
   label_environment: "Environment"
   label_estimates_and_progress: "Estimates and progress"
   label_equals: "is"
@@ -2455,6 +2522,7 @@ uz:
   label_none_parentheses: "(none)"
   label_not_contains: "doesn't contain"
   label_not_equals: "is not"
+  label_life_cycle_step_plural: "Project lifecycle"
   label_on: "on"
   label_operator_all: "is not empty"
   label_operator_none: "is empty"
@@ -2556,6 +2624,7 @@ uz:
   label_reporting: "Reporting"
   label_reporting_plural: "Reportings"
   label_repository: "Repository"
+  label_repository_remove: "Remove repository"
   label_repository_root: "Repository root"
   label_repository_plural: "Repositories"
   label_required: "required"
@@ -2618,6 +2687,7 @@ uz:
   label_this_month: "this month"
   label_this_week: "this week"
   label_this_year: "this year"
+  label_time: "Time"
   label_time_entry_plural: "Spent time"
   label_time_entry_activity_plural: "Spent time activities"
   label_title: "Title"
@@ -2653,6 +2723,7 @@ uz:
   label_user_settings: "User settings"
   label_users_settings: "Users settings"
   label_version_new: "New version"
+  label_version_edit: "Edit version"
   label_version_plural: "Versions"
   label_version_sharing_descendants: "With subprojects"
   label_version_sharing_hierarchy: "With project hierarchy"
@@ -2790,8 +2861,13 @@ uz:
         prefix: "Received because of the notification setting: %{reason}"
         date_alert_start_date: "Date alert"
         date_alert_due_date: "Date alert"
+        reminder: "Reminder"
       see_all: "See all"
       updated_at: "Updated at %{timestamp} by %{user}"
+    reminder_notifications:
+      subject: "Reminder: %{note}"
+      heading: "You have a new reminder"
+      note: "Note: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "You may %{allowed_actions} this work package. This can change depending on your project role and permissions."
@@ -2958,6 +3034,7 @@ uz:
   notice_successful_connection: "Successful connection."
   notice_successful_create: "Successful creation."
   notice_successful_delete: "Successful deletion."
+  notice_successful_cancel: "Successful cancellation."
   notice_successful_update: "Successful update."
   notice_successful_update_custom_fields_added_to_project: |
     Successful update. The custom fields of the activated types are automatically activated
@@ -3035,6 +3112,7 @@ uz:
   permission_edit_own_time_entries: "Edit own time logs"
   permission_edit_project: "Edit project"
   permission_edit_project_attributes: "Edit project attributes"
+  permission_edit_project_stages_and_gates: "Edit project stages and gates"
   permission_edit_reportings: "Edit reportings"
   permission_edit_time_entries: "Edit time logs for other users"
   permission_edit_timelines: "Edit timelines"
@@ -3064,9 +3142,12 @@ uz:
   permission_search_project: "Search project"
   permission_select_custom_fields: "Select custom fields"
   permission_select_project_custom_fields: "Select project attributes"
+  permission_select_project_life_cycle: "Select project stages and gates"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "Select project modules"
   permission_share_work_packages: "Share work packages"
   permission_manage_types: "Select types"
+  permission_manage_own_reminders: "Create own reminders"
   permission_view_project: "View projects"
   permission_view_changesets: "View repository revisions in OpenProject"
   permission_view_commit_author_statistics: "View commit author statistics"
@@ -3087,6 +3168,7 @@ uz:
   permission_work_package_assigned_explanation: "Work packages can be assigned to users and groups in possession of this role in the respective project"
   permission_view_project_activity: "View project activity"
   permission_view_project_attributes: "View project attributes"
+  permission_view_project_stages_and_gates: "View project stages and gates"
   permission_save_bcf_queries: "Save BCF queries"
   permission_manage_public_bcf_queries: "Manage public BCF queries"
   permission_edit_attribute_help_texts: "Edit attribute help texts"
@@ -3767,6 +3849,12 @@ uz:
       edit_description: "Can view, comment and edit this work package."
       view: "View"
       view_description: "Can view this work package."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Why are you setting this reminder?"
+      success_creation_message: "Reminder set successfully. You will receive a notification for this work package at the chosen time."
+      success_update_message: "Reminder updated successfully."
+      success_deletion_message: "Reminder deleted successfully."
   sharing:
     count:
       zero: "0 users"
diff --git a/config/locales/crowdin/vi.yml b/config/locales/crowdin/vi.yml
index 5887ad1c9bf3..70946552b9db 100644
--- a/config/locales/crowdin/vi.yml
+++ b/config/locales/crowdin/vi.yml
@@ -345,6 +345,9 @@ vi:
         text: "Hành động này sẽ không xóa bất kỳ dự án nào có trong danh sách. Bạn có chắc chắn muốn xóa danh sách dự án này không?"
     settings:
       change_identifier: Thay đổi định danh
+      actions:
+        label_enable_all: "Enable all"
+        label_disable_all: "Disable all"
       activities:
         no_results_title_text: Không có hoạt động nào hiện tại.
       forums:
@@ -355,18 +358,26 @@ vi:
         no_results_content_text: Tạo ra một loại gói công việc mới
       custom_fields:
         no_results_title_text: Không không có trường tùy chỉnh.
+      life_cycle:
+        header:
+          title: "Project lifecycle"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "Neither stages nor gates are currently defined."
+        section_header: "Stages and gates"
+        step:
+          use_in_project: "Use %{step} in this project"
+        filter:
+          label: "Search project stage or gate"
       project_custom_fields:
         header:
           title: "Thuộc tính dự án"
-          description: 'Các thuộc tính dự án này sẽ được hiển thị trên <a href=%{overview_url} target="_blank">trang tổng quan dự án</a> của bạn dưới các phần tương ứng của chúng. Bạn có thể bật hoặc tắt các thuộc tính cá nhân. Các thuộc tính và phần của dự án được xác định trong <a href=%{admin_settings_url} target="_blank">cài đặt quản trị</a> bởi quản trị viên của phiên bản.'
+          description_html: 'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes. Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
         filter:
           label: "Tìm kiếm thuộc tính dự án"
         actions:
           label_enable_single: "Kích hoạt trong dự án này, nhấp để tắt"
           label_disable_single: "Không kích hoạt trong dự án này, nhấp để bật"
           remove_from_project: "Xóa khỏi dự án"
-          label_enable_all: "Bật tất cả"
-          label_disable_all: "Tắt tất cả"
         is_required_blank_slate:
           heading: Bắt buộc trong tất cả các dự án
           description: Thuộc tính dự án này được kích hoạt trong tất cả các dự án vì tùy chọn "Bắt buộc trong tất cả các dự án" đã được chọn. Nó không thể bị vô hiệu hóa cho các dự án cá nhân.
@@ -379,6 +390,9 @@ vi:
         no_results_content_text: Tạo ra một phiên bản mới
       storage:
         no_results_title_text: Không có không gian đĩa bổ sung nào được ghi nhận bởi dự án này.
+  project_stage:
+    working_days_count:
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "Danh sách đã sửa đổi đã được lưu thành danh sách mới"
@@ -493,8 +507,12 @@ vi:
     groups:
       member_in_these_groups: "Người dùng này hiện là thành viên của các nhóm sau:"
       no_results_title_text: Người dùng này hiện không phải là thành viên của nhóm nào.
+      summary_with_more: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary: Member of %{names}.
     memberships:
       no_results_title_text: Người dùng này không phải là thành viên của dự án.
+    open_profile: "Open profile"
   page:
     text: "Văn bản"
   placeholder_users:
@@ -564,18 +582,27 @@ vi:
       no_results_title_text: Hiện tại không có loại nào.
       no_results_content_text: Tạo loại mới
     edit:
-      settings: "Cài đặt"
-      form_configuration: "Cấu hình biểu mẫu"
+      form_configuration:
+        tab: "Form configuration"
       more_info_text_html: >
         Phiên bản Doanh nghiệp cho phép bạn tùy chỉnh cấu hình biểu mẫu với các tiện ích bổ sung sau: <br> <ul class="%{list_styling_class}"> <li><b>Thêm nhóm thuộc tính mới</b></li> <li><b>Đổi tên nhóm thuộc tính</b></li> <li><b>Thêm bảng các gói công việc liên quan</b></li> </ul>
-      projects: "Dự án"
-      enabled_projects: "Các dự án đã bật"
-      edit_query: "Chỉnh sửa bảng"
-      query_group_placeholder: "Đặt tên cho bảng"
-      reset: "Đặt lại về mặc định"
-      type_color_text: |
-        Màu đã chọn phân biệt các loại khác nhau
-        trong biểu đồ Gantt hoặc bảng gói công việc. Do đó, nên sử dụng màu mạnh.
+      projects:
+        tab: "Projects"
+        enabled_projects: "Enabled projects"
+      settings:
+        tab: "Settings"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Subject configuration"
+        manually_editable_subjects:
+          label: "Manually editable subjects"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automatically generated subjects"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Subject pattern"
+          caption: "Search for an attribute or add text. To create a space between elements add it as a text."
   versions:
     overview:
       work_packages_in_archived_projects: "Phiên bản này được chia sẻ với các dự án đã lưu trữ vẫn có gói công việc được gán cho phiên bản này. Những gói công việc này được tính, nhưng sẽ không xuất hiện trong các chế độ xem liên kết."
@@ -637,6 +664,10 @@ vi:
     label_add_x: "Add %{x}"
     label_edit_x: "Edit %{x}"
     label_add_description: "Add description"
+    lag:
+      subject: "Lag"
+      title: "Lag (in days)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
       label_relates_singular: "related to"
       label_relates_plural: "related to"
@@ -841,6 +872,9 @@ vi:
         lag: "Kết quả chậm"
         from: "Gói công việc"
         to: "Work package liên quan"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Time"
       repository:
         url: "Đường dẫn (URL)"
       role:
@@ -929,6 +963,7 @@ vi:
       messages:
         accepted: "phải được đồng ý"
         after: "phải sau %{date}"
+        after_today: "must be in the future."
         after_or_equal_to: "phải sau hoặc tương đương với %{date}"
         before: "phải trước khi %{date}"
         before_or_equal_to: "phải có trước hay tương đương với %{date}"
@@ -975,6 +1010,7 @@ vi:
         not_an_integer: "không phải là một số nguyên"
         not_an_iso_date: "không phải là một ngày hợp lệ. Yêu cầu định dạng: YYYY-MM-DD."
         not_same_project: "không thuộc cùng dự án."
+        datetime_must_be_in_future: "must be in the future."
         odd: "phải là số lẻ"
         regex_match_failed: "không khớp với biểu thức chính quy %{expression}."
         regex_invalid: "có thể không được xác nhận với các biểu hiện thường xuyên liên kết."
@@ -1088,16 +1124,38 @@ vi:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "start date must be before the end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "is incomplete."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1311,6 +1369,8 @@ vi:
         other: "Thông báo"
       placeholder_user: "Người dùng thay thế"
       project: "Dự án"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         other: "Danh sách dự án"
       query: "Truy vấn riêng"
@@ -1407,6 +1467,7 @@ vi:
     login: "Tên người dùng"
     mail: "Thư điện tử"
     name: "Tên"
+    note: "Note"
     password: "Mật khẩu"
     priority: "Ưu tiên"
     project: "Dự án"
@@ -1503,6 +1564,7 @@ vi:
   button_print: "In"
   button_quote: "Trích dẫn"
   button_remove: Xoá
+  button_remove_reminder: "Remove reminder"
   button_rename: "Đổi tên"
   button_replace: "Thay thế"
   button_revoke: "Thu hồi"
@@ -1513,6 +1575,7 @@ vi:
   button_save_as: "Lưu thành"
   button_apply_changes: "Áp dụng thay đổi"
   button_save_back: "Lưu và trở lại"
+  button_set_reminder: "Set reminder"
   button_show: "Hiện"
   button_sort: "Sắp xếp"
   button_submit: "Gửi"
@@ -1700,12 +1763,12 @@ vi:
   direction: ltr
   ee:
     upsale:
+      title: "Enterprise add-on"
+      link_title: "More information"
       form_configuration:
         description: "Tùy chỉnh cấu hình mẫu với các tiện ích bổ sung sau:"
         add_groups: "Thêm 1 nhóm thuộc tính"
         rename_groups: "Đổi tên nhóm thuộc tính"
-      project_filters:
-        description_html: "Lọc và sắp xếp trên các trường tùy chỉnh là một tiện ích bổ sung của phiên bản Enterprise."
   enumeration_activities: "Theo dõi hoạt động"
   enumeration_work_package_priorities: "Độ ưu tiên của work package"
   enumeration_reported_project_statuses: "Tình trạng dự án đã báo cáo"
@@ -1738,6 +1801,7 @@ vi:
   error_pdf_export_too_many_columns: "Quá nhiều cột được chọn cho xuất PDF. Vui lòng giảm số lượng cột."
   error_pdf_failed_to_export: "Xuất PDF không thể được lưu: %{error}"
   error_token_authenticity: "Không thể xác minh token Cross-Site Request Forgery. Bạn có cố gắng gửi dữ liệu trên nhiều trình duyệt hoặc tab không? Vui lòng đóng tất cả các tab và thử lại."
+  error_reminder_not_found: "The reminder was not found or was already notified about."
   error_work_package_not_found_in_project: "Work package không được tìm thấy hoặc không thuộc về dự án này"
   error_work_package_id_not_found: "Không tìm thấy gói công việc."
   error_must_be_project_member: "phải là thành viên dự án"
@@ -2031,6 +2095,7 @@ vi:
       responsible: "Có trách nhiệm"
       shared: "Được chia sẻ"
       watched: "Quan sát viên"
+      reminder: "Reminder"
     facets:
       unread: "Chưa đọc"
       unread_title: "Hiện chưa đọc"
@@ -2198,8 +2263,10 @@ vi:
   label_default: "Mặc định"
   label_delete_user: "Xóa người dùng"
   label_delete_project: "Xóa dự án"
+  label_delete: "Delete"
   label_deleted: "đã xóa"
   label_deleted_custom_field: "(đã xóa các mục tùy chỉnh)"
+  label_deleted_custom_item: "(deleted item)"
   label_deleted_custom_option: "(tùy chọn đã xóa)"
   label_empty_element: "(rỗng)"
   label_missing_or_hidden_custom_option: "(giá trị thiếu hoặc không có quyền truy cập)"
@@ -2236,7 +2303,6 @@ vi:
   label_enterprise_active_users: "%{current}/%{limit} người dùng đang hoạt động đã đặt chỗ"
   label_enterprise_edition: "Phiên bản doanh nghiệp"
   label_enterprise_support: "Hỗ trợ doanh nghiệp"
-  label_enterprise_addon: "Tiện ích mở rộng doanh nghiệp"
   label_environment: "Môi trường"
   label_estimates_and_progress: "Ước lượng và tiến độ"
   label_equals: "là"
@@ -2421,6 +2487,7 @@ vi:
   label_none_parentheses: "(trống)"
   label_not_contains: "không chứa"
   label_not_equals: "không là"
+  label_life_cycle_step_plural: "Project lifecycle"
   label_on: "bật"
   label_operator_all: "không rỗng"
   label_operator_none: "rỗng"
@@ -2522,6 +2589,7 @@ vi:
   label_reporting: "Đang báo cáo"
   label_reporting_plural: "Đang báo cáo"
   label_repository: "Kho lưu trữ"
+  label_repository_remove: "Remove repository"
   label_repository_root: "Gốc kho lưu trữ"
   label_repository_plural: "Kho lưu trữ"
   label_required: "bắt buộc"
@@ -2584,6 +2652,7 @@ vi:
   label_this_month: "tháng này"
   label_this_week: "tuần này"
   label_this_year: "năm này"
+  label_time: "Time"
   label_time_entry_plural: "Thời gian đã tiêu tốn"
   label_time_entry_activity_plural: "Hoạt động thời gian đã tiêu tốn"
   label_title: "Tiêu đề"
@@ -2619,6 +2688,7 @@ vi:
   label_user_settings: "Cài đặt người dùng"
   label_users_settings: "Cài đặt người dùng"
   label_version_new: "Phiên bản mới"
+  label_version_edit: "Edit version"
   label_version_plural: "Các phiên bản"
   label_version_sharing_descendants: "Với các dự án con"
   label_version_sharing_hierarchy: "Với phân cấp dự án"
@@ -2755,8 +2825,13 @@ vi:
         prefix: "Nhận được do cài đặt thông báo: %{reason}"
         date_alert_start_date: "Cảnh báo ngày"
         date_alert_due_date: "Cảnh báo ngày"
+        reminder: "Reminder"
       see_all: "Xem tất cả"
       updated_at: "Cập nhật vào %{timestamp} bởi %{user}"
+    reminder_notifications:
+      subject: "Reminder: %{note}"
+      heading: "You have a new reminder"
+      note: "Note: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "Bạn có thể %{allowed_actions} gói công việc này. Điều này có thể thay đổi tùy thuộc vào vai trò và quyền hạn của bạn trong dự án."
@@ -2923,6 +2998,7 @@ vi:
   notice_successful_connection: "Kết nối thành công."
   notice_successful_create: "Tạo thành công."
   notice_successful_delete: "Xóa thành công."
+  notice_successful_cancel: "Successful cancellation."
   notice_successful_update: "Cập nhật thành công."
   notice_successful_update_custom_fields_added_to_project: |
     Cập nhật thành công. Các trường tùy chỉnh của các loại đã kích hoạt sẽ tự động được kích hoạt
@@ -2999,6 +3075,7 @@ vi:
   permission_edit_own_time_entries: "Chỉnh sửa nhật ký thời gian của riêng bạn"
   permission_edit_project: "Chỉnh sửa dự án"
   permission_edit_project_attributes: "Chỉnh sửa thuộc tính dự án"
+  permission_edit_project_stages_and_gates: "Edit project stages and gates"
   permission_edit_reportings: "Chỉnh sửa báo cáo"
   permission_edit_time_entries: "Chỉnh sửa nhật ký thời gian của người khác"
   permission_edit_timelines: "Chỉnh sửa mốc thời gian"
@@ -3028,9 +3105,12 @@ vi:
   permission_search_project: "Tìm kiếm dự án"
   permission_select_custom_fields: "Chọn trường tùy chỉnh"
   permission_select_project_custom_fields: "Chọn thuộc tính dự án"
+  permission_select_project_life_cycle: "Select project stages and gates"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "Chọn các mô-đun dự án"
   permission_share_work_packages: "Chia sẻ gói công việc"
   permission_manage_types: "Chọn loại"
+  permission_manage_own_reminders: "Create own reminders"
   permission_view_project: "Xem dự án"
   permission_view_changesets: "Xem các sửa đổi kho trong OpenProject"
   permission_view_commit_author_statistics: "Xem thống kê tác giả cam kết"
@@ -3051,6 +3131,7 @@ vi:
   permission_work_package_assigned_explanation: "Gói công việc có thể được gán cho người dùng và nhóm sở hữu vai trò này trong dự án tương ứng"
   permission_view_project_activity: "Xem hoạt động dự án"
   permission_view_project_attributes: "Xem thuộc tính dự án"
+  permission_view_project_stages_and_gates: "View project stages and gates"
   permission_save_bcf_queries: "Lưu các truy vấn BCF"
   permission_manage_public_bcf_queries: "Quản lý các truy vấn BCF công khai"
   permission_edit_attribute_help_texts: "Chỉnh sửa văn bản trợ giúp thuộc tính"
@@ -3729,6 +3810,12 @@ vi:
       edit_description: "Có thể xem, nhận xét và chỉnh sửa gói công việc này."
       view: "Xem"
       view_description: "Có thể xem gói công việc này."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Why are you setting this reminder?"
+      success_creation_message: "Reminder set successfully. You will receive a notification for this work package at the chosen time."
+      success_update_message: "Reminder updated successfully."
+      success_deletion_message: "Reminder deleted successfully."
   sharing:
     count:
       zero: "0 người dùng"
diff --git a/config/locales/crowdin/zh-CN.yml b/config/locales/crowdin/zh-CN.yml
index 748a5fac6d37..f4aa896853d0 100644
--- a/config/locales/crowdin/zh-CN.yml
+++ b/config/locales/crowdin/zh-CN.yml
@@ -340,6 +340,9 @@ zh-CN:
         text: "此操作不会删除列表中包含的任何项目。确定要删除此项目列表吗？"
     settings:
       change_identifier: 更改标识符
+      actions:
+        label_enable_all: "全部启用"
+        label_disable_all: "全部禁用"
       activities:
         no_results_title_text: 目前有可用的任何活动。
       forums:
@@ -350,18 +353,26 @@ zh-CN:
         no_results_content_text: 创建一个新的工作包类别
       custom_fields:
         no_results_title_text: 目前没有可用的自定义字段。
+      life_cycle:
+        header:
+          title: "项目生命周期"
+          description_html: '项目生命周期中的这些项目阶段和关口将显示在 <a href=%{overview_url} target="_blank"> 项目概览页面</a> 中，并由实例管理员在 <a href=%{admin_settings_url} target="_blank"> 管理设置</a> 中定义。您可以启用或禁用单个属性。'
+        non_defined: "目前既未定义阶段也未定关口。"
+        section_header: "阶段和关口"
+        step:
+          use_in_project: "在此项目中使用 %{step}"
+        filter:
+          label: "搜索项目阶段或关口"
       project_custom_fields:
         header:
           title: "项目属性"
-          description: '这些项目属性将显示在<a href=%{overview_url} target="_blank">项目概览页面</a> 的相应部分下。您可以启用或禁用单个属性。项目属性和部分由实例管理员在 <a href=%{admin_settings_url} target="_blank"> 管理设置</a> 中定义。 '
+          description_html: '这些项目属性将显示在<a href=%{overview_url} target="_blank">项目概览页面</a> 的相应分区下。您可以启用或禁用单个属性。项目属性和分区由实例管理员在 <a href=%{admin_settings_url} target="_blank"> 管理设置</a> 中定义。 '
         filter:
           label: "搜索项目属性"
         actions:
           label_enable_single: "在此项目中处于活动状态，点击禁用"
           label_disable_single: "在此项目中未启用，点击启用"
           remove_from_project: "从项目移除"
-          label_enable_all: "全部启用"
-          label_disable_all: "全部禁用"
         is_required_blank_slate:
           heading: 所有项目中需要
           description: 此项目属性已在所有项目中激活，因为选中了“所有项目中需要”的选项。它在单个项目中不能被停用。
@@ -374,6 +385,9 @@ zh-CN:
         no_results_content_text: 创建一个新的版本
       storage:
         no_results_title_text: 此项目没有已记录的额外磁盘空间消耗。
+  project_stage:
+    working_days_count:
+      other: "时长： %{count} 个工作日"
   lists:
     create:
       success: "已将修改后的列表保存为新列表"
@@ -488,8 +502,12 @@ zh-CN:
     groups:
       member_in_these_groups: "此用户当前是以下组的成员："
       no_results_title_text: 此用户当前不是任何组的成员。
+      summary_with_more: '%{names} 和 %{count_link} 成员。'
+      more: "还有 %{count} 个"
+      summary: '%{names} 的成员。'
     memberships:
       no_results_title_text: 该用户当前非项目成员。
+    open_profile: "人员详情"
   page:
     text: "文本"
   placeholder_users:
@@ -558,17 +576,27 @@ zh-CN:
       no_results_title_text: 目前没有类型。
       no_results_content_text: 创建新的类型
     edit:
-      settings: "设置"
-      form_configuration: "表格配置"
+      form_configuration:
+        tab: "表单配置"
       more_info_text_html: >
         企业版允许您使用以下附加组件自定义表单配置：<br> <ul class="%{list_styling_class}"> <li><b>添加新属性组</b></li> <li><b>重命名属性组</b></li> <li><b>添加相关工作包的表格</b></li> </ul>
-      projects: "项目"
-      enabled_projects: "已启用的项目"
-      edit_query: "编辑表"
-      query_group_placeholder: "为表命名"
-      reset: "重置为默认值"
-      type_color_text: |
-        所选颜色可用于在甘特图或工作包表中区分不同类型。因此，建议使用浓烈的颜色。
+      projects:
+        tab: "项目"
+        enabled_projects: "已启用的项目"
+      settings:
+        tab: "设置"
+        type_color_text: 所选颜色用于在甘特图或工作包表中区分不同类型。因此建议使用鲜艳的颜色。
+      subject_configuration:
+        tab: "主题配置"
+        manually_editable_subjects:
+          label: "可手动编辑的主题"
+          caption: "用户可以不受限制地手动输入和编辑工作包主题。"
+        automatically_generated_subjects:
+          label: "自动生成主题"
+          caption: "使用引用属性和文本定义模式，自动生成工作包主题。用户将无法手动编辑主题。"
+        pattern:
+          label: "主题模式"
+          caption: "搜索属性或添加文本。要在元素之间创建空格，请将其添加为文本。"
   versions:
     overview:
       work_packages_in_archived_projects: "该版本与归档项目共享，这些项目仍然有分配给此版本的工作包。虽然这些工作包被计算在内，但不会显示在链接视图中。"
@@ -630,6 +658,10 @@ zh-CN:
     label_add_x: "添加 %{x}"
     label_edit_x: "编辑 %{x}"
     label_add_description: "添加说明"
+    lag:
+      subject: "间隔"
+      title: "间隔(天数)"
+      caption: "两个工作包之间的最低工作日数。"
     relations:
       label_relates_singular: "关联到"
       label_relates_plural: "关联到"
@@ -644,7 +676,7 @@ zh-CN:
       label_follows_plural: "前任(之前)"
       follows_description: "相关工作包必须在本工作包启动前完成"
       label_child_singular: "子节点"
-      label_child_plural: "子节点"
+      label_child_plural: "子项"
       child_description: "使相关工作包成为当前(父) 工作包的子项目"
       label_blocks_singular: "阻止"
       label_blocks_plural: "阻止"
@@ -834,6 +866,9 @@ zh-CN:
         lag: "延迟"
         from: "工作包"
         to: "相关的工作包"
+      reminder:
+        remind_at_date: "日期"
+        remind_at_time: "时间"
       repository:
         url: "URL"
       role:
@@ -922,6 +957,7 @@ zh-CN:
       messages:
         accepted: "必须接受。"
         after: "必须在 %{date} 之后。"
+        after_today: "必须是将来的时间"
         after_or_equal_to: "必须后或等于 %{date}。"
         before: "必须在 %{date} 之前。"
         before_or_equal_to: "必须在早于或等于 %{date}"
@@ -968,6 +1004,7 @@ zh-CN:
         not_an_integer: "不是一个整数。"
         not_an_iso_date: "不是有效日期。所需格式：YYYY-MM-DD。"
         not_same_project: "不属于同一个项目。"
+        datetime_must_be_in_future: "必须是将来的时间"
         odd: "必须是奇数。"
         regex_match_failed: "与正则表达式 %{expression}不匹配。"
         regex_invalid: "无法与关联的正则表达式进行验证。"
@@ -1081,16 +1118,38 @@ zh-CN:
           attributes:
             type:
               must_be_a_stage_or_gate: "必须是 Project::StageDefinition 或 Project::GateDefinition"
+              type_and_class_name_mismatch: "必须匹配实例化类型名称"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "必须是一个项目：:关口定义"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "必须是一个项目：:阶段定义"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "必须是 Project::Stage 或 Project::Gate"
               must_be_a_stage: "必须是 Project::Stage"
               must_be_a_gate: "必须是 Project::Gate"
+              type_and_class_name_mismatch: "必须匹配实例化类型名称"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "无法将 `end_date` 分配给一个项目::Gate"
+              end_date_not_allowed: "无法将结束日期分配给一个项目：:关口"
+            type:
+              type_and_class_name_mismatch: "必须是一个项目：:关口"
+            date:
+              non_continuous_dates: "不能早于前一个 %{step}的结束日期。"
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "开始日期必须早于结束日期。"
+              non_continuous_dates: "不能早于前一个 %{step}的结束日期。"
+              incomplete: "不完整。"
+            type:
+              type_and_class_name_mismatch: "必须是一个项目::阶段"
         query:
           attributes:
             project:
@@ -1304,6 +1363,8 @@ zh-CN:
         other: "通知"
       placeholder_user: "占位符用户"
       project: "项目"
+      project/gate_definition: "关口"
+      project/stage_definition: "阶段"
       project_query:
         other: "项目列表"
       query: "自定义查询"
@@ -1400,6 +1461,7 @@ zh-CN:
     login: "用户名"
     mail: "电子邮件"
     name: "名称"
+    note: "备注"
     password: "密码"
     priority: "优先级"
     project: "项目"
@@ -1496,6 +1558,7 @@ zh-CN:
   button_print: "打印"
   button_quote: "引用"
   button_remove: 移除
+  button_remove_reminder: "删除提醒"
   button_rename: "重命名"
   button_replace: "替换"
   button_revoke: "撤消"
@@ -1506,6 +1569,7 @@ zh-CN:
   button_save_as: "另存为"
   button_apply_changes: "应用更改"
   button_save_back: "保存并返回"
+  button_set_reminder: "设置提醒"
   button_show: "显示"
   button_sort: "排序"
   button_submit: "提交"
@@ -1693,12 +1757,12 @@ zh-CN:
   direction: 从左向右
   ee:
     upsale:
+      title: "企业附加组件"
+      link_title: "更多信息"
       form_configuration:
         description: "使用以下附加组件自定义表单配置："
         add_groups: "添加新属性组"
         rename_groups: "重命名属性组"
-      project_filters:
-        description_html: "自定义字段的过滤和排序是企业版附加组件。"
   enumeration_activities: "时间跟踪活动"
   enumeration_work_package_priorities: "工作包优先级"
   enumeration_reported_project_statuses: "报告的项目状态"
@@ -1731,6 +1795,7 @@ zh-CN:
   error_pdf_export_too_many_columns: "选择 PDF 导出的列太多。请减少列数。"
   error_pdf_failed_to_export: "无法保存被导出的 PDF 文件：%{error}"
   error_token_authenticity: "无法验证跨站请求伪造令牌。您是否曾尝试在多个浏览器或选项卡上提交数据？请关闭所有选项卡并重试。"
+  error_reminder_not_found: "未找到提醒或已收到相关提醒的通知。"
   error_work_package_not_found_in_project: "工作包找不到或不属于此项目"
   error_work_package_id_not_found: "工作包未找到"
   error_must_be_project_member: "必须是项目成员"
@@ -2024,6 +2089,7 @@ zh-CN:
       responsible: "负责人"
       shared: "共享"
       watched: "关注人"
+      reminder: "提醒"
     facets:
       unread: "未读"
       unread_title: "显示未读信息"
@@ -2191,8 +2257,10 @@ zh-CN:
   label_default: "默认"
   label_delete_user: "删除用户"
   label_delete_project: "删除项目"
+  label_delete: "删除"
   label_deleted: "已删除"
   label_deleted_custom_field: "（删除自定义字段）"
+  label_deleted_custom_item: "(删除项目)"
   label_deleted_custom_option: "（删除的选项）"
   label_empty_element: "（空）"
   label_missing_or_hidden_custom_option: "（缺少值或缺少访问权限）"
@@ -2229,7 +2297,6 @@ zh-CN:
   label_enterprise_active_users: "%{current}/%{limit} 已预订的活跃用户"
   label_enterprise_edition: "企业版"
   label_enterprise_support: "企业支持"
-  label_enterprise_addon: "企业版附加组件"
   label_environment: "环境"
   label_estimates_and_progress: "预估和进度"
   label_equals: "是"
@@ -2414,6 +2481,7 @@ zh-CN:
   label_none_parentheses: "(无)"
   label_not_contains: "不包含"
   label_not_equals: "不是"
+  label_life_cycle_step_plural: "项目生命周期"
   label_on: "于"
   label_operator_all: "不为空"
   label_operator_none: "为空"
@@ -2515,6 +2583,7 @@ zh-CN:
   label_reporting: "报告"
   label_reporting_plural: "报告"
   label_repository: "存储库"
+  label_repository_remove: "移除存储库"
   label_repository_root: "存储库根"
   label_repository_plural: "存储库"
   label_required: "必填"
@@ -2577,6 +2646,7 @@ zh-CN:
   label_this_month: "这个月"
   label_this_week: "这一周"
   label_this_year: "这一年"
+  label_time: "时间"
   label_time_entry_plural: "已耗工时"
   label_time_entry_activity_plural: "花费时间的活动"
   label_title: "标题"
@@ -2612,6 +2682,7 @@ zh-CN:
   label_user_settings: "用户设置"
   label_users_settings: "用户设置"
   label_version_new: "新版本"
+  label_version_edit: "编辑版本"
   label_version_plural: "版本"
   label_version_sharing_descendants: "与子项目"
   label_version_sharing_hierarchy: "与项目层次结构"
@@ -2748,8 +2819,13 @@ zh-CN:
         prefix: "接收原因为以下通知设置：%{reason}"
         date_alert_start_date: "日期提醒"
         date_alert_due_date: "日期提醒"
+        reminder: "提醒"
       see_all: "查看全部"
       updated_at: "由 %{user} 于 %{timestamp} 更新"
+    reminder_notifications:
+      subject: "提醒： %{note}"
+      heading: "您有一个新的提醒"
+      note: "注：\"%{note}\""
     sharing:
       work_packages:
         allowed_actions: "你可以 %{allowed_actions} 这个工作包。这可以基于你的项目角色和权限而变化。"
@@ -2914,6 +2990,7 @@ zh-CN:
   notice_successful_connection: "成功连接。"
   notice_successful_create: "成功创建。"
   notice_successful_delete: "成功删除。"
+  notice_successful_cancel: "取消成功"
   notice_successful_update: "成功更新。"
   notice_successful_update_custom_fields_added_to_project: |
     更新成功。已激活类型的自定义字段在工作包表单上自动激活。<a href="%{url}" target="_blank">了解详情</a>。
@@ -2989,6 +3066,7 @@ zh-CN:
   permission_edit_own_time_entries: "编辑自己的时间记录"
   permission_edit_project: "编辑项目"
   permission_edit_project_attributes: "编辑项目属性"
+  permission_edit_project_stages_and_gates: "编辑项目阶段和关口"
   permission_edit_reportings: "编辑报告"
   permission_edit_time_entries: "编辑其他用户的时间日志"
   permission_edit_timelines: "编辑时间线"
@@ -3018,9 +3096,12 @@ zh-CN:
   permission_search_project: "搜索项目"
   permission_select_custom_fields: "选择自定义字段"
   permission_select_project_custom_fields: "选择项目属性"
+  permission_select_project_life_cycle: "选择项目阶段和关口"
+  permission_select_project_life_cycle_explanation: "激活/停用项目中的阶段和关口。允许户选择适合项目的生命周期，因为非激活的阶段和关口在项目概览页或项目列表中都不可见。"
   permission_select_project_modules: "选择项目模块"
   permission_share_work_packages: "共享工作包"
   permission_manage_types: "选择类型"
+  permission_manage_own_reminders: "创建个人提醒事项"
   permission_view_project: "查看项目"
   permission_view_changesets: "查看 OpenProject 存储库修订"
   permission_view_commit_author_statistics: "查看提交作者统计信息"
@@ -3041,6 +3122,7 @@ zh-CN:
   permission_work_package_assigned_explanation: "工作包可以分配给在各自项目中拥有此角色的用户和组"
   permission_view_project_activity: "查看项目活动"
   permission_view_project_attributes: "查看项目属性"
+  permission_view_project_stages_and_gates: "查看项目阶段和关口"
   permission_save_bcf_queries: "保存 BCF 查询"
   permission_manage_public_bcf_queries: "管理公开的 BCF 查询"
   permission_edit_attribute_help_texts: "编辑属性帮助文本"
@@ -3717,6 +3799,12 @@ zh-CN:
       edit_description: "可以查看、评论和编辑此工作包。"
       view: "查看"
       view_description: "可以查看此工作包。"
+    reminders:
+      label_remind_at: "日期"
+      note_placeholder: "您为什么要设置此提醒？"
+      success_creation_message: "提醒设置成功。您将在所选时间收到此工作包的通知。"
+      success_update_message: "提醒更新成功。"
+      success_deletion_message: "提醒已成功删除。"
   sharing:
     count:
       zero: "0 个用户"
diff --git a/config/locales/crowdin/zh-TW.yml b/config/locales/crowdin/zh-TW.yml
index c5baa3e62b0c..20426d7eaae9 100644
--- a/config/locales/crowdin/zh-TW.yml
+++ b/config/locales/crowdin/zh-TW.yml
@@ -30,7 +30,7 @@ zh-TW:
         no_results_description_text: "選擇「顯示所有內容」以顯示所有活動和留言"
         label_activity_show_all: "全部顯示"
         label_activity_show_only_comments: "僅顯示留言"
-        label_activity_show_only_changes: "僅顯示差異"
+        label_activity_show_only_changes: "僅顯示檔案異動"
         label_sort_asc: "最新的在最下面"
         label_sort_desc: "最新的在最上面"
         label_type_to_comment: "留言。輸入 @ 來通知他人。"
@@ -342,6 +342,9 @@ zh-TW:
         text: "此動作不會刪除清單中包含的任何專案。您確定要刪除此專案清單？"
     settings:
       change_identifier: 變更識別碼
+      actions:
+        label_enable_all: "全部啟用"
+        label_disable_all: "全部停用"
       activities:
         no_results_title_text: 目前沒有可用的活動
       forums:
@@ -352,18 +355,26 @@ zh-TW:
         no_results_content_text: 建立一個新工作項目類別
       custom_fields:
         no_results_title_text: 目前沒有客製欄位可用。
+      life_cycle:
+        header:
+          title: "專案生命週期"
+          description_html: '專案生命週期中的這些專案階段和關卡將顯示在您的 <a href=%{overview_url} target="_blank「> 專案總覽頁面</a> 中，並由實例的管理員在 <a href=%{admin_settings_url} target=」_blank"> 管理設定</a> 中定義。您可以啟用或停用個別屬性。'
+        non_defined: "目前階段和閘門都未定義。"
+        section_header: "階段與關卡"
+        step:
+          use_in_project: "在本專案中使用 %{step}"
+        filter:
+          label: "搜尋專案階段或關卡"
       project_custom_fields:
         header:
           title: "專案屬性"
-          description: '這些專案屬性將顯示在您各自的<a href=%{overview_url} target="_blank">專案總覽頁面</a>中。您可以啟用或停用單一屬性。專案屬性由管理員在<a href=%{admin_settings_url} target="_blank">管理設定</a>中定義。'
+          description_html: '這些專案屬性會顯示在您的 <a href=%{overview_url} target="_blank"> 專案總覽頁面</a> 中各自的區段之下。您可以啟用或停用個別屬性。專案屬性和區段由實例的管理員在 <a href=%{admin_settings_url} target="_blank"> 管理設定</a> 中定義。 '
         filter:
           label: "搜尋專案屬性"
         actions:
           label_enable_single: "於此專案使用，請按一下停用"
           label_disable_single: "於此專案未使用，請按一下啟用"
           remove_from_project: "從專案移除"
-          label_enable_all: "全部啟用"
-          label_disable_all: "全部停用"
         is_required_blank_slate:
           heading: 所有專案都需要
           description: 由於已勾選「所有專案都需要」選項，因此所有專案都會啟用此專案屬性。個別專案無法停用。
@@ -376,6 +387,9 @@ zh-TW:
         no_results_content_text: 建立一個新版本
       storage:
         no_results_title_text: 該專案沒有額外消耗磁碟空間。
+  project_stage:
+    working_days_count:
+      other: "時間： %{count} 工作天"
   lists:
     create:
       success: "修改後的清單已儲存為新清單"
@@ -490,8 +504,12 @@ zh-TW:
     groups:
       member_in_these_groups: "此用戶當前是以下群組的成員："
       no_results_title_text: 這個使用者目前不是任何群組的成員
+      summary_with_more: '%{names} 和 %{count_link}的成員。'
+      more: "其餘 %{count} 項"
+      summary: '%{names}的成員。'
     memberships:
       no_results_title_text: 這個使用者目前不是任何專案的成員
+    open_profile: "開啟個人資料"
   page:
     text: "文字"
   placeholder_users:
@@ -560,17 +578,27 @@ zh-TW:
       no_results_title_text: 目前沒有類型
       no_results_content_text: 新增一個類型
     edit:
-      settings: "設定"
-      form_configuration: "表單設置"
+      form_configuration:
+        tab: "表單設置"
       more_info_text_html: >
         企業版允許您使用以下附加組件自定義表單設定：<br> <ul class="%{list_styling_class}"> <li><b>添加新屬性組</b></li> <li><b>重命名屬性組</b></li> <li><b>添加相關工作項目表</b></li> </ul>
-      projects: "專案"
-      enabled_projects: "已啟用的專案"
-      edit_query: "編輯表格"
-      query_group_placeholder: "給表格命名"
-      reset: "重設為預設值"
-      type_color_text: |
-        所選顏色區分甘特圖或工作項目中的不同類型。因此建議使用濃烈的顏色。
+      projects:
+        tab: "專案"
+        enabled_projects: "已啟用專案"
+      settings:
+        tab: "設定"
+        type_color_text: 選取的顏色可區分甘特圖或工作包表格中的不同類型。因此建議使用強烈的顏色。
+      subject_configuration:
+        tab: "主題設定"
+        manually_editable_subjects:
+          label: "可手動編輯的主題"
+          caption: "使用者可以不受限制地手動輸入和編輯工作項目主題。"
+        automatically_generated_subjects:
+          label: "自動產生的主題"
+          caption: "使用參考屬性和文字定義模式，以自動產生工作項目主題。使用者將無法手動編輯主題。"
+        pattern:
+          label: "主題模板"
+          caption: "搜尋屬性或新增文字。若要在元素之間建立空格，請將其建立為文字。"
   versions:
     overview:
       work_packages_in_archived_projects: "該版本與歸檔項目共用，這些專案仍然有分配給此版本的工作項目。雖然這些工作項目被計算在內，但不會顯示在視圖中。"
@@ -632,6 +660,10 @@ zh-TW:
     label_add_x: "新增 %{x}"
     label_edit_x: "編輯：%{x}"
     label_add_description: "新增說明"
+    lag:
+      subject: "延遲"
+      title: "延遲（天數）"
+      caption: "兩個工作項目之間最少要相隔多少個工作天。"
     relations:
       label_relates_singular: "相關於"
       label_relates_plural: "相關於"
@@ -836,6 +868,9 @@ zh-TW:
         lag: "延遲"
         from: "工作項目"
         to: "相關的工作項目"
+      reminder:
+        remind_at_date: "日期"
+        remind_at_time: "時間"
       repository:
         url: "URL"
       role:
@@ -924,6 +959,7 @@ zh-TW:
       messages:
         accepted: "必須被接受"
         after: "必須在 %{date} 之後"
+        after_today: "必須是未來時間。"
         after_or_equal_to: "必須在 %{date} 以後"
         before: "必須在 %{date} 之前"
         before_or_equal_to: "必須在 %{date} 以前"
@@ -970,6 +1006,7 @@ zh-TW:
         not_an_integer: "不是整數"
         not_an_iso_date: "不是有效日期。所需格式：YYYY-MM-DD。"
         not_same_project: "不屬於相同的專案"
+        datetime_must_be_in_future: "必須是未來時間。"
         odd: "必須是奇數"
         regex_match_failed: "與正則表達式 %{expression} 不匹配。"
         regex_invalid: "不能被相關聯的正則運算式驗證。"
@@ -1083,16 +1120,38 @@ zh-TW:
           attributes:
             type:
               must_be_a_stage_or_gate: ""
+              type_and_class_name_mismatch: "必須與實體化的類別名稱相符"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "必須是 Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "必須是 Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: ""
               must_be_a_stage: ""
               must_be_a_gate: "必須是 Project::Gate"
+              type_and_class_name_mismatch: "必須與實體化的類別名稱相符"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "無法指定 `end_date` 到 Project::Gate"
+              end_date_not_allowed: "無法為 Project::Gate 指定結束日期"
+            type:
+              type_and_class_name_mismatch: "必須是 Project::Gate"
+            date:
+              non_continuous_dates: "不能早於前一個 %{step}的結束日期。"
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "開始日期必須在結束日期之前。"
+              non_continuous_dates: "不能早於前一個 %{step}的結束日期。"
+              incomplete: "未完成。"
+            type:
+              type_and_class_name_mismatch: "必須是 Project::Stage"
         query:
           attributes:
             project:
@@ -1306,6 +1365,8 @@ zh-TW:
         other: "通知"
       placeholder_user: "虛擬群組"
       project: "專案"
+      project/gate_definition: "關卡"
+      project/stage_definition: "階段"
       project_query:
         other: "專案列表"
       query: "自訂查詢"
@@ -1402,6 +1463,7 @@ zh-TW:
     login: "使用者帳號"
     mail: "電子郵件"
     name: "名稱"
+    note: "備註"
     password: "密碼"
     priority: "優先等級"
     project: "專案"
@@ -1498,6 +1560,7 @@ zh-TW:
   button_print: "列印"
   button_quote: "引言"
   button_remove: 刪除
+  button_remove_reminder: "移除提醒"
   button_rename: "重新命名"
   button_replace: "取代"
   button_revoke: "撤銷"
@@ -1508,6 +1571,7 @@ zh-TW:
   button_save_as: "另存為"
   button_apply_changes: "套用設定"
   button_save_back: "儲存並返回"
+  button_set_reminder: "設定提醒"
   button_show: "顯示"
   button_sort: "排序"
   button_submit: "提交"
@@ -1695,12 +1759,12 @@ zh-TW:
   direction: 由左至右
   ee:
     upsale:
+      title: "企業版附加元件"
+      link_title: "更多資訊"
       form_configuration:
         description: "使用以下附加組件自定義表單配置："
         add_groups: "增加新的屬性群組"
         rename_groups: "重新命名屬性群组"
-      project_filters:
-        description_html: "自訂過濾條件和排序是企業版功能"
   enumeration_activities: "時間追蹤活動"
   enumeration_work_package_priorities: "工作項目優先等級"
   enumeration_reported_project_statuses: "報告的專案狀態"
@@ -1733,6 +1797,7 @@ zh-TW:
   error_pdf_export_too_many_columns: "為 PDF 匯出選擇的列太多。請減少列數。"
   error_pdf_failed_to_export: "無法另存 pdf 匯出: %{error}"
   error_token_authenticity: "無法驗證跨網域請求權杖(Token)。你是不是試圖在多個瀏覽器或者分頁上傳送資料？請關閉所有的分頁後再試一次。"
+  error_reminder_not_found: "未找到提醒內容或已收到相關通知。"
   error_work_package_not_found_in_project: "工作項目找不到或是不屬於這個專案"
   error_work_package_id_not_found: "無此工作項目"
   error_must_be_project_member: "必須是專案的成員"
@@ -2026,6 +2091,7 @@ zh-TW:
       responsible: "負責人"
       shared: "參與"
       watched: "監看者"
+      reminder: "提醒"
     facets:
       unread: "未讀"
       unread_title: "顯示未讀"
@@ -2193,8 +2259,10 @@ zh-TW:
   label_default: "預設"
   label_delete_user: "刪除使用者"
   label_delete_project: "刪除專案"
+  label_delete: "删除"
   label_deleted: "刪除線"
   label_deleted_custom_field: "(已刪除的客製欄位)"
+  label_deleted_custom_item: "(刪除項目)"
   label_deleted_custom_option: "(刪除的選項)"
   label_empty_element: "(空)"
   label_missing_or_hidden_custom_option: "(缺少值或缺少訪問權限)"
@@ -2231,7 +2299,6 @@ zh-TW:
   label_enterprise_active_users: "%{current}/%{limit} 已預訂的活動使用者"
   label_enterprise_edition: "企業版"
   label_enterprise_support: "Enterprise support"
-  label_enterprise_addon: "企業版附加插件"
   label_environment: "環境"
   label_estimates_and_progress: "預估和進度"
   label_equals: "是"
@@ -2416,6 +2483,7 @@ zh-TW:
   label_none_parentheses: "（無）"
   label_not_contains: "不包含"
   label_not_equals: "不是"
+  label_life_cycle_step_plural: "專案生命週期"
   label_on: "開啟"
   label_operator_all: "全部"
   label_operator_none: "無"
@@ -2517,6 +2585,7 @@ zh-TW:
   label_reporting: "報表"
   label_reporting_plural: "報表"
   label_repository: "版本庫"
+  label_repository_remove: "移除儲存庫"
   label_repository_root: "版本庫根目錄"
   label_repository_plural: "Repositories"
   label_required: "必要"
@@ -2579,6 +2648,7 @@ zh-TW:
   label_this_month: "本月"
   label_this_week: "本週"
   label_this_year: "今年"
+  label_time: "時間"
   label_time_entry_plural: "耗時"
   label_time_entry_activity_plural: "耗時活動"
   label_title: "標題"
@@ -2614,6 +2684,7 @@ zh-TW:
   label_user_settings: "使用者設定"
   label_users_settings: "使用者設定"
   label_version_new: "新增版本"
+  label_version_edit: "編輯版本"
   label_version_plural: "版本"
   label_version_sharing_descendants: "與子專案"
   label_version_sharing_hierarchy: "有專案階層"
@@ -2750,8 +2821,13 @@ zh-TW:
         prefix: "因為通知設定而收到：%{reason}"
         date_alert_start_date: "日期提醒"
         date_alert_due_date: "到期提醒"
+        reminder: "提醒"
       see_all: "全部顯示"
       updated_at: "%{user} 在 %{timestamp} 更新"
+    reminder_notifications:
+      subject: "提醒： %{note}"
+      heading: "您有新的提醒"
+      note: "備註： \"%{note}\""
     sharing:
       work_packages:
         allowed_actions: "您擁有這個工作項目的 %{allowed_actions} 權限. 這些權限將隨著您的角色不同而更改."
@@ -2917,6 +2993,7 @@ zh-TW:
   notice_successful_connection: "連接成功"
   notice_successful_create: "建立成功"
   notice_successful_delete: "刪除成功"
+  notice_successful_cancel: "取消成功"
   notice_successful_update: "更新成功"
   notice_successful_update_custom_fields_added_to_project: |
     更新成功。相關類型之專案，此客製欄位會自動啟動。<a href="%{url}" target="_blank">看更多</a>。
@@ -2992,6 +3069,7 @@ zh-TW:
   permission_edit_own_time_entries: "編輯自己的時間日誌"
   permission_edit_project: "編輯專案"
   permission_edit_project_attributes: "編輯項目屬性"
+  permission_edit_project_stages_and_gates: "檢視專案階段與關卡"
   permission_edit_reportings: "編輯報表"
   permission_edit_time_entries: "編輯他人耗時"
   permission_edit_timelines: "編輯時間軸"
@@ -3021,9 +3099,12 @@ zh-TW:
   permission_search_project: "搜尋專案"
   permission_select_custom_fields: "選擇客製欄位"
   permission_select_project_custom_fields: "選擇專案屬性"
+  permission_select_project_life_cycle: "選擇專案階段與關卡"
+  permission_select_project_life_cycle_explanation: "啟動/停用專案中的階段和關卡。使用者可以選擇適合專案的生命週期，因為非活躍階段和關卡不會在專案總覽頁面或專案清單中顯示。"
   permission_select_project_modules: "選擇專案的模組"
   permission_share_work_packages: "參與工作項目"
   permission_manage_types: "選擇類型"
+  permission_manage_own_reminders: "建立自己的提醒事項"
   permission_view_project: "檢視專案"
   permission_view_changesets: "在 OpenProject 檢視版本庫修訂"
   permission_view_commit_author_statistics: "檢視 Commit 的作者統計資訊"
@@ -3044,6 +3125,7 @@ zh-TW:
   permission_work_package_assigned_explanation: "可以將工作項目分配給在相應專案中擁有此角色的使用者和群組"
   permission_view_project_activity: "查看專案活動"
   permission_view_project_attributes: "查看專案屬性"
+  permission_view_project_stages_and_gates: "檢視專案階段與關卡"
   permission_save_bcf_queries: "保存 BCF 查詢"
   permission_manage_public_bcf_queries: "管理公開的 BCF 查詢"
   permission_edit_attribute_help_texts: "編輯屬性說明文字"
@@ -3723,6 +3805,12 @@ zh-TW:
       edit_description: "可以查看，留言與編輯此工作項目"
       view: "檢視"
       view_description: "查看此工作項目"
+    reminders:
+      label_remind_at: "日期"
+      note_placeholder: "為什麼要設定這個提醒？"
+      success_creation_message: "提醒設定成功。您會在選定的時間收到此工作項目的通知。"
+      success_update_message: "提醒成功更新"
+      success_deletion_message: "提醒已成功刪除。"
   sharing:
     count:
       zero: "0個用戶"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index aa05c4b171c9..51dda2724183 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -378,6 +378,9 @@ en:
         text: "This action will not delete any project the list contains. Are you sure you want to delete this project list?"
     settings:
       change_identifier: Change identifier
+      actions:
+        label_enable_all: "Enable all"
+        label_disable_all: "Disable all"
       activities:
         no_results_title_text: There are currently no activities available.
       forums:
@@ -388,10 +391,20 @@ en:
         no_results_content_text: Create a new work package category
       custom_fields:
         no_results_title_text: There are currently no custom fields available.
+      life_cycle:
+        header:
+          title: "Project lifecycle"
+          description_html: 'These project stages and gates in the project lifecycle will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> and are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. You can enable or disable individual attributes.'
+        non_defined: "Neither stages nor gates are currently defined."
+        section_header: "Stages and gates"
+        step:
+          use_in_project: "Use %{step} in this project"
+        filter:
+          label: "Search project stage or gate"
       project_custom_fields:
         header:
           title: "Project attributes"
-          description:
+          description_html:
             'These project attributes will be displayed in your <a href=%{overview_url} target="_blank">project overview page</a> under their respective sections. You can enable or disable individual attributes.
             Project attributes and sections are defined in the <a href=%{admin_settings_url} target="_blank">administration settings</a> by the administrator of the instance. '
         filter:
@@ -400,8 +413,6 @@ en:
           label_enable_single: "Active in this project, click to disable"
           label_disable_single: "Inactive in this project, click to enable"
           remove_from_project: "Remove from project"
-          label_enable_all: "Enable all"
-          label_disable_all: "Disable all"
         is_required_blank_slate:
           heading: Required in all projects
           description: This project attribute is activated in all projects since the "Required in all projects" option is checked. It cannot be deactivated for individual projects.
@@ -414,7 +425,10 @@ en:
         no_results_content_text: Create a new version
       storage:
         no_results_title_text: There is no additional recorded disk space consumed by this project.
-
+  project_stage:
+    working_days_count:
+      one: "Duration: %{count} working day"
+      other: "Duration: %{count} working days"
   lists:
     create:
       success: "The modified list has been saved as a new list"
@@ -539,8 +553,12 @@ en:
     groups:
       member_in_these_groups: "This user is currently a member of the following groups:"
       no_results_title_text: This user is currently not a member in any group.
+      summary_with_more: Member of %{names} and %{count_link}.
+      more: "%{count} more"
+      summary: Member of %{names}.
     memberships:
       no_results_title_text: This user is currently not a member of a project.
+    open_profile: "Open profile"
   page:
     text: "Text"
   placeholder_users:
@@ -624,8 +642,8 @@ en:
       no_results_title_text: There are currently no types.
       no_results_content_text: Create a new type
     edit:
-      settings: "Settings"
-      form_configuration: "Form configuration"
+      form_configuration:
+        tab: "Form configuration"
       more_info_text_html: >
         Enterprise edition allows you to customize form configuration with these additional add-ons: <br>
         <ul class="%{list_styling_class}">
@@ -633,14 +651,23 @@ en:
           <li><b>Rename attribute groups</b></li>
           <li><b>Add a table of related work packages</b></li>
         </ul>
-      projects: "Projects"
-      enabled_projects: "Enabled projects"
-      edit_query: "Edit table"
-      query_group_placeholder: "Give the table a name"
-      reset: "Reset to defaults"
-      type_color_text: |
-        The selected color distinguishes different types
-        in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      projects:
+        tab: "Projects"
+        enabled_projects: "Enabled projects"
+      settings:
+        tab: "Settings"
+        type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color.
+      subject_configuration:
+        tab: "Subject configuration"
+        manually_editable_subjects:
+          label: "Manually editable subjects"
+          caption: "Users can manually enter and edit work package subjects without restrictions."
+        automatically_generated_subjects:
+          label: "Automatically generated subjects"
+          caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects."
+        pattern:
+          label: "Subject pattern"
+          caption: "Search for an attribute or add text. To create a space between elements add it as a text."
 
   versions:
     overview:
@@ -716,6 +743,10 @@ en:
     label_add_x: "Add %{x}"
     label_edit_x: "Edit %{x}"
     label_add_description: "Add description"
+    lag:
+      subject: "Lag"
+      title: "Lag (in days)"
+      caption: "The minimum number of working days to keep in between the two work packages."
     relations:
       label_relates_singular: "related to"
       label_relates_plural: "related to"
@@ -928,6 +959,9 @@ en:
         lag: "Lag"
         from: "Work package"
         to: "Related work package"
+      reminder:
+        remind_at_date: "Date"
+        remind_at_time: "Time"
       repository:
         url: "URL"
       role:
@@ -1017,6 +1051,7 @@ en:
       messages:
         accepted: "must be accepted."
         after: "must be after %{date}."
+        after_today: "must be in the future."
         after_or_equal_to: "must be after or equal to %{date}."
         before: "must be before %{date}."
         before_or_equal_to: "must be before or equal to %{date}."
@@ -1063,6 +1098,7 @@ en:
         not_an_integer: "is not an integer."
         not_an_iso_date: "is not a valid date. Required format: YYYY-MM-DD."
         not_same_project: "doesn't belong to the same project."
+        datetime_must_be_in_future: "must be in the future."
         odd: "must be odd."
         regex_match_failed: "does not match the regular expression %{expression}."
         regex_invalid: "could not be validated with the associated regular expression."
@@ -1176,16 +1212,38 @@ en:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition"
+              type_and_class_name_mismatch: "must match the instantiated class name"
+        project/gate_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::GateDefinition"
+        project/stage_definition:
+          attributes:
+            type:
+              type_and_class_name_mismatch: "must be a Project::StageDefinition"
         project/life_cycle_step:
           attributes:
             type:
               must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate"
               must_be_a_stage: "must be a Project::Stage"
               must_be_a_gate: "must be a Project::Gate"
+              type_and_class_name_mismatch: "must match the instantiated class name"
         project/gate:
           attributes:
             base:
-              end_date_not_allowed: "Cannot assign `end_date` to a Project::Gate"
+              end_date_not_allowed: "Cannot assign end date to a Project::Gate"
+            type:
+              type_and_class_name_mismatch: "must be a Project::Gate"
+            date:
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+        project/stage:
+          attributes:
+            date_range:
+              start_date_must_be_before_end_date: "start date must be before the end date."
+              non_continuous_dates: "can't be earlier than the previous %{step}'s end date."
+              incomplete: "is incomplete."
+            type:
+              type_and_class_name_mismatch: "must be a Project::Stage"
         query:
           attributes:
             project:
@@ -1403,6 +1461,8 @@ en:
         other: "Notifications"
       placeholder_user: "Placeholder user"
       project: "Project"
+      project/gate_definition: "Gate"
+      project/stage_definition: "Stage"
       project_query:
         one: "Project list"
         other: "Project lists"
@@ -1509,6 +1569,7 @@ en:
     login: "Username"
     mail: "Email"
     name: "Name"
+    note: "Note"
     password: "Password"
     priority: "Priority"
     project: "Project"
@@ -1612,6 +1673,7 @@ en:
   button_print: "Print"
   button_quote: "Quote"
   button_remove: Remove
+  button_remove_reminder: "Remove reminder"
   button_rename: "Rename"
   button_replace: "Replace"
   button_revoke: "Revoke"
@@ -1622,6 +1684,7 @@ en:
   button_save_as: "Save as"
   button_apply_changes: "Apply changes"
   button_save_back: "Save and back"
+  button_set_reminder: "Set reminder"
   button_show: "Show"
   button_sort: "Sort"
   button_submit: "Submit"
@@ -1683,7 +1746,7 @@ en:
   create_new_page: "Wiki page"
 
   date:
-    abbr_day_names: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]
+    abbr_day_names: [ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" ]
     abbr_month_names:
       [
         ~,
@@ -1838,12 +1901,12 @@ en:
 
   ee:
     upsale:
+      title: "Enterprise add-on"
+      link_title: "More information"
       form_configuration:
         description: "Customize the form configuration with these additional add-ons:"
         add_groups: "Add new attribute groups"
         rename_groups: "Rename attributes groups"
-      project_filters:
-        description_html: "Filtering and sorting on custom fields is an Enterprise edition add-on."
 
   enumeration_activities: "Time tracking activities"
   enumeration_work_package_priorities: "Work package priorities"
@@ -1878,6 +1941,7 @@ en:
   error_pdf_export_too_many_columns: "Too many columns selected for the PDF export. Please reduce the number of columns."
   error_pdf_failed_to_export: "The PDF export could not be saved: %{error}"
   error_token_authenticity: "Unable to verify Cross-Site Request Forgery token. Did you try to submit data on multiple browsers or tabs? Please close all tabs and try again."
+  error_reminder_not_found: "The reminder was not found or was already notified about."
   error_work_package_not_found_in_project: "The work package was not found or does not belong to this project"
   error_work_package_id_not_found: "The work package was not found."
   error_must_be_project_member: "must be project member"
@@ -2012,20 +2076,20 @@ en:
   pdf_generator:
     page_nr_footer: "Page %{page} of %{total}"
     dialog:
-       title: Generate PDF
-       submit: Generate
-       header_right:
-         label: Header right
-         caption: Text to be displayed in the right of the header
-       footer_center:
-         label: Footer center
-         caption: Text to be displayed in the center of the footer
-       hyphenation:
-         label: Hyphenation
-         caption: Break words between lines to improve text justification and readability.
-       paper_size:
-         label: Paper size
-         caption: The size of the paper to use for the PDF.
+      title: Generate PDF
+      submit: Generate
+      header_right:
+        label: Header right
+        caption: Text to be displayed in the right of the header
+      footer_center:
+        label: Footer center
+        caption: Text to be displayed in the center of the footer
+      hyphenation:
+        label: Hyphenation
+        caption: Break words between lines to improve text justification and readability.
+      paper_size:
+        label: Paper size
+        caption: The size of the paper to use for the PDF.
 
   extraction:
     available:
@@ -2188,6 +2252,7 @@ en:
       responsible: "Accountable"
       shared: "Shared"
       watched: "Watcher"
+      reminder: "Reminder"
     facets:
       unread: "Unread"
       unread_title: "Show unread"
@@ -2356,8 +2421,10 @@ en:
   label_default: "Default"
   label_delete_user: "Delete user"
   label_delete_project: "Delete project"
+  label_delete: "Delete"
   label_deleted: "deleted"
   label_deleted_custom_field: "(deleted custom field)"
+  label_deleted_custom_item: "(deleted item)"
   label_deleted_custom_option: "(deleted option)"
   label_empty_element: "(empty)"
   label_missing_or_hidden_custom_option: "(missing value or lacking permissions to access)"
@@ -2394,7 +2461,6 @@ en:
   label_enterprise_active_users: "%{current}/%{limit} booked active users"
   label_enterprise_edition: "Enterprise edition"
   label_enterprise_support: "Enterprise support"
-  label_enterprise_addon: "Enterprise add-on"
   label_environment: "Environment"
   label_estimates_and_progress: "Estimates and progress"
   label_equals: "is"
@@ -2579,6 +2645,7 @@ en:
   label_none_parentheses: "(none)"
   label_not_contains: "doesn't contain"
   label_not_equals: "is not"
+  label_life_cycle_step_plural: "Project lifecycle"
   label_on: "on"
   label_operator_all: "is not empty"
   label_operator_none: "is empty"
@@ -2680,6 +2747,7 @@ en:
   label_reporting: "Reporting"
   label_reporting_plural: "Reportings"
   label_repository: "Repository"
+  label_repository_remove: "Remove repository"
   label_repository_root: "Repository root"
   label_repository_plural: "Repositories"
   label_required: "required"
@@ -2742,6 +2810,7 @@ en:
   label_this_month: "this month"
   label_this_week: "this week"
   label_this_year: "this year"
+  label_time: "Time"
   label_time_entry_plural: "Spent time"
   label_time_entry_activity_plural: "Spent time activities"
   label_title: "Title"
@@ -2777,6 +2846,7 @@ en:
   label_user_settings: "User settings"
   label_users_settings: "Users settings"
   label_version_new: "New version"
+  label_version_edit: "Edit version"
   label_version_plural: "Versions"
   label_version_sharing_descendants: "With subprojects"
   label_version_sharing_hierarchy: "With project hierarchy"
@@ -2916,8 +2986,13 @@ en:
         prefix: "Received because of the notification setting: %{reason}"
         date_alert_start_date: "Date alert"
         date_alert_due_date: "Date alert"
+        reminder: "Reminder"
       see_all: "See all"
       updated_at: "Updated at %{timestamp} by %{user}"
+    reminder_notifications:
+      subject: "Reminder: %{note}"
+      heading: "You have a new reminder"
+      note: "Note: “%{note}”"
     sharing:
       work_packages:
         allowed_actions: "You may %{allowed_actions} this work package. This can change depending on your project role and permissions."
@@ -3093,6 +3168,7 @@ en:
   notice_successful_connection: "Successful connection."
   notice_successful_create: "Successful creation."
   notice_successful_delete: "Successful deletion."
+  notice_successful_cancel: "Successful cancellation."
   notice_successful_update: "Successful update."
   notice_successful_update_custom_fields_added_to_project: |
     Successful update. The custom fields of the activated types are automatically activated
@@ -3174,6 +3250,7 @@ en:
   permission_edit_own_time_entries: "Edit own time logs"
   permission_edit_project: "Edit project"
   permission_edit_project_attributes: "Edit project attributes"
+  permission_edit_project_stages_and_gates: "Edit project stages and gates"
   permission_edit_reportings: "Edit reportings"
   permission_edit_time_entries: "Edit time logs for other users"
   permission_edit_timelines: "Edit timelines"
@@ -3203,9 +3280,12 @@ en:
   permission_search_project: "Search project"
   permission_select_custom_fields: "Select custom fields"
   permission_select_project_custom_fields: "Select project attributes"
+  permission_select_project_life_cycle: "Select project stages and gates"
+  permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list."
   permission_select_project_modules: "Select project modules"
   permission_share_work_packages: "Share work packages"
   permission_manage_types: "Select types"
+  permission_manage_own_reminders: "Create own reminders"
   permission_view_project: "View projects"
   permission_view_changesets: "View repository revisions in OpenProject"
   permission_view_commit_author_statistics: "View commit author statistics"
@@ -3226,6 +3306,7 @@ en:
   permission_work_package_assigned_explanation: "Work packages can be assigned to users and groups in possession of this role in the respective project"
   permission_view_project_activity: "View project activity"
   permission_view_project_attributes: "View project attributes"
+  permission_view_project_stages_and_gates: "View project stages and gates"
   permission_save_bcf_queries: "Save BCF queries"
   permission_manage_public_bcf_queries: "Manage public BCF queries"
   permission_edit_attribute_help_texts: "Edit attribute help texts"
@@ -4028,6 +4109,12 @@ en:
       edit_description: "Can view, comment and edit this work package."
       view: "View"
       view_description: "Can view this work package."
+    reminders:
+      label_remind_at: "Date"
+      note_placeholder: "Why are you setting this reminder?"
+      success_creation_message: "Reminder set successfully. You will receive a notification for this work package at the chosen time."
+      success_update_message: "Reminder updated successfully."
+      success_deletion_message: "Reminder deleted successfully."
   sharing:
     count:
       zero: "0 users"
diff --git a/config/locales/js-en.yml b/config/locales/js-en.yml
index 761b7a5153c6..fd80166a7665 100644
--- a/config/locales/js-en.yml
+++ b/config/locales/js-en.yml
@@ -400,16 +400,17 @@ en:
           learn_about: "Learn more about the new features"
           # Include the version to invalidate outdated translations in other locales.
           # Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release.
-          "15_1":
+          "15_2":
             standard:
               new_features_html: >
                 The release brings various features and improvements for you, e.g. <br>
                 <ul class="%{list_styling_class}">
-                  <li>Custom fields of type hierarchy (Enterprise add-on).</li>
-                  <li>Redesign of the Relations tab in work packages.</li>
-                  <li>Redesign of the Meetings index page.</li>
-                  <li>Manual page breaks in PDF work package exports.</li>
-                  <li>Zen mode for project lists.</li>
+                  <li>Set reminders for work packages to generate date alert notifications.</li>
+                  <li>Create new folders directly from the location picker for file storage.</li>
+                  <li>Specify a required lag between work packages successors and predecessors.</li>
+                  <li>Enable ordering and grouping for work packages on values of custom fields type hierarchy.</li>
+                  <li>Export time entries as PDF timesheets.</li>
+                  <li>Add a popover displaying user information when hovering.</li>
                 </ul>
 
     ical_sharing_modal:
@@ -676,14 +677,15 @@ en:
         prioritized: "Prioritized"
         dateAlert: "Date alert"
         shared: "Shared"
+        reminder: "Reminder"
       date_alerts:
         milestone_date: "Milestone date"
         overdue: "Overdue"
-        overdue_since: "since %{difference_in_days}"
-        property_today: "is today"
-        property_is: "is in %{difference_in_days}"
-        property_was: "was %{difference_in_days} ago"
-        property_is_deleted: "is deleted"
+        overdue_since: "since %{difference_in_days}."
+        property_today: "is today."
+        property_is: "is in %{difference_in_days}."
+        property_was: "was %{difference_in_days} ago."
+        property_is_deleted: "is deleted."
         upsale:
           title: "Date alerts"
           description: "With date alerts, you will be notified of upcoming start or finish dates so that you never miss or forget an important deadline."
@@ -708,6 +710,8 @@ en:
         new_notifications:
           message: "There are new notifications."
           link_text: "Click here to load them."
+      reminders:
+        note: "Note: “%{note}”"
       settings:
         change_notification_settings: 'You can modify your <a target="_blank" href="%{url}">notification settings</a> to ensure you never miss an important update.'
         title: "Notification settings"
@@ -802,6 +806,7 @@ en:
         immediate:
           title: "Send me an email reminder"
           mentioned: "Immediately when someone @mentions me"
+          personal_reminder: "Immediately when I receive a personal reminder"
         alerts:
           title: "Email alerts for other items (that are not work packages)"
           explanation: >
@@ -837,10 +842,6 @@ en:
         upgrade_to_ee_text: "Wow! If you need this add-on you are a super pro! Would you mind supporting us OpenSource developers by becoming an Enterprise edition client?"
         more_information: "More information"
         nevermind: "Nevermind"
-      edit:
-        form_configuration: "Form Configuration"
-        projects: "Projects"
-        settings: "Settings"
 
     time_entry:
       work_package_required: "Requires selecting a work package first."
@@ -1126,6 +1127,12 @@ en:
           not_found: "There is no such view"
           duplicate_query_title: "Name of this view already exists. Change anyway?"
         text_no_results: "No matching views were found."
+      reminders:
+        button_label: "Set reminder"
+        title:
+          new: "Set reminder"
+          edit: "Edit reminder"
+        subtitle: "You will receive a notification for this work package at the chosen time."
       scheduling:
         is_parent: "The dates of this work package are automatically deduced from its children. Activate 'Manual scheduling' to set the dates."
         is_switched_from_manual_to_automatic: "The dates of this work package may need to be recalculated after switching from manual to automatic scheduling due to relationships with other work packages."
@@ -1453,6 +1460,3 @@ en:
       waiting_subtitle:
         network_off: "There is a network problem."
         network_on: "Network is back. We are trying."
-        timeout: >
-          OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br>
-          If that problem persists please contact your OpenProject administrator to check the <a href="https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/file-storage-troubleshooting/">health status of the file storage setup</a>.
diff --git a/config/routes.rb b/config/routes.rb
index 397a8e3180dd..c7b9f9d1014c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -244,6 +244,15 @@
             put :disable_all_of_section
           end
         end
+        resources :life_cycle_steps, only: %i[index], path: "life_cycle" do
+          member do
+            post :toggle
+          end
+          collection do
+            post :enable_all
+            post :disable_all
+          end
+        end
         resource :custom_fields, only: %i[show update]
         resource :repository, only: %i[show], controller: "repository"
         resource :versions, only: %i[show]
@@ -518,6 +527,9 @@
           delete :unlink
         end
       end
+      # TODO: This is for now only added to be able to create a link
+      # There is no controller behind this.
+      resources :project_life_cycle_step_definitions, path: "project_life_cycles", only: %i[index]
       resources :project_custom_field_sections, controller: "/admin/settings/project_custom_field_sections",
                                                 only: %i[create update destroy] do
         member do
@@ -610,6 +622,12 @@
     resources :relations_tab, only: %i[index], controller: "work_package_relations_tab"
     resources :relations, only: %i[new create edit update destroy], controller: "work_package_relations"
 
+    resources :reminders,
+              controller: "work_packages/reminders",
+              only: %i[create update destroy] do
+      get :modal_body, on: :collection
+    end
+
     get "/export_dialog" => "work_packages#export_dialog", on: :collection, as: "export_dialog"
     get :show_conflict_flash_message, on: :collection # we don't need a specific work package for this
 
@@ -642,6 +660,7 @@
     resources :memberships, controller: "users/memberships", only: %i[update create destroy]
 
     member do
+      get "/hover_card" => "users/hover_card#show"
       get "/edit(/:tab)" => "users#edit", as: "edit"
       get "/change_status/:change_action" => "users#change_status_info", as: "change_status_info"
       post :change_status
diff --git a/config/schemas/user_preferences.schema.json b/config/schemas/user_preferences.schema.json
index 55f9af30c0b9..7d6258deab86 100644
--- a/config/schemas/user_preferences.schema.json
+++ b/config/schemas/user_preferences.schema.json
@@ -74,6 +74,9 @@
           "properties": {
             "mentioned": {
               "type": "boolean"
+            },
+            "personal_reminder": {
+              "type": "boolean"
             }
           },
           "required": [
diff --git a/db/migrate/20241119131205_create_reminders.rb b/db/migrate/20241119131205_create_reminders.rb
new file mode 100644
index 000000000000..1ad0989de80a
--- /dev/null
+++ b/db/migrate/20241119131205_create_reminders.rb
@@ -0,0 +1,42 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+class CreateReminders < ActiveRecord::Migration[7.1]
+  def change
+    create_table :reminders do |t|
+      t.references :remindable, polymorphic: true, null: false
+      t.references :creator, null: false, foreign_key: { to_table: :users }
+      t.datetime :remind_at, null: false
+      t.datetime :completed_at
+      t.string :job_id
+      t.text :note
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20241121113638_create_reminder_notifications.rb b/db/migrate/20241121113638_create_reminder_notifications.rb
new file mode 100644
index 000000000000..0e92b9dab99e
--- /dev/null
+++ b/db/migrate/20241121113638_create_reminder_notifications.rb
@@ -0,0 +1,42 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+class CreateReminderNotifications < ActiveRecord::Migration[7.1]
+  def change
+    create_table :reminder_notifications do |t|
+      t.references :reminder, foreign_key: true
+      t.references :notification, foreign_key: true
+
+      t.timestamps
+    end
+
+    add_index :reminder_notifications, :notification_id,
+              unique: true,
+              name: "index_reminder_notifications_unique"
+  end
+end
diff --git a/db/migrate/20241125161226_unique_index_on_project_life_cycle_steps.rb b/db/migrate/20241125161226_unique_index_on_project_life_cycle_steps.rb
new file mode 100644
index 000000000000..e2358eb64f92
--- /dev/null
+++ b/db/migrate/20241125161226_unique_index_on_project_life_cycle_steps.rb
@@ -0,0 +1,7 @@
+class UniqueIndexOnProjectLifeCycleSteps < ActiveRecord::Migration[7.1]
+  def change
+    add_index :project_life_cycle_steps,
+              %i[project_id definition_id],
+              unique: true
+  end
+end
diff --git a/db/migrate/20241126111225_add_project_life_cycle_step_roles.rb b/db/migrate/20241126111225_add_project_life_cycle_step_roles.rb
new file mode 100644
index 000000000000..e618a7696ae7
--- /dev/null
+++ b/db/migrate/20241126111225_add_project_life_cycle_step_roles.rb
@@ -0,0 +1,39 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require Rails.root.join("db/migrate/migration_utils/permission_adder")
+
+class AddProjectLifeCycleStepRoles < ActiveRecord::Migration[7.1]
+  def change
+    ::Migration::MigrationUtils::PermissionAdder
+      .add(:view_project, :view_project_stages_and_gates)
+
+    ::Migration::MigrationUtils::PermissionAdder
+      .add(:edit_project, :edit_project_stages_and_gates)
+  end
+end
diff --git a/db/migrate/20241127161228_grant_select_project_life_cycle_permission.rb b/db/migrate/20241127161228_grant_select_project_life_cycle_permission.rb
new file mode 100644
index 000000000000..8309166220a7
--- /dev/null
+++ b/db/migrate/20241127161228_grant_select_project_life_cycle_permission.rb
@@ -0,0 +1,7 @@
+require_relative "migration_utils/permission_adder"
+
+class GrantSelectProjectLifeCyclePermission < ActiveRecord::Migration[7.1]
+  def up
+    ::Migration::MigrationUtils::PermissionAdder.add(:edit_project, :select_project_life_cycle)
+  end
+end
diff --git a/db/migrate/20241129135602_populate_manage_own_reminders_permission.rb b/db/migrate/20241129135602_populate_manage_own_reminders_permission.rb
new file mode 100644
index 000000000000..586be7102374
--- /dev/null
+++ b/db/migrate/20241129135602_populate_manage_own_reminders_permission.rb
@@ -0,0 +1,40 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require Rails.root.join("db/migrate/migration_utils/permission_adder")
+
+class PopulateManageOwnRemindersPermission < ActiveRecord::Migration[7.1]
+  def up
+    ::Migration::MigrationUtils::PermissionAdder
+      .add(:view_project,
+           :manage_own_reminders)
+  end
+
+  # No-op
+  def down; end
+end
diff --git a/db/migrate/20241211152749_introduce_patterns_to_types.rb b/db/migrate/20241211152749_introduce_patterns_to_types.rb
new file mode 100644
index 000000000000..4688c751f3b9
--- /dev/null
+++ b/db/migrate/20241211152749_introduce_patterns_to_types.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+class IntroducePatternsToTypes < ActiveRecord::Migration[7.1]
+  def change
+    change_table :types do |t|
+      t.text :patterns, null: true
+    end
+  end
+end
diff --git a/db/migrate/20241217190533_add_uniqueness_index_to_project_life_cycle_step_definitions_name.rb b/db/migrate/20241217190533_add_uniqueness_index_to_project_life_cycle_step_definitions_name.rb
new file mode 100644
index 000000000000..f6aba362e529
--- /dev/null
+++ b/db/migrate/20241217190533_add_uniqueness_index_to_project_life_cycle_step_definitions_name.rb
@@ -0,0 +1,5 @@
+class AddUniquenessIndexToProjectLifeCycleStepDefinitionsName < ActiveRecord::Migration[7.1]
+  def change
+    add_index :project_life_cycle_step_definitions, :name, unique: true
+  end
+end
diff --git a/db/migrate/20250102161733_adds_position_cache_to_hierarchy_items.rb b/db/migrate/20250102161733_adds_position_cache_to_hierarchy_items.rb
new file mode 100644
index 000000000000..cb9b09f8d18c
--- /dev/null
+++ b/db/migrate/20250102161733_adds_position_cache_to_hierarchy_items.rb
@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+class AddsPositionCacheToHierarchyItems < ActiveRecord::Migration[7.1]
+  def change
+    add_column :hierarchical_items, :position_cache, :bigint, null: true
+    add_index :hierarchical_items, :position_cache
+
+    reversible do |dir|
+      dir.up do
+        update_sql = ->(root_id) {
+          <<-SQL.squish
+          UPDATE hierarchical_items
+          SET position_cache = subquery.position
+          FROM (
+            SELECT hi.id
+                  , SUM((1 + COALESCE(anc.sort_order, 0)) *
+                      POWER(count_max.total_descendants, count_max.max_gens - depths.generations)) AS position
+            FROM hierarchical_items hi
+                 INNER JOIN hierarchical_item_hierarchies hih ON hi.id = hih.descendant_id
+                 JOIN hierarchical_item_hierarchies anc_h ON anc_h.descendant_id = hih.descendant_id
+                 JOIN hierarchical_items anc ON anc.id = anc_h.ancestor_id
+                 JOIN hierarchical_item_hierarchies depths ON depths.ancestor_id = #{root_id} AND depths.descendant_id = anc.id
+               , (
+                SELECT COUNT(1) AS total_descendants, MAX(generations) + 1 AS max_gens
+                FROM hierarchical_items hi
+                    INNER JOIN hierarchical_item_hierarchies hih ON hi.id = hih.ancestor_id
+                WHERE ancestor_id = #{root_id}
+                ) count_max
+            WHERE hih.ancestor_id = #{root_id}
+            GROUP BY hi.id) as subquery
+          WHERE hierarchical_items.id = subquery.id;
+          SQL
+        }
+
+        roots_sql = "select id from hierarchical_items where custom_field_id is not NULL;"
+        ActiveRecord::Base.connection.execute(roots_sql).each do |row|
+          ActiveRecord::Base.connection.execute(update_sql.call(row["id"]))
+        end
+      end
+    end
+  end
+end
diff --git a/db/migrate/20250108100511_remove_incorrect_manage_own_reminders_permission.rb b/db/migrate/20250108100511_remove_incorrect_manage_own_reminders_permission.rb
new file mode 100644
index 000000000000..04000285d8fb
--- /dev/null
+++ b/db/migrate/20250108100511_remove_incorrect_manage_own_reminders_permission.rb
@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+class RemoveIncorrectManageOwnRemindersPermission < ActiveRecord::Migration[7.1]
+  def up
+    # Remove manage_own_reminders permission from non member and anonymous roles
+    # Use hardcoded values for `Role::BUILTIN_NON_MEMBER` and `Role::BUILTIN_ANONYMOUS`
+    # to avoid breaking the migration if the values are changed in the future
+    non_member_builtin = 1 # Role::BUILTIN_NON_MEMBER
+    anonymous_builtin = 2 # Role::BUILTIN_ANONYMOUS
+    execute <<-SQL.squish
+      DELETE FROM role_permissions
+      WHERE role_id IN (
+        SELECT id FROM roles WHERE builtin IN (#{non_member_builtin}, #{anonymous_builtin})
+      )
+      AND permission = 'manage_own_reminders'
+    SQL
+
+    # Remove all reminders created by anonymous user and cascade delete related records
+    execute <<-SQL.squish
+      WITH deleted_reminders AS (
+        DELETE FROM reminders
+        WHERE creator_id IN (
+          SELECT id FROM users WHERE type = 'AnonymousUser'
+        )
+        RETURNING id
+      ),
+      deleted_reminder_notifications AS (
+        DELETE FROM reminder_notifications
+        WHERE reminder_id IN (SELECT id FROM deleted_reminders)
+        RETURNING notification_id
+      )
+      DELETE FROM notifications
+      WHERE id IN (SELECT notification_id FROM deleted_reminder_notifications)
+    SQL
+  end
+
+  # No-op
+  def down; end
+end
diff --git a/db/migrate/20250117105334_remove_manage_own_reminders_permission.rb b/db/migrate/20250117105334_remove_manage_own_reminders_permission.rb
new file mode 100644
index 000000000000..5d931638dfcf
--- /dev/null
+++ b/db/migrate/20250117105334_remove_manage_own_reminders_permission.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+class RemoveManageOwnRemindersPermission < ActiveRecord::Migration[7.1]
+  def up
+    execute <<-SQL.squish
+      DELETE FROM role_permissions
+      WHERE permission = 'manage_own_reminders'
+    SQL
+  end
+
+  # No-op
+  def down; end
+end
diff --git a/docker-compose.override.example.yml b/docker-compose.override.example.yml
index 85dc5a5a972b..96095d1b6e44 100644
--- a/docker-compose.override.example.yml
+++ b/docker-compose.override.example.yml
@@ -8,7 +8,7 @@ services:
       - "${PORT:-3000}:3000"
 
   frontend:
-    # use these ports to be able to access the stack under http://localhost:3000
+    # use these ports to be able to access the stack under http://localhost:4200
     ports:
       - "${FE_PORT:-4200}:4200"
 
diff --git a/docker/ci/Dockerfile b/docker/ci/Dockerfile
index a8f8aa3de6da..18f9e7d81e24 100644
--- a/docker/ci/Dockerfile
+++ b/docker/ci/Dockerfile
@@ -11,7 +11,8 @@ ENV PGVERSION=13
 RUN wget --quiet -O- https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \
   echo "deb http://apt.postgresql.org/pub/repos/apt bookworm-pgdg main" > /etc/apt/sources.list.d/pgdg.list
 
-ENV CHROME_SOURCE_URL="https://dl.google.com/dl/linux/direct/google-chrome-stable_current_amd64.deb"
+# Temporarily use a mirror for Chrome until the official one is not having the problems to spin up sessions with selenium any more.
+ENV CHROME_SOURCE_URL="https://mirror.cs.uchicago.edu/google-chrome/pool/main/g/google-chrome-stable/google-chrome-stable_131.0.6778.85-1_amd64.deb"
 RUN --mount=type=cache,target=/var/cache/apt export f="/tmp/chrome.deb" && wget --no-verbose -O $f $CHROME_SOURCE_URL && \
   apt-get update -qq && apt-get install -y "$f" postgresql-$PGVERSION postgresql-client-$PGVERSION time imagemagick default-jre-headless firefox-esr && \
   rm -f "$f" && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /var/lib/postgresql && find /usr/share/locale/* -maxdepth 0 -type d ! -name 'en' -exec rm -rf {} \;
diff --git a/docker/dev/keycloak/docker-compose.yml b/docker/dev/keycloak/docker-compose.yml
index aac66478bc40..e866e614c140 100644
--- a/docker/dev/keycloak/docker-compose.yml
+++ b/docker/dev/keycloak/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.9"
 services:
   db-keycloak:
     image: postgres:13
-    restart: always
+    restart: unless-stopped
     networks:
       - external
     environment:
@@ -14,7 +14,7 @@ services:
   keycloak:
     image: quay.io/keycloak/keycloak:21.1
     command: ["start-dev", "--proxy edge", "--spi-connections-http-client-default-disable-trust-manager=true"]
-    restart: no
+    restart: unless-stopped
     networks:
       - external
     extra_hosts:
@@ -28,7 +28,7 @@ services:
       - KEYCLOAK_ADMIN_PASSWORD=admin
       - KC_DB_SCHEMA=public
       - KC_HOSTNAME=keycloak.local
-      - KC_FEATURES=token-exchange
+      - KC_FEATURES=token-exchange,admin-fine-grained-authz
       - KC_TRANSACTION_XA_ENABLED=false
     volumes:
       - /etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt:ro
diff --git a/docker/dev/nextcloud/README.md b/docker/dev/nextcloud/README.md
new file mode 100644
index 000000000000..98a046d12e0c
--- /dev/null
+++ b/docker/dev/nextcloud/README.md
@@ -0,0 +1,15 @@
+A minimal setup to run a Nextcloud inside the TLS-enabled docker development stack.
+
+# First installation steps
+
+1. Allow accessing OP through `openproject.local`:
+    * `docker compose exec --user www-data nextcloud php occ config:system:set allow_local_remote_servers --value 1`
+2. Import Dev CA cert into Nextcloud's own certificate store:
+    * `docker compose cp /path/to/your/OpenProject_Development_Root_CA.crt nextcloud:/tmp/root.crt`
+    * `docker compose exec nextcloud chown www-data /tmp/root.crt`
+    * `docker compose exec --user www-data nextcloud php occ security:certificates:import /tmp/root.crt`
+3. Following [docs](https://docs.nextcloud.com/server/30/admin_manual/configuration_server/reverse_proxy_configuration.html#defining-trusted-proxies) configure Traefik as trusted proxy
+    * e.g. add `'trusted_proxies' => ['172.0.0.0/8'],` to `config/config.php` for a pretty broad allowance for most docker services (verify that your `gateway` network uses IPs in the given address range)
+4. Download/Activate Nextcloud plugins:
+    * `integration_openproject`
+    * `groupfolders` (dependency for certain OP functions)
diff --git a/docker/dev/nextcloud/docker-compose.yml b/docker/dev/nextcloud/docker-compose.yml
new file mode 100644
index 000000000000..9db2fa4ef1a2
--- /dev/null
+++ b/docker/dev/nextcloud/docker-compose.yml
@@ -0,0 +1,35 @@
+services:
+  nextcloud:
+    image: nextcloud:stable
+    restart: unless-stopped
+    networks:
+      - gateway
+    volumes:
+      - nextcloud:/var/www/html
+      #   If you want to use a local version of a plugin, mount a local folder
+      #   more detailed instructions available at https://github.com/nextcloud/integration_openproject/blob/master/docs/setup_via_docker.md
+      # - ../nextcloud_apps:/var/www/html/custom_apps
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.nextcloud.rule=Host(`nextcloud.local`)"
+      - "traefik.http.routers.nextcloud.entrypoints=websecure"
+
+  cron:
+    image: nextcloud:stable
+    restart: unless-stopped
+    volumes:
+      - nextcloud:/var/www/html
+      #   If you want to use a local version of a plugin, mount a local folder
+      #   more detailed instructions available at https://github.com/nextcloud/integration_openproject/blob/master/docs/setup_via_docker.md
+      # - ../nextcloud_apps:/var/www/html/custom_apps
+    networks:
+      - gateway
+    entrypoint: /cron.sh
+
+networks:
+  gateway:
+    external: true
+    name: gateway
+
+volumes:
+  nextcloud:
diff --git a/docker/dev/tls/docker-compose.core-override.example.yml b/docker/dev/tls/docker-compose.core-override.example.yml
index 152d6b9d5ad1..d65823a49c90 100644
--- a/docker/dev/tls/docker-compose.core-override.example.yml
+++ b/docker/dev/tls/docker-compose.core-override.example.yml
@@ -1,27 +1,44 @@
+# Some containers (e.g. backend and workers) need some variables to be configured properly
+x-op-env-override: &environment
+  OPENPROJECT_CLI_PROXY: "${OPENPROJECT_DEV_URL}"
+  OPENPROJECT_DEV_EXTRA_HOSTS: "${OPENPROJECT_DEV_HOST}"
+  OPENPROJECT_HTTPS: true
+  SSL_CERT_FILE: /etc/ssl/certs/ca-certificates.crt
+  # uncomment and set all the envs below to integrate keycloak with OpenProject
+  # OPENPROJECT_OPENID__CONNECT_KEYCLOAK_DISPLAY__NAME: Keycloak
+  # OPENPROJECT_OPENID__CONNECT_KEYCLOAK_HOST: keycloak.local
+  # OPENPROJECT_OPENID__CONNECT_KEYCLOAK_IDENTIFIER: https://openproject.local
+  # OPENPROJECT_OPENID__CONNECT_KEYCLOAK_SECRET: <The client secret you copied from keycloak>
+  # OPENPROJECT_OPENID__CONNECT_KEYCLOAK_ISSUER: https://keycloak.local/realms/<REALM>
+  # OPENPROJECT_OPENID__CONNECT_KEYCLOAK_AUTHORIZATION__ENDPOINT: /realms/<REALM>/protocol/openid-connect/auth
+  # OPENPROJECT_OPENID__CONNECT_KEYCLOAK_TOKEN__ENDPOINT: /realms/<REALM>/protocol/openid-connect/token
+  # OPENPROJECT_OPENID__CONNECT_KEYCLOAK_USERINFO__ENDPOINT: /realms/<REALM>/protocol/openid-connect/userinfo
+  # OPENPROJECT_OPENID__CONNECT_KEYCLOAK_END__SESSION__ENDPOINT: https://keycloak.local/realms/<REALM>/protocol/openid-connect/logout
+
 services:
   backend:
-    # The backend container needs some variables to be configured properly
     environment:
-      OPENPROJECT_CLI_PROXY: "${OPENPROJECT_DEV_URL}"
-      OPENPROJECT_DEV_EXTRA_HOSTS: "${OPENPROJECT_DEV_HOST}"
-      OPENPROJECT_HTTPS: true
-      SSL_CERT_FILE: /etc/ssl/certs/ca-certificates.crt
-      # uncomment and set all the envs below to integrate keycloak with OpenProject
-      # OPENPROJECT_OPENID__CONNECT_KEYCLOAK_DISPLAY__NAME: Keycloak
-      # OPENPROJECT_OPENID__CONNECT_KEYCLOAK_HOST: keycloak.local
-      # OPENPROJECT_OPENID__CONNECT_KEYCLOAK_IDENTIFIER: https://openproject.local
-      # OPENPROJECT_OPENID__CONNECT_KEYCLOAK_SECRET: <The client secret you copied from keycloak>
-      # OPENPROJECT_OPENID__CONNECT_KEYCLOAK_ISSUER: https://keycloak.local/realms/<REALM>
-      # OPENPROJECT_OPENID__CONNECT_KEYCLOAK_AUTHORIZATION__ENDPOINT: /realms/<REALM>/protocol/openid-connect/auth
-      # OPENPROJECT_OPENID__CONNECT_KEYCLOAK_TOKEN__ENDPOINT: /realms/<REALM>/protocol/openid-connect/token
-      # OPENPROJECT_OPENID__CONNECT_KEYCLOAK_USERINFO__ENDPOINT: /realms/<REALM>/protocol/openid-connect/userinfo
-      # OPENPROJECT_OPENID__CONNECT_KEYCLOAK_END__SESSION__ENDPOINT: https://keycloak.local/realms/<REALM>/protocol/openid-connect/logout
+      <<: *environment
     networks:
       - external
     volumes:
-      # This volume mount is the usual volume mount for a linux environment.
-      # It must be amended accordingly to OS.
+      # Linux
       - /etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt:ro
+      # Mac OS
+      # - ~/.step/certs:/etc/ssl/certs
+      # - ~/.step/certs:/usr/local/share/ca-certificates
+
+  worker:
+    environment:
+      <<: *environment
+    networks:
+      - external
+    volumes:
+      # Linux
+      - /etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt:ro
+      # Mac OS
+      # - ~/.step/certs:/etc/ssl/certs
+      # - ~/.step/certs:/usr/local/share/ca-certificates
 
   backend-test:
     # Connect the backend-test container to the same network as the backend for nextcloud HTTP interactions
diff --git a/docker/prod/Dockerfile b/docker/prod/Dockerfile
old mode 100644
new mode 100755
index 828c7e6ec711..4bb22a22851a
--- a/docker/prod/Dockerfile
+++ b/docker/prod/Dockerfile
@@ -58,15 +58,8 @@ COPY vendor ./vendor
 # Add lib in case a plugin tries to load VERSION file under lib
 COPY lib ./lib
 
-RUN \
-  bundle config set --local path 'vendor/bundle' && \
-  bundle config set --local without 'test development' && \
-  bundle install --quiet --no-cache --jobs=8 --retry=3 && \
-  bundle config set deployment 'true' && \
-  cp Gemfile.lock Gemfile.lock.bak && \
-  rm -rf vendor/bundle/ruby/*/cache && \
-  rm -rf vendor/bundle/ruby/*/gems/*/spec && \
-  rm -rf vendor/bundle/ruby/*/gems/*/test
+COPY ./docker/prod/setup/bundle-install.sh ./vendor/bundle* ./vendor/
+RUN bash vendor/bundle-install.sh && rm vendor/bundle-install.sh
 
 COPY . .
 
diff --git a/docker/prod/setup/bundle-install.sh b/docker/prod/setup/bundle-install.sh
new file mode 100644
index 000000000000..d2c0d740ee15
--- /dev/null
+++ b/docker/prod/setup/bundle-install.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -e
+
+# temporary 'seed' for working ppc64 cached vendor/bundle
+if [ ! -d vendor/bundle ] && [ -n "$(uname -a | grep ppc64)" ]; then
+  wget https://openproject-public.s3.eu-central-1.amazonaws.com/ruby/bundle/openproject-release-15.2-836aec00b1-vendor-bundle.tar.gz
+  tar -xf openproject-release-15.2-836aec00b1-vendor-bundle.tar.gz
+fi
+
+bundle config set --local path 'vendor/bundle'
+bundle config set --local without 'test development'
+bundle install --jobs=8 --retry=3
+bundle config set deployment 'true'
+cp Gemfile.lock Gemfile.lock.bak
+rm -rf vendor/bundle/ruby/*/cache
+rm -rf vendor/bundle/ruby/*/gems/*/spec
+rm -rf vendor/bundle/ruby/*/gems/*/test
diff --git a/docs/api/apiv3/components/examples/storage-create-folder-request-body.yml b/docs/api/apiv3/components/examples/storage-create-folder-request-body.yml
new file mode 100644
index 000000000000..dad2d8b2e047
--- /dev/null
+++ b/docs/api/apiv3/components/examples/storage-create-folder-request-body.yml
@@ -0,0 +1,5 @@
+description: |-
+  A valid request body to create a new folder on a external storage
+value:
+  name: Uploads
+  parentId: "200"
diff --git a/docs/api/apiv3/components/schemas/reminder_model.yml b/docs/api/apiv3/components/schemas/reminder_model.yml
new file mode 100644
index 000000000000..08af277c4285
--- /dev/null
+++ b/docs/api/apiv3/components/schemas/reminder_model.yml
@@ -0,0 +1,28 @@
+# Schema: ReminderModel
+---
+type: object
+properties:
+  id:
+    type: integer
+    description: Reminder id
+    readOnly: true
+    minimum: 1
+  note:
+    type: string
+    description: The note of the reminder
+  remindAt:
+    type: string
+    format: date-time
+    description: The date and time when the reminder is due
+  _links:
+    required:
+      - creator
+    type: object
+    properties:
+      creator:
+        allOf:
+          - $ref: "./link.yml"
+          - description: |-
+              The person that created the reminder
+
+              **Resource**: User
diff --git a/docs/api/apiv3/components/schemas/storage_folder_write_model.yml b/docs/api/apiv3/components/schemas/storage_folder_write_model.yml
new file mode 100644
index 000000000000..bcdef5c9e552
--- /dev/null
+++ b/docs/api/apiv3/components/schemas/storage_folder_write_model.yml
@@ -0,0 +1,13 @@
+# Schema: StorageFolderWriteModel
+---
+type: object
+required:
+  - name
+  - parentId
+properties:
+  name:
+    type: string
+    description: Name of the folder to be created
+  parentId:
+    type: string
+    description: Unique identifier of the parent folder in which the new folder should be created in
diff --git a/docs/api/apiv3/openapi-spec.yml b/docs/api/apiv3/openapi-spec.yml
index e3afad89a8f4..67f025f81ba1 100644
--- a/docs/api/apiv3/openapi-spec.yml
+++ b/docs/api/apiv3/openapi-spec.yml
@@ -392,6 +392,8 @@ paths:
     "$ref": "./paths/storage_files.yml"
   "/api/v3/storages/{id}/files/prepare_upload":
     "$ref": "./paths/storage_files_prepare_upload.yml"
+  "/api/v3/storages/{id}/folders":
+    "$ref": "./paths/storage_folders.yml"
   "/api/v3/storages/{id}/oauth_client_credentials":
     "$ref": "./paths/storage_oauth_client_credentials.yml"
   "/api/v3/storages/{id}/open":
@@ -478,6 +480,8 @@ paths:
     "$ref": "./paths/work_package_revisions.yml"
   "/api/v3/work_packages/{id}/relations":
     "$ref": "./paths/work_package_relations.yml"
+  "/api/v3/work_packages/{id}/reminders":
+    "$ref": "./paths/work_package_reminders.yml"
   "/api/v3/work_packages/{id}/watchers":
     "$ref": "./paths/work_package_watchers.yml"
   "/api/v3/work_packages/{id}/watchers/{user_id}":
@@ -545,6 +549,8 @@ components:
       $ref: "./components/examples/status_response.yml"
     StorageNextcloudResponse:
       $ref: "./components/examples/storage-nextcloud-response.yml"
+    StorageCreateFolderRequestBody:
+      $ref: "./components/examples/storage-create-folder-request-body.yml"
     StorageNextcloudResponseForCreation:
       $ref: "./components/examples/storage-nextcloud-response-for-creation.yml"
     StorageNextcloudUnauthorizedResponse:
@@ -795,6 +801,8 @@ components:
       "$ref": "./components/schemas/relation_read_model.yml"
     RelationWriteModel:
       "$ref": "./components/schemas/relation_write_model.yml"
+    ReminderModel:
+      "$ref": "./components/schemas/reminder_model.yml"
     RevisionModel:
       "$ref": "./components/schemas/revision_model.yml"
     RevisionsModel:
@@ -825,6 +833,8 @@ components:
       "$ref": "./components/schemas/storage_file_model.yml"
     StorageFilesModel:
       "$ref": "./components/schemas/storage_files_model.yml"
+    StorageFolderWriteModel:
+      "$ref": "./components/schemas/storage_folder_write_model.yml"
     StorageFileUploadPreparationModel:
       "$ref": "./components/schemas/storage_file_upload_preparation_model.yml"
     StorageFileUploadLinkModel:
diff --git a/docs/api/apiv3/paths/storage_folders.yml b/docs/api/apiv3/paths/storage_folders.yml
new file mode 100644
index 000000000000..1e22c776775f
--- /dev/null
+++ b/docs/api/apiv3/paths/storage_folders.yml
@@ -0,0 +1,68 @@
+# /api/v3/storages/{id}/folders
+---
+post:
+  summary: Creation of a new folder
+  operationId: create_storage_folder
+  tags:
+    - File links
+  description: Creates a new folder under the given parent
+  parameters:
+    - name: id
+      description: Storage id
+      in: path
+      required: true
+      schema:
+        type: integer
+      example: 1337
+  requestBody:
+    content:
+      application/json:
+        schema:
+          $ref: '../components/schemas/storage_folder_write_model.yml'
+        examples:
+          'Valid example':
+            $ref: '../components/examples/storage-create-folder-request-body.yml'
+  responses:
+    '201':
+      description: Created
+      content:
+        application/hal+json:
+          schema:
+            $ref: '../components/schemas/storage_file_model.yml'
+    '400':
+      content:
+        application/hal+json:
+          schema:
+            $ref: '../components/schemas/error_response.yml'
+          example:
+            _type: Error
+            errorIdentifier: urn:openproject-org:api:v3:errors:InvalidQuery
+            message: The given parent is not a directory.
+      description: |-
+        Returned if the request is missing a required parameter.
+    '403':
+      content:
+        application/hal+json:
+          schema:
+            $ref: '../components/schemas/error_response.yml'
+          example:
+            _type: Error
+            errorIdentifier: urn:openproject-org:api:v3:errors:MissingPermission
+            message: You are not authorized to access this resource.
+      description: |-
+        Returned if the client does not have sufficient permissions.
+
+        **Required permission:** manage file links
+    '404':
+      content:
+        application/hal+json:
+          schema:
+            $ref: '../components/schemas/error_response.yml'
+          example:
+            _type: Error
+            errorIdentifier: urn:openproject-org:api:v3:errors:NotFound
+            message: The requested resource could not be found.
+      description: |-
+        Returned if the storage does not exist or the client does not have sufficient permissions to see it.
+
+        **Required permission:** view file links
diff --git a/docs/api/apiv3/paths/work_package_reminders.yml b/docs/api/apiv3/paths/work_package_reminders.yml
new file mode 100644
index 000000000000..4f7027a53393
--- /dev/null
+++ b/docs/api/apiv3/paths/work_package_reminders.yml
@@ -0,0 +1,61 @@
+# /api/v3/work_packages/{id}/reminders
+---
+get:
+  parameters:
+  - description: Work package id
+    example: '1'
+    in: path
+    name: id
+    required: true
+    schema:
+      type: integer
+  responses:
+    '200':
+      description: OK
+      content:
+        application/hal+json:
+          schema:
+            $ref: '../components/schemas/reminder_model.yml'
+      headers: {}
+    '403':
+      content:
+        application/hal+json:
+          schema:
+            $ref: "../components/schemas/error_response.yml"
+          examples:
+            response:
+              value:
+                _type: Error
+                errorIdentifier: urn:openproject-org:api:v3:errors:MissingPermission
+                message: You are not allowed to see linked reminders for this work
+                  package.
+      description: |-
+        Returned if the client does not have sufficient permissions.
+
+        **Required permission:** view work packages for the project the work package is contained in.
+        **Required permission:** manage own reminders for the work package.
+
+        *Note that you will only receive this error, if you are at least allowed to see the corresponding work package.*
+      headers: {}
+    '404':
+      content:
+        application/hal+json:
+          schema:
+            $ref: "../components/schemas/error_response.yml"
+          examples:
+            response:
+              value:
+                _type: Error
+                errorIdentifier: urn:openproject-org:api:v3:errors:NotFound
+                message: The specified work package does not exist.
+      description: |-
+        Returned if the work package does not exist or the client does not have sufficient permissions to see it.
+
+        **Required permission:** view work package
+      headers: {}
+  tags:
+  - Work Packages
+  description: |-
+    Gets a list of your upcoming reminders for this work package.
+  operationId: Reminders
+  summary: Reminders
diff --git a/docs/api/apiv3/tags/basic_objects.yml b/docs/api/apiv3/tags/basic_objects.yml
index 5605921ee25e..1b45d7d84720 100644
--- a/docs/api/apiv3/tags/basic_objects.yml
+++ b/docs/api/apiv3/tags/basic_objects.yml
@@ -66,7 +66,7 @@ description: |-
       * It *must not* include HTML or other kind of markup
       * Error messages form complete sentences including punctuation
 
-  ##### Example
+  #### Example
 
   ```json
   {
@@ -214,7 +214,7 @@ description: |-
 
   If the *Formattable* is marked as **read only**, the `raw` attribute also becomes **read only**.
 
-  ##### Example
+  ### Example
 
   ```json
   {
@@ -248,7 +248,7 @@ description: |-
   Colors are represented in RGB using hexadecimal notation as specified in [CSS Color Module Level 3](https://www.w3.org/TR/css3-color/).
   That is a `#` followed by either three or six hexadecimal digits.
 
-  ##### Example
+  ### Example
 
   ```
       red:   #ff0000 or #f00
@@ -270,7 +270,7 @@ description: |-
   | algorithm | The algorithm used to compute the digest           | String | md5                                |
   | hash      | The calculated digest in hexadecimal notation      | String | 64c26a8403cd796ea4cf913cda2ee4a9   |
 
-  ##### Example
+  ### Example
 
   ```json
   {
diff --git a/docs/api/apiv3/tags/schemas.yml b/docs/api/apiv3/tags/schemas.yml
index e962715701ff..b42c134a3e9e 100644
--- a/docs/api/apiv3/tags/schemas.yml
+++ b/docs/api/apiv3/tags/schemas.yml
@@ -22,9 +22,9 @@ description: |-
 
   The `_dependencies` property contains the list of dependencies that exist between the value selected for one of the properties of the described resource and the resource's structure. Depending on the value, additional properties might exist or properties might have other values allowed to be assigned. See [SchemaDependency](https://www.openproject.org/docs/api/endpoints/schemas/#schema-dependencies) for more information.
 
-  # Field schema
+  ## Field schema
 
-  ## Linked Properties
+  ### Linked Properties
 
   | Property             | Description                                                    | Conditions                                           |
   | :--------------:     | -------------------------------------------------------------- | ---------------------------------------------        |
@@ -39,7 +39,7 @@ description: |-
 
   Only one of the links (`allowedValues`, `allowedValuesSchemas`) will exist for any given property.
 
-  ## Local Properties
+  ### Local Properties
 
   | Property          | Description                                                                        | Type         | Default |
   |:-----------------:| ---------------------------------------------------------------------------------- | ------------ | ------- |
@@ -72,7 +72,7 @@ description: |-
   property set to `_links`. This means that the `user` property will be found under the path
   `_links.user` of the json payload of the work package resource.
 
-  # Schema Dependencies
+  ## Schema Dependencies
 
   A `SchemaDependency` describes the dependencies between a value chosen for a resource's property
   and the resource's structure. By that, additional properties or changes in a property are
@@ -89,11 +89,11 @@ description: |-
 
   SchemaDependencies are always embedded inside a Schema's `_dependencies` attribute. As such, they are not independently existing resources. Consequently, they do not have a `self` reference.
 
-  ## Linked Properties
+  ### Linked Properties
 
   A SchemaDependency does not have any links.
 
-  ## Local Properties
+  ### Local Properties
 
   | Property            | Description                                                                        | Type             |
   | :-----------------: | ---------------------------------------------------------------------------------- | ---------------- |
diff --git a/docs/development/development-environment/README.md b/docs/development/development-environment/README.md
index 58ecee41d708..a8c09fe9dbb1 100644
--- a/docs/development/development-environment/README.md
+++ b/docs/development/development-environment/README.md
@@ -15,20 +15,20 @@ keywords: development setup
 | [MacOS](macos)                     | Develop setup on MacOS                                                            |
 
 
-### Start Coding
+## Start Coding
 
 Please have a look at [our development guidelines](../code-review-guidelines/) for tips and guides on how to start
 coding. We have advice on how to get your changes back into the OpenProject core as smooth as possible.
 Also, take a look at the `doc` directory in our sources, especially
 the [how to run tests](../running-tests) documentation (we like to have automated tests for every new developed feature).
 
-### Troubleshooting
+## Troubleshooting
 
 The OpenProject logfile can be found in `log/development.log`.
 
 If an error occurs, it should be logged there (as well as in the output to STDOUT/STDERR of the rails server process).
 
-### Questions, Comments, and Feedback
+## Questions, Comments, and Feedback
 
 If you have any further questions, comments, feedback, or an idea to enhance this guide, please tell us at the
 appropriate [forum](https://community.openproject.org/projects/openproject/boards/9).
diff --git a/docs/development/development-environment/docker/README.md b/docs/development/development-environment/docker/README.md
index a16792714f2e..cdb667db5232 100644
--- a/docs/development/development-environment/docker/README.md
+++ b/docs/development/development-environment/docker/README.md
@@ -218,6 +218,18 @@ you want to see what the browsers are doing. `gvncviewer` or `vinagre` on Linux
 the `docker-compose.override.yml` to access a container of a specific browser. As a default, the `chrome` container is
 exposed on port 5900. The password is `secret` for all.
 
+Adding additional external docker networks to the test services like `backend-test` (e.g. inside the
+`docker-compose.override.yml`) breaks the functionality of the Selenium service. This results in failing tests running
+inside a Selenium context, like feature and UI tests.
+
+```
+Selenium::WebDriver::Error::UnknownError:
+  unknown error: net::ERR_CONNECTION_REFUSED
+    (Session info: chrome=130.0.6723.91)
+```
+
+If this happens just comment out the network overrides.
+
 ## TLS support
 
 Within `docker/dev/tls` compose files are provided, that elevate the development stack to be run under full TLS
diff --git a/docs/glossary/README.md b/docs/glossary/README.md
index 82a03e84c3e5..9c506c4a79e9 100644
--- a/docs/glossary/README.md
+++ b/docs/glossary/README.md
@@ -360,7 +360,7 @@ The quick context menu in OpenProject opens when you open a [work package table]
 
 ## Relations
 
-In OpenProject, you can set work packages in relation to each other. Some relation types simply create a visible link between the two work packages. Others have an additional effect, e.g. force one work package to be finished before the other one starts (Predecessor). The simpliest way to add a relation between two existing work packages is to click the +Relation button on the Relations tab of one of the work packages. [Read more about work package relations and hierarchies in our user guide](../user-guide/work-packages/work-package-relations-hierarchies/).
+In OpenProject, you can set work packages in relation to each other. Some relation types simply create a visible link between the two work packages. Others have an additional effect, e.g. force one work package to be finished before the other one starts (Predecessor). The simplest way to add a relation between two existing work packages is to click the +Relation button on the Relations tab of one of the work packages. [Read more about work package relations and hierarchies in our user guide](../user-guide/work-packages/work-package-relations-hierarchies/).
 
 ## Repository
 
@@ -492,4 +492,4 @@ WYSIWYG stands for 'What you see is what you get'. A WYSIWYG editor is a content
 
 ### Zen mode
 
-In OpenProject, Zen mode allows users to focus on a certain page, as all other menu items and elements are hidden, and the page is displayed in full screen. OpenProject offers zen mode for other modules like work packages, boards, Gantt charts, calendars, and project lists.
\ No newline at end of file
+In OpenProject, Zen mode allows users to focus on a certain page, as all other menu items and elements are hidden, and the page is displayed in full screen. OpenProject offers zen mode for other modules like work packages, boards, Gantt charts, calendars, and project lists.
diff --git a/docs/installation-and-operations/configuration/environment/README.md b/docs/installation-and-operations/configuration/environment/README.md
index 5eb92e35bb86..c8f511de9d03 100644
--- a/docs/installation-and-operations/configuration/environment/README.md
+++ b/docs/installation-and-operations/configuration/environment/README.md
@@ -195,7 +195,7 @@ OPENPROJECT_ENABLE__INTERNAL__ASSETS__SERVER (default=false) Serve assets throug
 OPENPROJECT_ENABLED__PROJECTS__COLUMNS (default=["project_status", "public", "created_at", "latest_activity_at", "required_disk_space"]) Visible in project list
 OPENPROJECT_ENABLED__SCM (default=["subversion", "git"]) Enabled SCM
 OPENPROJECT_ENTERPRISE__CHARGEBEE__SITE (default="openproject-enterprise") Site name for EE trial service
-OPENPROJECT_ENTERPRISE__PLAN (default="enterprise-on-premises---euro---1-year") Default EE selected plan
+OPENPROJECT_ENTERPRISE__PLAN (default="enterprise-on-premises---basic---euro---1-year") Default EE selected plan
 OPENPROJECT_ENTERPRISE__TRIAL__CREATION__HOST (default="https://augur.openproject.com") Host for EE trial service
 OPENPROJECT_FEATURE__MANAGED__PROJECT__FOLDERS__ACTIVE (default=true)
 OPENPROJECT_FEATURE__MORE__GLOBAL__INDEX__PAGES__ACTIVE (default=true)
diff --git a/docs/release-notes/13-4-2/README.md b/docs/release-notes/13-4-2/README.md
index 88df45010dea..52d4194785b8 100644
--- a/docs/release-notes/13-4-2/README.md
+++ b/docs/release-notes/13-4-2/README.md
@@ -13,13 +13,12 @@ Release date: 2024-05-22
 We released [OpenProject 13.4.2](https://community.openproject.org/versions/2058).
 The release contains several bug fixes and we recommend updating to the newest version.
 
-### Fixes a stored XSS vulnerability in the cost report functionality (CVE-2024-135224)
+## Fixes a stored XSS vulnerability in the cost report functionality (CVE-2024-135224)
+
 OpenProject Cost Report functionality uses improper sanitization of user input. This can lead to Stored XSS via the header values of the report table. This attack requires the permissions "Edit work packages" as well as "Add attachments".
 
 For more information, [please see our security advisory](https://github.com/opf/openproject/security/advisories/GHSA-h26c-j8wg-frjc).
 
-<!--more-->
-
 ## Bug fixes and changes
 
 <!-- Warning: Anything within the below lines will be automatically removed by the release script -->
diff --git a/docs/release-notes/14-0-2/README.md b/docs/release-notes/14-0-2/README.md
index b52b3ffaac1b..04191f27c467 100644
--- a/docs/release-notes/14-0-2/README.md
+++ b/docs/release-notes/14-0-2/README.md
@@ -13,7 +13,8 @@ Release date: 2024-05-22
 We released [OpenProject 14.0.2](https://community.openproject.org/versions/2057).
 The release contains several bug fixes and we recommend updating to the newest version.
 
-### Fixes a stored XSS vulnerability in the cost report functionality (CVE-2024-135224)
+## Fixes a stored XSS vulnerability in the cost report functionality (CVE-2024-135224)
+
 OpenProject Cost Report functionality uses improper sanitization of user input. This can lead to Stored XSS via the header values of the report table. This attack requires the permissions "Edit work packages" as well as "Add attachments".
 
 For more information, [please see our security advisory](https://github.com/opf/openproject/security/advisories/GHSA-h26c-j8wg-frjc).
diff --git a/docs/release-notes/14-1-0/README.md b/docs/release-notes/14-1-0/README.md
index 21f6ca66ec98..be0e26eb0454 100644
--- a/docs/release-notes/14-1-0/README.md
+++ b/docs/release-notes/14-1-0/README.md
@@ -15,6 +15,7 @@ We released [OpenProject 14.1.0](https://community.openproject.org/versions/2030
 ## Important updates and breaking changes
 
 ### Fixes a stored XSS vulnerability in the cost report functionality (CVE-2024-135224)
+
 OpenProject Cost Report functionality uses improper sanitization of user input. This can lead to Stored XSS via the header values of the report table. This attack requires the permissions "Edit work packages" as well as "Add attachments".
 
 For more information, [please see our security advisory](https://github.com/opf/openproject/security/advisories/GHSA-h26c-j8wg-frjc).
@@ -175,7 +176,7 @@ Apart from the features mentioned above, there have been a lot of other changes,
 <!-- END AUTOMATED SECTION -->
 <!-- Warning: Anything above this line will be automatically removed by the release script -->
 
-#### Contributions
+## Contributions
 
 A very special thank you goes to our sponsors for features and improvements of this release:
 
diff --git a/docs/release-notes/15-2-0/README.md b/docs/release-notes/15-2-0/README.md
new file mode 100644
index 000000000000..41fedc9923f3
--- /dev/null
+++ b/docs/release-notes/15-2-0/README.md
@@ -0,0 +1,137 @@
+---
+title: OpenProject 15.2.0
+sidebar_navigation:
+    title: 15.2.0
+release_version: 15.2.0
+release_date: 2025-01-22
+---
+
+# OpenProject 15.2.0
+
+Release date: 2025-01-22
+
+We released [OpenProject 15.2.0](https://community.openproject.org/versions/2143). The release contains several bug fixes, and we recommend updating to the newest version.
+In these Release Notes, we will give an overview of important feature changes. At the end, you will find a complete list of all changes and bug fixes.
+
+## Important feature changes
+
+### Work package reminders
+
+You can now use the Reminder function to receive a reminder about a work package at a later point in time. Simply navigate to any work package, select the **Reminder icon** and specify when you would like to be reminded. You will receive a notification in the notification center. 
+
+![Work package reminder icon in OpenProject](openproject_user_guide_wp_reminder_icon.png)
+
+![Set a work package reminder in OpenProject](openproject_set_wp_reminders.png)
+
+> [!TIP]
+> You can also receive immediate notifications via e-mail for personal reminders. To do that, [adjust your account settings](../../user-guide/account-settings/#email-reminders) accordingly.
+
+[Read more about setting work package reminders](../../user-guide/work-packages/edit-work-package/#work-package-reminders).
+
+### Export timesheets as PDF
+
+Time reports can now be exported not only in Excel, but also in PDF format. Navigate to the Time and costs module of your project, specify all report filters according to your needs, and press the **Export PDF timesheet** button. 
+
+![Export timesheet in PDF format in OpenProject](openproject_user_timesheet_pdf_export.png)
+
+Here is an example of a timesheet PDF export:
+
+![A timesheet PDF export example](openproject_userguide_timesheet_pdf_export_file.png)
+
+> [!TIP]
+> Keep in mind that this time report will only include time entries, but not the cost ones.
+
+[Learn how to export timesheets as PDF](../../user-guide/time-and-costs/reporting/#export-time-sheets).
+
+### Add a lag to Predecessor/Successor relations
+
+For Predecessor/Successor relations, you can now specify a **lag**, which represents the minimum number of working days to maintain between two work packages. This flexibility ensures more precise scheduling and helps align task dependencies effectively. By default, the lag is set to 0 working days, but you can update the *Description* and *Lag* fields anytime to adapt to changes in your project timeline.
+
+![Specify predecessor/successor work package relations in OpenProject](openproject_user_guide_relations_tab_edit_lag.png)
+
+[Read more about work package relations](../../user-guide/work-packages/work-package-relations-hierarchies).
+
+### Create a new folder directly when using file storages integrations
+
+Users can now create a folder structure directly while selecting the destination folder for file uploads, enhancing the integration with both **Nextcloud** and **OneDrive/SharePoint**. This improvement simplifies the process by allowing users to organize their files during the upload, without the need to separately create folders in the file storage, thus streamlining workflows and improving overall efficiency.
+
+![Create a new folder when uploading a file to a file storage](openproject-file-storage-new-folder.png)
+
+### Group and order by for custom fields of type hierarchy
+
+Users can now sort their work package list by the assigned values of custom fields of type hierarchy. This enhancement allows for a more efficient overview, helping users quickly organize and filter work packages within a specific hierarchical context. Here is an example of how work packages grouped by a custom field of a type hierarchy looks like:
+
+![Work packages grouped by a custom field of type hierarchy](openproject_cf_hierarchy_grouping.png)
+
+### Popover on user information on hover
+
+To simplify accessing specific user details without needing to navigate to their profile, user information will now be displayed when hovering over a user's avatar, on pages like the Members or Activity page.
+
+![User information is displayed when hovering over avatar in OpenProject](openproject_avatar_hover.png)
+
+### Continued updating page headers and subheaders
+
+We continued introducing standardized components for page headers and subheaders across multiple project pages, to further improve design consistency. 
+
+[Find out which pages have been updated in the associated work package for these design updates](https://community.openproject.org/projects/openproject/work_packages/53810).
+
+## Bug fixes and changes
+
+<!-- Warning: Anything within the below lines will be automatically removed by the release script -->
+<!-- BEGIN AUTOMATED SECTION -->
+
+- Feature: Edit lag to follow-precedes-relations \[[#22360](https://community.openproject.org/wp/22360)\]
+- Feature: Create new folder from within the location picker \[[#46811](https://community.openproject.org/wp/46811)\]
+- Feature: Update PageHeaders &amp; SubHeaders in the (rails) project pages (Part 1) \[[#53810](https://community.openproject.org/wp/53810)\]
+- Feature: Popover for user information on hover \[[#55581](https://community.openproject.org/wp/55581)\]
+- Feature: Enable group by CF hierarchy for the work package query \[[#59174](https://community.openproject.org/wp/59174)\]
+- Feature: Basic functionality of work package &quot;Reminders&quot;, scheduling &quot;Reminder&quot; notifications \[[#59436](https://community.openproject.org/wp/59436)\]
+- Feature: Enable ordering for work packages on values of custom fields of type hierarchy \[[#59766](https://community.openproject.org/wp/59766)\]
+- Feature: When adding new relations, auto-scroll to show the newly added relation \[[#59769](https://community.openproject.org/wp/59769)\]
+- Feature: Create new icon for setting reminders \[[#59793](https://community.openproject.org/wp/59793)\]
+- Feature: Export cost query as timesheet PDF \[[#59824](https://community.openproject.org/wp/59824)\]
+- Feature: Improve comprehensibility of the &quot;Add relations&quot; modal \[[#60462](https://community.openproject.org/wp/60462)\]
+- Bugfix: Mobile: tap twice on comment input to start typing \[[#57107](https://community.openproject.org/wp/57107)\]
+- Bugfix: Activity panel (Notification center goes into mobile layout even on a desktop when the browser on desktop \[[#59235](https://community.openproject.org/wp/59235)\]
+- Bugfix: Folders missing in log lines for &quot;Unexpected Content Error&quot; \[[#59346](https://community.openproject.org/wp/59346)\]
+- Bugfix: Activity tab does not scroll to the bottom or correct comment on mobile \[[#59458](https://community.openproject.org/wp/59458)\]
+- Bugfix: Activity only shows 1 value even if several were updated \[[#59855](https://community.openproject.org/wp/59855)\]
+- Bugfix: User Hovercard rendering is bumpy \[[#59879](https://community.openproject.org/wp/59879)\]
+- Bugfix: User hovercard is showing on User own profile page and other users profile page \[[#59898](https://community.openproject.org/wp/59898)\]
+- Bugfix: User hovercard is showing behind the Meeting participants overlay \[[#59907](https://community.openproject.org/wp/59907)\]
+- Bugfix: Impossible to group by CF hierarchy multi-select \[[#59920](https://community.openproject.org/wp/59920)\]
+- Bugfix: Proto plugin dose not work with OpenProject 15 \[[#59931](https://community.openproject.org/wp/59931)\]
+- Bugfix: Project membership in group administration lists global roles \[[#59934](https://community.openproject.org/wp/59934)\]
+- Bugfix: Internal server error on Azure OIDC login with expired client secret \[[#59960](https://community.openproject.org/wp/59960)\]
+- Bugfix: OpenID setup fails due to Claims is not a valid JSON object \[[#59962](https://community.openproject.org/wp/59962)\]
+- Bugfix: Wrong locale of error message while personal API access token creation \[[#60025](https://community.openproject.org/wp/60025)\]
+- Bugfix: Filter translations for Meetings Module missing \[[#60113](https://community.openproject.org/wp/60113)\]
+- Bugfix: Saving a new WP triggers browser warning message \[[#60133](https://community.openproject.org/wp/60133)\]
+- Bugfix: Meeting creator is not added as invitee by default + All meetings menu point should not have a filter by default \[[#60287](https://community.openproject.org/wp/60287)\]
+- Bugfix: Titles do not always use App Title \[[#60371](https://community.openproject.org/wp/60371)\]
+- Bugfix: No connection error after folder creation in file picker \[[#60384](https://community.openproject.org/wp/60384)\]
+- Bugfix: Non working days not shown on calendar widget \[[#60410](https://community.openproject.org/wp/60410)\]
+- Bugfix: Distance between sticky buttons and form field above is too small in scrollable modals \[[#60430](https://community.openproject.org/wp/60430)\]
+- Bugfix: Reminders generate two or more lines for a work package in notification center, clicking one selects all \[[#60449](https://community.openproject.org/wp/60449)\]
+- Bugfix: The &#39;set reminder&#39; action is available to users who are not signed in \[[#60458](https://community.openproject.org/wp/60458)\]
+- Bugfix: ActionView::Template::Error happening in MessagesController#show  \[[#60478](https://community.openproject.org/wp/60478)\]
+- Bugfix: Reminder menu item is not placed correctly \[[#60501](https://community.openproject.org/wp/60501)\]
+- Bugfix: Vanishing filters in &quot;Work package table&quot;-widgets  \[[#60546](https://community.openproject.org/wp/60546)\]
+- Bugfix: Remove permission restriction for users to set their own reminders \[[#60568](https://community.openproject.org/wp/60568)\]
+- Bugfix: Relations dropdown capitalizes wrong in German \[[#60627](https://community.openproject.org/wp/60627)\]
+
+<!-- END AUTOMATED SECTION -->
+<!-- Warning: Anything above this line will be automatically removed by the release script -->
+
+## Contributions
+A heartfelt thank you to the City of Cologne and ZenDiS for sponsoring parts of this release. Your support, combined with the incredible efforts of our Community, continues to drive these innovations forward.
+
+Also a big thanks to our Community members for reporting bugs and helping us identify and provide fixes. Special thanks for reporting and finding bugs go to Stefan Weiberg.
+
+Last but not least, we are very grateful for our very engaged translation contributors on Crowdin, who translated quite a few OpenProject strings! This release we would like to highlight
+- [atifahnordin](https://crowdin.com/profile/atifahnordin), for an outstanding number of translations into Malay.
+- [Vlastislav Dockal](https://crowdin.com/profile/vdockal), for a great number of translations into Czech.
+- [Alin Marcu](https://crowdin.com/profile/deconfcom), for a great number of translations into Romanian.
+- [Yuliia Pavliuk](https://crowdin.com/profile/pav.yulia), for a great number of translations into Ukrainian.
+
+Would you like to help out with translations yourself? Then take a look at our [translation guide](../../contributions-guide/translate-openproject/) and find out exactly how you can contribute. It is very much appreciated!
diff --git a/docs/release-notes/15-2-0/openproject-file-storage-new-folder.png b/docs/release-notes/15-2-0/openproject-file-storage-new-folder.png
new file mode 100644
index 000000000000..51747277da64
Binary files /dev/null and b/docs/release-notes/15-2-0/openproject-file-storage-new-folder.png differ
diff --git a/docs/release-notes/15-2-0/openproject_avatar_hover.png b/docs/release-notes/15-2-0/openproject_avatar_hover.png
new file mode 100644
index 000000000000..67ac4a241862
Binary files /dev/null and b/docs/release-notes/15-2-0/openproject_avatar_hover.png differ
diff --git a/docs/release-notes/15-2-0/openproject_cf_hierarchy_grouping.png b/docs/release-notes/15-2-0/openproject_cf_hierarchy_grouping.png
new file mode 100644
index 000000000000..e0a8e66d9edd
Binary files /dev/null and b/docs/release-notes/15-2-0/openproject_cf_hierarchy_grouping.png differ
diff --git a/docs/release-notes/15-2-0/openproject_set_wp_reminders.png b/docs/release-notes/15-2-0/openproject_set_wp_reminders.png
new file mode 100644
index 000000000000..85694a95948a
Binary files /dev/null and b/docs/release-notes/15-2-0/openproject_set_wp_reminders.png differ
diff --git a/docs/release-notes/15-2-0/openproject_user_guide_relations_tab_edit_lag.png b/docs/release-notes/15-2-0/openproject_user_guide_relations_tab_edit_lag.png
new file mode 100644
index 000000000000..c3f4aa997153
Binary files /dev/null and b/docs/release-notes/15-2-0/openproject_user_guide_relations_tab_edit_lag.png differ
diff --git a/docs/release-notes/15-2-0/openproject_user_guide_wp_reminder_icon.png b/docs/release-notes/15-2-0/openproject_user_guide_wp_reminder_icon.png
new file mode 100644
index 000000000000..46be521140fd
Binary files /dev/null and b/docs/release-notes/15-2-0/openproject_user_guide_wp_reminder_icon.png differ
diff --git a/docs/release-notes/15-2-0/openproject_user_timesheet_pdf_export.png b/docs/release-notes/15-2-0/openproject_user_timesheet_pdf_export.png
new file mode 100644
index 000000000000..adf8e839cc5c
Binary files /dev/null and b/docs/release-notes/15-2-0/openproject_user_timesheet_pdf_export.png differ
diff --git a/docs/release-notes/15-2-0/openproject_userguide_timesheet_pdf_export_file.png b/docs/release-notes/15-2-0/openproject_userguide_timesheet_pdf_export_file.png
new file mode 100644
index 000000000000..80745f0401f4
Binary files /dev/null and b/docs/release-notes/15-2-0/openproject_userguide_timesheet_pdf_export_file.png differ
diff --git a/docs/release-notes/README.md b/docs/release-notes/README.md
index cdca676d40d3..71adb167afa1 100644
--- a/docs/release-notes/README.md
+++ b/docs/release-notes/README.md
@@ -13,6 +13,13 @@ Stay up to date and get an overview of the new features included in the releases
 <!--- New release notes are generated below. Do not remove comment. -->
 <!--- RELEASE MARKER -->
 
+## 15.2.0
+
+Release date: 2025-01-22
+
+[Release Notes](15-2-0/)
+
+
 ## 15.1.1
 
 Release date: 2025-01-13
diff --git a/docs/release-notes/openproject_userguide_timesheet_pdf_export.png b/docs/release-notes/openproject_userguide_timesheet_pdf_export.png
new file mode 100644
index 000000000000..80745f0401f4
Binary files /dev/null and b/docs/release-notes/openproject_userguide_timesheet_pdf_export.png differ
diff --git a/docs/system-admin-guide/authentication/openid-providers/README.md b/docs/system-admin-guide/authentication/openid-providers/README.md
index 832d24d306dc..2cd8dc3842c8 100644
--- a/docs/system-admin-guide/authentication/openid-providers/README.md
+++ b/docs/system-admin-guide/authentication/openid-providers/README.md
@@ -10,12 +10,12 @@ keywords: OpenID providers
 > [!IMPORTANT] 
 > OpenID Connect providers is an Enterprise add-on. If you do not see the button you will have to activate the Enterprise edition first.
 
-| Topic                                                        | Content                                                      |
-| ------------------------------------------------------------ | ------------------------------------------------------------ |
-| Login with [Google Workspace](#google)                       | How to use Google Workspace as an SSO provider for OpenProject? |
-| [Microsoft Entra ID](#microsoft-entra) (previously Azure)    | How to use Microsoft Azure Active Directory as an SSO provider for OpenProject? |
-| [Custom OpenID Connect Providers](#custom-openid-connect-provider) | Configuration of additional OpenID Connect providers.        |
-| [Troubleshooting](#troubleshooting)                          | Common complications when using OpenID as SSO.               |
+| Topic                                                              | Content                                                                         |
+|--------------------------------------------------------------------|---------------------------------------------------------------------------------|
+| Login with [Google Workspace](#google)                             | How to use Google Workspace as an SSO provider for OpenProject?                 |
+| [Microsoft Entra ID](#microsoft-entra) (previously Azure)          | How to use Microsoft Azure Active Directory as an SSO provider for OpenProject? |
+| [Custom OpenID Connect Providers](#custom-openid-connect-provider) | Configuration of additional OpenID Connect providers.                           |
+| [Troubleshooting](#troubleshooting)                                | Common complications when using OpenID as SSO.                                  |
 
 To activate and configure OpenID providers in OpenProject, navigate to *Administration* -> *Authentication* and choose -> *OpenID providers*.
 
@@ -77,7 +77,6 @@ You can create different kinds of providers with a different set of properties.
 After pressing **CREATE** you will see a following pop-up window.
 
 > [!TIP]
->
 > Make sure to note your **Client ID** and **Client Secret**.
 
 ![OAuth client created](g5-oauth-client-created.png)
@@ -100,7 +99,9 @@ Press **Finish setup** to save the client and complete. If you go back to the in
 
 ## Microsoft Entra
 
-### Step 1: Register an App in Azure Active Directory
+### Step-by-step
+
+#### Step 1: Register an App in Azure Active Directory
 
 If your organization currently has an Azure Active Directory to manage users, and you want to use that to log in to OpenProject, you will need to register a new *App*.
 
@@ -149,7 +150,7 @@ The steps are as follows:
 
 9. A secret should have been generated and will be displayed on the page. 
 
->  [!IMPORTANT]
+> [!IMPORTANT]
 > Make sure to save it because it will only be displayed once.
 
 ![Azure Active Directory Add Secret](08-add-secret.png)
@@ -188,6 +189,8 @@ To start creating a custom provider, please follow these steps:
    - **Click** the green *+ OpenID Connect provider* button
    - **Choose** the *Option* **Custom**
 
+### Step-by-step
+
 #### Step 1: Display name
 
 - Set a **Display Name**, this is the name of the login button shown to users. Let's assume we're trying to connect *Keycloak* with OpenProject for this example. We will type in Keycloak as that's the label of the button to be shown to users trying to authenticate.
diff --git a/docs/system-admin-guide/authentication/recaptcha/README.md b/docs/system-admin-guide/authentication/recaptcha/README.md
index 72c26e6e3299..c7516ac75f2a 100644
--- a/docs/system-admin-guide/authentication/recaptcha/README.md
+++ b/docs/system-admin-guide/authentication/recaptcha/README.md
@@ -3,7 +3,7 @@ sidebar_navigation:
   title: reCAPTCHA
   priority: 600
 description: configure reCAPTCHA for OpenProject.
-keywords: reCAPTCHA
+keywords: reCAPTCHA, turnstile
 ---
 # reCAPTCHA configuration
 
@@ -21,8 +21,7 @@ You can configure the following options:
 
 ![reCAPTCHA authentication settings in OpenProject administration](openproject_system_admin_guide_recaptcha.png)
 
-
-# Cloudflare Turnstile configuration
+## Cloudflare Turnstile configuration
 
 To use Cloudflare Turnstile with OpenProject, you need to configure the reCAPTCHA settings in the Cloudflare dashboard. Please see the following link for more details on Cloudflare Turnstile and how to configure it: [https://developers.cloudflare.com/turnstile/](https://developers.cloudflare.com/turnstile/).
 
diff --git a/docs/system-admin-guide/integrations/github-integration/README.md b/docs/system-admin-guide/integrations/github-integration/README.md
index 6070f475502c..96d293891152 100644
--- a/docs/system-admin-guide/integrations/github-integration/README.md
+++ b/docs/system-admin-guide/integrations/github-integration/README.md
@@ -90,7 +90,7 @@ First you will need to create a user in OpenProject that will make the comments.
 The user will have to be added to each project with a role that allows them
 to see work packages and comment on them.
 
-The role needs two permissions and should only receive those two: "View work packages" and "Add notes" which you will find in the "Work package tracking" section.
+The role needs two permissions and should only receive those two: "View work packages" and "Add notes" which you will find in the "Work packages and Gantt charts" section.
 
 ![GitHub role with 'add notes' permission](github-role.png)
 
diff --git a/docs/system-admin-guide/integrations/github-integration/github-role.png b/docs/system-admin-guide/integrations/github-integration/github-role.png
index 39092a238931..348f3d3290ca 100644
Binary files a/docs/system-admin-guide/integrations/github-integration/github-role.png and b/docs/system-admin-guide/integrations/github-integration/github-role.png differ
diff --git a/docs/system-admin-guide/users-permissions/avatars/README.md b/docs/system-admin-guide/users-permissions/avatars/README.md
index 4e88e7ceaa16..153917a77a41 100644
--- a/docs/system-admin-guide/users-permissions/avatars/README.md
+++ b/docs/system-admin-guide/users-permissions/avatars/README.md
@@ -9,7 +9,7 @@ keywords: Avatars
 
 To select which type of Avatars can be used in your OpenProject, navigate to **Administration -> Users and permissions -> Avatars**.
 
-You can choose whether to allow user gravatars or enable to upload custom avatars.
+You can choose whether to allow user gravatars or enable custom avatars upload.
 
 The Avatars can be configured via the [user profile](../users).
 
diff --git a/docs/system-admin-guide/users-permissions/users/README.md b/docs/system-admin-guide/users-permissions/users/README.md
index d4885b6798cf..f82b768d015d 100644
--- a/docs/system-admin-guide/users-permissions/users/README.md
+++ b/docs/system-admin-guide/users-permissions/users/README.md
@@ -13,7 +13,7 @@ The user list provides an overview of all users in OpenProject. You can create n
 <div class="glossary">
 **User** is defined as a person (described by an identifier) who uses OpenProject. Users can become project members by assigning them a role and adding them via the project settings.
 </div>
-To manage users click on your avatar (top right corner) and select **Administration**. Select ***Users and permissions -> Users**. The list of current users is shown.
+To manage users click on your avatar (top right corner) and select **Administration**. Select **Users and permissions -> Users**. The list of current users is shown.
 
 In the Community edition there is no limit to the number of users. In Enterprise editions (cloud and on-premises) the user limit is based on your subscription. The number of users for your subscription is thus not bound to names. For example, if you block a user you can add a new one without upgrading.
 
@@ -196,7 +196,11 @@ To enter a new hourly rate, click on the **Update** icon next to the rate histor
 
 ### Avatar
 
-The **Avatar** tab shows the default icon to be shown for this user. A custom image can be uploaded as the avatar. In addition, the users can also use their [Gravatar](https://en.wikipedia.org/wiki/Gravatar). The user can manage this in their Profile. These features can be disabled in the [avatar settings](../avatars).
+The **Avatar** tab shows the default icon to be shown for this user. A custom image can be uploaded as the avatar. In addition, users can also use their [Gravatar](https://en.wikipedia.org/wiki/Gravatar). User can manage this under their [profile settings](../../../user-guide/account-settings/#set-an-avatar). These features can be disabled in the [avatar settings](../avatars).
+
+> ![TIP]
+>
+> Hovering over a user's avatar, for example on the Members page or the Activity page, will display their information. 
 
 ### Two-factor authentication (2FA)
 
diff --git a/docs/user-guide/account-settings/openproject_account_settings_email_reminders.png b/docs/user-guide/account-settings/openproject_account_settings_email_reminders.png
index 1afb512eaead..ea0bc15c7330 100644
Binary files a/docs/user-guide/account-settings/openproject_account_settings_email_reminders.png and b/docs/user-guide/account-settings/openproject_account_settings_email_reminders.png differ
diff --git a/docs/user-guide/file-management/nextcloud-integration/NC_12.5-fileIsNowLinked.png b/docs/user-guide/file-management/nextcloud-integration/NC_12.5-fileIsNowLinked.png
index d2513c281bd7..dc078d61b996 100644
Binary files a/docs/user-guide/file-management/nextcloud-integration/NC_12.5-fileIsNowLinked.png and b/docs/user-guide/file-management/nextcloud-integration/NC_12.5-fileIsNowLinked.png differ
diff --git a/docs/user-guide/file-management/nextcloud-integration/NC_12.5-selctFileToUpload.png b/docs/user-guide/file-management/nextcloud-integration/NC_12.5-selctFileToUpload.png
index 86cc1c083d19..c8055a5b34a4 100644
Binary files a/docs/user-guide/file-management/nextcloud-integration/NC_12.5-selctFileToUpload.png and b/docs/user-guide/file-management/nextcloud-integration/NC_12.5-selctFileToUpload.png differ
diff --git a/docs/user-guide/file-management/nextcloud-integration/NC_12.5-selectLocationToUploadTo.png b/docs/user-guide/file-management/nextcloud-integration/NC_12.5-selectLocationToUploadTo.png
index 426b79281ef9..51747277da64 100644
Binary files a/docs/user-guide/file-management/nextcloud-integration/NC_12.5-selectLocationToUploadTo.png and b/docs/user-guide/file-management/nextcloud-integration/NC_12.5-selectLocationToUploadTo.png differ
diff --git a/docs/user-guide/file-management/nextcloud-integration/NC_12.5-uploadFilesLink.png b/docs/user-guide/file-management/nextcloud-integration/NC_12.5-uploadFilesLink.png
index 5be2445ed7dc..bf57ae45072c 100644
Binary files a/docs/user-guide/file-management/nextcloud-integration/NC_12.5-uploadFilesLink.png and b/docs/user-guide/file-management/nextcloud-integration/NC_12.5-uploadFilesLink.png differ
diff --git a/docs/user-guide/file-management/nextcloud-integration/README.md b/docs/user-guide/file-management/nextcloud-integration/README.md
index 06157f58c594..5a19dfe1e219 100644
--- a/docs/user-guide/file-management/nextcloud-integration/README.md
+++ b/docs/user-guide/file-management/nextcloud-integration/README.md
@@ -106,14 +106,16 @@ You will then be prompted to select a file (or multiple files) on your computer
 
 Alternatively, you can also simply drag a file or folder from your computer to the drag zone that will appear under the name of your Nextcloud file storage.
 
-Once you have selected or dropped the files you would like to upload, you will need to select a folder on Nextcloud to which they should be stored.
+Once you have selected or dropped the files you would like to upload, you will need to select a folder on Nextcloud to which they should be added. 
 
 > [!TIP]
 > The default project that opens in the location picker is defined by the project administrators in the [File storages settings](../../projects/project-settings/files/).
 
 ![Select the destination folder on Nextcloud](NC_12.5-selectLocationToUploadTo.png)
 
-You can click on folders you see to navigate to them. A helpful breadcrumb shows you where you are in the folder hierarchy.
+You can click on folders you see to navigate to them. A helpful breadcrumb shows you where you are in the folder hierarchy. 
+
+You can also directly create a new folder by clicking the **New folder** button on the left. 
 
 To navigate one level up or to go back to the root, simply click on the relevant parent in the breadcrumb.
 
diff --git a/docs/user-guide/file-management/one-drive-integration/README.md b/docs/user-guide/file-management/one-drive-integration/README.md
index 01ae5d48f51e..a0310aa3325a 100644
--- a/docs/user-guide/file-management/one-drive-integration/README.md
+++ b/docs/user-guide/file-management/one-drive-integration/README.md
@@ -10,14 +10,16 @@ keywords: integration, apps, OneDrive, SharePoint, user
 
 You can use **OneDrive/SharePoint** as an integrated file storage in OpenProject.
 
-> **Note**: OneDrive/SharePoint integration is an Enterprise add-on and can only be used with [Enterprise cloud](../../../enterprise-guide/enterprise-cloud-guide/) or [Enterprise on-premises](../../../enterprise-guide/enterprise-on-premises-guide/). An upgrade from the free Community edition is easy and helps support OpenProject.
+> [!NOTE]
+> OneDrive/SharePoint integration is an Enterprise add-on and can only be used with [Enterprise cloud](../../../enterprise-guide/enterprise-cloud-guide/) or [Enterprise on-premises](../../../enterprise-guide/enterprise-on-premises-guide/). An upgrade from the free Community edition is easy and helps support OpenProject.
 
 This integration makes it possible for you to:
 
 - Link files and folders stored in OneDrive/SharePoint with work packages in OpenProject
 - View, open and download files and folders linked to a work package via the **Files** tab
 
-> **Important note**: To be able to use OneDrive/SharePoint as a file storage in your project, the administrator of your instance should first have completed the [OneDrive/SharePoint integration setup](../../../system-admin-guide/integrations/one-drive). Then a project administrator can activate the integrated storage in the [File storages](../../projects/project-settings/files/) for a project.
+> [!IMPORTANT]
+> To be able to use OneDrive/SharePoint as a file storage in your project, the administrator of your instance should first have completed the [OneDrive/SharePoint integration setup](../../../system-admin-guide/integrations/one-drive). Then a project administrator can activate the integrated storage in the [File storages](../../projects/project-settings/files/) for a project.
 
 | Topic                                                        | Description                                                  |
 | ------------------------------------------------------------ | :----------------------------------------------------------- |
@@ -52,7 +54,8 @@ To link a SharePoint file to the current work package, you can either:
 
 ![Link existing files to OneDrive/SharePoint from an OpenProject work package](openproject_onedrive_link_existing_files_link.png)
 
-> **Info**: The default location that opens in the file picker is the file root of the configured OneDrive/SharePoint drive.
+> [!NOTE]
+> The default location that opens in the file picker is the file root of the configured OneDrive/SharePoint drive.
 
 ![Select a SharePoint file or folder to link to an OpenProject work package](openproject_onedrive_link_files.png)
 
@@ -70,7 +73,8 @@ Alternatively, you can also simply drag a file or folder from your computer to t
 
 Once you have selected or dropped the files you would like to upload, you will need to select the location on OneDrive/SharePoint to which they should be stored.
 
-> **Info**: The default location that opens in the file picker is the file root of the configured OneDrive/SharePoint drive.
+> [!NOTE]
+> The default location that opens in the file picker is the file root of the configured OneDrive/SharePoint drive.
 
 ![Selection a Sharepoint location to upload a file from OpenProject](openproject_onedrive_select_location.png)
 
@@ -78,7 +82,10 @@ You can click on folders you see to navigate to them. Helpful breadcrumbs show y
 
 To navigate one level up or to go back to the root, simply click on the relevant parent in the breadcrumbs.
 
-> **Info**: If you have navigated particularly deep (over 4 levels), intermediate levels might be collapsed to save space, but you’ll always be able to navigate back to the immediate parent or the root to go backwards.
+> [!TIP]
+> If you have navigated particularly deep (over 4 levels), intermediate levels might be collapsed to save space, but you’ll always be able to navigate back to the immediate parent or the root to go backwards.
+
+You can also directly create a new folder within your Sharepoint folder structure at this point by using the **New folder** button.
 
 To save the files you uploaded to the currently open folder, click on the **Choose location** button.
 
diff --git a/docs/user-guide/file-management/one-drive-integration/openproject_onedrive_file_uploaded.png b/docs/user-guide/file-management/one-drive-integration/openproject_onedrive_file_uploaded.png
index 1bc611866c30..b2225ffc3fa6 100644
Binary files a/docs/user-guide/file-management/one-drive-integration/openproject_onedrive_file_uploaded.png and b/docs/user-guide/file-management/one-drive-integration/openproject_onedrive_file_uploaded.png differ
diff --git a/docs/user-guide/file-management/one-drive-integration/openproject_onedrive_select_file.png b/docs/user-guide/file-management/one-drive-integration/openproject_onedrive_select_file.png
index 007a64f77a2a..2d833f7ccb68 100644
Binary files a/docs/user-guide/file-management/one-drive-integration/openproject_onedrive_select_file.png and b/docs/user-guide/file-management/one-drive-integration/openproject_onedrive_select_file.png differ
diff --git a/docs/user-guide/file-management/one-drive-integration/openproject_onedrive_select_location.png b/docs/user-guide/file-management/one-drive-integration/openproject_onedrive_select_location.png
index 0d7318356d59..ca2464094ed2 100644
Binary files a/docs/user-guide/file-management/one-drive-integration/openproject_onedrive_select_location.png and b/docs/user-guide/file-management/one-drive-integration/openproject_onedrive_select_location.png differ
diff --git a/docs/user-guide/file-management/one-drive-integration/openproject_onedrive_upload_file_link.png b/docs/user-guide/file-management/one-drive-integration/openproject_onedrive_upload_file_link.png
index f6d51158bad2..35b7ebeb7123 100644
Binary files a/docs/user-guide/file-management/one-drive-integration/openproject_onedrive_upload_file_link.png and b/docs/user-guide/file-management/one-drive-integration/openproject_onedrive_upload_file_link.png differ
diff --git a/docs/user-guide/notifications/README.md b/docs/user-guide/notifications/README.md
index eed7300dad35..bcb2cc1cde97 100644
--- a/docs/user-guide/notifications/README.md
+++ b/docs/user-guide/notifications/README.md
@@ -35,6 +35,12 @@ Each row in Notification center is a work package that has generated a notificat
 
 The work packages are listed in order of freshness. The work packages on top of the list have the "newest" notifications. This means if there is a new update to a work package that was further down in your notification list, it will be moved to the top since that is now the newest notification.
 
+> [!NOTE] 
+>
+> If multiple notifications exist for a single work package, the [work package reminder](../work-packages/edit-work-package/#work-package-reminders) will take precedence, showing the reminder note at the bottom of the page if one exists. 
+>
+> In case a work package has both a reminder and a date alert notification set up, then the date alert is combined with the reminder note such that that both are visible in the last line. If there are additional reasons for the notification (watcher, mentioned, assignee), those will continue to be displayed in first line of the notification.
+
 ## Manage notifications
 
 Click on a notification to open the Activity tab of this work package in split screen. If you double click on a notification, it will open the full view of a work package. 
@@ -51,7 +57,7 @@ The Activity tab will auto-scroll to the last event that generated a notificatio
 
 You can filter or group notifications by using the two sets of predefined filters on the left-hand menu:
 
-(Area 1) You can filter by the **reason** you were notified: because you were mentioned (*@mention*), because you are either the assignee or accountable for that work package, because it concerns a work package you are watching or because you have an active date alert.
+(Area 1) You can filter by the **reason** you were notified: because you were mentioned (*@mention*), because you are either the assignee or accountable for that work package, because it concerns a work package you are watching or because you have an active reminder or a date alert.
 
 (Area 2) You can filter by **project** (area 2), for example to filter for notifications that originated from a specific project.
 
diff --git a/docs/user-guide/notifications/openproject_user_guide_notification_center_split_screen.png b/docs/user-guide/notifications/openproject_user_guide_notification_center_split_screen.png
index 89c6833792b3..abae45e0c412 100644
Binary files a/docs/user-guide/notifications/openproject_user_guide_notification_center_split_screen.png and b/docs/user-guide/notifications/openproject_user_guide_notification_center_split_screen.png differ
diff --git a/docs/user-guide/time-and-costs/reporting/README.md b/docs/user-guide/time-and-costs/reporting/README.md
index 5e95ac37ae67..b5453802eabb 100644
--- a/docs/user-guide/time-and-costs/reporting/README.md
+++ b/docs/user-guide/time-and-costs/reporting/README.md
@@ -10,7 +10,8 @@ keywords: time and cost reporting
 
 You can easily report spent time and costs in OpenProject and filter, group and save the reports according to your needs.
 
-> **Note**: To use the time tracking functionality, the **Time and costs module** needs to be activated in the [project settings](../../projects/project-settings/modules/).
+> [!NOTE]
+> To use the time tracking functionality, the **Time and costs module** needs to be activated in the [project settings](../../projects/project-settings/modules/).
 
 | Topic                                                                     | Content                                                                                           |
 |---------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------|
@@ -26,9 +27,12 @@ You can easily report spent time and costs in OpenProject and filter, group and
 To open the time and costs reports in OpenProject, navigate to the **Time and costs** module in the project navigation.
 
 <div class="glossary">
+
 **Time and costs** is a plugin to filter cost reports on individual or multiple users across individual or multiple projects. The plugin has to be activated as a module in the project settings to be displayed in the side navigation.
+
 </div>
-![time-and-costs-report](image-20210305134828633.png)
+
+![Time and costs module in OpenProject](openproject_userguide_timeandcosts_module.png)
 
 ## Change time and costs reports
 
@@ -43,19 +47,19 @@ Depending on your rights in the project, multiple users can also be selected. Th
 
 The results will then be displayed in the time and cost report below.
 
-![filter-time-and-costs-report](image-20210305134143475.png)
+![Time and cost reports filters in OpenProject](openproject_userguide_timeandcosts_module_filter.png)
 
 ### Group by criteria for cost reports
 
 The time and cost reports can be grouped by selected criteria, such as dates, work packages, assignee, or any other field, incl. custom fields.
 
-To add grouping criteria to the columns or rows of the report, select the drop-down field on the right to **add grouping field**.
+To add grouping criteria to the columns or rows of the report, select the drop-down field on the right to **add a group-by attribute**.
 
-![Time-costs-group-by](Time-cots-group-by.png)
+![Group time and costs report by attributes in OpenProject](openproject_userguide_timeandcosts_groupby.png)
 
 The grouping criteria will then be added to the columns or rows of the report.
 
-Click the blue **Apply button** to display your changes.
+Click the **Apply** button to display your changes.
 
 ![Time-costs-reports-columns-rows](Time-costs-reports-columns-rows.png)
 
@@ -94,3 +98,23 @@ Click the grey **Export XLS** (Excel) button.
 You can then continue working in the Excel spreadsheet to filter, group, or import the data in different systems.
 
 ![Excel export time and cost reports](image-20200212131921959.png)
+
+## Export time sheets
+
+You can  **export reports for time entries** in PDF format in the *Time and costs* module of your project. 
+
+>  [!TIP]
+>
+> Keep in mind that this report will only include time entries, but not the cost ones.
+
+To prepare the export, first filter and set up the report according to your preferences and click the **Export PDF timesheet** button.
+
+> [!NOTE]
+>
+> Please note that "Group by" settings won't be applied to the exported file.
+
+![Settings for timesheet PDF export in OpenProject](openproject_userguide_timeandcosts_timesheet_export_settings.png)
+
+A PDF file will be generated, containing the time entries specified by the report.
+
+![Timesheet PDF export in OpenProject](openproject_userguide_timesheet_pdf_export.png)
diff --git a/docs/user-guide/time-and-costs/reporting/openproject_userguide_timeandcosts_groupby.png b/docs/user-guide/time-and-costs/reporting/openproject_userguide_timeandcosts_groupby.png
new file mode 100644
index 000000000000..6993f4913326
Binary files /dev/null and b/docs/user-guide/time-and-costs/reporting/openproject_userguide_timeandcosts_groupby.png differ
diff --git a/docs/user-guide/time-and-costs/reporting/openproject_userguide_timeandcosts_module.png b/docs/user-guide/time-and-costs/reporting/openproject_userguide_timeandcosts_module.png
new file mode 100644
index 000000000000..42828bd277be
Binary files /dev/null and b/docs/user-guide/time-and-costs/reporting/openproject_userguide_timeandcosts_module.png differ
diff --git a/docs/user-guide/time-and-costs/reporting/openproject_userguide_timeandcosts_module_filter.png b/docs/user-guide/time-and-costs/reporting/openproject_userguide_timeandcosts_module_filter.png
new file mode 100644
index 000000000000..63eb15fb5cb0
Binary files /dev/null and b/docs/user-guide/time-and-costs/reporting/openproject_userguide_timeandcosts_module_filter.png differ
diff --git a/docs/user-guide/time-and-costs/reporting/openproject_userguide_timeandcosts_timesheet_export_settings.png b/docs/user-guide/time-and-costs/reporting/openproject_userguide_timeandcosts_timesheet_export_settings.png
new file mode 100644
index 000000000000..5a2d46af9638
Binary files /dev/null and b/docs/user-guide/time-and-costs/reporting/openproject_userguide_timeandcosts_timesheet_export_settings.png differ
diff --git a/docs/user-guide/time-and-costs/reporting/openproject_userguide_timesheet_pdf_export.png b/docs/user-guide/time-and-costs/reporting/openproject_userguide_timesheet_pdf_export.png
new file mode 100644
index 000000000000..80745f0401f4
Binary files /dev/null and b/docs/user-guide/time-and-costs/reporting/openproject_userguide_timesheet_pdf_export.png differ
diff --git a/docs/user-guide/work-packages/create-work-package/README.md b/docs/user-guide/work-packages/create-work-package/README.md
index 3f3c9b4fb229..bd33b55c7835 100644
--- a/docs/user-guide/work-packages/create-work-package/README.md
+++ b/docs/user-guide/work-packages/create-work-package/README.md
@@ -66,8 +66,10 @@ Also, at the bottom of the Work package form you can add files via drag and drop
 
 ![add-file](1566305040178.png)
 
-> Note: it is also possible for users that are not members of the project to add attachments to work packages if they have been granted the permission by an administrator. This can be useful for example for confirming bug reports.
+> [!NOTE]
+> It is also possible for users that are not members of the project to add attachments to work packages if they have been granted the permission by an administrator. This can be useful for example for confirming bug reports.
 
 Find out how to [edit existing Work packages](../edit-work-package).
 
-> Note: you can also use [Nextcloud integration](../../file-management/nextcloud-integration/#link-files-and-folders-to-work-packages) to upload files to Nextcloud or link already existing files or folders to a work package under the tab **Files**.
+> [!NOTE]
+> you can also use [Nextcloud integration](../../file-management/nextcloud-integration/#link-files-and-folders-to-work-packages) to upload files to Nextcloud or link already existing files or folders to a work package under the tab **Files**.
diff --git a/docs/user-guide/work-packages/edit-work-package/README.md b/docs/user-guide/work-packages/edit-work-package/README.md
index d998e361ef09..14da820e24c7 100644
--- a/docs/user-guide/work-packages/edit-work-package/README.md
+++ b/docs/user-guide/work-packages/edit-work-package/README.md
@@ -13,6 +13,7 @@ keywords: edit work packages
 | [Update a work package](#update-a-work-package)              | How to make a change to an existing work package.            |
 | [Update a work package in a table view](#update-a-work-package-in-a-work-package-table-view) | How to use the quick context menu in the work package table view. |
 | [Attach files to work packages](#attach-files-to-work-packages) | How to manually attach files to work packages.               |
+| [Set work package reminders](#work-package-reminders)        | How to set a reminder for a work package.                    |
 | [Watchers](#watchers)                                        | How to add or remove watchers from a work package.           |
 | [Export work packages](#export-work-packages)                | How to export work packages.                                 |
 | [Bulk edit work packages](#bulk-edit-work-packages)          | How to edit several work packages as once.                   |
@@ -98,6 +99,34 @@ You can remove an attachment by hovering over it and clicking the **Delete** ico
 
 ![Delete a work package attachment in OpenProject](openproject_user_guide_wp_file_delete.png)
 
+## Work package reminders
+
+If you want to be reminded about a work package at a later point in time, you can use the **Reminder** function. Click the **Reminder** (alarm clock) icon in the work package detailed view.
+
+![Work package reminder icon in OpenProject](openproject_user_guide_wp_reminder_icon.png)
+
+Specify the time and date on which you would like to be reminded and optionally add a note for more context. Then click the **Set reminder** button.
+
+![Set reminder in OpenProject work packages](openproject_user_guide_wp_set_reminder.png)
+
+Once you set a reminder, you will see a confirmation message. The reminder icon will now show a badge to indicate that a reminder has been set. Clicking on the reminder icon again will let you modify the existing one.
+
+![A badge to indicate a set reminder in OpenProject work package](openproject_user_guide_wp_reminder_badge.png)
+
+At the configured date and time, you will receive the reminder in [Notification center](../../notifications/#access-in-app-notifications). 
+
+![Work package reminder in OpenProject notificaiton center](openproject_user_guide_wp_set_reminder_notification.png)
+
+>  [!NOTE] 
+>
+> If multiple notifications exist for a single work package, the reminder will take precedence, showing the reminder note at the bottom of the  page. 
+>
+> In case a work package has both a reminder and date alert  notification set up, then the date alert is combined with the reminder note, so that both are visible.
+
+> [!TIP]
+>
+> You can set to receive immediate notifications via e-mail for personal reminders. To do that, adjust your [account settings](../../account-settings/#email-reminders) accordingly.
+
 ## Watchers
 
 ### How to add watchers to a work package
diff --git a/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_reminder_badge.png b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_reminder_badge.png
new file mode 100644
index 000000000000..7c245a56a14b
Binary files /dev/null and b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_reminder_badge.png differ
diff --git a/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_reminder_icon.png b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_reminder_icon.png
new file mode 100644
index 000000000000..46be521140fd
Binary files /dev/null and b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_reminder_icon.png differ
diff --git a/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_set_reminder.png b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_set_reminder.png
new file mode 100644
index 000000000000..85694a95948a
Binary files /dev/null and b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_set_reminder.png differ
diff --git a/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_set_reminder_notification.png b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_set_reminder_notification.png
new file mode 100644
index 000000000000..a945d8be5581
Binary files /dev/null and b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_set_reminder_notification.png differ
diff --git a/docs/user-guide/work-packages/share-work-packages/README.md b/docs/user-guide/work-packages/share-work-packages/README.md
index df6c56847340..2bf9b44f985f 100644
--- a/docs/user-guide/work-packages/share-work-packages/README.md
+++ b/docs/user-guide/work-packages/share-work-packages/README.md
@@ -10,7 +10,8 @@ keywords: work package, share, share work packages
 
 It is possible to share work packages with users that are not members of a project or are not yet registered on your instance. In the latter case a user will need to register in order to view the work package.
 
-> **Note**: Sharing work packages with non-member is an Enterprise add-on and can only be used with [Enterprise cloud](../../../enterprise-guide/enterprise-cloud-guide/) or  [Enterprise on-premises](../../../enterprise-guide/enterprise-on-premises-guide/). An upgrade from the free community edition is easy and helps support OpenProject.
+> [!NOTE]
+> Sharing work packages with non-member is an Enterprise add-on and can only be used with [Enterprise cloud](../../../enterprise-guide/enterprise-cloud-guide/) or  [Enterprise on-premises](../../../enterprise-guide/enterprise-on-premises-guide/). An upgrade from the free community edition is easy and helps support OpenProject.
 
 ## Share a work package
 
@@ -20,7 +21,8 @@ To share a work package with a project non-member select the detailed view of a
 
 A dialogue window will open, showing the list of all users, who this work package has already been shared with. If the work package has not yet been shared, the list will be empty.
 
-> **Note**: In order to be able to share a work package with non members you need to have been assigned a [global role *create users*](../../../system-admin-guide/users-permissions/users/#create-users). If you do not see the option to share a work package, please contact your administrator.
+> [!NOTE]
+> In order to be able to share a work package with non members you need to have been assigned a [global role *create users*](../../../system-admin-guide/users-permissions/users/#create-users). If you do not see the option to share a work package, please contact your administrator.
 
 ![List of users with access to a work package in OpenProject](openproject_user_guide_shared_with_list.png)
 
@@ -46,7 +48,8 @@ Following user roles are available as filters:
 
 ![Filter list of users by user role](openproject_user_guide_sharing_member_role_filter.png)
 
-> **Note:** Please keep in mind that users listed after you have applied a filter may have additional permissions. For example if you select the **View** filter, it is possible that a user is listed, which has inherited additional role as part of user group with permissions exceeding the viewing ones.
+> [!NOTE]
+> Please keep in mind that users listed after you have applied a filter may have additional permissions. For example if you select the **View** filter, it is possible that a user is listed, which has inherited additional role as part of user group with permissions exceeding the viewing ones.
 
 You can search for a user or a group via a user name, group name or an email address. You can either select an existing user from the dropdown menu or enter an email address for an entirely new user, who will receive an invitation to create an account on your instance.
 
@@ -62,7 +65,8 @@ You can always adjust the viewing rights of a user by selecting an option from t
 
 ![Shared work package roles](openproject_user_guide_shared_with_list_change_role.png)
 
-> **Note:** granting the **edit** rights to the user will allow you to set this user a work package **Assignee** or **Accountable**.
+> [!NOTE]
+> Granting the **edit** rights to the user will allow you to set this user a work package **Assignee** or **Accountable**.
 
 Once a work package has been shared, you will see the number of shared users in the **Share** button.
 
diff --git a/docs/user-guide/work-packages/work-package-relations-hierarchies/README.md b/docs/user-guide/work-packages/work-package-relations-hierarchies/README.md
index 38df9343c8a1..c1f6a77df593 100644
--- a/docs/user-guide/work-packages/work-package-relations-hierarchies/README.md
+++ b/docs/user-guide/work-packages/work-package-relations-hierarchies/README.md
@@ -52,6 +52,10 @@ You can select one of the following relations:
 > [!TIP]
 > Prior to 15.1, *Predecessor (before)* was called *Precedes*, and *Successor (after)* was called *Follows*.
 
+For the relations of type Predecessor/Successor, you can also define **Lag**, which is the minimum number of working days to keep in between the two work packages. The default setting for lag is 0 working days. You can always edit the *Description* and *Lag* fields at a later time.
+
+![Add a successor work package in OpenProject](openproject_user_guide_relations_tab_edit_lag.png)
+
 - **Includes / Part of** - Defines if work package A includes or is part of work package B. This relation type can be used for example when you have a roll-out work package and work packages which should be shown as included without using hierarchical relationships. There is no additional effect.
 
 - **Requires / Required by** - Defines if work package A requires or is required by work package B. There is no additional effect.
diff --git a/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_relations_tab_edit_lag.png b/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_relations_tab_edit_lag.png
new file mode 100644
index 000000000000..c3f4aa997153
Binary files /dev/null and b/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_relations_tab_edit_lag.png differ
diff --git a/docs/user-guide/work-packages/work-package-table-configuration/README.md b/docs/user-guide/work-packages/work-package-table-configuration/README.md
index 2837701b77a1..fc4c34c1b57d 100644
--- a/docs/user-guide/work-packages/work-package-table-configuration/README.md
+++ b/docs/user-guide/work-packages/work-package-table-configuration/README.md
@@ -62,7 +62,8 @@ To add a filter criterion, choose one from the drop-down list next to **+ Add fi
 You can add as many filter criteria as needed.
 Also, you can filter by [custom fields](../../../system-admin-guide/custom-fields) if you set this in the custom field configuration.
 
-> **Good to know**: Filtering a work package table will temporarily change the default work package type and default status to the values used in the filters to make newly created work packages visible in the table.
+> [!TIP]
+> Filtering a work package table will temporarily change the default work package type and default status to the values used in the filters to make newly created work packages visible in the table.
 
 ### Filter operators
 
@@ -156,7 +157,8 @@ Clicking the blue **Apply** button will save your changes and display the result
 
 ![sort-work-packages](sort-work-packages.png)
 
-> **Please note**:  If you have the hierarchy mode activated, all filtered table results will be augmented with their ancestors. Hierarchies can be expanded and collapsed.
+> [!NOTE]
+> If you have the hierarchy mode activated, all filtered table results will be augmented with their ancestors. Hierarchies can be expanded and collapsed.
 
 Therefore, the results may differ if you sort in a flat list or in a hierarchy mode.
 
@@ -166,7 +168,7 @@ The same filter applied in the hierarchy mode.
 
 ### Manual sorting of the work package table
 
-You can sort the work package table manually, using the icon with the 6 dots on the left of each work package to drag and drop it.
+You can sort the work package table manually, using the icon with the three dots on the left of each work package to drag and drop it.
 
 Moving a work package will change its attributes, depending on the kind of table displayed, e.g. hierarchy changes or priority.
 
@@ -247,7 +249,8 @@ If you check the public visibility, the view will be saved under your public vie
 
 ![Work-packages-public-views](Work-packages-public-views.png)
 
-**Please note:** The collapse status (collapsed or expanded groups) can not be saved.
+> [!NOTE]
+> The collapse status (collapsed or expanded groups) can not be saved.
 
 ### Change saved work package views
 
@@ -257,4 +260,5 @@ If you make changes to a saved view, e.g. change a filter criteria, you have to
 
 If you want to save a completely new work package view, again click on the settings and select **Save as...** as described [above](#save-work-package-views).
 
-> **Please note**:  You can't change the default "All open" view. Therefore pressing the disc icon won't have any effect on the default view that is displayed when navigating to the work packages module. You always have to create a new view (filter, group, etc.), set a name and save it (private or public).
+> [!IMPORTANT]
+> You can't change the default "All open" view. Therefore pressing the disc icon won't have any effect on the default view that is displayed when navigating to the work packages module. You always have to create a new view (filter, group, etc.), set a name and save it (private or public).
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 80711257051e..16becf86c119 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -46,12 +46,12 @@
         "@ng-select/ng-select": "^13.2.0",
         "@ngneat/content-loader": "^7.0.0",
         "@ngx-formly/core": "^6.1.4",
-        "@openproject/octicons-angular": "^19.19.0",
-        "@openproject/primer-view-components": "^0.49.2",
+        "@openproject/octicons-angular": "^19.20.0",
+        "@openproject/primer-view-components": "^0.52.0",
         "@openproject/reactivestates": "^3.0.1",
         "@primer/css": "^21.5.0",
         "@primer/primitives": "^9.1.2",
-        "@primer/view-components": "npm:@openproject/primer-view-components@^0.49.2",
+        "@primer/view-components": "npm:@openproject/primer-view-components@^0.52.0",
         "@types/hotwired__turbo": "^8.0.1",
         "@uirouter/angular": "^13.0.0",
         "@uirouter/core": "^6.1.0",
@@ -1147,9 +1147,9 @@
       }
     },
     "node_modules/@appsignal/javascript": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@appsignal/javascript/-/javascript-1.4.1.tgz",
-      "integrity": "sha512-jdZdXvMWLVdCVtVUbgK45WpxK/FQguQL4EI21ebUib4ySQXU1Hdy2Z6uU8AOcM/CfGtmCIil7EcjEwJMH5UFQg==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@appsignal/javascript/-/javascript-1.5.0.tgz",
+      "integrity": "sha512-Wbf7pzUtksK70ci8kTOhVjd3zgeGFSwXqsGH8Pa/D9b3opJwUwDjbDLhdH7dFSE/lIKWKPoynzOIG+nRHND3vQ==",
       "dependencies": {
         "@appsignal/core": "=1.1.24",
         "@appsignal/types": "=3.0.1",
@@ -1157,11 +1157,11 @@
       }
     },
     "node_modules/@appsignal/plugin-breadcrumbs-console": {
-      "version": "1.1.34",
-      "resolved": "https://registry.npmjs.org/@appsignal/plugin-breadcrumbs-console/-/plugin-breadcrumbs-console-1.1.34.tgz",
-      "integrity": "sha512-BcfiQ9NEqxVKeZrG/tPWf+VVwwpe/DDZemfYel6X2X2Q5E26fDqmE997dpeo4S5xoPhZnWvs/fMBX6sdTxJ0xg==",
+      "version": "1.1.35",
+      "resolved": "https://registry.npmjs.org/@appsignal/plugin-breadcrumbs-console/-/plugin-breadcrumbs-console-1.1.35.tgz",
+      "integrity": "sha512-3dtblBrWDewQZvipBmwEka44Y+pgQpHQpnu/P9kZqtMuNNuRDRom1+0nIL2PV73jsmbxz+En2rwqTRBxahFZxQ==",
       "dependencies": {
-        "@appsignal/javascript": "=1.4.1"
+        "@appsignal/javascript": "=1.5.0"
       }
     },
     "node_modules/@appsignal/plugin-breadcrumbs-network": {
@@ -3351,15 +3351,15 @@
       "integrity": "sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig=="
     },
     "node_modules/@fullcalendar/angular": {
-      "version": "6.1.15",
-      "resolved": "https://registry.npmjs.org/@fullcalendar/angular/-/angular-6.1.15.tgz",
-      "integrity": "sha512-4QUwYt5X/BQIz+Y6EnRIC9el4MyLPFQ/Yq6ZDPdStH9EGOu+8mDMMCvQFj0RApIgs+uOLe9Vz92Jd4ajTBrymA==",
+      "version": "6.1.16",
+      "resolved": "https://registry.npmjs.org/@fullcalendar/angular/-/angular-6.1.16.tgz",
+      "integrity": "sha512-Qqs0MZPlIDretmWgtOr0H+uiLO6DKeqxqH1Y2oeWufwEbQTaAxhH7mivdTmxL596JkiuJ/1dhCm+v4tVbFb40w==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "peerDependencies": {
-        "@angular/common": "12 - 18",
-        "@angular/core": "12 - 18",
+        "@angular/common": "12 - 19",
+        "@angular/core": "12 - 19",
         "@fullcalendar/core": "~6.1.15"
       }
     },
@@ -4091,9 +4091,9 @@
       }
     },
     "node_modules/@ngx-formly/core": {
-      "version": "6.3.11",
-      "resolved": "https://registry.npmjs.org/@ngx-formly/core/-/core-6.3.11.tgz",
-      "integrity": "sha512-C/k1bbBjIKM5SnpGl9eHe0EcTlXlxYBg9u5JCWuh8GgR2BPXAaBcXfTcsrp4SRDLSXre/GyxWt4iCLjPWCZ/ug==",
+      "version": "6.3.12",
+      "resolved": "https://registry.npmjs.org/@ngx-formly/core/-/core-6.3.12.tgz",
+      "integrity": "sha512-88MOfn9dM1B33t04jl8x0Glh0Ed0lUKMkhYajicRH7ZHTmwIdla1SQjiblp2C+EcCFvsY7XAU2/JUZQdl56aUw==",
       "dependencies": {
         "tslib": "^2.0.0"
       },
@@ -4814,9 +4814,9 @@
       "integrity": "sha512-jrqoTI8lk5UziDsDPJ2Y+nmXYCcRhmr6uMARr3v/W6AMxRgsnRLWJyWKYr6FjaGMgbyxXG+OkCUPQY4Xl3toGg=="
     },
     "node_modules/@openproject/octicons-angular": {
-      "version": "19.19.0",
-      "resolved": "https://registry.npmjs.org/@openproject/octicons-angular/-/octicons-angular-19.19.0.tgz",
-      "integrity": "sha512-RvLatG2EygvHNWsveDLNFqoikxviQciw87cQkr3R+/bHBIF7DvPQ0BzLKzC9m5tY8tkX0Dk11yI2V2IIcRoHvQ==",
+      "version": "19.20.0",
+      "resolved": "https://registry.npmjs.org/@openproject/octicons-angular/-/octicons-angular-19.20.0.tgz",
+      "integrity": "sha512-mX9QHKvCi+84Q5qCF3f1fH96+ZhwdNLCgn3MPkBvzTgvSRPuXfoboV/WVfl1jrPPiKBPUQuDBlq0UdmeklwLlw==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -4828,9 +4828,9 @@
       }
     },
     "node_modules/@openproject/primer-view-components": {
-      "version": "0.49.2",
-      "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.49.2.tgz",
-      "integrity": "sha512-bpzWRsamWLj0H9VD9jSVC7r/VS9dw+ES6w/tCbjmXKrpDUFOD6m4EN7anrZoH/l7ogp0b4ByN2cGR4H5Ucyn5w==",
+      "version": "0.52.0",
+      "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.52.0.tgz",
+      "integrity": "sha512-rs08YC4NtJsyQOCb+/xq3rqSrNWOOiDicOiEAKwOMf5NNjdy/aVK5vE/F19qdGETy3SXobElk68Mm+SEPXesWg==",
       "dependencies": {
         "@github/auto-check-element": "^5.2.0",
         "@github/auto-complete-element": "^3.6.2",
@@ -4925,9 +4925,9 @@
     },
     "node_modules/@primer/view-components": {
       "name": "@openproject/primer-view-components",
-      "version": "0.49.2",
-      "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.49.2.tgz",
-      "integrity": "sha512-bpzWRsamWLj0H9VD9jSVC7r/VS9dw+ES6w/tCbjmXKrpDUFOD6m4EN7anrZoH/l7ogp0b4ByN2cGR4H5Ucyn5w==",
+      "version": "0.52.0",
+      "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.52.0.tgz",
+      "integrity": "sha512-rs08YC4NtJsyQOCb+/xq3rqSrNWOOiDicOiEAKwOMf5NNjdy/aVK5vE/F19qdGETy3SXobElk68Mm+SEPXesWg==",
       "dependencies": {
         "@github/auto-check-element": "^5.2.0",
         "@github/auto-complete-element": "^3.6.2",
@@ -5559,9 +5559,9 @@
       "dev": true
     },
     "node_modules/@types/hotwired__turbo": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/@types/hotwired__turbo/-/hotwired__turbo-8.0.2.tgz",
-      "integrity": "sha512-fFWI/JNSTVKTPliSOV4fdeC3Kt3FUTbRYkvtF7QPCkqR51+AJWIiX0T5sJXwUnjL9j43tzfBXPZ2jEsBqw8/Bg=="
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/@types/hotwired__turbo/-/hotwired__turbo-8.0.3.tgz",
+      "integrity": "sha512-dBO3AlOdN9IXTD3bmAzi5ZhNwJJd8Eiy1tObsUbFUH6sCohvybwyv3GOtP3KlziWfK/qC85CFohsTR5wcmRM1A=="
     },
     "node_modules/@types/http-errors": {
       "version": "2.0.1",
@@ -7954,9 +7954,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.24.2",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz",
-      "integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==",
+      "version": "4.24.3",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.3.tgz",
+      "integrity": "sha512-1CPmv8iobE2fyRMV97dAcMVegvvWKxmq94hkLiAkUGwKVTyDLw33K+ZxiFrREKmmps4rIw6grcCFCnTMSZ/YiA==",
       "funding": [
         {
           "type": "opencollective",
@@ -7972,9 +7972,9 @@
         }
       ],
       "dependencies": {
-        "caniuse-lite": "^1.0.30001669",
-        "electron-to-chromium": "^1.5.41",
-        "node-releases": "^2.0.18",
+        "caniuse-lite": "^1.0.30001688",
+        "electron-to-chromium": "^1.5.73",
+        "node-releases": "^2.0.19",
         "update-browserslist-db": "^1.1.1"
       },
       "bin": {
@@ -8109,9 +8109,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001669",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001669.tgz",
-      "integrity": "sha512-DlWzFDJqstqtIVx1zeSpIMLjunf5SmwOw0N2Ck/QSQdS8PLS4+9HrLaYei4w8BIAL7IB/UEDu889d8vhCTPA0w==",
+      "version": "1.0.30001688",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001688.tgz",
+      "integrity": "sha512-Nmqpru91cuABu/DTCXbM2NSRHzM2uVHfPnhJ/1zEAJx/ILBRVmz3pzH4N7DZqbdG0gWClsCC05Oj0mJ/1AWMbA==",
       "funding": [
         {
           "type": "opencollective",
@@ -9586,9 +9586,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.41",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.41.tgz",
-      "integrity": "sha512-dfdv/2xNjX0P8Vzme4cfzHqnPm5xsZXwsolTYr0eyW18IUmNyG08vL+fttvinTfhKfIKdRoqkDIC9e9iWQCNYQ=="
+      "version": "1.5.73",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.73.tgz",
+      "integrity": "sha512-8wGNxG9tAG5KhGd3eeA0o6ixhiNdgr0DcHWm85XPCphwZgD1lIEoi6t3VERayWao7SF7AAZTw6oARGJeVjH8Kg=="
     },
     "node_modules/emoji-regex": {
       "version": "9.2.2",
@@ -10946,9 +10946,9 @@
       }
     },
     "node_modules/express": {
-      "version": "4.21.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz",
-      "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
+      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
@@ -10969,7 +10969,7 @@
         "methods": "~1.1.2",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.10",
+        "path-to-regexp": "0.1.12",
         "proxy-addr": "~2.0.7",
         "qs": "6.13.0",
         "range-parser": "~1.2.1",
@@ -10984,6 +10984,10 @@
       },
       "engines": {
         "node": ">= 0.10.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
     "node_modules/express/node_modules/debug": {
@@ -12692,9 +12696,9 @@
       }
     },
     "node_modules/i18n-js": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/i18n-js/-/i18n-js-4.5.0.tgz",
-      "integrity": "sha512-eiT3ZzK+k1VUR/oDz0Nne3dWU6DE+4P3FxtHXgHMZyzW1lKAHsjEYaOPZClU4QA9rI+uoeE71zq1QzLnZ6LDJQ==",
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/i18n-js/-/i18n-js-4.5.1.tgz",
+      "integrity": "sha512-n7jojFj1WC0tztgr0I8jqTXuIlY1xNzXnC3mjKX/YjJhimdM+jXM8vOmn9d3xQFNC6qDHJ4ovhdrGXrRXLIGkA==",
       "dependencies": {
         "bignumber.js": "*",
         "lodash": "*",
@@ -15423,9 +15427,9 @@
       }
     },
     "node_modules/nanoid": {
-      "version": "3.3.7",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+      "version": "3.3.8",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
+      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
       "funding": [
         {
           "type": "github",
@@ -15660,9 +15664,9 @@
       "dev": true
     },
     "node_modules/node-releases": {
-      "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
-      "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g=="
+      "version": "2.0.19",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
+      "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw=="
     },
     "node_modules/normalize-package-data": {
       "version": "6.0.0",
@@ -16870,9 +16874,9 @@
       }
     },
     "node_modules/path-to-regexp": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
-      "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w=="
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
+      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ=="
     },
     "node_modules/path-type": {
       "version": "4.0.0",
@@ -19247,9 +19251,9 @@
       }
     },
     "node_modules/stimulus-use": {
-      "version": "0.52.2",
-      "resolved": "https://registry.npmjs.org/stimulus-use/-/stimulus-use-0.52.2.tgz",
-      "integrity": "sha512-413+tIw9n6Jnb0OFiQE1i3aP01i0hhGgAnPp1P6cNuBbhhqG2IOp8t1O/4s5Tw2lTvSYrFeLNdaY8sYlDaULeg==",
+      "version": "0.52.3",
+      "resolved": "https://registry.npmjs.org/stimulus-use/-/stimulus-use-0.52.3.tgz",
+      "integrity": "sha512-stZ5dID6FUrGCR/ChWUa0FT5Z8iqkzT6lputOAb50eF+Ayg7RzJj4U/HoRlp2NV333QfvoRidru9HLbom4hZVw==",
       "peerDependencies": {
         "@hotwired/stimulus": ">= 3",
         "hotkeys-js": ">= 3"
@@ -22792,9 +22796,9 @@
       }
     },
     "@appsignal/javascript": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@appsignal/javascript/-/javascript-1.4.1.tgz",
-      "integrity": "sha512-jdZdXvMWLVdCVtVUbgK45WpxK/FQguQL4EI21ebUib4ySQXU1Hdy2Z6uU8AOcM/CfGtmCIil7EcjEwJMH5UFQg==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@appsignal/javascript/-/javascript-1.5.0.tgz",
+      "integrity": "sha512-Wbf7pzUtksK70ci8kTOhVjd3zgeGFSwXqsGH8Pa/D9b3opJwUwDjbDLhdH7dFSE/lIKWKPoynzOIG+nRHND3vQ==",
       "requires": {
         "@appsignal/core": "=1.1.24",
         "@appsignal/types": "=3.0.1",
@@ -22802,11 +22806,11 @@
       }
     },
     "@appsignal/plugin-breadcrumbs-console": {
-      "version": "1.1.34",
-      "resolved": "https://registry.npmjs.org/@appsignal/plugin-breadcrumbs-console/-/plugin-breadcrumbs-console-1.1.34.tgz",
-      "integrity": "sha512-BcfiQ9NEqxVKeZrG/tPWf+VVwwpe/DDZemfYel6X2X2Q5E26fDqmE997dpeo4S5xoPhZnWvs/fMBX6sdTxJ0xg==",
+      "version": "1.1.35",
+      "resolved": "https://registry.npmjs.org/@appsignal/plugin-breadcrumbs-console/-/plugin-breadcrumbs-console-1.1.35.tgz",
+      "integrity": "sha512-3dtblBrWDewQZvipBmwEka44Y+pgQpHQpnu/P9kZqtMuNNuRDRom1+0nIL2PV73jsmbxz+En2rwqTRBxahFZxQ==",
       "requires": {
-        "@appsignal/javascript": "=1.4.1"
+        "@appsignal/javascript": "=1.5.0"
       }
     },
     "@appsignal/plugin-breadcrumbs-network": {
@@ -24213,9 +24217,9 @@
       "integrity": "sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig=="
     },
     "@fullcalendar/angular": {
-      "version": "6.1.15",
-      "resolved": "https://registry.npmjs.org/@fullcalendar/angular/-/angular-6.1.15.tgz",
-      "integrity": "sha512-4QUwYt5X/BQIz+Y6EnRIC9el4MyLPFQ/Yq6ZDPdStH9EGOu+8mDMMCvQFj0RApIgs+uOLe9Vz92Jd4ajTBrymA==",
+      "version": "6.1.16",
+      "resolved": "https://registry.npmjs.org/@fullcalendar/angular/-/angular-6.1.16.tgz",
+      "integrity": "sha512-Qqs0MZPlIDretmWgtOr0H+uiLO6DKeqxqH1Y2oeWufwEbQTaAxhH7mivdTmxL596JkiuJ/1dhCm+v4tVbFb40w==",
       "requires": {
         "tslib": "^2.3.0"
       }
@@ -24800,9 +24804,9 @@
       "integrity": "sha512-SfTCbplt4y6ak5cf2IfqdoVOsnoNdh/j6Vu+wb8WWABKwZ5yfr2S/Gk6ithSKcdIZhAF8DNBOoyk1EJuf8Xkfg=="
     },
     "@ngx-formly/core": {
-      "version": "6.3.11",
-      "resolved": "https://registry.npmjs.org/@ngx-formly/core/-/core-6.3.11.tgz",
-      "integrity": "sha512-C/k1bbBjIKM5SnpGl9eHe0EcTlXlxYBg9u5JCWuh8GgR2BPXAaBcXfTcsrp4SRDLSXre/GyxWt4iCLjPWCZ/ug==",
+      "version": "6.3.12",
+      "resolved": "https://registry.npmjs.org/@ngx-formly/core/-/core-6.3.12.tgz",
+      "integrity": "sha512-88MOfn9dM1B33t04jl8x0Glh0Ed0lUKMkhYajicRH7ZHTmwIdla1SQjiblp2C+EcCFvsY7XAU2/JUZQdl56aUw==",
       "requires": {
         "tslib": "^2.0.0"
       }
@@ -25280,17 +25284,17 @@
       "integrity": "sha512-jrqoTI8lk5UziDsDPJ2Y+nmXYCcRhmr6uMARr3v/W6AMxRgsnRLWJyWKYr6FjaGMgbyxXG+OkCUPQY4Xl3toGg=="
     },
     "@openproject/octicons-angular": {
-      "version": "19.19.0",
-      "resolved": "https://registry.npmjs.org/@openproject/octicons-angular/-/octicons-angular-19.19.0.tgz",
-      "integrity": "sha512-RvLatG2EygvHNWsveDLNFqoikxviQciw87cQkr3R+/bHBIF7DvPQ0BzLKzC9m5tY8tkX0Dk11yI2V2IIcRoHvQ==",
+      "version": "19.20.0",
+      "resolved": "https://registry.npmjs.org/@openproject/octicons-angular/-/octicons-angular-19.20.0.tgz",
+      "integrity": "sha512-mX9QHKvCi+84Q5qCF3f1fH96+ZhwdNLCgn3MPkBvzTgvSRPuXfoboV/WVfl1jrPPiKBPUQuDBlq0UdmeklwLlw==",
       "requires": {
         "tslib": "^2.3.0"
       }
     },
     "@openproject/primer-view-components": {
-      "version": "0.49.2",
-      "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.49.2.tgz",
-      "integrity": "sha512-bpzWRsamWLj0H9VD9jSVC7r/VS9dw+ES6w/tCbjmXKrpDUFOD6m4EN7anrZoH/l7ogp0b4ByN2cGR4H5Ucyn5w==",
+      "version": "0.52.0",
+      "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.52.0.tgz",
+      "integrity": "sha512-rs08YC4NtJsyQOCb+/xq3rqSrNWOOiDicOiEAKwOMf5NNjdy/aVK5vE/F19qdGETy3SXobElk68Mm+SEPXesWg==",
       "requires": {
         "@github/auto-check-element": "^5.2.0",
         "@github/auto-complete-element": "^3.6.2",
@@ -25363,9 +25367,9 @@
       }
     },
     "@primer/view-components": {
-      "version": "npm:@openproject/primer-view-components@0.49.2",
-      "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.49.2.tgz",
-      "integrity": "sha512-bpzWRsamWLj0H9VD9jSVC7r/VS9dw+ES6w/tCbjmXKrpDUFOD6m4EN7anrZoH/l7ogp0b4ByN2cGR4H5Ucyn5w==",
+      "version": "npm:@openproject/primer-view-components@0.52.0",
+      "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.52.0.tgz",
+      "integrity": "sha512-rs08YC4NtJsyQOCb+/xq3rqSrNWOOiDicOiEAKwOMf5NNjdy/aVK5vE/F19qdGETy3SXobElk68Mm+SEPXesWg==",
       "requires": {
         "@github/auto-check-element": "^5.2.0",
         "@github/auto-complete-element": "^3.6.2",
@@ -25835,9 +25839,9 @@
       "dev": true
     },
     "@types/hotwired__turbo": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/@types/hotwired__turbo/-/hotwired__turbo-8.0.2.tgz",
-      "integrity": "sha512-fFWI/JNSTVKTPliSOV4fdeC3Kt3FUTbRYkvtF7QPCkqR51+AJWIiX0T5sJXwUnjL9j43tzfBXPZ2jEsBqw8/Bg=="
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/@types/hotwired__turbo/-/hotwired__turbo-8.0.3.tgz",
+      "integrity": "sha512-dBO3AlOdN9IXTD3bmAzi5ZhNwJJd8Eiy1tObsUbFUH6sCohvybwyv3GOtP3KlziWfK/qC85CFohsTR5wcmRM1A=="
     },
     "@types/http-errors": {
       "version": "2.0.1",
@@ -27611,13 +27615,13 @@
       }
     },
     "browserslist": {
-      "version": "4.24.2",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz",
-      "integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==",
+      "version": "4.24.3",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.3.tgz",
+      "integrity": "sha512-1CPmv8iobE2fyRMV97dAcMVegvvWKxmq94hkLiAkUGwKVTyDLw33K+ZxiFrREKmmps4rIw6grcCFCnTMSZ/YiA==",
       "requires": {
-        "caniuse-lite": "^1.0.30001669",
-        "electron-to-chromium": "^1.5.41",
-        "node-releases": "^2.0.18",
+        "caniuse-lite": "^1.0.30001688",
+        "electron-to-chromium": "^1.5.73",
+        "node-releases": "^2.0.19",
         "update-browserslist-db": "^1.1.1"
       }
     },
@@ -27708,9 +27712,9 @@
       "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
     },
     "caniuse-lite": {
-      "version": "1.0.30001669",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001669.tgz",
-      "integrity": "sha512-DlWzFDJqstqtIVx1zeSpIMLjunf5SmwOw0N2Ck/QSQdS8PLS4+9HrLaYei4w8BIAL7IB/UEDu889d8vhCTPA0w=="
+      "version": "1.0.30001688",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001688.tgz",
+      "integrity": "sha512-Nmqpru91cuABu/DTCXbM2NSRHzM2uVHfPnhJ/1zEAJx/ILBRVmz3pzH4N7DZqbdG0gWClsCC05Oj0mJ/1AWMbA=="
     },
     "capture-exit": {
       "version": "2.0.0",
@@ -28797,9 +28801,9 @@
       }
     },
     "electron-to-chromium": {
-      "version": "1.5.41",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.41.tgz",
-      "integrity": "sha512-dfdv/2xNjX0P8Vzme4cfzHqnPm5xsZXwsolTYr0eyW18IUmNyG08vL+fttvinTfhKfIKdRoqkDIC9e9iWQCNYQ=="
+      "version": "1.5.73",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.73.tgz",
+      "integrity": "sha512-8wGNxG9tAG5KhGd3eeA0o6ixhiNdgr0DcHWm85XPCphwZgD1lIEoi6t3VERayWao7SF7AAZTw6oARGJeVjH8Kg=="
     },
     "emoji-regex": {
       "version": "9.2.2",
@@ -29884,9 +29888,9 @@
       "integrity": "sha512-iPowgKUZkTPX5PznYsmifVj9Bob0w2wTHVkt/eYNPSzyebkUgIedmskf/kcfEIWpiWjg3JRjnW+a17XypySMuw=="
     },
     "express": {
-      "version": "4.21.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz",
-      "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
+      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
       "requires": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
@@ -29907,7 +29911,7 @@
         "methods": "~1.1.2",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.10",
+        "path-to-regexp": "0.1.12",
         "proxy-addr": "~2.0.7",
         "qs": "6.13.0",
         "range-parser": "~1.2.1",
@@ -31206,9 +31210,9 @@
       "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="
     },
     "i18n-js": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/i18n-js/-/i18n-js-4.5.0.tgz",
-      "integrity": "sha512-eiT3ZzK+k1VUR/oDz0Nne3dWU6DE+4P3FxtHXgHMZyzW1lKAHsjEYaOPZClU4QA9rI+uoeE71zq1QzLnZ6LDJQ==",
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/i18n-js/-/i18n-js-4.5.1.tgz",
+      "integrity": "sha512-n7jojFj1WC0tztgr0I8jqTXuIlY1xNzXnC3mjKX/YjJhimdM+jXM8vOmn9d3xQFNC6qDHJ4ovhdrGXrRXLIGkA==",
       "requires": {
         "bignumber.js": "*",
         "lodash": "*",
@@ -33207,9 +33211,9 @@
       "integrity": "sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA=="
     },
     "nanoid": {
-      "version": "3.3.7",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g=="
+      "version": "3.3.8",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
+      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w=="
     },
     "nanomatch": {
       "version": "1.2.13",
@@ -33376,9 +33380,9 @@
       "dev": true
     },
     "node-releases": {
-      "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
-      "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g=="
+      "version": "2.0.19",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
+      "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw=="
     },
     "normalize-package-data": {
       "version": "6.0.0",
@@ -34268,9 +34272,9 @@
       }
     },
     "path-to-regexp": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
-      "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w=="
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
+      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ=="
     },
     "path-type": {
       "version": "4.0.0",
@@ -36019,9 +36023,9 @@
       "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
     },
     "stimulus-use": {
-      "version": "0.52.2",
-      "resolved": "https://registry.npmjs.org/stimulus-use/-/stimulus-use-0.52.2.tgz",
-      "integrity": "sha512-413+tIw9n6Jnb0OFiQE1i3aP01i0hhGgAnPp1P6cNuBbhhqG2IOp8t1O/4s5Tw2lTvSYrFeLNdaY8sYlDaULeg=="
+      "version": "0.52.3",
+      "resolved": "https://registry.npmjs.org/stimulus-use/-/stimulus-use-0.52.3.tgz",
+      "integrity": "sha512-stZ5dID6FUrGCR/ChWUa0FT5Z8iqkzT6lputOAb50eF+Ayg7RzJj4U/HoRlp2NV333QfvoRidru9HLbom4hZVw=="
     },
     "streamroller": {
       "version": "3.1.5",
diff --git a/frontend/package.json b/frontend/package.json
index 98e4b60eab2e..7dc207a71bfe 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -98,12 +98,12 @@
     "@ng-select/ng-select": "^13.2.0",
     "@ngneat/content-loader": "^7.0.0",
     "@ngx-formly/core": "^6.1.4",
-    "@openproject/octicons-angular": "^19.19.0",
-    "@openproject/primer-view-components": "^0.49.2",
+    "@openproject/octicons-angular": "^19.20.0",
+    "@openproject/primer-view-components": "^0.52.0",
     "@openproject/reactivestates": "^3.0.1",
     "@primer/css": "^21.5.0",
     "@primer/primitives": "^9.1.2",
-    "@primer/view-components": "npm:@openproject/primer-view-components@^0.49.2",
+    "@primer/view-components": "npm:@openproject/primer-view-components@^0.52.0",
     "@types/hotwired__turbo": "^8.0.1",
     "@uirouter/angular": "^13.0.0",
     "@uirouter/core": "^6.1.0",
diff --git a/frontend/src/app/core/apiv3/endpoints/work_packages/api-v3-work-package-paths.ts b/frontend/src/app/core/apiv3/endpoints/work_packages/api-v3-work-package-paths.ts
index bb325734f769..99a8eeee5ad8 100644
--- a/frontend/src/app/core/apiv3/endpoints/work_packages/api-v3-work-package-paths.ts
+++ b/frontend/src/app/core/apiv3/endpoints/work_packages/api-v3-work-package-paths.ts
@@ -46,6 +46,9 @@ export class ApiV3WorkPackagePaths extends ApiV3Resource<WorkPackageResource> {
   // /api/v3/(?:projectPath)/work_packages/(:workPackageId)/available_watchers
   public readonly available_watchers = this.subResource('available_watchers');
 
+  // /api/v3/(?:projectPath)/work_packages/(:workPackageId)/reminders
+  public readonly reminders = this.subResource('reminders');
+
   // /api/v3/(?:projectPath)/work_packages/(:workPackageId)/available_projects
   public readonly available_projects = this.subResource('available_projects');
 
diff --git a/frontend/src/app/core/current-user/current-user.service.ts b/frontend/src/app/core/current-user/current-user.service.ts
index 9f62c5df719d..65c8a3a49666 100644
--- a/frontend/src/app/core/current-user/current-user.service.ts
+++ b/frontend/src/app/core/current-user/current-user.service.ts
@@ -28,13 +28,13 @@
 
 import { Injectable } from '@angular/core';
 import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
-import { CurrentUser, CurrentUserStore } from './current-user.store';
-import { CurrentUserQuery } from './current-user.query';
-import { CapabilitiesResourceService } from 'core-app/core/state/capabilities/capabilities.service';
-import { Observable } from 'rxjs';
-import { distinctUntilChanged, map, switchMap, take } from 'rxjs/operators';
 import { ApiV3ListFilter } from 'core-app/core/apiv3/paths/apiv3-list-resource.interface';
+import { CapabilitiesResourceService } from 'core-app/core/state/capabilities/capabilities.service';
 import { ICapability } from 'core-app/core/state/capabilities/capability.model';
+import { Observable, combineLatest } from 'rxjs';
+import { distinctUntilChanged, map, switchMap, take } from 'rxjs/operators';
+import { CurrentUserQuery } from './current-user.query';
+import { CurrentUser, CurrentUserStore } from './current-user.store';
 
 @Injectable({ providedIn: 'root' })
 export class CurrentUserService {
@@ -63,6 +63,15 @@ export class CurrentUserService {
     }));
   }
 
+  public isLoggedInAndHasCapabalities$(action:string|string[], projectContext:string|null):Observable<boolean> {
+    return combineLatest([
+      this.isLoggedIn$,
+      this.hasCapabilities$(action, projectContext),
+    ]).pipe(
+      map(([isLoggedIn, hasCapabilities]) => isLoggedIn && hasCapabilities),
+    );
+  }
+
   /**
    * Returns the set of capabilities for the given context and/or actions
    */
diff --git a/frontend/src/app/core/global_search/input/global-search-input.component.html b/frontend/src/app/core/global_search/input/global-search-input.component.html
index 86954b119595..0419ceecb2e0 100644
--- a/frontend/src/app/core/global_search/input/global-search-input.component.html
+++ b/frontend/src/app/core/global_search/input/global-search-input.component.html
@@ -59,6 +59,7 @@
           <op-principal
             [hideName]="true"
             [principal]="item.author"
+            [hoverCard]="false"
             class="hidden-for-mobile global-search--principal"
           ></op-principal>
           <div class="global-search--option-meta">
diff --git a/frontend/src/app/core/html/op-title.service.ts b/frontend/src/app/core/html/op-title.service.ts
index c4b1f0bfb821..2d8e8cd48338 100644
--- a/frontend/src/app/core/html/op-title.service.ts
+++ b/frontend/src/app/core/html/op-title.service.ts
@@ -6,28 +6,29 @@ const titlePartsSeparator = ' | ';
 @Injectable({ providedIn: 'root' })
 export class OpTitleService {
   constructor(private titleService:Title) {
-
   }
 
   public get current():string {
     return this.titleService.getTitle();
   }
 
+  public get base():string {
+    const appTitle = document.querySelector('meta[name=app_title]') as HTMLMetaElement;
+    return appTitle.content;
+  }
+
   public get titleParts():string[] {
     return this.current.split(titlePartsSeparator);
   }
 
   public setFirstPart(value:string) {
-    const parts = this.titleParts;
-    parts[0] = value;
-
-    this.titleService.setTitle(parts.join(titlePartsSeparator));
-  }
-
-  public prependFirstPart(value:string):void {
-    const parts = this.titleParts;
-    parts.unshift(value);
-
-    this.titleService.setTitle(parts.join(titlePartsSeparator));
+    if (this.current.includes(this.base) && this.current.includes(titlePartsSeparator)) {
+      const parts = this.titleParts;
+      parts[0] = value;
+      this.titleService.setTitle(parts.join(titlePartsSeparator));
+    } else {
+      const newTitle = [value, this.base].join(titlePartsSeparator);
+      this.titleService.setTitle(newTitle);
+    }
   }
 }
diff --git a/frontend/src/app/core/main-menu/main-menu-toggle.service.ts b/frontend/src/app/core/main-menu/main-menu-toggle.service.ts
index 6db9707b6dca..f98505cc2413 100644
--- a/frontend/src/app/core/main-menu/main-menu-toggle.service.ts
+++ b/frontend/src/app/core/main-menu/main-menu-toggle.service.ts
@@ -66,12 +66,18 @@ export class MainMenuToggleService {
   private changeData = new BehaviorSubject<any>({});
 
   public changeData$ = this.changeData.asObservable();
+  private wasHiddenDueToResize = false;
+
+  private wasCollapsedByUser = false;
 
   constructor(
     protected I18n:I18nService,
     public injector:Injector,
     readonly deviceService:DeviceService,
   ) {
+    this.initializeMenu();
+    // Add resize event listener
+    window.addEventListener('resize', this.onWindowResize.bind(this));
   }
 
   public initializeMenu():void {
@@ -80,45 +86,57 @@ export class MainMenuToggleService {
     }
 
     this.elementWidth = parseInt(window.OpenProject.guardedLocalStorage(this.localStorageKey) as string);
-    const menuCollapsed = window.OpenProject.guardedLocalStorage(this.localStorageStateKey) as string;
+    const menuCollapsed = window.OpenProject.guardedLocalStorage(this.localStorageStateKey) === 'true';
+
+    // Set the initial value of the collapse tracking flag
+    this.wasCollapsedByUser = menuCollapsed;
 
     if (!this.elementWidth) {
       this.saveWidth(this.mainMenu.offsetWidth);
-    } else if (menuCollapsed && JSON.parse(menuCollapsed)) {
+    } else if (menuCollapsed) {
       this.closeMenu();
     } else {
       this.setWidth();
     }
 
-    const currentProject:CurrentProjectService = this.injector.get(CurrentProjectService);
-    if (jQuery(document.body).hasClass('controller-my') && this.elementWidth === 0 || currentProject.id === null) {
-      this.saveWidth(this.defaultWidth);
-    }
+    this.adjustMenuVisibility();
+  }
 
-    // small desktop version default: hide menu on initialization
-    this.closeWhenOnSmallDesktop();
+  private onWindowResize():void {
+    this.adjustMenuVisibility();
+  }
+
+  private adjustMenuVisibility():void {
+    if (window.innerWidth >= 1012) {
+      // On larger screens, reopen the menu if it was hidden only due to screen resizing
+      if (this.wasHiddenDueToResize && !this.wasCollapsedByUser) {
+        this.setWidth(this.defaultWidth);
+        this.wasHiddenDueToResize = false; // Reset the flag since the menu is now shown
+      }
+    } else if (this.showNavigation) {
+        this.closeMenu();
+        this.wasHiddenDueToResize = true; // Indicate that the menu was hidden due to resize
+    }
   }
 
-  // click on arrow or hamburger icon
   public toggleNavigation(event?:JQuery.TriggeredEvent|Event):void {
     if (event) {
       event.stopPropagation();
       event.preventDefault();
     }
 
-    if (!this.showNavigation) { // sidebar is hidden -> show menu
-      if (this.deviceService.isSmallDesktop) { // small desktop version
-        this.setWidth(window.innerWidth);
-      } else { // desktop version
-        const savedWidth = parseInt(window.OpenProject.guardedLocalStorage(this.localStorageKey) as string);
-        const widthToSave = savedWidth >= this.elementMinWidth ? savedWidth : this.defaultWidth;
+    // Update the user collapse flag and clear `wasHiddenDueToResize`
+    this.wasCollapsedByUser = this.showNavigation;
+    this.wasHiddenDueToResize = false; // Reset because a manual toggle overrides any resize behavior
 
-        this.saveWidth(widthToSave);
-      }
-    } else { // sidebar is expanded -> close menu
+    if (this.showNavigation) {
       this.closeMenu();
+    } else {
+      this.openMenu();
     }
 
+    // Save the collapsed state in localStorage
+    window.OpenProject.guardedLocalStorage(this.localStorageStateKey, String(!this.showNavigation));
     // Set focus on first visible main menu item.
     // This needs to be called after AngularJS has rendered the menu, which happens some when after(!) we leave this
     // method here. So we need to set the focus after a timeout.
@@ -129,48 +147,43 @@ export class MainMenuToggleService {
 
   public closeMenu():void {
     this.setWidth(0);
-    window.OpenProject.guardedLocalStorage(this.localStorageStateKey, 'true');
     jQuery('.searchable-menu--search-input').blur();
   }
 
-  public closeWhenOnSmallDesktop():void {
-    if (this.deviceService.isSmallDesktop) {
-      this.closeMenu();
-      window.OpenProject.guardedLocalStorage(this.localStorageStateKey, 'false');
-    }
-  }
-
-  public saveWidth(width?:number):void {
-    this.setWidth(width);
-    window.OpenProject.guardedLocalStorage(this.localStorageKey, String(this.elementWidth));
-    window.OpenProject.guardedLocalStorage(this.localStorageStateKey, String(this.elementWidth === 0));
+  public openMenu():void {
+    this.setWidth(this.defaultWidth);
   }
 
-  public setWidth(width?:any):void {
+  public setWidth(width?:number):void {
     if (width !== undefined) {
-      // Leave a minimum amount of space for space for the content
-      const maxMenuWidth = this.deviceService.isSmallDesktop ? window.innerWidth - 120 : window.innerWidth - 520;
-      if (width > maxMenuWidth) {
-        this.elementWidth = maxMenuWidth;
-      } else {
-        this.elementWidth = width as number;
-      }
+      this.elementWidth = width;
     }
 
+    // Apply the width directly to the main menu
+    this.mainMenu.style.width = `${this.elementWidth}px`;
+
+    // Apply to root CSS variable for any related layout adjustments
+    this.htmlNode.style.setProperty('--main-menu-width', `${this.elementWidth}px`);
+
+    // Check if menu is open or closed and apply CSS class if needed
+    this.toggleClassHidden();
     this.snapBack();
     this.setToggleTitle();
-    this.toggleClassHidden();
 
-    this.global.showNavigation = this.showNavigation;
-    this.htmlNode.style.setProperty('--main-menu-width', `${this.elementWidth}px`);
+    // Save the width if it's open
+    if (this.elementWidth > 0) {
+      window.OpenProject.guardedLocalStorage(this.localStorageKey, String(this.elementWidth));
+    }
+  }
 
-    // Send change event when size of menu is changing (menu toggled or resized)
-    const changeEvent = jQuery.Event('change');
-    this.changeData.next(changeEvent);
+  public saveWidth(width?:number):void {
+    this.setWidth(width);
+    window.OpenProject.guardedLocalStorage(this.localStorageKey, String(this.elementWidth));
+    window.OpenProject.guardedLocalStorage(this.localStorageStateKey, String(this.elementWidth === 0));
   }
 
   public get showNavigation():boolean {
-    return (this.elementWidth >= this.elementMinWidth);
+    return this.elementWidth >= this.elementMinWidth;
   }
 
   private snapBack():void {
@@ -189,6 +202,7 @@ export class MainMenuToggleService {
   }
 
   private toggleClassHidden():void {
-    this.hideElements.toggleClass('hidden-navigation', !this.showNavigation);
+    const isHidden = this.elementWidth < this.elementMinWidth;
+    this.hideElements.toggleClass('hidden-navigation', isHidden);
   }
 }
diff --git a/frontend/src/app/core/path-helper/path-helper.service.ts b/frontend/src/app/core/path-helper/path-helper.service.ts
index c6228adeb946..b39afd827d8f 100644
--- a/frontend/src/app/core/path-helper/path-helper.service.ts
+++ b/frontend/src/app/core/path-helper/path-helper.service.ts
@@ -220,6 +220,10 @@ export class PathHelperService {
     return `${this.usersPath()}/${id}`;
   }
 
+  public userHoverCardPath(id:string|number) {
+    return `${this.usersPath()}/${id}/hover_card`;
+  }
+
   public placeholderUserPath(id:string|number) {
     return `${this.placeholderUsersPath()}/${id}`;
   }
@@ -276,6 +280,10 @@ export class PathHelperService {
     return this.workPackageDetailsPath(projectIdentifier, workPackageId, 'copy');
   }
 
+  public workPackageReminderModalBodyPath(workPackageId:string|number) {
+    return `${this.workPackagePath(workPackageId)}/reminders/modal_body`;
+  }
+
   public workPackageSharePath(workPackageId:string|number) {
     return `${this.workPackagePath(workPackageId)}/shares`;
   }
diff --git a/frontend/src/app/core/routing/openproject.routes.ts b/frontend/src/app/core/routing/openproject.routes.ts
index d1f3cf49cf02..ebb4709e386d 100644
--- a/frontend/src/app/core/routing/openproject.routes.ts
+++ b/frontend/src/app/core/routing/openproject.routes.ts
@@ -195,29 +195,6 @@ export function initializeUiRouterListeners(injector:Injector) {
     (transition) => redirectToMobileAlternative(transition),
   );
 
-  // Fire an event when navigating to a different module. This event then can be detected in
-  // the non-angular parts of the application. A usecase for this can be found in the
-  // overview-header.controllers.ts
-  // See https://community.openproject.org/wp/55024 for details.
-  $transitions.onBefore(
-    {},
-    (transition:Transition) => {
-      const fromState = transition.from();
-      const toState = transition.to();
-      if (
-        !!fromState.name
-        && !!toState.name
-        && fromState.name?.split('.')[0] !== toState.name?.split('.')[0]
-      ) {
-        window.dispatchEvent(new CustomEvent('angular:router:module-changed', {
-          detail: toState.name?.split('.')[0],
-        }));
-      }
-
-      return true;
-    },
-  );
-
   // Apply classes from bodyClasses in each state definition
   // This was defined as onEnter, onExit functions in each state before
   // but since AOT doesn't allow anonymous functions, we can't re-use them now.
diff --git a/frontend/src/app/core/setup/globals/global-listeners/hover-card-trigger.service.ts b/frontend/src/app/core/setup/globals/global-listeners/hover-card-trigger.service.ts
index eff95f2b842c..6edea8a379ff 100644
--- a/frontend/src/app/core/setup/globals/global-listeners/hover-card-trigger.service.ts
+++ b/frontend/src/app/core/setup/globals/global-listeners/hover-card-trigger.service.ts
@@ -29,12 +29,23 @@
 import { Injectable, Injector, NgZone } from '@angular/core';
 import { OpModalService } from 'core-app/shared/components/modal/modal.service';
 import { HoverCardComponent } from 'core-app/shared/components/modals/preview-modal/hover-card-modal/hover-card.modal';
+import { PortalOutletTarget } from 'core-app/shared/components/modal/portal-outlet-target.enum';
 
 @Injectable({ providedIn: 'root' })
 export class HoverCardTriggerService {
   private modalElement:HTMLElement;
 
   private mouseInModal = false;
+  private hoverTimeout:number|null = null;
+  private closeTimeout:number|null = null;
+  // Set to custom when opening the hover card on top of another modal
+  private modalTarget:PortalOutletTarget = PortalOutletTarget.Default;
+  private previousTarget:HTMLElement|null = null;
+
+  // The time you need to keep hovering over a trigger before the hover card is shown
+  OPEN_DELAY_IN_MS = 1000;
+  // The time you need to keep away from trigger/hover card before an opened card is closed
+  CLOSE_DELAY_IN_MS = 250;
 
   constructor(
     readonly opModalService:OpModalService,
@@ -49,31 +60,45 @@ export class HoverCardTriggerService {
       e.stopPropagation();
       // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
       const el = e.target as HTMLElement;
-      if (el) {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-        const turboFrameUrl = el.getAttribute('data-hover-card-url');
-
-        if (!turboFrameUrl) {
-          return;
-        }
-
-        this.opModalService.show(
-          HoverCardComponent,
-          this.injector,
-          { turboFrameSrc: turboFrameUrl, event: e },
-          true,
-        ).subscribe((previewModal) => {
-          this.modalElement = previewModal.elementRef.nativeElement as HTMLElement;
-          void previewModal.reposition(this.modalElement, el);
-        });
+      if (!el) { return; }
+
+      if (this.previousTarget && this.previousTarget === el) {
+        // Re-entering the trigger counts as hovering over the card:
+        this.mouseInModal = true;
+        // But we will not re-render the same card, abort here
+        return;
+      }
+
+      // Hovering over a new target. Close the old one (if any).
+      this.close(true);
+      this.previousTarget = el;
+
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+      const turboFrameUrl = el.getAttribute('data-hover-card-url');
+      if (!turboFrameUrl) { return; }
+
+      // Reset close timer for when hovering over multiple triggers in quick succession.
+      // A timer from a previous hover card might still be running. We do not want it to
+      // close the new (i.e. this) hover card.
+      if (this.closeTimeout) {
+        clearTimeout(this.closeTimeout);
+        this.closeTimeout = null;
       }
+
+      // Set a delay before showing the hover card
+      this.hoverTimeout = window.setTimeout(() => {
+        this.showHoverCard(el, turboFrameUrl, e);
+      }, this.OPEN_DELAY_IN_MS);
     });
 
     jQuery(document.body).on('mouseleave', '.op-hover-card--preview-trigger', () => {
+      this.clearHoverTimer();
+      this.mouseInModal = false;
       this.closeAfterTimeout();
     });
 
     jQuery(document.body).on('mouseleave', '.op-hover-card', () => {
+      this.clearHoverTimer();
       this.mouseInModal = false;
       this.closeAfterTimeout();
     });
@@ -83,13 +108,63 @@ export class HoverCardTriggerService {
     });
   }
 
+  private showHoverCard(el:HTMLElement, turboFrameUrl:string, e:JQuery.MouseOverEvent) {
+    // Abort if the element is no longer present in the DOM. This can happen when this method is called after a delay.
+    if (!document.body.contains(el)) { return; }
+
+    this.parseHoverCardOptions(el);
+
+    // There is only one possible slot to insert a modal. If that slot is taken, we assume the other modal
+    // to be more important than a hover card and give up.
+    const modal = this.opModalService.showIfNotActive(
+      HoverCardComponent,
+      this.injector,
+      { turboFrameSrc: turboFrameUrl, event: e },
+      true,
+      false,
+      this.modalTarget,
+    );
+
+    modal?.subscribe((previewModal) => {
+      this.modalElement = previewModal.elementRef.nativeElement as HTMLElement;
+      previewModal.alignment = 'top';
+
+      void previewModal.reposition(this.modalElement, el);
+    });
+  }
+
+  // Should be called when the mouse leaves the hover-zone so that we no longer attempt ot display the hover card.
+  private clearHoverTimer() {
+    if (this.hoverTimeout) {
+      clearTimeout(this.hoverTimeout);
+      this.hoverTimeout = null;
+    }
+  }
+
   private closeAfterTimeout() {
     this.ngZone.runOutsideAngular(() => {
-      setTimeout(() => {
-        if (!this.mouseInModal) {
-          this.opModalService.close();
-        }
-      }, 100);
+      this.closeTimeout = window.setTimeout(() => {
+        this.close();
+      }, this.CLOSE_DELAY_IN_MS);
     });
   }
+
+  private close(forceClose=false) {
+    if (forceClose) {
+      this.mouseInModal = false;
+    }
+
+    if (!this.mouseInModal) {
+      this.opModalService.close();
+      // Allow opening this target once more, since it has been orderly closed
+      this.previousTarget = null;
+    }
+  }
+
+  private parseHoverCardOptions(el:HTMLElement) {
+    const modalTarget = el.getAttribute('data-hover-card-target');
+    if (modalTarget) {
+      this.modalTarget = parseInt(modalTarget, 10);
+    }
+  }
 }
diff --git a/frontend/src/app/core/state/in-app-notifications/in-app-notification.model.ts b/frontend/src/app/core/state/in-app-notifications/in-app-notification.model.ts
index eeae2b406f04..1a12217b389f 100644
--- a/frontend/src/app/core/state/in-app-notifications/in-app-notification.model.ts
+++ b/frontend/src/app/core/state/in-app-notifications/in-app-notification.model.ts
@@ -13,7 +13,7 @@ export interface IInAppNotificationHalResourceLinks extends IHalResourceLinks {
   activity:IHalResourceLink;
 }
 
-export type IInAppNotificationDetailsAttribute = 'startDate'|'dueDate'|'date';
+export type IInAppNotificationDetailsAttribute = 'startDate'|'dueDate'|'date'|'note';
 
 export interface IInAppNotificationDetailsResource {
   property:IInAppNotificationDetailsAttribute;
diff --git a/frontend/src/app/core/state/storage-files/storage-files.service.ts b/frontend/src/app/core/state/storage-files/storage-files.service.ts
index 5a7d9e9bcb42..b621427704e4 100644
--- a/frontend/src/app/core/state/storage-files/storage-files.service.ts
+++ b/frontend/src/app/core/state/storage-files/storage-files.service.ts
@@ -79,6 +79,10 @@ export class StorageFilesResourceService {
     return this.httpClient.request<IUploadLink>(link.method, link.href, { body: link.payload });
   }
 
+  createFolder(href:string, body:{ name:string, parent_id:ID }):Observable<IStorageFile> {
+    return this.httpClient.post<IStorageFile>(href, body);
+  }
+
   reset():void {
     this.store.reset();
   }
diff --git a/frontend/src/app/features/calendar/op-work-packages-calendar.service.ts b/frontend/src/app/features/calendar/op-work-packages-calendar.service.ts
index 2a854e746d6e..c8569e0e911c 100644
--- a/frontend/src/app/features/calendar/op-work-packages-calendar.service.ts
+++ b/frontend/src/app/features/calendar/op-work-packages-calendar.service.ts
@@ -147,8 +147,8 @@ export class OpWorkPackagesCalendarService extends UntilDestroyedMixin {
     }
   }
 
-  async requireNonWorkingDays(date:Date|string) {
-    this.nonWorkingDays = await firstValueFrom(this.dayService.requireNonWorkingYear$(date));
+  async requireNonWorkingDays(start:Date|string, end:Date|string) {
+    this.nonWorkingDays = await firstValueFrom(this.dayService.requireNonWorkingYears$(start, end));
   }
 
   isNonWorkingDay(date:Date|string):boolean {
@@ -160,8 +160,7 @@ export class OpWorkPackagesCalendarService extends UntilDestroyedMixin {
     fetchInfo:{ start:Date, end:Date, timeZone:string },
     projectIdentifier:string|undefined,
   ):Promise<unknown> {
-    await this.requireNonWorkingDays(fetchInfo.start);
-    await this.requireNonWorkingDays(fetchInfo.end);
+    await this.requireNonWorkingDays(fetchInfo.start, fetchInfo.end);
 
     if (this.areFiltersEmpty && this.querySpace.query.value) {
       // nothing to do
diff --git a/frontend/src/app/features/calendar/te-calendar/te-calendar.component.ts b/frontend/src/app/features/calendar/te-calendar/te-calendar.component.ts
index 6216191458f1..8634c3795442 100644
--- a/frontend/src/app/features/calendar/te-calendar/te-calendar.component.ts
+++ b/frontend/src/app/features/calendar/te-calendar/te-calendar.component.ts
@@ -181,8 +181,9 @@ export class TimeEntryCalendarComponent {
     void this.weekdayService.loadWeekdays()
       .toPromise()
       .then(async () => {
-        const date = moment(new Date()).toString();
-        await this.requireNonWorkingDays(date);
+        const startOfWeek = moment().startOf('week').format('YYYY-MM-DD');
+        const endOfWeek = moment().endOf('week').format('YYYY-MM-DD');
+        await this.requireNonWorkingDays(startOfWeek, endOfWeek);
         this.additionalOptions.hiddenDays = this.setHiddenDays(displayedDayss);
         this.calendarOptions$.next(
           this.additionalOptions,
@@ -211,8 +212,8 @@ export class TimeEntryCalendarComponent {
     readonly dayService:DayResourceService,
   ) {}
 
-  async requireNonWorkingDays(date:Date|string) {
-    this.nonWorkingDays = await firstValueFrom(this.dayService.requireNonWorkingYear$(date));
+  async requireNonWorkingDays(start:Date|string, end:Date|string) {
+    this.nonWorkingDays = await firstValueFrom(this.dayService.requireNonWorkingYears$(start, end));
   }
 
   public calendarEventsFunction(
@@ -255,8 +256,7 @@ export class TimeEntryCalendarComponent {
 
   private async buildEntries(entries:TimeEntryResource[], fetchInfo:{ start:Date, end:Date }):Promise<EventInput[]> {
     this.setRatio(entries);
-    await this.requireNonWorkingDays(fetchInfo.start);
-    await this.requireNonWorkingDays(fetchInfo.end);
+    await this.requireNonWorkingDays(fetchInfo.start, fetchInfo.end);
     return this.buildTimeEntryEntries(entries)
       .concat(this.buildAuxEntries(entries, fetchInfo));
   }
diff --git a/frontend/src/app/features/homescreen/blocks/new-features.component.ts b/frontend/src/app/features/homescreen/blocks/new-features.component.ts
index 204f008bbee5..6cc7053d53e2 100644
--- a/frontend/src/app/features/homescreen/blocks/new-features.component.ts
+++ b/frontend/src/app/features/homescreen/blocks/new-features.component.ts
@@ -33,9 +33,9 @@ import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { imagePath } from 'core-app/shared/helpers/images/path-helper';
 
 // The key used in the I18n files to distinguish between versions.
-const OpVersionI18n = '15_1';
+const OpVersionI18n = '15_2';
 
-const OpReleaseURL = 'https://www.openproject.org/docs/release-notes/15-1-0/';
+const OpReleaseURL = 'https://www.openproject.org/docs/release-notes';
 
 /** Update the teaser image to the next version */
 const featureTeaserImage = `${OpVersionI18n}_features.svg`;
diff --git a/frontend/src/app/features/in-app-notifications/center/in-app-notification-center.component.ts b/frontend/src/app/features/in-app-notifications/center/in-app-notification-center.component.ts
index 641983075d1f..70b4f0c8eea2 100644
--- a/frontend/src/app/features/in-app-notifications/center/in-app-notification-center.component.ts
+++ b/frontend/src/app/features/in-app-notifications/center/in-app-notification-center.component.ts
@@ -101,6 +101,10 @@ export class InAppNotificationCenterComponent implements OnInit {
       key: 'shared',
       title: this.I18n.t('js.notifications.reasons.shared'),
     },
+    {
+      key: 'reminder',
+      title: this.I18n.t('js.notifications.reasons.reminder'),
+    },
   ];
 
   selectedFilter = this.reasonMenuItems.find((item) => item.key === this.urlParams.get('name'))?.title;
diff --git a/frontend/src/app/features/in-app-notifications/entry/actors-line/in-app-notification-actors-line.component.html b/frontend/src/app/features/in-app-notifications/entry/actors-line/in-app-notification-actors-line.component.html
index 16ebc61cac34..1d6adf2d0b30 100644
--- a/frontend/src/app/features/in-app-notifications/entry/actors-line/in-app-notification-actors-line.component.html
+++ b/frontend/src/app/features/in-app-notifications/entry/actors-line/in-app-notification-actors-line.component.html
@@ -1,8 +1,6 @@
-<div
-  class="op-ian-actors--date"
-  [title]="fixedTime"
-  [textContent]="relativeTime$ | async"
-></div>
+<op-in-app-notification-relative-time
+  [notification]="notification"
+/>
 <div class="op-ian-actors--container">
   <ng-container *ngFor="let actor of actors | slice:0:3; let idx = index; let last = last">
     <span *ngIf="last && actors.length > 1 && actors.length < 4" textContent=" {{ text.and }} "></span>
diff --git a/frontend/src/app/features/in-app-notifications/entry/actors-line/in-app-notification-actors-line.component.sass b/frontend/src/app/features/in-app-notifications/entry/actors-line/in-app-notification-actors-line.component.sass
index 92a4de952732..376f23ed350a 100644
--- a/frontend/src/app/features/in-app-notifications/entry/actors-line/in-app-notification-actors-line.component.sass
+++ b/frontend/src/app/features/in-app-notifications/entry/actors-line/in-app-notification-actors-line.component.sass
@@ -7,11 +7,6 @@
   align-items: center
   color: var(--fgColor-muted)
 
-  &--date
-    @include text-shortener
-    max-width: 100%
-    line-height: 1rem
-
   &--container
     @include text-shortener
     display: flex
diff --git a/frontend/src/app/features/in-app-notifications/entry/actors-line/in-app-notification-actors-line.component.ts b/frontend/src/app/features/in-app-notifications/entry/actors-line/in-app-notification-actors-line.component.ts
index e6bcd7b9f6d7..3f8c271ce907 100644
--- a/frontend/src/app/features/in-app-notifications/entry/actors-line/in-app-notification-actors-line.component.ts
+++ b/frontend/src/app/features/in-app-notifications/entry/actors-line/in-app-notification-actors-line.component.ts
@@ -1,11 +1,8 @@
 import { ChangeDetectionStrategy, Component, HostBinding, Input, OnInit, ViewEncapsulation } from '@angular/core';
+import { DeviceService } from 'core-app/core/browser/device.service';
+import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { INotification } from 'core-app/core/state/in-app-notifications/in-app-notification.model';
 import { PrincipalLike } from 'core-app/shared/components/principal/principal-types';
-import { Observable, timer } from 'rxjs';
-import { distinctUntilChanged, map } from 'rxjs/operators';
-import { I18nService } from 'core-app/core/i18n/i18n.service';
-import { TimezoneService } from 'core-app/core/datetime/timezone.service';
-import { DeviceService } from 'core-app/core/browser/device.service';
 
 @Component({
   selector: 'op-in-app-notification-actors-line',
@@ -24,13 +21,6 @@ export class InAppNotificationActorsLineComponent implements OnInit {
   // The actor, if any
   actors:PrincipalLike[] = [];
 
-  // Fixed notification time
-  fixedTime:string;
-
-  // Format relative elapsed time (n seconds/minutes/hours ago)
-  // at an interval for auto updating
-  relativeTime$:Observable<string>;
-
   text = {
     and: this.I18n.t('js.notifications.center.label_actor_and'),
     and_other_singular: this.I18n.t('js.notifications.center.and_more_users.one'),
@@ -41,21 +31,14 @@ export class InAppNotificationActorsLineComponent implements OnInit {
     loading: this.I18n.t('js.ajax.loading'),
     placeholder: this.I18n.t('js.placeholders.default'),
     mark_as_read: this.I18n.t('js.notifications.center.mark_as_read'),
-    updated_by_at: (age:string):string => this.I18n.t(
-      'js.notifications.center.text_update_date_by',
-      { date: age },
-    ),
   };
 
   constructor(
     readonly deviceService:DeviceService,
     private I18n:I18nService,
-    private timezoneService:TimezoneService,
   ) { }
 
   ngOnInit():void {
-    this.buildTime();
-
     // Don't show the actor if the first item is actor-less (date alert)
     if (this.notification._links.actor) {
       this.buildActors();
@@ -70,22 +53,6 @@ export class InAppNotificationActorsLineComponent implements OnInit {
     return this.text.and_other_plural(number);
   }
 
-  private buildTime() {
-    this.fixedTime = this.timezoneService.formattedDatetime(this.notification.createdAt);
-    this.relativeTime$ = timer(0, 10000)
-      .pipe(
-        map(() => {
-          const time = this.timezoneService.formattedRelativeDateTime(this.notification.createdAt);
-          if (this.notification._links.actor) {
-            return this.text.updated_by_at(time);
-          }
-
-          return time;
-        }),
-        distinctUntilChanged(),
-      );
-  }
-
   private buildActors() {
     const actors = this
       .aggregatedNotifications
diff --git a/frontend/src/app/features/in-app-notifications/entry/date-alert/in-app-notification-date-alert.component.ts b/frontend/src/app/features/in-app-notifications/entry/date-alert/in-app-notification-date-alert.component.ts
index 877f2b592be6..5a6215e4285f 100644
--- a/frontend/src/app/features/in-app-notifications/entry/date-alert/in-app-notification-date-alert.component.ts
+++ b/frontend/src/app/features/in-app-notifications/entry/date-alert/in-app-notification-date-alert.component.ts
@@ -6,10 +6,9 @@ import {
   OnInit,
   ViewEncapsulation,
 } from '@angular/core';
-import { INotification } from 'core-app/core/state/in-app-notifications/in-app-notification.model';
-import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { TimezoneService } from 'core-app/core/datetime/timezone.service';
-import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
+import { I18nService } from 'core-app/core/i18n/i18n.service';
+import { IInAppNotificationDetailsAttribute, INotification } from 'core-app/core/state/in-app-notifications/in-app-notification.model';
 import * as moment from 'moment';
 import { Moment } from 'moment';
 
@@ -23,8 +22,6 @@ import { Moment } from 'moment';
 export class InAppNotificationDateAlertComponent implements OnInit {
   @Input() aggregatedNotifications:INotification[];
 
-  @Input() workPackage:WorkPackageResource;
-
   @HostBinding('class.op-ian-date-alert') className = true;
 
   @HostBinding('class.op-ian-date-alert_overdue') isOverdue:boolean;
@@ -49,6 +46,7 @@ export class InAppNotificationDateAlertComponent implements OnInit {
     dueDate: this.I18n.t('js.work_packages.properties.dueDate'),
     date: this.I18n.t('js.notifications.date_alerts.milestone_date'),
     due_today: this.I18n.t('js.notifications.date_alerts.property_today'),
+    note: '', // date alerts do not have notes
   };
 
   constructor(
@@ -71,7 +69,7 @@ export class InAppNotificationDateAlertComponent implements OnInit {
     }
   }
 
-  private deriveDueDate(value:string, property:'startDate'|'dueDate'|'date') {
+  private deriveDueDate(value:string, property:IInAppNotificationDetailsAttribute) {
     const dateValue = this.timezoneService.parseISODate(value).startOf('day');
     const today = moment();
     this.dateIsPast = dateValue.isBefore(today, 'day');
@@ -106,7 +104,8 @@ export class InAppNotificationDateAlertComponent implements OnInit {
   private deriveMostRelevantAlert(aggregatedNotifications:INotification[]) {
     // Second case: We have one date alert + some others
     const dateAlerts = aggregatedNotifications.filter((notification) => notification.reason === 'dateAlert');
-    const first = aggregatedNotifications[0];
+    const first = dateAlerts[0];
+
     if (dateAlerts.length > 1) {
       const found = dateAlerts.find((notification) => notification._embedded.details[0].property === 'dueDate');
       return found || first;
diff --git a/frontend/src/app/features/in-app-notifications/entry/in-app-notification-entry.component.html b/frontend/src/app/features/in-app-notifications/entry/in-app-notification-entry.component.html
index 14868f1cb424..bad0d0141e37 100644
--- a/frontend/src/app/features/in-app-notifications/entry/in-app-notification-entry.component.html
+++ b/frontend/src/app/features/in-app-notifications/entry/in-app-notification-entry.component.html
@@ -88,16 +88,21 @@
     <div
       class="op-ian-item--bottom-line"
     >
-      <op-in-app-notification-date-alert
-        *ngIf="showDateAlert"
-        [workPackage]="workPackage"
+      <op-in-app-notification-reminder-alert
+        *ngIf="hasReminderAlert"
         [aggregatedNotifications]="aggregatedNotifications"
-      ></op-in-app-notification-date-alert>
-      <op-in-app-notification-actors-line
-        *ngIf="!showDateAlert"
-        [notification]="notification"
-        [aggregatedNotifications]="aggregatedNotifications"
-      ></op-in-app-notification-actors-line>
+      />
+      <ng-container *ngIf="!hasReminderAlert">
+        <op-in-app-notification-date-alert
+          *ngIf="showDateAlert"
+          [aggregatedNotifications]="aggregatedNotifications"
+        ></op-in-app-notification-date-alert>
+        <op-in-app-notification-actors-line
+          *ngIf="!showDateAlert"
+          [notification]="notification"
+          [aggregatedNotifications]="aggregatedNotifications"
+        ></op-in-app-notification-actors-line>
+      </ng-container>
     </div>
   </ng-container>
   <ng-template #workPackageLoading>
diff --git a/frontend/src/app/features/in-app-notifications/entry/in-app-notification-entry.component.ts b/frontend/src/app/features/in-app-notifications/entry/in-app-notification-entry.component.ts
index 762fdc757304..376c4986dcf9 100644
--- a/frontend/src/app/features/in-app-notifications/entry/in-app-notification-entry.component.ts
+++ b/frontend/src/app/features/in-app-notifications/entry/in-app-notification-entry.component.ts
@@ -29,6 +29,7 @@ export class InAppNotificationEntryComponent implements OnInit {
   workPackage$:Observable<WorkPackageResource>|null = null;
 
   showDateAlert = false;
+  hasReminderAlert = false;
 
   loading$ = this.storeService.query.selectLoading();
 
@@ -62,19 +63,15 @@ export class InAppNotificationEntryComponent implements OnInit {
     const href = this.notification._links.resource?.href;
     this.workPackageId = href && HalResource.matchFromLink(href, 'work_packages');
 
-    this.showDateAlert = this.hasActiveDateAlert();
+    this.hasReminderAlert = this.hasNotificationReason('reminder');
+    this.showDateAlert = this.hasNotificationReason('dateAlert');
     this.buildTranslatedReason();
     this.buildProject();
     this.loadWorkPackage();
   }
 
-  private hasActiveDateAlert():boolean {
-    if (this.urlParams.get('filter') === 'reason' && this.urlParams.get('name') === 'date_alert') {
-      return true;
-    }
-
-    const dateAlerts = this.aggregatedNotifications.filter((notification) => notification.reason === 'dateAlert');
-    return dateAlerts.length === this.aggregatedNotifications.length;
+  private hasNotificationReason(reason:string):boolean {
+    return this.aggregatedNotifications.some((notification) => notification.reason === reason);
   }
 
   private loadWorkPackage() {
diff --git a/frontend/src/app/features/in-app-notifications/entry/relative-time/in-app-notification-relative-time.component.html b/frontend/src/app/features/in-app-notifications/entry/relative-time/in-app-notification-relative-time.component.html
new file mode 100644
index 000000000000..982ee91f405a
--- /dev/null
+++ b/frontend/src/app/features/in-app-notifications/entry/relative-time/in-app-notification-relative-time.component.html
@@ -0,0 +1,5 @@
+<div
+  class="op-ian-relative-time"
+  [title]="fixedTime"
+  [textContent]="relativeTime$ | async">
+</div>
diff --git a/frontend/src/app/features/in-app-notifications/entry/relative-time/in-app-notification-relative-time.component.sass b/frontend/src/app/features/in-app-notifications/entry/relative-time/in-app-notification-relative-time.component.sass
new file mode 100644
index 000000000000..547e9c4b48d7
--- /dev/null
+++ b/frontend/src/app/features/in-app-notifications/entry/relative-time/in-app-notification-relative-time.component.sass
@@ -0,0 +1,6 @@
+@import "helpers"
+
+.op-ian-relative-time
+  @include text-shortener
+  max-width: 100%
+  line-height: 1rem
diff --git a/frontend/src/app/features/in-app-notifications/entry/relative-time/in-app-notification-relative-time.component.ts b/frontend/src/app/features/in-app-notifications/entry/relative-time/in-app-notification-relative-time.component.ts
new file mode 100644
index 000000000000..153e658175a7
--- /dev/null
+++ b/frontend/src/app/features/in-app-notifications/entry/relative-time/in-app-notification-relative-time.component.ts
@@ -0,0 +1,63 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Input,
+  OnInit,
+  ViewEncapsulation,
+} from '@angular/core';
+import { TimezoneService } from 'core-app/core/datetime/timezone.service';
+import { I18nService } from 'core-app/core/i18n/i18n.service';
+import { INotification } from 'core-app/core/state/in-app-notifications/in-app-notification.model';
+import { Observable, timer } from 'rxjs';
+import { distinctUntilChanged, map } from 'rxjs/operators';
+
+@Component({
+  selector: 'op-in-app-notification-relative-time',
+  templateUrl: './in-app-notification-relative-time.component.html',
+  styleUrls: ['./in-app-notification-relative-time.component.sass'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  encapsulation: ViewEncapsulation.None,
+})
+export class InAppNotificationRelativeTimeComponent implements OnInit {
+  @Input() notification:INotification;
+  @Input() hasActorByLine:boolean = true;
+
+  // Fixed notification time
+  fixedTime:string;
+
+  // Format relative elapsed time (n seconds/minutes/hours ago)
+  // at an interval for auto updating
+  relativeTime$:Observable<string>;
+
+  text = {
+    updated_by_at: (age:string):string => this.I18n.t(
+      'js.notifications.center.text_update_date_by',
+      { date: age },
+    ),
+  };
+
+  constructor(
+    private I18n:I18nService,
+    private timezoneService:TimezoneService,
+  ) { }
+
+  ngOnInit():void {
+    this.buildTime();
+  }
+
+  private buildTime() {
+    this.fixedTime = this.timezoneService.formattedDatetime(this.notification.createdAt);
+    this.relativeTime$ = timer(0, 10000)
+      .pipe(
+        map(() => {
+          const time = this.timezoneService.formattedRelativeDateTime(this.notification.createdAt);
+          if (this.hasActorByLine && this.notification._links.actor) {
+            return this.text.updated_by_at(time);
+          }
+
+          return `${time}.`;
+        }),
+        distinctUntilChanged(),
+      );
+  }
+}
diff --git a/frontend/src/app/features/in-app-notifications/entry/reminder-alert/in-app-notification-reminder-alert.component.html b/frontend/src/app/features/in-app-notifications/entry/reminder-alert/in-app-notification-reminder-alert.component.html
new file mode 100644
index 000000000000..14ad39483e6a
--- /dev/null
+++ b/frontend/src/app/features/in-app-notifications/entry/reminder-alert/in-app-notification-reminder-alert.component.html
@@ -0,0 +1,14 @@
+<op-in-app-notification-date-alert
+  *ngIf="hasDateAlert"
+  [aggregatedNotifications]="dateAlerts">
+</op-in-app-notification-date-alert>
+<op-in-app-notification-relative-time
+  *ngIf="!hasDateAlert"
+  [notification]="reminderAlert"
+  [hasActorByLine]="false">
+</op-in-app-notification-relative-time>
+
+<span
+  class="op-ian-reminder-alert--note"
+  [textContent]="reminderNote"
+></span>
diff --git a/frontend/src/app/features/in-app-notifications/entry/reminder-alert/in-app-notification-reminder-alert.component.sass b/frontend/src/app/features/in-app-notifications/entry/reminder-alert/in-app-notification-reminder-alert.component.sass
new file mode 100644
index 000000000000..02f042d770c8
--- /dev/null
+++ b/frontend/src/app/features/in-app-notifications/entry/reminder-alert/in-app-notification-reminder-alert.component.sass
@@ -0,0 +1,16 @@
+@import "helpers"
+
+.op-ian-reminder-alert
+  display: grid
+  grid-template-columns: auto 1fr
+  grid-column-gap: $spot-spacing-0_25
+  align-items: center
+  color: var(--fgColor-muted)
+
+  &--note
+    @include text-shortener
+    line-height: 1rem
+    color: var(--fgColor-default)
+
+    > *
+      flex-shrink: 0
diff --git a/frontend/src/app/features/in-app-notifications/entry/reminder-alert/in-app-notification-reminder-alert.component.ts b/frontend/src/app/features/in-app-notifications/entry/reminder-alert/in-app-notification-reminder-alert.component.ts
new file mode 100644
index 000000000000..f898e9b47b98
--- /dev/null
+++ b/frontend/src/app/features/in-app-notifications/entry/reminder-alert/in-app-notification-reminder-alert.component.ts
@@ -0,0 +1,63 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  HostBinding,
+  Input,
+  OnInit,
+  ViewEncapsulation,
+} from '@angular/core';
+import { I18nService } from 'core-app/core/i18n/i18n.service';
+import { IInAppNotificationDetailsResource, INotification } from 'core-app/core/state/in-app-notifications/in-app-notification.model';
+
+@Component({
+  selector: 'op-in-app-notification-reminder-alert',
+  templateUrl: './in-app-notification-reminder-alert.component.html',
+  styleUrls: ['./in-app-notification-reminder-alert.component.sass'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  encapsulation: ViewEncapsulation.None,
+})
+export class InAppNotificationReminderAlertComponent implements OnInit {
+  @Input() aggregatedNotifications:INotification[];
+
+  @HostBinding('class.op-ian-reminder-alert') className = true;
+
+  reminderNote:string;
+  reminderAlert:INotification;
+  hasDateAlert = false;
+  dateAlerts:INotification[] = [];
+
+  constructor(
+    private I18n:I18nService,
+  ) { }
+
+  ngOnInit():void {
+    this.reminderAlert = this.deriveMostRecentReminder(this.aggregatedNotifications);
+    this.reminderNote = this.extractReminderNoteValue(this.reminderAlert._embedded.details);
+    this.dateAlerts = this.aggregatedNotifications.filter((notification) => notification.reason === 'dateAlert');
+    this.hasDateAlert = this.dateAlerts.length > 0;
+  }
+
+  private deriveMostRecentReminder(aggregatedNotifications:INotification[]):INotification {
+    const reminderAlerts = aggregatedNotifications.filter((notification:INotification) => notification.reason === 'reminder');
+
+    if (reminderAlerts.length > 1) {
+      const mostRecent = reminderAlerts.reduce((prev:INotification, current:INotification) => {
+        const prevDate = new Date(prev.createdAt);
+        const currentDate = new Date(current.createdAt);
+        return prevDate > currentDate ? prev : current;
+      });
+      return mostRecent;
+    }
+
+    return reminderAlerts[0];
+  }
+
+  private extractReminderNoteValue(details:IInAppNotificationDetailsResource[]):string {
+    const noteDetail = details.find((detail:IInAppNotificationDetailsResource) => detail.property === 'note');
+    if (noteDetail?.value) {
+      return this.I18n.t('js.notifications.reminders.note', { note: (noteDetail?.value) });
+    }
+
+    return '';
+  }
+}
diff --git a/frontend/src/app/features/in-app-notifications/in-app-notifications.module.ts b/frontend/src/app/features/in-app-notifications/in-app-notifications.module.ts
index aade9f5cc27e..d921e8f48c78 100644
--- a/frontend/src/app/features/in-app-notifications/in-app-notifications.module.ts
+++ b/frontend/src/app/features/in-app-notifications/in-app-notifications.module.ts
@@ -1,31 +1,33 @@
-import { NgModule } from '@angular/core';
-import { OpSharedModule } from 'core-app/shared/shared.module';
+import { ScrollingModule } from '@angular/cdk/scrolling';
 import { CommonModule } from '@angular/common';
-import { IconModule } from 'core-app/shared/components/icon/icon.module';
+import { NgModule } from '@angular/core';
 import {
   InAppNotificationBellComponent,
 } from 'core-app/features/in-app-notifications/bell/in-app-notification-bell.component';
-import {
-  InAppNotificationEntryComponent,
-} from 'core-app/features/in-app-notifications/entry/in-app-notification-entry.component';
-import { OpenprojectPrincipalRenderingModule } from 'core-app/shared/components/principal/principal-rendering.module';
-import { ScrollingModule } from '@angular/cdk/scrolling';
+import { IanBellService } from 'core-app/features/in-app-notifications/bell/state/ian-bell.service';
 import {
   InAppNotificationCenterComponent,
 } from 'core-app/features/in-app-notifications/center/in-app-notification-center.component';
+import { IanCenterService } from 'core-app/features/in-app-notifications/center/state/ian-center.service';
+import {
+  InAppNotificationsDateAlertsUpsaleComponent,
+} from 'core-app/features/in-app-notifications/date-alerts-upsale/ian-date-alerts-upsale.component';
+import {
+  InAppNotificationEntryComponent,
+} from 'core-app/features/in-app-notifications/entry/in-app-notification-entry.component';
 import { OpenprojectWorkPackagesModule } from 'core-app/features/work-packages/openproject-work-packages.module';
-import { DynamicModule } from 'ng-dynamic-component';
-import { InAppNotificationStatusComponent } from './entry/status/in-app-notification-status.component';
+import { IconModule } from 'core-app/shared/components/icon/icon.module';
 import {
   OpenprojectContentLoaderModule,
 } from 'core-app/shared/components/op-content-loader/openproject-content-loader.module';
-import { IanBellService } from 'core-app/features/in-app-notifications/bell/state/ian-bell.service';
+import { OpenprojectPrincipalRenderingModule } from 'core-app/shared/components/principal/principal-rendering.module';
+import { OpSharedModule } from 'core-app/shared/shared.module';
+import { DynamicModule } from 'ng-dynamic-component';
 import { InAppNotificationActorsLineComponent } from './entry/actors-line/in-app-notification-actors-line.component';
 import { InAppNotificationDateAlertComponent } from './entry/date-alert/in-app-notification-date-alert.component';
-import {
-  InAppNotificationsDateAlertsUpsaleComponent,
-} from 'core-app/features/in-app-notifications/date-alerts-upsale/ian-date-alerts-upsale.component';
-import { IanCenterService } from 'core-app/features/in-app-notifications/center/state/ian-center.service';
+import { InAppNotificationRelativeTimeComponent } from './entry/relative-time/in-app-notification-relative-time.component';
+import { InAppNotificationReminderAlertComponent } from './entry/reminder-alert/in-app-notification-reminder-alert.component';
+import { InAppNotificationStatusComponent } from './entry/status/in-app-notification-status.component';
 
 @NgModule({
   declarations: [
@@ -36,6 +38,8 @@ import { IanCenterService } from 'core-app/features/in-app-notifications/center/
     InAppNotificationActorsLineComponent,
     InAppNotificationDateAlertComponent,
     InAppNotificationsDateAlertsUpsaleComponent,
+    InAppNotificationRelativeTimeComponent,
+    InAppNotificationReminderAlertComponent,
   ],
   imports: [
     OpSharedModule,
diff --git a/frontend/src/app/features/overview/overview.component.ts b/frontend/src/app/features/overview/overview.component.ts
index 742139d19362..86e75ede5e39 100644
--- a/frontend/src/app/features/overview/overview.component.ts
+++ b/frontend/src/app/features/overview/overview.component.ts
@@ -1,3 +1,31 @@
+//-- copyright
+// OpenProject is an open source project management software.
+// Copyright (C) the OpenProject GmbH
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License version 3.
+//
+// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+// Copyright (C) 2006-2013 Jean-Philippe Lang
+// Copyright (C) 2010-2013 the ChiliProject Team
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+//
+// See COPYRIGHT and LICENSE files for more details.
+//++
+
 import { ChangeDetectionStrategy, Component } from '@angular/core';
 import { GridPageComponent } from 'core-app/shared/components/grids/grid/page/grid-page.component';
 import { GRID_PROVIDERS } from 'core-app/shared/components/grids/grid/grid.component';
@@ -17,15 +45,34 @@ export class OverviewComponent extends GridPageComponent {
   }
 
   protected isTurboFrameSidebarEnabled():boolean {
-    const sidebarEnabledTag:HTMLMetaElement|null = document.querySelector('meta[name="sidebar_enabled"]');
-    return sidebarEnabledTag?.dataset.enabled === 'true';
+    return this.isCustomFieldsSidebarEnabled() || this.isLifeCyclesSidebarEnabled();
+  }
+
+  protected isCustomFieldsSidebarEnabled():boolean {
+    const customFieldsSidebarEnabledTag:HTMLMetaElement|null = document.querySelector('meta[name="custom_fields_sidebar_enabled"]');
+
+    return customFieldsSidebarEnabledTag?.dataset.enabled === 'true';
+  }
+
+  protected isLifeCyclesSidebarEnabled():boolean {
+    const lifeCyclesSidebarEnabledTag:HTMLMetaElement|null = document.querySelector('meta[name="life_cycles_sidebar_enabled"]');
+
+    return lifeCyclesSidebarEnabledTag?.dataset.enabled === 'true';
+  }
+
+  protected lifeCyclesSidebarSrc():string {
+    return `${this.pathHelper.staticBase}/projects/${this.currentProject.identifier ?? ''}/project_life_cycles_sidebar`;
+  }
+
+  protected lifeCyclesSidebarId():string {
+    return 'project-life-cycles-sidebar';
   }
 
-  protected turboFrameSidebarSrc():string {
+  protected projectCustomFieldsSidebarSrc():string {
     return `${this.pathHelper.staticBase}/projects/${this.currentProject.identifier ?? ''}/project_custom_fields_sidebar`;
   }
 
-  protected turboFrameSidebarId():string {
+  protected projectCustomFieldsSidebarId():string {
     return 'project-custom-fields-sidebar';
   }
 
diff --git a/frontend/src/app/features/user-preferences/reminder-settings/immediate-reminders/immediate-reminder-settings.component.html b/frontend/src/app/features/user-preferences/reminder-settings/immediate-reminders/immediate-reminder-settings.component.html
index 3e85891c967f..1a1bc1accf8c 100644
--- a/frontend/src/app/features/user-preferences/reminder-settings/immediate-reminders/immediate-reminder-settings.component.html
+++ b/frontend/src/app/features/user-preferences/reminder-settings/immediate-reminders/immediate-reminder-settings.component.html
@@ -14,4 +14,16 @@ <h3 [textContent]="text.title" class="op-form--section-header-title"></h3>
       data-qa-immediate-reminder="mentioned"
     />
   </spot-selector-field>
+
+  <spot-selector-field
+    [label]="text.personalReminder"
+    [control]="form.get('personalReminder')"
+  >
+    <input
+      slot="input"
+      type="checkbox"
+      formControlName="personalReminder"
+      data-qa-immediate-reminder="personalReminder"
+    />
+  </spot-selector-field>
 </ng-container>
diff --git a/frontend/src/app/features/user-preferences/reminder-settings/immediate-reminders/immediate-reminder-settings.component.ts b/frontend/src/app/features/user-preferences/reminder-settings/immediate-reminders/immediate-reminder-settings.component.ts
index f94fac6e7510..c96b9216807d 100644
--- a/frontend/src/app/features/user-preferences/reminder-settings/immediate-reminders/immediate-reminder-settings.component.ts
+++ b/frontend/src/app/features/user-preferences/reminder-settings/immediate-reminders/immediate-reminder-settings.component.ts
@@ -22,6 +22,7 @@ export class ImmediateReminderSettingsComponent implements OnInit {
     title: this.I18n.t('js.reminders.settings.immediate.title'),
     explanation: this.I18n.t('js.reminders.settings.immediate.explanation'),
     mentioned: this.I18n.t('js.reminders.settings.immediate.mentioned'),
+    personalReminder: this.I18n.t('js.reminders.settings.immediate.personal_reminder'),
   };
 
   constructor(
diff --git a/frontend/src/app/features/user-preferences/reminder-settings/page/reminder-settings-page.component.ts b/frontend/src/app/features/user-preferences/reminder-settings/page/reminder-settings-page.component.ts
index 8d271291f78d..b2d1af356d86 100644
--- a/frontend/src/app/features/user-preferences/reminder-settings/page/reminder-settings-page.component.ts
+++ b/frontend/src/app/features/user-preferences/reminder-settings/page/reminder-settings-page.component.ts
@@ -39,6 +39,7 @@ export class ReminderSettingsPageComponent extends UntilDestroyedMixin implement
   public form = this.fb.group({
     immediateReminders: this.fb.group({
       mentioned: this.fb.control(false),
+      personalReminder: this.fb.control(false),
     }),
     dailyReminders: this.fb.group({
       enabled: this.fb.control(false),
@@ -112,6 +113,7 @@ export class ReminderSettingsPageComponent extends UntilDestroyedMixin implement
 
   private buildForm(settings:IUserPreference, globalSetting:INotificationSetting) {
     this.form.get('immediateReminders.mentioned')?.setValue(settings.immediateReminders.mentioned);
+    this.form.get('immediateReminders.personalReminder')?.setValue(settings.immediateReminders.personalReminder);
 
     this.form.get('dailyReminders.enabled')?.setValue(settings.dailyReminders.enabled);
 
diff --git a/frontend/src/app/features/user-preferences/state/user-preferences.model.ts b/frontend/src/app/features/user-preferences/state/user-preferences.model.ts
index 172a4ff16c87..c2f527626352 100644
--- a/frontend/src/app/features/user-preferences/state/user-preferences.model.ts
+++ b/frontend/src/app/features/user-preferences/state/user-preferences.model.ts
@@ -11,6 +11,7 @@ export interface PauseRemindersSettings {
 }
 export interface ImmediateRemindersSettings {
   mentioned:boolean;
+  personalReminder:boolean;
 }
 
 export interface IUserPreference {
diff --git a/frontend/src/app/features/user-preferences/state/user-preferences.store.ts b/frontend/src/app/features/user-preferences/state/user-preferences.store.ts
index c5f8d658857e..f05236f1a435 100644
--- a/frontend/src/app/features/user-preferences/state/user-preferences.store.ts
+++ b/frontend/src/app/features/user-preferences/state/user-preferences.store.ts
@@ -46,6 +46,7 @@ function createInitialState():IUserPreference {
     workdays: [1, 2, 3, 4, 5],
     immediateReminders: {
       mentioned: false,
+      personalReminder: false,
     },
     pauseReminders: {
       enabled: false,
diff --git a/frontend/src/app/features/work-packages/components/wp-buttons/wp-reminder-button/wp-reminder-button.component.ts b/frontend/src/app/features/work-packages/components/wp-buttons/wp-reminder-button/wp-reminder-button.component.ts
new file mode 100644
index 000000000000..318e6ffd84ab
--- /dev/null
+++ b/frontend/src/app/features/work-packages/components/wp-buttons/wp-reminder-button/wp-reminder-button.component.ts
@@ -0,0 +1,110 @@
+//-- copyright
+// OpenProject is an open source project management software.
+// Copyright (C) the OpenProject GmbH
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License version 3.
+//
+// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+// Copyright (C) 2006-2013 Jean-Philippe Lang
+// Copyright (C) 2010-2013 the ChiliProject Team
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+//
+// See COPYRIGHT and LICENSE files for more details.
+//++
+
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit } from '@angular/core';
+import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
+import { I18nService } from 'core-app/core/i18n/i18n.service';
+import { ActionsService } from 'core-app/core/state/actions/actions.service';
+import { notificationCountChanged } from 'core-app/core/state/in-app-notifications/in-app-notifications.actions';
+import { CollectionResource } from 'core-app/features/hal/resources/collection-resource';
+import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
+import { IanBellService } from 'core-app/features/in-app-notifications/bell/state/ian-bell.service';
+import { reminderModalUpdated } from 'core-app/features/work-packages/components/wp-reminder-modal/reminder.actions';
+import {
+  WorkPackageReminderModalComponent,
+} from 'core-app/features/work-packages/components/wp-reminder-modal/wp-reminder.modal';
+import { OpModalService } from 'core-app/shared/components/modal/modal.service';
+import { UntilDestroyedMixin } from 'core-app/shared/helpers/angular/until-destroyed.mixin';
+import { merge, Observable } from 'rxjs';
+import { filter, map, startWith, switchMap } from 'rxjs/operators';
+
+@Component({
+  // eslint-disable-next-line @angular-eslint/component-selector
+  selector: 'wp-reminder-button',
+  templateUrl: './wp-reminder-button.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class WorkPackageReminderButtonComponent extends UntilDestroyedMixin implements OnInit {
+  @Input() public workPackage:WorkPackageResource;
+
+  hasReminder$:Observable<boolean>;
+
+  public buttonTitle = this.I18n.t('js.work_packages.reminders.button_label');
+
+  constructor(
+    readonly I18n:I18nService,
+    readonly opModalService:OpModalService,
+    readonly cdRef:ChangeDetectorRef,
+    readonly apiV3Service:ApiV3Service,
+    readonly actions$:ActionsService,
+    readonly storeService:IanBellService,
+  ) {
+    super();
+  }
+
+  ngOnInit() {
+    const reminderModalUpdated$ = this
+      .actions$
+      .ofType(reminderModalUpdated)
+      .pipe(
+        map((action) => action.workPackageId),
+        filter((id) => id === this.workPackage.id?.toString()),
+        startWith(null),
+      );
+    const notificationCountChanged$ = this
+      .actions$
+      .ofType(notificationCountChanged)
+      .pipe(
+        map((action) => action.count),
+      );
+
+    this.hasReminder$ = merge(
+      notificationCountChanged$,
+      reminderModalUpdated$,
+    ).pipe(
+      switchMap(() => this.countReminders()),
+      map((count) => count > 0),
+    );
+  }
+
+  openModal():void {
+    this.opModalService.show(WorkPackageReminderModalComponent, 'global', { workPackage: this.workPackage }, false, true);
+  }
+
+  private countReminders():Observable<number> {
+    return this
+      .apiV3Service
+      .work_packages
+      .id(this.workPackage.id as string)
+      .reminders
+      .get()
+      .pipe(
+        map((collection:CollectionResource) => { return collection.total; }),
+      );
+  }
+}
diff --git a/frontend/src/app/features/work-packages/components/wp-buttons/wp-reminder-button/wp-reminder-button.html b/frontend/src/app/features/work-packages/components/wp-buttons/wp-reminder-button/wp-reminder-button.html
new file mode 100644
index 000000000000..f7efdd27ff0d
--- /dev/null
+++ b/frontend/src/app/features/work-packages/components/wp-buttons/wp-reminder-button/wp-reminder-button.html
@@ -0,0 +1,13 @@
+<button
+  class="button toolbar-icon"
+  data-test-selector="op-wp-reminder-button"
+  [attr.title]="buttonTitle"
+  (click)="openModal()"
+>
+  <ng-container *ngIf="(hasReminder$ | async) as reminder; else noReminder">
+    <svg op-alarm-set-icon class="button--icon" size="small"></svg>
+  </ng-container>
+  <ng-template #noReminder>
+    <svg op-alarm-icon class="button--icon" size="small"></svg>
+  </ng-template>
+</button>
diff --git a/frontend/src/app/features/work-packages/components/wp-details/wp-details-toolbar.component.ts b/frontend/src/app/features/work-packages/components/wp-details/wp-details-toolbar.component.ts
index ffa70468099e..3017649a1cd3 100644
--- a/frontend/src/app/features/work-packages/components/wp-details/wp-details-toolbar.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-details/wp-details-toolbar.component.ts
@@ -26,19 +26,21 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
+import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
+import { ConfigurationService } from 'core-app/core/config/configuration.service';
+import { CurrentUserService } from 'core-app/core/current-user/current-user.service';
+import { I18nService } from 'core-app/core/i18n/i18n.service';
+import { ProjectResource } from 'core-app/features/hal/resources/project-resource';
+import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import {
   HalResourceEditingService,
 } from 'core-app/shared/components/fields/edit/services/hal-resource-editing.service';
-import { I18nService } from 'core-app/core/i18n/i18n.service';
-import { Component, Input, OnInit } from '@angular/core';
-import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
-import { ConfigurationService } from 'core-app/core/config/configuration.service';
-import { CurrentUserService } from 'core-app/core/current-user/current-user.service';
-import { Observable } from 'rxjs';
+import { Observable, of } from 'rxjs';
 
 @Component({
   selector: 'wp-details-toolbar',
   templateUrl: './wp-details-toolbar.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class WorkPackageSplitViewToolbarComponent implements OnInit {
   @Input() workPackage:WorkPackageResource;
@@ -46,6 +48,7 @@ export class WorkPackageSplitViewToolbarComponent implements OnInit {
   @Input() displayNotificationsButton:boolean;
 
   public displayShareButton$:false|Observable<boolean> = false;
+  public displayReminderButton$:Observable<boolean> = of(false);
 
   public text = {
     button_more: this.I18n.t('js.button_more'),
@@ -60,6 +63,11 @@ export class WorkPackageSplitViewToolbarComponent implements OnInit {
   }
 
   ngOnInit() {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access
     this.displayShareButton$ = this.currentUserService.hasCapabilities$('work_package_shares/index', this.workPackage.project.id);
+    this.displayReminderButton$ = this.currentUserService.isLoggedInAndHasCapabalities$(
+      'work_packages/read',
+      (this.workPackage.project as ProjectResource).id,
+    );
   }
 }
diff --git a/frontend/src/app/features/work-packages/components/wp-details/wp-details-toolbar.html b/frontend/src/app/features/work-packages/components/wp-details/wp-details-toolbar.html
index 719812e30a69..d1d4ffb06103 100644
--- a/frontend/src/app/features/work-packages/components/wp-details/wp-details-toolbar.html
+++ b/frontend/src/app/features/work-packages/components/wp-details/wp-details-toolbar.html
@@ -14,6 +14,10 @@
                    *ngIf="displayShareButton$ | async">
   </wp-share-button>
 
+  <wp-reminder-button [workPackage]="workPackage"
+                      *ngIf="displayReminderButton$ | async">
+  </wp-reminder-button>
+
   <button class="button dropdown-relative"
           [attr.accesskey]="7"
 
diff --git a/frontend/src/app/features/work-packages/components/wp-reminder-modal/reminder.actions.ts b/frontend/src/app/features/work-packages/components/wp-reminder-modal/reminder.actions.ts
new file mode 100644
index 000000000000..c97af59fb081
--- /dev/null
+++ b/frontend/src/app/features/work-packages/components/wp-reminder-modal/reminder.actions.ts
@@ -0,0 +1,6 @@
+import { action, props } from 'ts-action';
+
+export const reminderModalUpdated = action(
+  '[Reminder] Reminder modal closed or updated',
+  props<{ workPackageId:string }>(),
+);
diff --git a/frontend/src/app/features/work-packages/components/wp-reminder-modal/wp-reminder.modal.html b/frontend/src/app/features/work-packages/components/wp-reminder-modal/wp-reminder.modal.html
new file mode 100644
index 000000000000..021be9da9bd4
--- /dev/null
+++ b/frontend/src/app/features/work-packages/components/wp-reminder-modal/wp-reminder.modal.html
@@ -0,0 +1,53 @@
+<div
+  class="spot-modal op-reminder-dialog-modal"
+>
+  <div
+    class="spot-modal--header"
+  >
+    <div
+      id="spotModalTitle"
+      class="spot-modal--header-title"
+      [textContent]="(this.title$ | async) || this.text.new_title">
+    </div>
+
+    <button
+      class="button button_no-margin -transparent spot-modal--header-close-button"
+      [attr.aria-label]="text.button_close"
+      (click)="closeMe($event)"
+      data-test-selector="op-reminder-dialog-modal--close-icon"
+    >
+      <svg
+        x-icon
+        size="small"
+        class="spot-modal--header-close-button-icon"
+      ></svg>
+    </button>
+  </div>
+  <p
+    class="spot-modal--subheader fgColor-muted"
+    [textContent]="this.text.subtitle">
+  </p>
+
+  <div class="spot-modal--body spot-container">
+    <turbo-frame
+      #frameElement
+      id="reminder_modal_body"
+      src="{{this.frameSrc}}">
+      <op-content-loader
+        viewBox="0 0 180 80"
+      >
+        <svg:rect height="8" rx="2" ry="2" width="30" x="0" y="0"/>
+        <svg:rect height="10" rx="2" ry="2" width="180" x="0" y="10"/>
+
+        <svg:rect height="8" rx="2" ry="2" width="30" x="0" y="24"/>
+        <svg:rect height="10" rx="2" ry="2" width="180" x="0" y="34"/>
+
+        <svg:rect height="8" rx="2" ry="2" width="30" x="0" y="48"/>
+        <svg:rect height="10" rx="2" ry="2" width="180" x="0" y="58"/>
+
+        <svg:rect height="8" rx="2" ry="2" width="50" x="0" y="72"/>
+        <svg:rect height="8" rx="2" ry="2" width="50" x="130" y="72"/>
+      </op-content-loader>
+    </turbo-frame>
+  </div>
+</div>
diff --git a/frontend/src/app/features/work-packages/components/wp-reminder-modal/wp-reminder.modal.sass b/frontend/src/app/features/work-packages/components/wp-reminder-modal/wp-reminder.modal.sass
new file mode 100644
index 000000000000..dcc140b3d546
--- /dev/null
+++ b/frontend/src/app/features/work-packages/components/wp-reminder-modal/wp-reminder.modal.sass
@@ -0,0 +1,2 @@
+.op-reminder-dialog-modal
+  min-height: 350px
diff --git a/frontend/src/app/features/work-packages/components/wp-reminder-modal/wp-reminder.modal.ts b/frontend/src/app/features/work-packages/components/wp-reminder-modal/wp-reminder.modal.ts
new file mode 100644
index 000000000000..b0a946d02b70
--- /dev/null
+++ b/frontend/src/app/features/work-packages/components/wp-reminder-modal/wp-reminder.modal.ts
@@ -0,0 +1,113 @@
+import {
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
+  Component,
+  ElementRef,
+  Inject,
+  OnInit,
+  ViewChild, AfterViewInit, OnDestroy,
+} from '@angular/core';
+import { OpModalLocalsMap } from 'core-app/shared/components/modal/modal.types';
+import { OpModalComponent } from 'core-app/shared/components/modal/modal.component';
+import { OpModalLocalsToken } from 'core-app/shared/components/modal/modal.service';
+import { I18nService } from 'core-app/core/i18n/i18n.service';
+import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
+import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
+import { ActionsService } from 'core-app/core/state/actions/actions.service';
+import { reminderModalUpdated } from 'core-app/features/work-packages/components/wp-reminder-modal/reminder.actions';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
+import { CollectionResource } from 'core-app/features/hal/resources/collection-resource';
+
+@Component({
+  templateUrl: './wp-reminder.modal.html',
+  styleUrls: ['./wp-reminder.modal.sass'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class WorkPackageReminderModalComponent extends OpModalComponent implements OnInit, AfterViewInit, OnDestroy {
+  @ViewChild('frameElement') frameElement:ElementRef<HTMLIFrameElement>;
+
+  // Hide close button so it's not duplicated in primer (WP#51699)
+  showCloseButton = false;
+
+  private workPackage:WorkPackageResource;
+  public frameSrc:string;
+
+  text = {
+    new_title: this.I18n.t('js.work_packages.reminders.title.new'),
+    edit_title: this.I18n.t('js.work_packages.reminders.title.edit'),
+    subtitle: this.I18n.t('js.work_packages.reminders.subtitle'),
+    button_close: this.I18n.t('js.button_close'),
+  };
+
+  public title$:Observable<string>;
+
+  constructor(
+    @Inject(OpModalLocalsToken) public locals:OpModalLocalsMap,
+    readonly cdRef:ChangeDetectorRef,
+    readonly I18n:I18nService,
+    readonly elementRef:ElementRef<HTMLElement>,
+    readonly pathHelper:PathHelperService,
+    readonly actions$:ActionsService,
+    readonly apiV3Service:ApiV3Service,
+  ) {
+    super(locals, cdRef, elementRef);
+
+    this.workPackage = this.locals.workPackage as WorkPackageResource;
+    this.title$ = this
+      .isEditMode()
+      .pipe(
+        map((isEditMode) => (isEditMode ? this.text.edit_title : this.text.new_title)),
+      );
+    this.frameSrc = this.pathHelper.workPackageReminderModalBodyPath(this.workPackage.id as string);
+  }
+
+  ngOnInit() {
+    super.ngOnInit();
+  }
+
+  ngAfterViewInit() {
+    // Use event delegation on a parent element that won't be re-rendered
+    this.elementRef.nativeElement.addEventListener('turbo:submit-end', this.turboSubmitEndListener.bind(this));
+  }
+
+  ngOnDestroy() {
+    super.ngOnDestroy();
+
+    this.elementRef.nativeElement.removeEventListener('turbo:submit-end', this.turboSubmitEndListener.bind(this));
+  }
+
+  onClose():boolean {
+    this.actions$.dispatch(reminderModalUpdated({ workPackageId: this.workPackage.id as string }));
+
+    return super.onClose();
+  }
+
+  private turboSubmitEndListener(event:CustomEvent) {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    const { fetchResponse } = event.detail;
+
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+    if (fetchResponse.succeeded) {
+      this.closeMe();
+      this.onClose();
+    }
+  }
+
+  /**
+   * Check if there is already a reminder for the work package
+   * so we can determine if we are in edit or new mode
+   */
+  private isEditMode():Observable<boolean> {
+    return this
+      .apiV3Service
+      .work_packages
+      .id(this.workPackage.id as string)
+      .reminders
+      .get()
+      .pipe(
+        map((collection:CollectionResource) => { return collection.total > 0; }),
+      );
+  }
+}
diff --git a/frontend/src/app/features/work-packages/openproject-work-packages.module.ts b/frontend/src/app/features/work-packages/openproject-work-packages.module.ts
index 03f4398e73d5..77144ba3947e 100644
--- a/frontend/src/app/features/work-packages/openproject-work-packages.module.ts
+++ b/frontend/src/app/features/work-packages/openproject-work-packages.module.ts
@@ -407,6 +407,12 @@ import {
 } from 'core-app/features/work-packages/components/wp-timer-button/wp-timer-button.component';
 import { OpenprojectTimeEntriesModule } from 'core-app/shared/components/time_entries/openproject-time-entries.module';
 import { RecentItemsService } from 'core-app/core/recent-items.service';
+import {
+  WorkPackageReminderButtonComponent,
+} from 'core-app/features/work-packages/components/wp-buttons/wp-reminder-button/wp-reminder-button.component';
+import {
+  WorkPackageReminderModalComponent,
+} from 'core-app/features/work-packages/components/wp-reminder-modal/wp-reminder.modal';
 import {
   WorkPackageShareButtonComponent,
 } from 'core-app/features/work-packages/components/wp-buttons/wp-share-button/wp-share-button.component';
@@ -612,6 +618,7 @@ import {
     WorkPackageBreadcrumbComponent,
     WorkPackageSplitViewToolbarComponent,
     WorkPackageWatcherButtonComponent,
+    WorkPackageReminderButtonComponent,
     WorkPackageShareButtonComponent,
     WorkPackageSubjectComponent,
 
@@ -632,6 +639,7 @@ import {
     SaveQueryModalComponent,
     WpDestroyModalComponent,
     WorkPackageShareModalComponent,
+    WorkPackageReminderModalComponent,
 
     // CustomActions
     WpCustomActionComponent,
diff --git a/frontend/src/app/features/work-packages/routing/wp-full-view/wp-full-view.component.ts b/frontend/src/app/features/work-packages/routing/wp-full-view/wp-full-view.component.ts
index a6fa95583355..f97c4bdc1646 100644
--- a/frontend/src/app/features/work-packages/routing/wp-full-view/wp-full-view.component.ts
+++ b/frontend/src/app/features/work-packages/routing/wp-full-view/wp-full-view.component.ts
@@ -26,24 +26,26 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
-import { StateService } from '@uirouter/core';
 import {
+  ChangeDetectionStrategy,
   Component,
   HostListener,
   Injector,
   OnInit,
 } from '@angular/core';
-import { Observable, of } from 'rxjs';
+import { StateService } from '@uirouter/core';
+import { ConfigurationService } from 'core-app/core/config/configuration.service';
+import { CurrentUserService } from 'core-app/core/current-user/current-user.service';
+import { RecentItemsService } from 'core-app/core/recent-items.service';
+import { ProjectResource } from 'core-app/features/hal/resources/project-resource';
+import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
+import { HalResourceNotificationService } from 'core-app/features/hal/services/hal-resource-notification.service';
+import { CommentService } from 'core-app/features/work-packages/components/wp-activity/comment-service';
+import { WpSingleViewService } from 'core-app/features/work-packages/routing/wp-view-base/state/wp-single-view.service';
 import { WorkPackageViewSelectionService } from 'core-app/features/work-packages/routing/wp-view-base/view-services/wp-view-selection.service';
 import { WorkPackageSingleViewBase } from 'core-app/features/work-packages/routing/wp-view-base/work-package-single-view.base';
-import { HalResourceNotificationService } from 'core-app/features/hal/services/hal-resource-notification.service';
 import { WorkPackageNotificationService } from 'core-app/features/work-packages/services/notifications/work-package-notification.service';
-import { WpSingleViewService } from 'core-app/features/work-packages/routing/wp-view-base/state/wp-single-view.service';
-import { CommentService } from 'core-app/features/work-packages/components/wp-activity/comment-service';
-import { RecentItemsService } from 'core-app/core/recent-items.service';
-import { ConfigurationService } from 'core-app/core/config/configuration.service';
-import { CurrentUserService } from 'core-app/core/current-user/current-user.service';
+import { Observable, of } from 'rxjs';
 
 @Component({
   templateUrl: './wp-full-view.html',
@@ -55,16 +57,19 @@ import { CurrentUserService } from 'core-app/core/current-user/current-user.serv
     CommentService,
     { provide: HalResourceNotificationService, useExisting: WorkPackageNotificationService },
   ],
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class WorkPackagesFullViewComponent extends WorkPackageSingleViewBase implements OnInit {
   // Watcher properties
   public isWatched:boolean;
 
-  public displayWatchButton = false;
+  public displayReminderButton$:Observable<boolean> = of(false);
+
+  public displayShareButton$:false|Observable<boolean> = false;
 
   public displayTimerButton = false;
 
-  public displayShareButton$:false|Observable<boolean> = false;
+  public displayWatchButton = false;
 
   public watchers:any;
 
@@ -116,7 +121,11 @@ export class WorkPackagesFullViewComponent extends WorkPackageSingleViewBase imp
     this.isWatched = Object.prototype.hasOwnProperty.call(wp, 'unwatch');
     this.displayWatchButton = Object.prototype.hasOwnProperty.call(wp, 'unwatch') || Object.prototype.hasOwnProperty.call(wp, 'watch');
     this.displayTimerButton = Object.prototype.hasOwnProperty.call(wp, 'logTime');
-    this.displayShareButton$ = this.currentUserService.hasCapabilities$('work_package_shares/index', wp.project.id);
+    this.displayShareButton$ = this.currentUserService.hasCapabilities$('work_package_shares/index', (wp.project as ProjectResource).id);
+    this.displayReminderButton$ = this.currentUserService.isLoggedInAndHasCapabalities$(
+      'work_packages/read',
+      (this.workPackage.project as ProjectResource).id,
+    );
 
     // watchers
     if (wp.watchers) {
diff --git a/frontend/src/app/features/work-packages/routing/wp-full-view/wp-full-view.html b/frontend/src/app/features/work-packages/routing/wp-full-view/wp-full-view.html
index a364194a4c85..421f48de11a6 100644
--- a/frontend/src/app/features/work-packages/routing/wp-full-view/wp-full-view.html
+++ b/frontend/src/app/features/work-packages/routing/wp-full-view/wp-full-view.html
@@ -42,6 +42,10 @@
                              [showText]="false">
           </wp-watcher-button>
         </li>
+        <li class="toolbar-item" *ngIf="displayReminderButton$ | async">
+          <wp-reminder-button [workPackage]="workPackage">
+          </wp-reminder-button>
+        </li>
         <li class="toolbar-item" *ngIf="(displayNotificationsButton$ | async)">
           <op-work-package-mark-notification-button
             [workPackage]="workPackage"
diff --git a/frontend/src/app/shared/components/autocompleter/user-autocompleter/user-autocompleter-template.component.html b/frontend/src/app/shared/components/autocompleter/user-autocompleter/user-autocompleter-template.component.html
index 6e40633b218d..e7753cd2dfa6 100644
--- a/frontend/src/app/shared/components/autocompleter/user-autocompleter/user-autocompleter-template.component.html
+++ b/frontend/src/app/shared/components/autocompleter/user-autocompleter/user-autocompleter-template.component.html
@@ -7,6 +7,8 @@
     *ngIf="item && item.href"
     [principal]="item"
     [hideName]="true"
+    [hoverCard]="hoverCards"
+    [hoverCardModalTarget]="isOpenedInModal ? 'custom' : 'default'"
     size="mini"
   ></op-principal>
   <span [opSearchHighlight]="search"
diff --git a/frontend/src/app/shared/components/autocompleter/user-autocompleter/user-autocompleter-template.component.ts b/frontend/src/app/shared/components/autocompleter/user-autocompleter/user-autocompleter-template.component.ts
index 9d65e99c4a2a..8861ebdca3cf 100644
--- a/frontend/src/app/shared/components/autocompleter/user-autocompleter/user-autocompleter-template.component.ts
+++ b/frontend/src/app/shared/components/autocompleter/user-autocompleter/user-autocompleter-template.component.ts
@@ -42,6 +42,8 @@ import { IAutocompleterTemplateComponent } from 'core-app/shared/components/auto
 })
 export class UserAutocompleterTemplateComponent implements IAutocompleterTemplateComponent {
   @Input() public inviteUserToProject:string|undefined;
+  @Input() public isOpenedInModal:boolean = false;
+  @Input() public hoverCards:boolean = true;
 
   @ViewChild('optionTemplate') optionTemplate:TemplateRef<Element>;
   @ViewChild('footerTemplate') footerTemplate?:TemplateRef<Element>;
diff --git a/frontend/src/app/shared/components/autocompleter/user-autocompleter/user-autocompleter.component.ts b/frontend/src/app/shared/components/autocompleter/user-autocompleter/user-autocompleter.component.ts
index 904b8f0afcc2..91cc6cd53fb0 100644
--- a/frontend/src/app/shared/components/autocompleter/user-autocompleter/user-autocompleter.component.ts
+++ b/frontend/src/app/shared/components/autocompleter/user-autocompleter/user-autocompleter.component.ts
@@ -56,6 +56,7 @@ import { addFiltersToPath } from 'core-app/core/apiv3/helpers/add-filters-to-pat
 import { UserAutocompleterTemplateComponent } from 'core-app/shared/components/autocompleter/user-autocompleter/user-autocompleter-template.component';
 import { IUser } from 'core-app/core/state/principals/user.model';
 import { compareByAttribute } from 'core-app/shared/helpers/angular/tracking-functions';
+import { SHOW_USER_HOVER_CARD } from 'core-app/shared/components/time_entries/create/create.modal';
 
 export const usersAutocompleterSelector = 'op-user-autocompleter';
 
@@ -87,18 +88,31 @@ export interface IUserAutocompleteItem {
 export class UserAutocompleterComponent extends OpAutocompleterComponent<IUserAutocompleteItem> implements OnInit, ControlValueAccessor {
   @Input() public inviteUserToProject:string|undefined;
 
+  @Input() public isOpenedInModal:boolean = false;
+  @Input() public hoverCards:boolean = true;
+
   @Input() public url:string = this.apiV3Service.users.path;
 
   @Output() public userInvited = new EventEmitter<HalResource>();
 
   @InjectField(OpInviteUserModalService) opInviteUserModalService:OpInviteUserModalService;
+  @InjectField(SHOW_USER_HOVER_CARD, true) showUserHoverCard:boolean;
 
   getOptionsFn = this.getAvailableUsers.bind(this);
 
   ngOnInit():void {
     super.ngOnInit();
 
-    this.applyTemplates(UserAutocompleterTemplateComponent, { inviteUserToProject: this.inviteUserToProject });
+    // Disabling hover cards by injection takes precedence over the input setting
+    if (!this.showUserHoverCard) {
+      this.hoverCards = false;
+    }
+
+    this.applyTemplates(UserAutocompleterTemplateComponent, {
+      inviteUserToProject: this.inviteUserToProject,
+      isOpenedInModal: this.isOpenedInModal,
+      hoverCards: this.hoverCards,
+    });
 
     this
       .opInviteUserModalService
diff --git a/frontend/src/app/shared/components/datepicker/basic-range-date-picker/basic-range-date-picker.component.html b/frontend/src/app/shared/components/datepicker/basic-range-date-picker/basic-range-date-picker.component.html
index 6c9a4f8699d3..e083c264ab13 100644
--- a/frontend/src/app/shared/components/datepicker/basic-range-date-picker/basic-range-date-picker.component.html
+++ b/frontend/src/app/shared/components/datepicker/basic-range-date-picker/basic-range-date-picker.component.html
@@ -2,12 +2,15 @@
   *ngIf="!mobile"
   #input
   type="text"
+  autocomplete="off"
   class="spot-input op-basic-range-datepicker--input"
   data-test-selector="op-basic-range-date-picker"
   [ngClass]="inputClassNames"
   [attr.data-value]="value"
+  [attr.data-action]="dataAction"
   [id]="id"
   [name]="name"
+  [attr.name]="name"
   [required]="required"
   [disabled]="disabled"
   [ngModel]="stringValue"
@@ -46,6 +49,8 @@
     [attr.data-value]="stringValue"
     [id]="id"
     [name]="name"
+    [attr.name]="name"
+    [attr.data-action]="dataAction"
     [ngModel]="stringValue"
   />
 </ng-container>
diff --git a/frontend/src/app/shared/components/datepicker/basic-range-date-picker/basic-range-date-picker.component.ts b/frontend/src/app/shared/components/datepicker/basic-range-date-picker/basic-range-date-picker.component.ts
index 35f9f3494f69..d9c791513467 100644
--- a/frontend/src/app/shared/components/datepicker/basic-range-date-picker/basic-range-date-picker.component.ts
+++ b/frontend/src/app/shared/components/datepicker/basic-range-date-picker/basic-range-date-picker.component.ts
@@ -115,6 +115,10 @@ export class OpBasicRangeDatePickerComponent implements OnInit, ControlValueAcce
 
   @Input() inputClassNames = '';
 
+  @Input() inDialog = false;
+
+  @Input() dataAction = '';
+
   @ViewChild('input') input:ElementRef;
 
   stringValue = '';
@@ -199,6 +203,7 @@ export class OpBasicRangeDatePickerComponent implements OnInit, ControlValueAcce
             !!this.minimalDate && dayElem.dateObj <= this.minimalDate,
           );
         },
+        static: this.inDialog,
       },
       this.input.nativeElement as HTMLInputElement,
     );
diff --git a/frontend/src/app/shared/components/datepicker/basic-single-date-picker/basic-single-date-picker.component.html b/frontend/src/app/shared/components/datepicker/basic-single-date-picker/basic-single-date-picker.component.html
index e15dd1bf3ebc..436cf1bccd7b 100644
--- a/frontend/src/app/shared/components/datepicker/basic-single-date-picker/basic-single-date-picker.component.html
+++ b/frontend/src/app/shared/components/datepicker/basic-single-date-picker/basic-single-date-picker.component.html
@@ -2,11 +2,13 @@
   *ngIf="!mobile"
   #input
   type="text"
+  autocomplete="off"
   class="spot-input"
   data-filter--filters-form-target="singleDay"
   [ngClass]="inputClassNames"
   [ngModel]="value"
   [attr.data-value]="value"
+  [attr.data-action]="dataAction"
   [id]="id"
   [name]="name"
   [attr.name]="name"
@@ -24,8 +26,10 @@
     data-filter--filters-form-target="singleDay"
     [ngClass]="inputClassNames"
     [attr.data-value]="value"
+    [attr.data-action]="dataAction"
     [id]="id"
     [name]="name"
+    [attr.name]="name"
     [required]="required"
     [disabled]="disabled"
     [ngModel]="value"
diff --git a/frontend/src/app/shared/components/datepicker/basic-single-date-picker/basic-single-date-picker.component.ts b/frontend/src/app/shared/components/datepicker/basic-single-date-picker/basic-single-date-picker.component.ts
index 130ab9e59b10..1ecc03b2fe52 100644
--- a/frontend/src/app/shared/components/datepicker/basic-single-date-picker/basic-single-date-picker.component.ts
+++ b/frontend/src/app/shared/components/datepicker/basic-single-date-picker/basic-single-date-picker.component.ts
@@ -52,7 +52,6 @@ import { DayElement } from 'flatpickr/dist/types/instance';
 import { populateInputsFromDataset } from '../../dataset-inputs';
 import { DeviceService } from 'core-app/core/browser/device.service';
 
-
 @Component({
   selector: 'op-basic-single-date-picker',
   templateUrl: './basic-single-date-picker.component.html',
@@ -96,6 +95,10 @@ export class OpBasicSingleDatePickerComponent implements ControlValueAccessor, O
 
   @Input() remoteFieldKey = null;
 
+  @Input() inDialog = false;
+
+  @Input() dataAction = '';
+
   @ViewChild('input') input:ElementRef;
 
   mobile = false;
@@ -179,6 +182,7 @@ export class OpBasicSingleDatePickerComponent implements ControlValueAccessor, O
             !!this.minimalDate && dayElem.dateObj <= this.minimalDate,
           );
         },
+        static: this.inDialog,
       },
       this.input.nativeElement as HTMLInputElement,
     );
diff --git a/frontend/src/app/shared/components/datepicker/styles/datepicker.modal.sass b/frontend/src/app/shared/components/datepicker/styles/datepicker.modal.sass
index 35d68546881f..904eb15044cd 100644
--- a/frontend/src/app/shared/components/datepicker/styles/datepicker.modal.sass
+++ b/frontend/src/app/shared/components/datepicker/styles/datepicker.modal.sass
@@ -1,6 +1,5 @@
 @import '../../app/spot/styles/sass/variables'
 @import '../../global_styles/openproject/variables'
-
 .op-datepicker-modal
   display: flex
   flex-direction: column
@@ -88,3 +87,8 @@
     &--date-form
       &:only-child
         grid-column: 1 / 3
+
+.flatpickr-wrapper
+  // Make flatpickr behave correctly when it is instantiated
+  // inside a dialog using the static: true option.
+  width: 100%
diff --git a/frontend/src/app/shared/components/fields/display/field-types/user-display-field.module.ts b/frontend/src/app/shared/components/fields/display/field-types/user-display-field.module.ts
index c28ede70d080..d4b59e731063 100644
--- a/frontend/src/app/shared/components/fields/display/field-types/user-display-field.module.ts
+++ b/frontend/src/app/shared/components/fields/display/field-types/user-display-field.module.ts
@@ -29,13 +29,19 @@
 import { DisplayField } from 'core-app/shared/components/fields/display/display-field.module';
 import { InjectField } from 'core-app/shared/helpers/angular/inject-field.decorator';
 import { PrincipalRendererService } from 'core-app/shared/components/principal/principal-renderer.service';
+import { PrincipalLike } from 'core-app/shared/components/principal/principal-types';
+
+interface Attribute {
+  url?:string;
+  name?:string;
+}
 
 export class UserDisplayField extends DisplayField {
   @InjectField() principalRenderer:PrincipalRendererService;
 
   public get value() {
     if (this.schema) {
-      return this.attribute && this.attribute.name;
+      return this.typeSafeAttribute()?.name || '';
     }
     return null;
   }
@@ -46,10 +52,14 @@ export class UserDisplayField extends DisplayField {
     } else {
       this.principalRenderer.render(
         element,
-        this.attribute,
+        this.typeSafeAttribute() as PrincipalLike,
         { hide: false, link: false },
-        { hide: false, size: 'medium' },
+        { hide: false, size: 'medium', hoverCard: { url: this.typeSafeAttribute()?.url || '' } },
       );
     }
   }
+
+  private typeSafeAttribute():Attribute {
+    return this.attribute as Attribute;
+  }
 }
diff --git a/frontend/src/app/shared/components/fields/edit/edit-form/edit-form.component.ts b/frontend/src/app/shared/components/fields/edit/edit-form/edit-form.component.ts
index 521f81c22445..d6811aa058e2 100644
--- a/frontend/src/app/shared/components/fields/edit/edit-form/edit-form.component.ts
+++ b/frontend/src/app/shared/components/fields/edit/edit-form/edit-form.component.ts
@@ -36,6 +36,7 @@ import {
   OnInit,
   Optional,
   Output,
+  ApplicationRef,
 } from '@angular/core';
 import { StateService, Transition, TransitionService } from '@uirouter/core';
 import { ConfigurationService } from 'core-app/core/config/configuration.service';
@@ -78,6 +79,7 @@ export class EditFormComponent extends EditForm<HalResource> implements OnInit,
 
   constructor(public readonly injector:Injector,
     protected readonly elementRef:ElementRef,
+    private appRef:ApplicationRef,
     protected readonly $transitions:TransitionService,
     protected readonly ConfigurationService:ConfigurationService,
     protected readonly editingPortalService:EditingPortalService,
@@ -86,11 +88,11 @@ export class EditFormComponent extends EditForm<HalResource> implements OnInit,
     @Optional() protected readonly editFormRouting:EditFormRoutingService,
     private globalEditFormChangesTrackerService:GlobalEditFormChangesTrackerService) {
     super(injector);
-
     const confirmText = I18n.t('js.work_packages.confirm_edit_cancel');
     const requiresConfirmation = ConfigurationService.warnOnLeavingUnsaved();
 
     this.unregisterListener = $transitions.onBefore({}, (transition:Transition) => {
+      this.removeIdleComponents();
       if (!this.editing) {
         return undefined;
       }
@@ -123,6 +125,16 @@ export class EditFormComponent extends EditForm<HalResource> implements OnInit,
     this.globalEditFormChangesTrackerService.removeFromActiveForms(this);
   }
 
+  // Hacky fix: remove inactive rendered components which aren't in DOM any more
+  removeIdleComponents() {
+    this.appRef.components.forEach((component) => {
+      const element = ((component.hostView as unknown) as { rootNodes:unknown[] }).rootNodes[0] as HTMLElement;
+      if (!document.body.contains(element)) {
+        this.appRef.detachView(component.hostView);
+      }
+    });
+  }
+
   public async activateField(form:EditForm, schema:IFieldSchema, fieldName:string, errors:string[]):Promise<EditFieldHandler> {
     return this.waitForField(fieldName).then((ctrl) => {
       ctrl.setActive(true);
diff --git a/frontend/src/app/shared/components/grids/grid/add-widget.service.ts b/frontend/src/app/shared/components/grids/grid/add-widget.service.ts
index 47ef4fb24b87..20b9534f459b 100644
--- a/frontend/src/app/shared/components/grids/grid/add-widget.service.ts
+++ b/frontend/src/app/shared/components/grids/grid/add-widget.service.ts
@@ -11,6 +11,7 @@ import { GridResizeService } from 'core-app/shared/components/grids/grid/resize.
 import { GridMoveService } from 'core-app/shared/components/grids/grid/move.service';
 import { GridGap } from 'core-app/shared/components/grids/areas/grid-gap';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
+import { GridResource } from 'core-app/features/hal/resources/grid-resource';
 
 @Injectable()
 export class GridAddWidgetService {
@@ -38,7 +39,7 @@ export class GridAddWidgetService {
   public widget(area:GridArea):Promise<GridWidgetResource|null> {
     return this
       .select(area)
-      .then((widgetResource) => {
+      .then(async (widgetResource) => {
         if (this.layout.isGap(area)) {
           this.addLine(area as GridGap);
         }
@@ -47,7 +48,7 @@ export class GridAddWidgetService {
 
         this.setMaxWidth(newArea);
 
-        this.persist(newArea);
+        await this.persist(newArea);
         return widgetResource;
       })
       .catch(() => null);
@@ -114,11 +115,12 @@ export class GridAddWidgetService {
     });
   }
 
-  private persist(area:GridWidgetArea) {
+  private async persist(area:GridWidgetArea):Promise<GridResource> {
     area.writeAreaChangeToWidget();
     this.layout.widgetAreas.push(area);
     this.layout.widgetResources.push(area.widget);
-    this.layout.rebuildAndPersist();
+
+    return this.layout.rebuildAndPersist();
   }
 
   public get isAllowed() {
diff --git a/frontend/src/app/shared/components/grids/grid/area.service.ts b/frontend/src/app/shared/components/grids/grid/area.service.ts
index 983938489e61..b29d79a95ee5 100644
--- a/frontend/src/app/shared/components/grids/grid/area.service.ts
+++ b/frontend/src/app/shared/components/grids/grid/area.service.ts
@@ -8,9 +8,10 @@ import { SchemaResource } from 'core-app/features/hal/resources/schema-resource'
 import { WidgetChangeset } from 'core-app/shared/components/grids/widgets/widget-changeset';
 import { ToastService } from 'core-app/shared/components/toaster/toast.service';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
-import { BehaviorSubject } from 'rxjs';
+import { BehaviorSubject, firstValueFrom } from 'rxjs';
 import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
 import { ApiV3GridForm } from 'core-app/core/apiv3/endpoints/grids/apiv3-grid-form';
+import { map } from 'rxjs/operators';
 
 @Injectable()
 export class GridAreaService {
@@ -42,7 +43,8 @@ export class GridAreaService {
     private apiV3Service:ApiV3Service,
     private toastService:ToastService,
     private i18n:I18nService,
-  ) { }
+  ) {
+  }
 
   public set gridResource(value:GridResource) {
     this.resource = value;
@@ -100,9 +102,10 @@ export class GridAreaService {
     }
   }
 
-  public rebuildAndPersist() {
-    this.persist();
+  public async rebuildAndPersist():Promise<GridResource> {
+    const resource = await this.persist();
     this.buildAreas(false);
+    return resource;
   }
 
   public persist() {
@@ -111,7 +114,7 @@ export class GridAreaService {
     this.resource.columnCount = this.numColumns;
 
     this.writeAreaChangesToWidgets();
-    this.saveGrid(this.resource, this.schema);
+    return this.saveGrid(this.resource, this.schema);
   }
 
   public saveWidgetChangeset(changeset:WidgetChangeset) {
@@ -154,16 +157,22 @@ export class GridAreaService {
     }
   }
 
-  private saveGrid(resource:GridWidgetResource|any, schema?:SchemaResource) {
-    this
+  private async saveGrid(resource:GridResource, schema?:SchemaResource):Promise<GridResource> {
+    const subscription = this
       .apiV3Service
       .grids
       .id(resource)
       .patch(resource, schema)
-      .subscribe((updatedGrid) => {
-        this.assignAreasWidget(updatedGrid);
-        this.toastService.addSuccess(this.i18n.t('js.notice_successful_update'));
-      });
+      .pipe(
+        map((updatedGrid) => {
+          this.assignAreasWidget(updatedGrid);
+          this.toastService.addSuccess(this.i18n.t('js.notice_successful_update'));
+
+          return updatedGrid;
+        }),
+      );
+
+    return firstValueFrom(subscription);
   }
 
   private assignAreasWidget(newGrid:GridResource) {
@@ -276,10 +285,10 @@ export class GridAreaService {
       const widget = this
         .rowWidgets(row)
         .sort((a, b) => a.startColumn - b.startColumn)
-        .find((widget) => !(widget.startRow < excludeRow && widget.endRow > excludeRow)
-                     && (widget.startColumn === column + 1
-                      || widget.endColumn === column + 1
-                      || widget.startColumn <= column && widget.endColumn > column));
+        .find((w) => !(w.startRow < excludeRow && w.endRow > excludeRow)
+          && (w.startColumn === column + 1
+            || w.endColumn === column + 1
+            || (w.startColumn <= column && w.endColumn > column)));
 
       if (widget) {
         movedWidgets.push(widget);
@@ -304,10 +313,10 @@ export class GridAreaService {
       const widget = this
         .columnWidgets(column)
         .sort((a, b) => a.startRow - b.startRow)
-        .find((widget) => !(widget.startColumn < excludeColumn && widget.endColumn > excludeColumn)
-                     && (widget.startRow === row + 1
-                       || widget.endRow === row + 1
-                       || widget.startRow <= row && widget.endRow > row));
+        .find((w) => !(w.startColumn < excludeColumn && w.endColumn > excludeColumn)
+          && (w.startRow === row + 1
+            || w.endRow === row + 1
+            || (w.startRow <= row && w.endRow > row)));
 
       if (widget) {
         movedWidgets.push(widget);
diff --git a/frontend/src/app/shared/components/grids/grid/page/grid-page.component.html b/frontend/src/app/shared/components/grids/grid/page/grid-page.component.html
index 01a5002f85d8..f3c82b9e54c7 100644
--- a/frontend/src/app/shared/components/grids/grid/page/grid-page.component.html
+++ b/frontend/src/app/shared/components/grids/grid/page/grid-page.component.html
@@ -17,7 +17,27 @@ <h2 [textContent]="text.title"></h2>
       <grid *ngIf="grid" [grid]="grid"></grid>
     </div>
     <div class="op-grid-page--sidebar">
-      <turbo-frame [src]="turboFrameSidebarSrc()" [id]="turboFrameSidebarId()">
+      <turbo-frame
+        *ngIf="isLifeCyclesSidebarEnabled()"
+        [src]="lifeCyclesSidebarSrc()"
+        [id]="lifeCyclesSidebarId()"
+      >
+        <op-content-loader viewBox="0 0 100 100">
+          <svg:rect x="0" y="0" width="70" height="5" rx="1" />
+
+          <svg:rect x="75" y="0" width="25" height="5" rx="1" />
+
+          <svg:rect x="0" y="10" width="100" height="8" rx="1" />
+
+          <svg:rect x="0" y="25" width="100" height="12" rx="1" />
+        </op-content-loader>
+      </turbo-frame>
+
+      <turbo-frame
+        *ngIf="isCustomFieldsSidebarEnabled()"
+        [src]="projectCustomFieldsSidebarSrc()"
+        [id]="projectCustomFieldsSidebarId()"
+      >
         <op-content-loader viewBox="0 0 100 100">
           <svg:rect x="0" y="0" width="70" height="5" rx="1" />
 
diff --git a/frontend/src/app/shared/components/grids/grid/page/grid-page.component.ts b/frontend/src/app/shared/components/grids/grid/page/grid-page.component.ts
index 0267279a9176..fe6a42d70ab2 100644
--- a/frontend/src/app/shared/components/grids/grid/page/grid-page.component.ts
+++ b/frontend/src/app/shared/components/grids/grid/page/grid-page.component.ts
@@ -1,6 +1,5 @@
 import { ChangeDetectorRef, Directive, OnDestroy, OnInit, Renderer2 } from '@angular/core';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
-import { Title } from '@angular/platform-browser';
 import { GridInitializationService } from 'core-app/shared/components/grids/grid/initialization.service';
 import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
 import { GridResource } from 'core-app/features/hal/resources/grid-resource';
@@ -8,6 +7,7 @@ import { GridAddWidgetService } from 'core-app/shared/components/grids/grid/add-
 import { GridAreaService } from 'core-app/shared/components/grids/grid/area.service';
 import { CurrentProjectService } from 'core-app/core/current-project/current-project.service';
 import { ConfigurationService } from 'core-app/core/config/configuration.service';
+import { OpTitleService } from 'core-app/core/html/op-title.service';
 
 @Directive()
 export abstract class GridPageComponent implements OnInit, OnDestroy {
@@ -25,7 +25,7 @@ export abstract class GridPageComponent implements OnInit, OnDestroy {
     readonly currentProject:CurrentProjectService,
     readonly i18n:I18nService,
     readonly cdRef:ChangeDetectorRef,
-    readonly title:Title,
+    readonly title:OpTitleService,
     readonly addWidget:GridAddWidgetService,
     readonly renderer:Renderer2,
     readonly areas:GridAreaService,
@@ -57,7 +57,7 @@ export abstract class GridPageComponent implements OnInit, OnDestroy {
   }
 
   private setHtmlTitle() {
-    this.title.setTitle(this.text.html_title);
+    this.title.setFirstPart(this.text.html_title);
   }
 
   protected abstract i18nNamespace():string;
diff --git a/frontend/src/app/shared/components/icon/icon.module.ts b/frontend/src/app/shared/components/icon/icon.module.ts
index 899abf3937be..feb5c478e999 100644
--- a/frontend/src/app/shared/components/icon/icon.module.ts
+++ b/frontend/src/app/shared/components/icon/icon.module.ts
@@ -4,8 +4,11 @@ import { OpIconComponent } from './icon.component';
 import {
   ChevronLeftIconComponent,
   ChevronRightIconComponent,
+  ClockIconComponent,
   HomeIconComponent,
   InfoIconComponent,
+  OpAlarmIconComponent,
+  OpAlarmSetIconComponent,
   OpCursorRectangleSelectIconComponent,
   OpCursorSelectIconComponent,
   OpEnterpriseAddonsIconComponent,
@@ -57,8 +60,11 @@ import {
 
     ChevronLeftIconComponent,
     ChevronRightIconComponent,
+    ClockIconComponent,
     HomeIconComponent,
     InfoIconComponent,
+    OpAlarmIconComponent,
+    OpAlarmSetIconComponent,
     OpCursorRectangleSelectIconComponent,
     OpCursorSelectIconComponent,
     OpEnterpriseAddonsIconComponent,
@@ -113,8 +119,11 @@ import {
 
     ChevronLeftIconComponent,
     ChevronRightIconComponent,
+    ClockIconComponent,
     HomeIconComponent,
     InfoIconComponent,
+    OpAlarmIconComponent,
+    OpAlarmSetIconComponent,
     OpCursorRectangleSelectIconComponent,
     OpCursorSelectIconComponent,
     OpEnterpriseAddonsIconComponent,
diff --git a/frontend/src/app/shared/components/modal/modal.service.ts b/frontend/src/app/shared/components/modal/modal.service.ts
index c495e3d8a3dc..eacdd7b1ad32 100644
--- a/frontend/src/app/shared/components/modal/modal.service.ts
+++ b/frontend/src/app/shared/components/modal/modal.service.ts
@@ -67,6 +67,26 @@ export class OpModalService {
     });
   }
 
+  /**
+   * Checks whether there is currently an active modal. Only shows the requested modal if this is not the case.
+   * Will return null if showing the modal is denied.
+   * @see show
+   */
+  public showIfNotActive<T extends OpModalComponent>(
+    modal:ComponentType<T>,
+    injector:Injector|'global',
+    locals:Record<string, unknown> = {},
+    notFullscreen = false,
+    mobileTopPosition = false,
+    target = PortalOutletTarget.Default,
+  ):Observable<T>|null {
+    if (this.activeModalInstance$.value) {
+      return null;
+    }
+
+    return this.show(modal, injector, locals, notFullscreen, mobileTopPosition, target);
+  }
+
   /**
    * Open a Modal reference and append it to the portal
    *
diff --git a/frontend/src/app/shared/components/modals/preview-modal/hover-card-modal/hover-card.modal.html b/frontend/src/app/shared/components/modals/preview-modal/hover-card-modal/hover-card.modal.html
index 7a382190fe7f..21552890a44e 100644
--- a/frontend/src/app/shared/components/modals/preview-modal/hover-card-modal/hover-card.modal.html
+++ b/frontend/src/app/shared/components/modals/preview-modal/hover-card-modal/hover-card.modal.html
@@ -7,12 +7,5 @@
     loading="lazy"
     id="op-hover-card-body"
     [src]="turboFrameSrc">
-    <op-content-loader
-      viewBox="0 0 330 60"
-    >
-      <svg:rect x="10" y="0" width="60%" height="16" rx="1" />
-      <svg:rect x="10" y="20" width="80%" height="16" rx="1" />
-      <svg:rect x="10" y="40" width="30%" height="16" rx="1" />
-    </op-content-loader>
   </turbo-frame>
 </div>
diff --git a/frontend/src/app/shared/components/modals/preview-modal/hover-card-modal/hover-card.modal.sass b/frontend/src/app/shared/components/modals/preview-modal/hover-card-modal/hover-card.modal.sass
index e3d1db7067c5..0e0081401739 100644
--- a/frontend/src/app/shared/components/modals/preview-modal/hover-card-modal/hover-card.modal.sass
+++ b/frontend/src/app/shared/components/modals/preview-modal/hover-card-modal/hover-card.modal.sass
@@ -1,6 +1,13 @@
 @import "helpers"
 
+@keyframes fade-in-hover-card
+  from
+    opacity: 0
+  to
+    opacity: 1
+
 .op-hover-card
+  animation: fade-in-hover-card .25s ease-in
   position: absolute
   background-color: var(--body-background)
   z-index: 5000
diff --git a/frontend/src/app/shared/components/modals/preview-modal/hover-card-modal/hover-card.modal.ts b/frontend/src/app/shared/components/modals/preview-modal/hover-card-modal/hover-card.modal.ts
index e9c481007ed3..619d9a7cbfab 100644
--- a/frontend/src/app/shared/components/modals/preview-modal/hover-card-modal/hover-card.modal.ts
+++ b/frontend/src/app/shared/components/modals/preview-modal/hover-card-modal/hover-card.modal.ts
@@ -58,10 +58,18 @@ export class HoverCardComponent extends OpModalComponent implements OnInit {
   @ViewChild('turboFrame')
   set turboFrame(frame:ElementRef<HTMLIFrameElement>|undefined) {
     if (frame !== undefined) {
+      // When a new turbo frame is set, hide the modal until the frame is loaded.
+      // Since the size of the new content is unknown in advance, showing a loading indicator within the hover card
+      // leads to a bumpy result once the actual content is inserted and the card extends its dimensions.
+      this.setOpacity(this.elementRef, 0);
+
       frame.nativeElement?.addEventListener('turbo:frame-load', () => {
         const modal = this.elementRef.nativeElement as HTMLElement;
         // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-explicit-any
         void this.reposition(modal, this.locals.event.target as HTMLElement);
+
+        // Content has been loaded, card has been positioned. Show it!
+        this.setOpacity(this.elementRef, 1);
       });
     }
   }
@@ -107,4 +115,10 @@ export class HoverCardComponent extends OpModalComponent implements OnInit {
       top: `${y}px`,
     });
   }
+
+  private setOpacity(elementRef:ElementRef, opacity:number) {
+    const element = elementRef.nativeElement as HTMLElement;
+
+    element.style.opacity = opacity.toString();
+  }
 }
diff --git a/frontend/src/app/shared/components/principal/principal-renderer.service.ts b/frontend/src/app/shared/components/principal/principal-renderer.service.ts
index eff236ea5d2f..8c7565d15edf 100644
--- a/frontend/src/app/shared/components/principal/principal-renderer.service.ts
+++ b/frontend/src/app/shared/components/principal/principal-renderer.service.ts
@@ -6,12 +6,19 @@ import idFromLink from 'core-app/features/hal/helpers/id-from-link';
 import { IPrincipal } from 'core-app/core/state/principals/principal.model';
 import { PrincipalLike } from './principal-types';
 import { hrefFromPrincipal, PrincipalType, typeFromHref } from './principal-helper';
+import { PortalOutletTarget } from 'core-app/shared/components/modal/portal-outlet-target.enum';
 
 export type AvatarSize = 'default'|'medium'|'mini';
 
+export interface HoverCardOptions {
+  url?:string;
+  modalTarget?:PortalOutletTarget;
+}
+
 export interface AvatarOptions {
   hide:boolean;
   size:AvatarSize;
+  hoverCard?:HoverCardOptions;
 }
 
 export interface NameOptions {
@@ -99,6 +106,11 @@ export class PrincipalRendererService {
     container.classList.add('op-principal');
     const type = typeFromHref(hrefFromPrincipal(principal)) as PrincipalType;
 
+    // Only actual users provide a hover card with additional info
+    if (type !== 'user') {
+      avatar.hoverCard = undefined;
+    }
+
     if (!avatar.hide) {
       const el = this.renderAvatar(principal, avatar, type);
       container.appendChild(el);
@@ -129,6 +141,8 @@ export class PrincipalRendererService {
     fallback.title = principal.name;
     fallback.textContent = userInitials;
 
+    this.setHoverCardAttributes(fallback, options, principal);
+
     if (type === 'placeholder_user' && colorMode !== colorModes.lightHighContrast) {
       fallback.style.color = colorCode;
       fallback.style.borderColor = colorCode;
@@ -144,7 +158,11 @@ export class PrincipalRendererService {
     return fallback;
   }
 
-  private renderUserAvatar(principal:PrincipalLike|IPrincipal, fallback:HTMLElement, options:AvatarOptions):void {
+  private renderUserAvatar(
+    principal:PrincipalLike|IPrincipal,
+    fallback:HTMLElement,
+    options:AvatarOptions,
+  ):void {
     const url = this.userAvatarUrl(principal);
 
     if (!url) {
@@ -155,6 +173,9 @@ export class PrincipalRendererService {
     image.classList.add('op-principal--avatar');
     image.classList.add('op-avatar');
     image.classList.add(`op-avatar_${options.size}`);
+
+    this.setHoverCardAttributes(image, options, principal);
+
     image.src = url;
     image.title = principal.name;
     image.alt = principal.name;
@@ -170,6 +191,11 @@ export class PrincipalRendererService {
     return id ? this.apiV3Service.users.id(id).avatar.toString() : null;
   }
 
+  private userHoverCardUrl(principal:PrincipalLike|IPrincipal):string|null {
+    const id = principal.id || idFromLink(hrefFromPrincipal(principal));
+    return id ? this.pathHelper.userHoverCardPath(id) : null;
+  }
+
   private renderName(
     principal:PrincipalLike|IPrincipal,
     type:PrincipalType,
@@ -226,4 +252,24 @@ export class PrincipalRendererService {
     const last = name[lastSpace + 1]?.toUpperCase();
     return [first, last].join('');
   }
+
+  private setHoverCardAttributes(element:HTMLElement, options:AvatarOptions, principal:PrincipalLike|IPrincipal):void {
+    const hoverCard = options.hoverCard;
+
+    if (!hoverCard?.url) {
+      // In some cases, there is no URL given although a hover card is expected. For example when the principle
+      // is rendered from an angular template. We try to infer the URL here.
+      const url = this.userHoverCardUrl(principal);
+      if (hoverCard && url) {
+        hoverCard.url = url;
+      } else {
+        return;
+      }
+    }
+
+    element.classList.add('op-hover-card--preview-trigger');
+
+    element.setAttribute('data-hover-card-url', hoverCard.url);
+    element.setAttribute('data-hover-card-target', String(hoverCard.modalTarget || PortalOutletTarget.Default));
+  }
 }
diff --git a/frontend/src/app/shared/components/principal/principal.component.ts b/frontend/src/app/shared/components/principal/principal.component.ts
index 8a8e4ac5c4df..3d521120a7f1 100644
--- a/frontend/src/app/shared/components/principal/principal.component.ts
+++ b/frontend/src/app/shared/components/principal/principal.component.ts
@@ -40,14 +40,12 @@ import { PathHelperService } from 'core-app/core/path-helper/path-helper.service
 import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
 
 import { TimezoneService } from 'core-app/core/datetime/timezone.service';
-import {
-  AvatarSize,
-  PrincipalRendererService,
-} from './principal-renderer.service';
+import { AvatarOptions, AvatarSize, PrincipalRendererService } from './principal-renderer.service';
 import { PrincipalLike } from './principal-types';
 import { populateInputsFromDataset } from 'core-app/shared/components/dataset-inputs';
 import { PrincipalType } from 'core-app/shared/components/principal/principal-helper';
 import { PrincipalsResourceService } from 'core-app/core/state/principals/principals.service';
+import { PortalOutletTarget } from 'core-app/shared/components/modal/portal-outlet-target.enum';
 
 export const principalSelector = 'op-principal';
 
@@ -76,6 +74,12 @@ export class OpPrincipalComponent implements OnInit {
 
   @Input() size:AvatarSize = 'default';
 
+  @Input() avatarClasses? = '';
+
+  @Input() hoverCard= true;
+  @Input() hoverCardUrl= '';
+  @Input() hoverCardModalTarget:'default'|'custom' = 'default';
+
   @Input() title = '';
 
   public constructor(
@@ -93,6 +97,19 @@ export class OpPrincipalComponent implements OnInit {
 
   ngOnInit() {
     if (this.principal.name) {
+      const avatarOptions:AvatarOptions = {
+        hide: this.hideAvatar,
+        size: this.size,
+      };
+
+      if (this.hoverCard) {
+        avatarOptions.hoverCard = {
+          url: this.hoverCardUrl,
+          modalTarget: this.hoverCardModalTarget === 'custom'
+            ? PortalOutletTarget.Custom : PortalOutletTarget.Default,
+        };
+      }
+
       this.principalRenderer.render(
         this.elementRef.nativeElement as HTMLElement,
         this.principal,
@@ -101,10 +118,7 @@ export class OpPrincipalComponent implements OnInit {
           link: this.link,
           classes: this.nameClasses,
         },
-        {
-          hide: this.hideAvatar,
-          size: this.size,
-        },
+        avatarOptions,
         this.title === '' ? null : this.title,
       );
     }
diff --git a/frontend/src/app/shared/components/storages/file-picker-base-modal/file-picker-base-modal.component.ts b/frontend/src/app/shared/components/storages/file-picker-base-modal/file-picker-base-modal.component.ts
index da706ce475f1..a807e9da5064 100644
--- a/frontend/src/app/shared/components/storages/file-picker-base-modal/file-picker-base-modal.component.ts
+++ b/frontend/src/app/shared/components/storages/file-picker-base-modal/file-picker-base-modal.component.ts
@@ -65,7 +65,7 @@ import {
   v3ErrorIdentifierOutboundRequestForbidden,
 } from 'core-app/features/hal/resources/error-resource';
 
-type Alert = 'none'|'noAccess'|'managedFolderNoAccess'|'managedFolderNotFound';
+type Alert = 'none'|'noAccess'|'managedFolderNoAccess'|'managedFolderNotFound'|'cannotCreateFolder';
 
 @Directive()
 export abstract class FilePickerBaseModalComponent extends OpModalComponent implements OnInit, OnDestroy {
diff --git a/frontend/src/app/shared/components/storages/location-picker-modal/location-picker-modal.component.html b/frontend/src/app/shared/components/storages/location-picker-modal/location-picker-modal.component.html
index 893be4759a44..9fb30308ad89 100644
--- a/frontend/src/app/shared/components/storages/location-picker-modal/location-picker-modal.component.html
+++ b/frontend/src/app/shared/components/storages/location-picker-modal/location-picker-modal.component.html
@@ -72,6 +72,17 @@
   </div>
 
   <div class="spot-action-bar">
+    <div class="spot-action-bar--left">
+      <button
+        type="button"
+        class="button spot-action-bar--action"
+        [disabled]="!canCreateFolder"
+        (click)="createAndNavigateToFolder()"
+      >
+        <span class="spot-icon spot-icon_folder-add op-files-tab--icon op-files-tab--icon_forums"></span>
+        <span [textContent]="text.buttons.newFolder"></span>
+      </button>
+    </div>
     <div class="spot-action-bar--right">
       <button
         type="button"
diff --git a/frontend/src/app/shared/components/storages/location-picker-modal/location-picker-modal.component.ts b/frontend/src/app/shared/components/storages/location-picker-modal/location-picker-modal.component.ts
index 6ecfecf518ca..d81aa4977031 100644
--- a/frontend/src/app/shared/components/storages/location-picker-modal/location-picker-modal.component.ts
+++ b/frontend/src/app/shared/components/storages/location-picker-modal/location-picker-modal.component.ts
@@ -63,6 +63,7 @@ export class LocationPickerModalComponent extends FilePickerBaseModalComponent {
     alertNoAccess: this.i18n.t('js.storages.files.project_folder_no_access'),
     alertNoManagedProjectFolder: this.i18n.t('js.storages.files.managed_project_folder_not_available'),
     alertNoAccessToManagedProjectFolder: this.i18n.t('js.storages.files.managed_project_folder_no_access'),
+    alertCannotCreateFolder: this.i18n.t('js.storages.files.cannot_create_folder'),
     content: {
       empty: this.i18n.t('js.storages.files.empty_folder'),
       emptyHint: this.i18n.t('js.storages.files.empty_folder_location_hint'),
@@ -74,6 +75,7 @@ export class LocationPickerModalComponent extends FilePickerBaseModalComponent {
       submitEmptySelection: this.i18n.t('js.storages.file_links.selection_none'),
       cancel: this.i18n.t('js.button_cancel'),
       selectAll: this.i18n.t('js.storages.file_links.select_all'),
+      newFolder: this.i18n.t('js.storages.new_folder'),
     },
     tooltip: {
       directory_not_writeable: this.i18n.t('js.storages.files.directory_not_writeable'),
@@ -101,6 +103,14 @@ export class LocationPickerModalComponent extends FilePickerBaseModalComponent {
     return this.currentDirectory.permissions.some((value) => value === 'writeable');
   }
 
+  public get canCreateFolder():boolean {
+    if (!this.currentDirectory) {
+      return false;
+    }
+
+    return this.currentDirectory.permissions.some((value) => value === 'writeable');
+  }
+
   public get alertText():Observable<string> {
     return this.showAlert
       .pipe(
@@ -112,6 +122,8 @@ export class LocationPickerModalComponent extends FilePickerBaseModalComponent {
               return this.text.alertNoAccessToManagedProjectFolder;
             case 'managedFolderNotFound':
               return this.text.alertNoManagedProjectFolder;
+            case 'cannotCreateFolder':
+              return this.text.alertCannotCreateFolder;
             case 'none':
               return '';
             default:
@@ -170,4 +182,21 @@ export class LocationPickerModalComponent extends FilePickerBaseModalComponent {
 
     return this.text.tooltip.file_not_selectable;
   }
+
+  public createAndNavigateToFolder() {
+    // eslint-disable-next-line
+    const value = window.prompt(this.text.buttons.newFolder);
+    if (!value) { return; }
+
+    this.storageFilesResourceService.createFolder(
+      this.locals.createFolderHref as string,
+      {
+        name: value,
+        parent_id: this.currentDirectory.id,
+      },
+    ).subscribe({
+      next: (newlyCreatedDirectory) => this.changeLevel(newlyCreatedDirectory),
+      error: (_) => this.showAlert.next('cannotCreateFolder'),
+    });
+  }
 }
diff --git a/frontend/src/app/shared/components/storages/storage/storage.component.ts b/frontend/src/app/shared/components/storages/storage/storage.component.ts
index 9877227ab475..1f133e75b40e 100644
--- a/frontend/src/app/shared/components/storages/storage/storage.component.ts
+++ b/frontend/src/app/shared/components/storages/storage/storage.component.ts
@@ -357,6 +357,7 @@ export class StorageComponent extends UntilDestroyedMixin implements OnInit, OnD
     const locals = {
       projectFolderHref: this.projectStorage._links.projectFolder?.href,
       projectFolderMode: this.projectStorage.projectFolderMode,
+      createFolderHref: `${this.projectStorage._links.storage.href}/folders`,
       storage,
     };
 
diff --git a/frontend/src/app/shared/components/time_entries/create/create.modal.ts b/frontend/src/app/shared/components/time_entries/create/create.modal.ts
index 6025be38a499..50d90c4493e6 100644
--- a/frontend/src/app/shared/components/time_entries/create/create.modal.ts
+++ b/frontend/src/app/shared/components/time_entries/create/create.modal.ts
@@ -1,14 +1,17 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { ChangeDetectionStrategy, Component, InjectionToken } from '@angular/core';
 import { HalResourceEditingService } from 'core-app/shared/components/fields/edit/services/hal-resource-editing.service';
 import { TimeEntryResource } from 'core-app/features/hal/resources/time-entry-resource';
 import { HalResource } from 'core-app/features/hal/resources/hal-resource';
 import { TimeEntryBaseModal } from '../shared/modal/base.modal';
 
+export const SHOW_USER_HOVER_CARD = new InjectionToken('SHOW_USER_HOVER_CARD');
+
 @Component({
   templateUrl: '../shared/modal/base.modal.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
   providers: [
     HalResourceEditingService,
+    { provide: SHOW_USER_HOVER_CARD, useValue: false },
   ],
 })
 export class TimeEntryCreateModalComponent extends TimeEntryBaseModal {
diff --git a/frontend/src/assets/images/15_1_features.svg b/frontend/src/assets/images/15_1_features.svg
deleted file mode 100644
index 9d3109d6a5b9..000000000000
--- a/frontend/src/assets/images/15_1_features.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 1000"><path d="M941.78,339.47h0v486.94c0,11.03-8.97,20-20,20H68.26v1.47c0,13.81,11.19,25,25,25h848.52c13.81,0,25-11.19,25-25v-483.4c0-13.81-11.19-25-25-25Z" style="fill:#cae3f4;"/><path d="M941.78,826.41v-503.4c0-11.03-8.97-20-20-20H53.26c-11.03,0-20,8.97-20,20v503.4c0,11.03,8.97,20,20,20h868.52c11.03,0,20-8.97,20-20ZM43.26,826.41v-503.4c0-5.51,4.49-10,10-10h868.52c5.51,0,10,4.49,10,10v503.4c0,5.51-4.49,10-10,10H53.26c-5.51,0-10-4.49-10-10Z" style="fill:#0070ba;"/><path d="M53.26,269.01h868.52c11.05,0,20.04-8.99,20.04-20.03v-101.81c0-11.05-8.99-20.03-20.04-20.03H53.26c-11.05,0-20.04,8.99-20.04,20.03v101.81c0,11.05,8.99,20.03,20.04,20.03ZM43.29,147.16c0-5.49,4.47-9.97,9.96-9.97h868.52c5.5,0,9.96,4.47,9.96,9.97v101.81c0,5.49-4.47,9.97-9.96,9.97H53.26c-5.5,0-9.96-4.47-9.96-9.97v-101.81Z" style="fill:#cae3f4;"/><path d="M113.12,213.07h370c8.28,0,15-6.72,15-15s-6.72-15-15-15H113.12c-8.28,0-15,6.72-15,15s6.72,15,15,15Z" style="fill:#cae3f4;"/><path d="M851.79,209.58c.82.73,1.84,1.09,2.87,1.09s2.05-.36,2.87-1.09l18.65-16.57c1.78-1.58,1.94-4.31.36-6.09-1.58-1.78-4.31-1.94-6.09-.36l-15.79,14.03-15.79-14.03c-1.78-1.58-4.51-1.42-6.09.36-1.58,1.78-1.42,4.51.36,6.09l18.65,16.57Z" style="fill:#0070ba;"/><path d="M209.35,451.37c.7,1.12,1.5,1.9,2.4,2.35.91.45,1.85.67,2.82.67s1.94-.22,2.86-.67c.92-.45,1.73-1.23,2.43-2.35.71-1.12,1.27-2.62,1.69-4.51.42-1.89.63-4.27.63-7.14s-.21-5.26-.63-7.14c-.42-1.89-.98-3.39-1.69-4.51s-1.52-1.9-2.43-2.35c-.92-.45-1.87-.67-2.86-.67s-1.91.22-2.82.67c-.91.45-1.71,1.23-2.4,2.35-.7,1.12-1.25,2.62-1.66,4.51s-.62,4.27-.62,7.14.21,5.26.62,7.14c.41,1.89.97,3.39,1.66,4.51Z" style="fill:#cae3f4;"/><path d="M622.56,475.46c2.76,0,5-2.24,5-5v-62.59c0-2.76-2.24-5-5-5H134.04c-2.76,0-5,2.24-5,5v62.59c0,2.76,2.24,5,5,5h488.52ZM241.94,453.67h28.3v6h-28.3v-6ZM201.16,430.68c.73-2.55,1.75-4.65,3.05-6.32,1.3-1.67,2.83-2.91,4.6-3.72s3.69-1.22,5.76-1.22,4,.41,5.78,1.22c1.79.81,3.33,2.06,4.64,3.72,1.31,1.67,2.33,3.77,3.08,6.32.74,2.55,1.11,5.56,1.11,9.04s-.37,6.47-1.11,9.02c-.74,2.56-1.77,4.67-3.08,6.33-1.31,1.67-2.86,2.91-4.64,3.72-1.79.81-3.71,1.22-5.78,1.22s-3.99-.41-5.76-1.22c-1.77-.81-3.3-2.06-4.6-3.72-1.3-1.67-2.32-3.78-3.05-6.33-.73-2.55-1.1-5.56-1.1-9.02s.37-6.49,1.1-9.04ZM188.65,454.22c.21-.51.5-.95.88-1.32.38-.37.82-.66,1.33-.88.51-.22,1.06-.33,1.65-.33s1.11.11,1.62.33.95.51,1.32.88c.37.37.66.81.88,1.32s.33,1.05.33,1.62-.11,1.13-.33,1.63c-.22.5-.51.94-.88,1.3-.37.37-.81.66-1.32.87-.51.21-1.05.32-1.62.32s-1.14-.11-1.65-.32c-.51-.21-.96-.5-1.33-.87-.38-.37-.67-.8-.88-1.3-.21-.5-.32-1.05-.32-1.63s.1-1.11.32-1.62ZM171.11,419.8h5.58v34.7h7.14v5.08h-21.98v-5.08h8.05v-23.16c0-.9.03-1.84.08-2.83l-5.71,4.78c-.24.2-.48.34-.73.41-.25.07-.49.11-.73.11-.37,0-.7-.08-1-.23-.3-.16-.53-.33-.67-.54l-2.14-2.94,12.12-10.3Z" style="fill:#cae3f4;"/><path d="M637.56,470.46v-62.59c0-8.27-6.73-15-15-15H134.04c-8.27,0-15,6.73-15,15v62.59c0,8.27,6.73,15,15,15h488.52c8.27,0,15-6.73,15-15ZM129.04,470.46v-62.59c0-2.76,2.24-5,5-5h488.52c2.76,0,5,2.24,5,5v62.59c0,2.76-2.24,5-5,5H134.04c-2.76,0-5-2.24-5-5Z" style="fill:#0070ba;"/><rect x="241.94" y="453.67" width="28.3" height="6" style="fill:#0070ba;"/><path d="M161.81,433.58c.3.16.64.23,1,.23.24,0,.48-.04.73-.11.25-.07.49-.21.73-.41l5.71-4.78c-.05.99-.08,1.93-.08,2.83v23.16h-8.05v5.08h21.98v-5.08h-7.14v-34.7h-5.58l-12.12,10.3,2.14,2.94c.15.2.37.38.67.54Z" style="fill:#0070ba;"/><path d="M189.53,458.78c.38.37.82.66,1.33.87.51.21,1.06.32,1.65.32s1.11-.11,1.62-.32c.51-.21.95-.5,1.32-.87.37-.37.66-.8.88-1.3.22-.5.33-1.05.33-1.63s-.11-1.11-.33-1.62-.51-.95-.88-1.32c-.37-.37-.81-.66-1.32-.88s-1.05-.33-1.62-.33-1.14.11-1.65.33c-.51.22-.96.51-1.33.88-.38.37-.67.81-.88,1.32-.21.51-.32,1.05-.32,1.62s.1,1.13.32,1.63c.21.5.5.94.88,1.3Z" style="fill:#0070ba;"/><path d="M204.21,455.07c1.3,1.67,2.83,2.91,4.6,3.72,1.77.81,3.69,1.22,5.76,1.22s4-.41,5.78-1.22c1.79-.81,3.33-2.06,4.64-3.72,1.31-1.67,2.33-3.78,3.08-6.33.74-2.55,1.11-5.56,1.11-9.02s-.37-6.49-1.11-9.04c-.74-2.55-1.77-4.65-3.08-6.32-1.31-1.67-2.86-2.91-4.64-3.72-1.79-.81-3.71-1.22-5.78-1.22s-3.99.41-5.76,1.22-3.3,2.06-4.6,3.72c-1.3,1.67-2.32,3.77-3.05,6.32s-1.1,5.56-1.1,9.04.37,6.47,1.1,9.02c.73,2.56,1.75,4.67,3.05,6.33ZM207.69,432.57c.41-1.89.97-3.39,1.66-4.51.7-1.12,1.5-1.9,2.4-2.35.91-.45,1.85-.67,2.82-.67s1.94.22,2.86.67c.92.45,1.73,1.23,2.43,2.35s1.27,2.62,1.69,4.51c.42,1.89.63,4.27.63,7.14s-.21,5.26-.63,7.14c-.42,1.89-.98,3.39-1.69,4.51-.71,1.12-1.52,1.9-2.43,2.35-.92.45-1.87.67-2.86.67s-1.91-.22-2.82-.67c-.91-.45-1.71-1.23-2.4-2.35-.7-1.12-1.25-2.62-1.66-4.51-.41-1.89-.62-4.27-.62-7.14s.21-5.26.62-7.14Z" style="fill:#0070ba;"/><path d="M583.3,609.69v-62.59c0-8.27-6.73-15-15-15H188.3c-8.27,0-15,6.73-15,15v62.59c0,8.27,6.73,15,15,15h380c8.27,0,15-6.73,15-15ZM340.45,592.86v6h-28.3v-6h28.3ZM294.88,595.07c0,.59-.11,1.13-.33,1.63-.22.5-.51.94-.88,1.3-.37.37-.81.66-1.32.87-.51.21-1.05.32-1.62.32s-1.14-.11-1.65-.32c-.51-.21-.96-.5-1.33-.87-.38-.37-.67-.8-.88-1.3-.21-.5-.32-1.05-.32-1.63s.1-1.11.32-1.62c.21-.51.5-.95.88-1.32.38-.37.82-.66,1.33-.88.51-.22,1.06-.33,1.65-.33s1.11.11,1.62.33.95.51,1.32.88c.37.37.66.81.88,1.32s.33,1.05.33,1.62ZM262.5,572.52c-.24.2-.48.34-.73.41-.25.07-.49.11-.73.11-.37,0-.7-.08-1-.23-.3-.16-.53-.33-.67-.54l-2.14-2.94,12.12-10.3h5.58v34.7h7.14v5.08h-21.98v-5.08h8.05v-23.16c0-.9.03-1.84.08-2.83l-5.71,4.78ZM250.66,595.07c0,.59-.11,1.13-.33,1.63-.22.5-.51.94-.88,1.3-.37.37-.81.66-1.32.87-.51.21-1.05.32-1.62.32s-1.14-.11-1.65-.32c-.51-.21-.96-.5-1.33-.87-.38-.37-.67-.8-.88-1.3-.21-.5-.32-1.05-.32-1.63s.1-1.11.32-1.62c.21-.51.5-.95.88-1.32.38-.37.82-.66,1.33-.88.51-.22,1.06-.33,1.65-.33s1.11.11,1.62.33.95.51,1.32.88c.37.37.66.81.88,1.32s.33,1.05.33,1.62ZM218.27,572.52c-.24.2-.48.34-.73.41-.25.07-.49.11-.73.11-.37,0-.7-.08-1-.23-.3-.16-.53-.33-.67-.54l-2.14-2.94,12.12-10.3h5.58v34.7h7.14v5.08h-21.98v-5.08h8.05v-23.16c0-.9.03-1.84.08-2.83l-5.71,4.78Z" style="fill:#66cb92;"/><rect x="312.15" y="592.86" width="28.3" height="6" style="fill:#fff;"/><path d="M223.9,593.72h-8.05v5.08h21.98v-5.08h-7.14v-34.7h-5.58l-12.12,10.3,2.14,2.94c.15.2.37.38.67.54.3.16.64.23,1,.23.24,0,.48-.04.73-.11.25-.07.49-.21.73-.41l5.71-4.78c-.05.99-.08,1.93-.08,2.83v23.16Z" style="fill:#fff;"/><path d="M248.13,591.25c-.51-.22-1.05-.33-1.62-.33s-1.14.11-1.65.33c-.51.22-.96.51-1.33.88-.38.37-.67.81-.88,1.32-.21.51-.32,1.05-.32,1.62s.1,1.13.32,1.63c.21.5.5.94.88,1.3.38.37.82.66,1.33.87.51.21,1.06.32,1.65.32s1.11-.11,1.62-.32c.51-.21.95-.5,1.32-.87.37-.37.66-.8.88-1.3.22-.5.33-1.05.33-1.63s-.11-1.11-.33-1.62-.51-.95-.88-1.32c-.37-.37-.81-.66-1.32-.88Z" style="fill:#fff;"/><path d="M268.13,593.72h-8.05v5.08h21.98v-5.08h-7.14v-34.7h-5.58l-12.12,10.3,2.14,2.94c.15.2.37.38.67.54.3.16.64.23,1,.23.24,0,.48-.04.73-.11.25-.07.49-.21.73-.41l5.71-4.78c-.05.99-.08,1.93-.08,2.83v23.16Z" style="fill:#fff;"/><path d="M292.36,591.25c-.51-.22-1.05-.33-1.62-.33s-1.14.11-1.65.33c-.51.22-.96.51-1.33.88-.38.37-.67.81-.88,1.32-.21.51-.32,1.05-.32,1.62s.1,1.13.32,1.63c.21.5.5.94.88,1.3.38.37.82.66,1.33.87.51.21,1.06.32,1.65.32s1.11-.11,1.62-.32c.51-.21.95-.5,1.32-.87.37-.37.66-.8.88-1.3.22-.5.33-1.05.33-1.63s-.11-1.11-.33-1.62-.51-.95-.88-1.32c-.37-.37-.81-.66-1.32-.88Z" style="fill:#fff;"/><path d="M786.46,681.24H234.3c-2.76,0-5,2.24-5,5v62.59c0,2.76,2.24,5,5,5h552.17c2.76,0,5-2.24,5-5v-62.59c0-2.76-2.24-5-5-5ZM283.83,737.95h-21.98v-5.08h8.05v-23.16c0-.9.03-1.84.08-2.83l-5.71,4.78c-.24.2-.48.34-.73.41-.25.07-.49.11-.73.11-.37,0-.7-.08-1-.23-.3-.16-.53-.33-.67-.54l-2.14-2.94,12.12-10.3h5.58v34.7h7.14v5.08ZM296.33,735.85c-.22.5-.51.94-.88,1.3-.37.37-.81.66-1.32.87s-1.05.32-1.62.32-1.14-.11-1.65-.32c-.51-.21-.96-.5-1.33-.87s-.67-.8-.88-1.3c-.21-.5-.32-1.05-.32-1.63s.1-1.11.32-1.62c.21-.51.5-.95.88-1.32s.82-.66,1.33-.88c.51-.22,1.06-.33,1.65-.33s1.11.11,1.62.33.95.51,1.32.88c.37.37.66.81.88,1.32s.33,1.05.33,1.62-.11,1.13-.33,1.63ZM328.06,737.95h-21.98v-5.08h8.05v-23.16c0-.9.03-1.84.08-2.83l-5.71,4.78c-.24.2-.48.34-.73.41-.25.07-.49.11-.73.11-.37,0-.7-.08-1-.23-.3-.16-.53-.33-.67-.54l-2.14-2.94,12.12-10.3h5.58v34.7h7.14v5.08ZM340.56,735.85c-.22.5-.51.94-.88,1.3-.37.37-.81.66-1.32.87s-1.05.32-1.62.32-1.14-.11-1.65-.32c-.51-.21-.96-.5-1.33-.87s-.67-.8-.88-1.3c-.21-.5-.32-1.05-.32-1.63s.1-1.11.32-1.62c.21-.51.5-.95.88-1.32s.82-.66,1.33-.88c.51-.22,1.06-.33,1.65-.33s1.11.11,1.62.33.95.51,1.32.88c.37.37.66.81.88,1.32s.33,1.05.33,1.62-.11,1.13-.33,1.63ZM365.39,737.95c-.49,0-.89-.13-1.19-.38-.3-.26-.55-.55-.76-.88l-5.99-9.81c-.17.66-.39,1.21-.69,1.65l-5.27,8.16c-.2.31-.45.6-.74.87s-.66.4-1.1.4h-6.07l9.64-14.53-9.26-13.65h6.54c.5,0,.86.07,1.1.21.24.14.45.36.63.67l5.91,9.42c.09-.31.21-.62.34-.93.14-.31.31-.62.51-.93l4.75-7.42c.22-.35.45-.6.69-.77.24-.17.53-.25.88-.25h6.24l-9.29,13.35,9.67,14.83h-6.54ZM413.51,737.88h-28.3v-6h28.3v6Z" style="fill:#cae3f4;"/><path d="M786.46,671.24H234.3c-8.27,0-15,6.73-15,15v62.59c0,8.27,6.73,15,15,15h552.17c8.27,0,15-6.73,15-15v-62.59c0-8.27-6.73-15-15-15ZM791.46,748.83c0,2.76-2.24,5-5,5H234.3c-2.76,0-5-2.24-5-5v-62.59c0-2.76,2.24-5,5-5h552.17c2.76,0,5,2.24,5,5v62.59Z" style="fill:#0070ba;"/><rect x="385.21" y="731.88" width="28.3" height="6" style="fill:#0070ba;"/><path d="M276.68,698.17h-5.58l-12.12,10.3,2.14,2.94c.15.2.37.38.67.54.3.16.64.23,1,.23.24,0,.48-.04.73-.11.25-.07.49-.21.73-.41l5.71-4.78c-.05.99-.08,1.93-.08,2.83v23.16h-8.05v5.08h21.98v-5.08h-7.14v-34.7Z" style="fill:#0070ba;"/><path d="M295.45,731.27c-.37-.37-.81-.66-1.32-.88s-1.05-.33-1.62-.33-1.14.11-1.65.33c-.51.22-.96.51-1.33.88s-.67.81-.88,1.32c-.21.51-.32,1.05-.32,1.62s.1,1.13.32,1.63c.21.5.5.94.88,1.3s.82.66,1.33.87c.51.21,1.06.32,1.65.32s1.11-.11,1.62-.32.95-.5,1.32-.87c.37-.37.66-.8.88-1.3s.33-1.05.33-1.63-.11-1.11-.33-1.62-.51-.95-.88-1.32Z" style="fill:#0070ba;"/><path d="M320.91,698.17h-5.58l-12.12,10.3,2.14,2.94c.15.2.37.38.67.54.3.16.64.23,1,.23.24,0,.48-.04.73-.11.25-.07.49-.21.73-.41l5.71-4.78c-.05.99-.08,1.93-.08,2.83v23.16h-8.05v5.08h21.98v-5.08h-7.14v-34.7Z" style="fill:#0070ba;"/><path d="M339.68,731.27c-.37-.37-.81-.66-1.32-.88s-1.05-.33-1.62-.33-1.14.11-1.65.33c-.51.22-.96.51-1.33.88s-.67.81-.88,1.32c-.21.51-.32,1.05-.32,1.62s.1,1.13.32,1.63c.21.5.5.94.88,1.3s.82.66,1.33.87c.51.21,1.06.32,1.65.32s1.11-.11,1.62-.32.95-.5,1.32-.87c.37-.37.66-.8.88-1.3s.33-1.05.33-1.63-.11-1.11-.33-1.62-.51-.95-.88-1.32Z" style="fill:#0070ba;"/><path d="M371.54,709.76h-6.24c-.35,0-.64.08-.88.25-.24.17-.47.42-.69.77l-4.75,7.42c-.2.31-.37.62-.51.93-.14.31-.25.62-.34.93l-5.91-9.42c-.18-.31-.39-.54-.63-.67-.24-.14-.6-.21-1.1-.21h-6.54l9.26,13.65-9.64,14.53h6.07c.44,0,.81-.13,1.1-.4s.54-.55.74-.87l5.27-8.16c.29-.44.52-.99.69-1.65l5.99,9.81c.2.33.45.62.76.88.3.26.7.38,1.19.38h6.54l-9.67-14.83,9.29-13.35Z" style="fill:#0070ba;"/></svg>
\ No newline at end of file
diff --git a/frontend/src/assets/images/15_2_features.svg b/frontend/src/assets/images/15_2_features.svg
new file mode 100644
index 000000000000..5916a8359d7f
--- /dev/null
+++ b/frontend/src/assets/images/15_2_features.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 1000"><path d="M117.94,703.73c-.35-.13-.74-.09-1.08.08-1.47.78-3.15,1.22-4.93,1.22s-3.44-.44-4.9-1.21c-.33-.18-.73-.21-1.08-.08-3.08,1.12-5.58,3.44-6.93,6.4-.18.4-.13.86.13,1.21,2.89,3.94,7.56,6.5,12.83,6.5s9.93-2.56,12.83-6.5c.26-.35.31-.82.13-1.21-1.36-2.97-3.88-5.31-6.99-6.41Z" style="fill:#fff;"/><circle cx="111.93" cy="694.31" r="7.01" style="fill:#fff;"/><circle cx="347.99" cy="694.31" r="7.01" style="fill:#fff;"/><path d="M354.01,703.73c-.35-.13-.74-.09-1.08.08-1.47.78-3.15,1.22-4.93,1.22s-3.44-.44-4.9-1.21c-.33-.18-.73-.21-1.08-.08-3.08,1.12-5.58,3.44-6.93,6.4-.18.4-.13.86.13,1.21,2.89,3.94,7.56,6.5,12.83,6.5s9.93-2.56,12.83-6.5c.26-.35.31-.82.13-1.21-1.36-2.97-3.88-5.31-6.99-6.41Z" style="fill:#fff;"/><path d="M936.11,308.29h-47.78c-2.54,0-4.59,2.06-4.59,4.59h0c0,2.54,2.06,4.59,4.59,4.59h47.78c8.28,0,15,6.72,15,15v454.81c0,8.28-6.72,15-15,15H63.89c-8.28,0-15-6.72-15-15v-454.81c0-8.28,6.72-15,15-15h481.91c2.54,0,4.59-2.06,4.59-4.59h0c0-2.54-2.06-4.59-4.59-4.59H63.89c-13.36,0-24.19,10.83-24.19,24.19v454.81c0,13.36,10.83,24.19,24.19,24.19h872.22c13.36,0,24.19-10.83,24.19-24.19v-454.81c0-13.36-10.83-24.19-24.19-24.19Z" style="fill:#0070ba;"/><path d="M108.23,501.15h46.8c8.84,0,16-7.16,16-16s-7.16-16-16-16h-46.8c-8.84,0-16,7.16-16,16s7.16,16,16,16Z" style="fill:#66cb92;"/><path d="M179.57,429.08h175.26c8.84,0,16-7.16,16-16s-7.16-16-16-16h-175.26c-8.84,0-16,7.16-16,16h0c0,8.84,7.16,16,16,16Z" style="fill:#0070ba;"/><path d="M201.23,485.15c0,2.76,2.24,5,5,5h190c2.76,0,5-2.24,5-5s-2.24-5-5-5h-190c-2.76,0-5,2.24-5,5Z" style="fill:#cae3f4;"/><path d="M92.67,414.08c.04.12.06.24.11.35.05.12.12.23.18.34.05.09.09.18.14.26.13.19.28.38.44.54l18.08,18.08c1.37,1.37,3.6,1.37,4.97,0,1.37-1.37,1.37-3.6,0-4.98l-12.07-12.07h14.02s0,0,0,0h10.55c1.94,0,3.52-1.58,3.52-3.52s-1.58-3.52-3.52-3.52h-24.58l12.07-12.07c1.37-1.37,1.37-3.6,0-4.98-1.37-1.37-3.6-1.37-4.97,0l-18.08,18.08c-.16.16-.31.35-.44.54-.06.08-.09.17-.14.26-.06.11-.13.22-.18.34-.05.11-.07.23-.11.35-.03.1-.07.2-.09.3-.05.23-.07.46-.07.69s.02.46.07.69c.02.1.06.2.09.3Z" style="fill:#cae3f4;"/><path d="M848.11,640.99H97.23c-2.76,0-5,2.24-5,5s2.24,5,5,5h750.88c2.76,0,5-2.24,5-5h0c0-2.76-2.24-5-5-5Z" style="fill:#0070ba;"/><path d="M97.23,595.5h514.79c2.76,0,5-2.24,5-5s-2.24-5-5-5H97.23c-2.76,0-5,2.24-5,5s2.24,5,5,5Z" style="fill:#0070ba;"/><path d="M653.86,357.69c0,16.79,6.62,32.88,18.41,44.75,11.79,11.87,27.77,18.54,44.44,18.54s32.66-6.67,44.44-18.54c11.79-11.87,18.41-27.97,18.41-44.75s-6.62-32.88-18.41-44.75c-11.79-11.87-27.77-18.54-44.44-18.54s-32.66,6.67-44.44,18.54c-11.79,11.87-18.41,27.97-18.41,44.75ZM707.04,326.04c0-1.94.76-3.79,2.12-5.16,1.36-1.37,3.2-2.14,5.13-2.14s3.77.77,5.13,2.14c1.36,1.37,2.12,3.23,2.12,5.16v29.13l19.61,7.91c1.73.76,3.1,2.16,3.81,3.92.72,1.76.73,3.72.02,5.49-.7,1.76-2.05,3.18-3.78,3.96-1.72.77-3.67.84-5.44.19l-24.17-9.74c-1.34-.54-2.5-1.48-3.31-2.69-.81-1.21-1.25-2.63-1.25-4.09v-34.08Z" style="fill:#0070ba;"/><path d="M589.52,460.46c0,13.81,11.19,25,25,25h205.55c13.81,0,25-11.19,25-25v-205.55c0-13.81-11.19-25-25-25h-205.55c-13.81,0-25,11.19-25,25v205.55ZM769.6,274.63c2.83-2.85,7.43-2.85,10.26,0l20.51,20.65c2.83,2.85,2.83,7.48,0,10.33-2.83,2.85-7.42,2.85-10.26,0l-20.51-20.65c-2.83-2.85-2.83-7.48,0-10.33ZM634.22,295.28l20.51-20.65c2.83-2.85,7.42-2.85,10.26,0,2.83,2.85,2.83,7.48,0,10.33l-20.51,20.65c-2.83,2.85-7.42,2.85-10.26,0-2.83-2.85-2.83-7.48,0-10.33ZM662.01,302.61c14.51-14.61,34.18-22.81,54.7-22.81s40.19,8.21,54.7,22.81c14.51,14.61,22.66,34.42,22.66,55.08s-8.15,40.47-22.66,55.08c-3.16,3.19-6.57,6.07-10.19,8.63l8.96,9.02c2.83,2.85,2.83,7.48,0,10.33-2.83,2.85-7.42,2.85-10.26,0l-9.67-9.74c-.7-.71-1.23-1.52-1.58-2.39-9.95,4.55-20.83,6.96-31.97,6.96s-21.31-2.26-30.99-6.52c-.34.7-.81,1.37-1.39,1.95l-9.67,9.74c-2.83,2.85-7.42,2.85-10.26,0-2.83-2.85-2.83-7.48,0-10.33l8.48-8.54c-3.87-2.68-7.51-5.72-10.88-9.11-14.51-14.61-22.66-34.42-22.66-55.08s8.15-40.47,22.66-55.08Z" style="fill:#0070ba;"/><path d="M644.48,305.61l20.51-20.65c2.83-2.85,2.83-7.48,0-10.33-2.83-2.85-7.42-2.85-10.26,0l-20.51,20.65c-2.83,2.85-2.83,7.48,0,10.33,2.83,2.85,7.42,2.85,10.26,0Z" style="fill:#fff;"/><path d="M790.11,305.61c2.83,2.85,7.42,2.85,10.26,0,2.83-2.85,2.83-7.48,0-10.33l-20.51-20.65c-2.83-2.85-7.42-2.85-10.26,0-2.83,2.85-2.83,7.48,0,10.33l20.51,20.65Z" style="fill:#fff;"/><path d="M707.04,360.12c0,1.46.43,2.88,1.25,4.09.81,1.21,1.96,2.14,3.31,2.69l24.17,9.74c1.77.65,3.72.58,5.44-.19,1.72-.77,3.08-2.19,3.78-3.96.7-1.76.69-3.73-.02-5.49-.71-1.76-2.08-3.16-3.81-3.92l-19.61-7.91v-29.13c0-1.94-.76-3.79-2.12-5.16-1.36-1.37-3.2-2.14-5.13-2.14s-3.77.77-5.13,2.14c-1.36,1.37-2.12,3.23-2.12,5.16v34.08Z" style="fill:#fff;"/><path d="M639.35,357.69c0,20.66,8.15,40.47,22.66,55.08,3.37,3.39,7.01,6.43,10.88,9.11l-8.48,8.54c-2.83,2.85-2.83,7.48,0,10.33,2.83,2.85,7.42,2.85,10.26,0l9.67-9.74c.58-.59,1.04-1.25,1.39-1.95,9.68,4.26,20.22,6.52,30.99,6.52s22.02-2.42,31.97-6.96c.35.87.88,1.68,1.58,2.39l9.67,9.74c2.83,2.85,7.43,2.85,10.26,0,2.83-2.85,2.83-7.48,0-10.33l-8.96-9.02c3.61-2.56,7.02-5.44,10.19-8.63,14.51-14.61,22.66-34.42,22.66-55.08s-8.15-40.47-22.66-55.08c-14.51-14.61-34.18-22.81-54.7-22.81s-40.19,8.21-54.7,22.81c-14.51,14.61-22.66,34.42-22.66,55.08ZM672.27,312.94c11.79-11.87,27.77-18.54,44.44-18.54s32.66,6.67,44.44,18.54c11.79,11.87,18.41,27.97,18.41,44.75s-6.62,32.88-18.41,44.75c-11.79,11.87-27.77,18.54-44.44,18.54s-32.66-6.67-44.44-18.54c-11.79-11.87-18.41-27.97-18.41-44.75s6.62-32.88,18.41-44.75Z" style="fill:#fff;"/><path d="M267.84,696.74h-110c-2.76,0-5,2.24-5,5s2.24,5,5,5h110c2.76,0,5-2.24,5-5s-2.24-5-5-5Z" style="fill:#66cb92;"/><path d="M111.97,681.96c-11.05,0-20,8.95-20,20s8.95,20,20,20,20-8.95,20-20-8.95-20-20-20ZM111.93,687.3c3.87,0,7.01,3.14,7.01,7.01s-3.14,7.01-7.01,7.01-7.01-3.14-7.01-7.01,3.14-7.01,7.01-7.01ZM124.8,711.36c-2.89,3.94-7.56,6.5-12.83,6.5s-9.93-2.56-12.83-6.5c-.26-.35-.31-.82-.13-1.21,1.35-2.96,3.85-5.28,6.93-6.4.35-.13.75-.1,1.08.08,1.47.77,3.13,1.21,4.9,1.21s3.46-.44,4.93-1.22c.33-.18.72-.21,1.08-.08,3.1,1.11,5.62,3.44,6.99,6.41.18.4.13.86-.13,1.21Z" style="fill:#66cb92;"/><path d="M503.91,696.74h-110c-2.76,0-5,2.24-5,5s2.24,5,5,5h110c2.76,0,5-2.24,5-5s-2.24-5-5-5Z" style="fill:#0070ba;"/><path d="M348.03,681.96c-11.05,0-20,8.95-20,20s8.95,20,20,20,20-8.95,20-20-8.95-20-20-20ZM347.99,687.3c3.87,0,7.01,3.14,7.01,7.01s-3.14,7.01-7.01,7.01-7.01-3.14-7.01-7.01,3.14-7.01,7.01-7.01ZM360.86,711.36c-2.89,3.94-7.56,6.5-12.83,6.5s-9.93-2.56-12.83-6.5c-.26-.35-.31-.82-.13-1.21,1.35-2.96,3.85-5.28,6.93-6.4.35-.13.75-.1,1.08.08,1.47.77,3.13,1.21,4.9,1.21s3.46-.44,4.93-1.22c.33-.18.72-.21,1.08-.08,3.1,1.11,5.62,3.44,6.99,6.41.18.4.13.86-.13,1.21Z" style="fill:#0070ba;"/></svg>
\ No newline at end of file
diff --git a/frontend/src/global_styles/common/header/app-header.sass b/frontend/src/global_styles/common/header/app-header.sass
index 28c081a03a16..87f17c2e29ad 100644
--- a/frontend/src/global_styles/common/header/app-header.sass
+++ b/frontend/src/global_styles/common/header/app-header.sass
@@ -83,4 +83,4 @@
         padding-right: 1rem
 
   &.op-app-header_development
-    background-image: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='90' height='20'><text x='0' y='1em' fill='rgba(0, 0, 0, 0.5)'>development</text></svg>")
+    background-image: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='120' height='20'><text x='0' y='1em' fill='rgba(0, 0, 0, 0.5)'>development</text></svg>")
diff --git a/frontend/src/global_styles/content/_enterprise.sass b/frontend/src/global_styles/content/_enterprise.sass
index b1f6e45fcb57..04e10759e463 100644
--- a/frontend/src/global_styles/content/_enterprise.sass
+++ b/frontend/src/global_styles/content/_enterprise.sass
@@ -55,6 +55,9 @@
 .upsale-colored
   color: $spot-color-feedback-warning-dark
 
+.upsale-border-colored
+  border-color: $spot-color-feedback-warning-dark
+
 .widget-box--blocks--upsale-title
   font-weight: 400
   font-size: 20px
diff --git a/frontend/src/global_styles/content/_forms.sass b/frontend/src/global_styles/content/_forms.sass
index 3d31e4448417..6598d59069e5 100644
--- a/frontend/src/global_styles/content/_forms.sass
+++ b/frontend/src/global_styles/content/_forms.sass
@@ -292,12 +292,6 @@ fieldset.form--fieldset
   padding: 0 0.25rem
   background-color: inherit
 
-  &.-in-header
-    margin-left: 5px
-    margin-bottom: 5px
-    font-style: italic
-    line-height: 44px
-
 .form--section
   @extend %form--fieldset-or-section
 
diff --git a/frontend/src/global_styles/content/_projects_list.sass b/frontend/src/global_styles/content/_projects_list.sass
index 0260b2f463c1..93fa5bc3a729 100644
--- a/frontend/src/global_styles/content/_projects_list.sass
+++ b/frontend/src/global_styles/content/_projects_list.sass
@@ -104,19 +104,3 @@ $content-padding: 10px
     padding-left: 1em
   li
     list-style-type: none
-
-// Firefox does not support the popover attribute yet. Thus, the Primer action menus create an ugly scroll inside the table
-// Follow https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/popover#browser_compatibility to see when this can be removed
-body:not(.-browser-firefox)
-  .project-list-page
-    display: flex
-    flex-direction: column
-    max-height: calc(100vh - #{var(--header-height)} - #{$content-padding} - #{$content-padding})
-
-    &--table
-      display: flex
-      flex-grow: 1
-      overflow: auto
-
-    .generic-table--results-container
-      overflow-x: hidden
diff --git a/frontend/src/global_styles/content/_table.sass b/frontend/src/global_styles/content/_table.sass
index aab02d6834d1..9b964a9f9cee 100644
--- a/frontend/src/global_styles/content/_table.sass
+++ b/frontend/src/global_styles/content/_table.sass
@@ -381,3 +381,8 @@ thead.-sticky th
 
   p:last-child
     margin-bottom: 0
+
+.generic-table
+  &--action-menu-button.leading-visual-icon-header
+    position: relative
+    top: 2px
diff --git a/frontend/src/global_styles/layout/_toolbar.sass b/frontend/src/global_styles/layout/_toolbar.sass
index c976a3270727..3ed0569ff9ca 100644
--- a/frontend/src/global_styles/layout/_toolbar.sass
+++ b/frontend/src/global_styles/layout/_toolbar.sass
@@ -61,14 +61,6 @@ $nm-color-success-background: #d8fdd1
   &.-with-dropdown .toolbar-item.drop-down
     position: relative
 
-  &.-minimum-title
-    .toolbar-items
-      flex-grow: 1
-
-    .title-container
-      flex-grow: 0
-      flex-basis: auto
-
 // Align title and toolbar with flex
 .toolbar
   display: flex
diff --git a/frontend/src/global_styles/primer/_overrides.sass b/frontend/src/global_styles/primer/_overrides.sass
index 2ef53fc4dd50..b458b00a2e9d 100644
--- a/frontend/src/global_styles/primer/_overrides.sass
+++ b/frontend/src/global_styles/primer/_overrides.sass
@@ -32,6 +32,12 @@
   input
     border-radius: var(--borderRadius-medium)
 
+  // Currently we cannot morph the angular datepicker input field, and we have no way to set the
+  // validation error border on the input. However we can morph the input's wrapper element, thus
+  // adding this parent wrapper rule we can display the red border on the input.
+  &-input-wrap[invalid='true'] input:not(:focus)
+    border-color: var(--control-borderColor-danger)
+
 .UnderlineNav
   @include no-visible-scroll-bar
   margin-bottom: 12px
diff --git a/frontend/src/stimulus/controllers/dynamic/admin/subject-configuration.controller.ts b/frontend/src/stimulus/controllers/dynamic/admin/subject-configuration.controller.ts
new file mode 100644
index 000000000000..1f523fd05154
--- /dev/null
+++ b/frontend/src/stimulus/controllers/dynamic/admin/subject-configuration.controller.ts
@@ -0,0 +1,67 @@
+/*
+ * -- copyright
+ * OpenProject is an open source project management software.
+ * Copyright (C) the OpenProject GmbH
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 3.
+ *
+ * OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+ * Copyright (C) 2006-2013 Jean-Philippe Lang
+ * Copyright (C) 2010-2013 the ChiliProject Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * See COPYRIGHT and LICENSE files for more details.
+ * ++
+ */
+
+import { Controller } from '@hotwired/stimulus';
+
+export default class SubjectConfigurationController extends Controller {
+  static targets = [
+    'patternInput',
+  ];
+
+  static values = {
+    hidePatternInput: Boolean,
+  };
+
+  declare readonly hidePatternInputValue:boolean;
+
+  declare readonly patternInputTarget:HTMLDivElement;
+
+  connect() {
+    if (this.hidePatternInputValue) {
+      this.hidePatternInput();
+    }
+  }
+
+  showPatternInput() {
+    this.togglePatternInput('show');
+  }
+
+  hidePatternInput() {
+    this.togglePatternInput('hide');
+  }
+
+  private togglePatternInput(toggle:'show'|'hide') {
+    if (toggle === 'show') {
+      this.patternInputTarget.classList.remove('d-none');
+    } else {
+      this.patternInputTarget.classList.add('d-none');
+    }
+  }
+}
diff --git a/frontend/src/stimulus/controllers/dynamic/chronic-duration.controller.ts b/frontend/src/stimulus/controllers/dynamic/chronic-duration.controller.ts
new file mode 100644
index 000000000000..fc0d69c0429a
--- /dev/null
+++ b/frontend/src/stimulus/controllers/dynamic/chronic-duration.controller.ts
@@ -0,0 +1,68 @@
+/*
+ * -- copyright
+ * OpenProject is an open source project management software.
+ * Copyright (C) the OpenProject GmbH
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 3.
+ *
+ * OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+ * Copyright (C) 2006-2013 Jean-Philippe Lang
+ * Copyright (C) 2010-2013 the ChiliProject Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * See COPYRIGHT and LICENSE files for more details.
+ * ++
+ *
+ */
+
+import { Controller } from '@hotwired/stimulus';
+import { outputChronicDuration, parseChronicDuration } from 'core-app/shared/helpers/chronic_duration';
+
+export default class ChronicDurationController extends Controller<HTMLInputElement> {
+  private processChangeFn = () => this.onBlur();
+  private keyPressedFn = (evt:KeyboardEvent) => this.onKeyPress(evt);
+
+  connect() {
+    this.element.addEventListener('blur', this.processChangeFn);
+    this.element.addEventListener('keypress', this.keyPressedFn);
+  }
+
+  disconnect() {
+    super.disconnect();
+
+    this.element.removeEventListener('blur', this.processChangeFn);
+    this.element.removeEventListener('keypress', this.keyPressedFn);
+  }
+
+  private onBlur() {
+    const value = this.element.value;
+    const hours = parseChronicDuration(
+      value,
+      {
+        defaultUnit: 'hours', ignoreSecondsWhenColonSeperated: true,
+      },
+    );
+
+    this.element.value = outputChronicDuration(hours, { format: 'hours_only' }) || '';
+  }
+
+  private onKeyPress(evt:KeyboardEvent) {
+    if (evt.key === 'Enter' && evt.currentTarget === this.element) {
+      this.element.blur();
+    }
+  }
+}
diff --git a/frontend/src/stimulus/controllers/dynamic/costs/export.controller.ts b/frontend/src/stimulus/controllers/dynamic/costs/export.controller.ts
new file mode 100644
index 000000000000..aa744db75469
--- /dev/null
+++ b/frontend/src/stimulus/controllers/dynamic/costs/export.controller.ts
@@ -0,0 +1,90 @@
+/*
+ * -- copyright
+ * OpenProject is an open source project management software.
+ * Copyright (C) the OpenProject GmbH
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 3.
+ *
+ * OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+ * Copyright (C) 2006-2013 Jean-Philippe Lang
+ * Copyright (C) 2010-2013 the ChiliProject Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * See COPYRIGHT and LICENSE files for more details.
+ * ++
+ */
+
+import { Controller } from '@hotwired/stimulus';
+import * as Turbo from '@hotwired/turbo';
+import { HttpErrorResponse } from '@angular/common/http';
+
+export default class ExportController extends Controller<HTMLLinkElement> {
+  static values = {
+    jobStatusDialogUrl: String,
+  };
+
+  declare jobStatusDialogUrlValue:string;
+
+  jobModalUrl(job_id:string):string {
+    return this.jobStatusDialogUrlValue.replace('_job_uuid_', job_id);
+  }
+
+  async showJobModal(job_id:string) {
+    const response = await fetch(this.jobModalUrl(job_id), {
+      method: 'GET',
+      headers: { Accept: 'text/vnd.turbo-stream.html' },
+    });
+    if (response.ok) {
+      Turbo.renderStreamMessage(await response.text());
+    } else {
+      throw new Error(response.statusText || 'Invalid response from server');
+    }
+  }
+
+  async requestExport(exportURL:string):Promise<string> {
+    const response = await fetch(exportURL, {
+      method: 'GET',
+      headers: { Accept: 'application/json' },
+      credentials: 'same-origin',
+    });
+    if (!response.ok) {
+      throw new Error(`HTTP ${response.status}: ${response.statusText}`);
+    }
+    const result = await response.json() as { job_id:string };
+    if (!result.job_id) {
+      throw new Error('Invalid response from server');
+    }
+    return result.job_id;
+  }
+
+  get href() {
+    return this.element.href;
+  }
+
+  download(evt:CustomEvent) {
+    evt.preventDefault(); // Don't follow the href
+    this.requestExport(this.href)
+      .then((job_id) => this.showJobModal(job_id))
+      .catch((error:HttpErrorResponse) => this.handleError(error));
+  }
+
+  private handleError(error:HttpErrorResponse) {
+    void window.OpenProject.getPluginContext().then((pluginContext) => {
+      pluginContext.services.notifications.addError(error);
+    });
+  }
+}
diff --git a/frontend/src/stimulus/controllers/dynamic/filter/filter-list.controller.ts b/frontend/src/stimulus/controllers/dynamic/filter/filter-list.controller.ts
index 420be0098525..4272a74adf8d 100644
--- a/frontend/src/stimulus/controllers/dynamic/filter/filter-list.controller.ts
+++ b/frontend/src/stimulus/controllers/dynamic/filter/filter-list.controller.ts
@@ -59,12 +59,23 @@ export default class FilterListController extends Controller {
     });
   }
 
+  /**
+   * Filters the list of items based on the input value in the filter target.
+   *
+   * This method converts the input value to lowercase and compares it with the text content
+   * of each search item. To avoid unwanted text from being part of the search string. E.g. the
+   * labels of buttons, the method first tries to find an element with the class `filter-target-visible-text`.
+   * If such an element exists, only the content of that element is used for the search.
+   * If the text content includes the input value, the item is shown;
+   * otherwise, it is hidden. Additionally, it controls the visibility of the no results text
+   * based on whether any items match the input value.
+   */
   filterLists() {
     const query = this.filterTarget.value.toLowerCase();
     let showNoResultsText = true;
 
     this.searchItemTargets.forEach((item) => {
-      const text = item.textContent?.toLowerCase();
+      const text = item.querySelector('.filter-target-visible-text')?.textContent?.toLowerCase() || item.textContent?.toLowerCase();
 
       if (text?.includes(query)) {
         this.setVisibility(item, true);
diff --git a/frontend/src/stimulus/controllers/dynamic/overview/project-life-cycles-form.controller.ts b/frontend/src/stimulus/controllers/dynamic/overview/project-life-cycles-form.controller.ts
new file mode 100644
index 000000000000..09c51ef995f0
--- /dev/null
+++ b/frontend/src/stimulus/controllers/dynamic/overview/project-life-cycles-form.controller.ts
@@ -0,0 +1,55 @@
+/*
+ * -- copyright
+ * OpenProject is an open source project management software.
+ * Copyright (C) the OpenProject GmbH
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 3.
+ *
+ * OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+ * Copyright (C) 2006-2013 Jean-Philippe Lang
+ * Copyright (C) 2010-2013 the ChiliProject Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * See COPYRIGHT and LICENSE files for more details.
+ * ++
+ */
+
+import { Controller } from '@hotwired/stimulus';
+
+export default class ProjectLifeCyclesFormController extends Controller {
+  static targets = ['form'];
+
+  declare readonly formTarget:HTMLFormElement;
+
+  previewForm(event:Event) {
+    const target = event.target as HTMLElement;
+    const previewUrl = this.formTarget.dataset.previewUrl;
+
+    if (!previewUrl || this.datePickerVisible(target)) {
+      return; // flatpickr is still open, do not submit yet.
+    }
+
+    const form = this.formTarget;
+    form.action = previewUrl;
+
+    form.requestSubmit();
+  }
+
+  datePickerVisible(element:HTMLElement) {
+    return element.classList.contains('active');
+  }
+}
diff --git a/frontend/src/stimulus/controllers/dynamic/overview-header.controller.ts b/frontend/src/stimulus/controllers/dynamic/primer-to-angular-modal.controller.ts
similarity index 69%
rename from frontend/src/stimulus/controllers/dynamic/overview-header.controller.ts
rename to frontend/src/stimulus/controllers/dynamic/primer-to-angular-modal.controller.ts
index c8c912e59055..a1856650d497 100644
--- a/frontend/src/stimulus/controllers/dynamic/overview-header.controller.ts
+++ b/frontend/src/stimulus/controllers/dynamic/primer-to-angular-modal.controller.ts
@@ -29,24 +29,17 @@
  */
 
 import { Controller } from '@hotwired/stimulus';
+import { from, filter, take } from 'rxjs';
 
-export default class OverviewHeaderController extends Controller {
-  connect() {
-    window.addEventListener('angular:router:module-changed', this.toggleHeaderVisibility);
+export default class PrimerToAngularModalController extends Controller {
+  close(event:CustomEvent):void {
+    from(window.OpenProject.getPluginContext())
+      .pipe(
+        take(1),
+        filter((context) => context.services.opModalService?.activeModalInstance$ !== null),
+      )
+      .subscribe((context) => {
+        context.services.opModalService.activeModalInstance$.value?.closeMe(event);
+      });
   }
-
-  disconnect() {
-    window.removeEventListener('angular:router:module-changed', this.toggleHeaderVisibility);
-  }
-
-  toggleHeaderVisibility = (event:CustomEvent) => {
-    const name = event.detail as string;
-    const element = this.element as HTMLElement;
-
-    if (name === 'overview') {
-      element.classList.remove('d-none');
-    } else {
-      element.classList.add('d-none');
-    }
-  };
 }
diff --git a/frontend/src/stimulus/controllers/dynamic/projects/settings/project-custom-fields-mapping-filter.controller.ts b/frontend/src/stimulus/controllers/dynamic/projects/settings/border-box-filter.controller.ts
similarity index 100%
rename from frontend/src/stimulus/controllers/dynamic/projects/settings/project-custom-fields-mapping-filter.controller.ts
rename to frontend/src/stimulus/controllers/dynamic/projects/settings/border-box-filter.controller.ts
diff --git a/frontend/src/stimulus/controllers/dynamic/recurring-meetings/form.controller.ts b/frontend/src/stimulus/controllers/dynamic/recurring-meetings/form.controller.ts
new file mode 100644
index 000000000000..64c6e0044bf8
--- /dev/null
+++ b/frontend/src/stimulus/controllers/dynamic/recurring-meetings/form.controller.ts
@@ -0,0 +1,32 @@
+import { ApplicationController } from 'stimulus-use';
+import { TurboRequestsService } from 'core-app/core/turbo/turbo-requests.service';
+import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
+
+export default class OpRecurringMeetingsFormController extends ApplicationController {
+  private turboRequests:TurboRequestsService;
+  private pathHelper:PathHelperService;
+
+  async connect() {
+    const context = await window.OpenProject.getPluginContext();
+    this.turboRequests = context.services.turboRequests;
+    this.pathHelper = context.services.pathHelperService;
+  }
+
+  updateFrequencyText():void {
+    const data = new FormData(this.element as HTMLFormElement);
+    const urlSearchParams = new URLSearchParams();
+    ['start_date', 'start_time_hour', 'frequency', 'interval'].forEach((name) => {
+      const key = `meeting[${name}]`;
+      urlSearchParams.append(key, data.get(key) as string);
+    });
+
+    void this
+      .turboRequests
+      .request(
+        `${this.pathHelper.staticBase}/recurring_meetings/humanize_schedule?${urlSearchParams.toString()}`,
+        {
+          headers: { Accept: 'text/vnd.turbo-stream.html' },
+        },
+      );
+  }
+}
diff --git a/frontend/src/stimulus/controllers/dynamic/storages/open-project-storage-modal.controller.ts b/frontend/src/stimulus/controllers/dynamic/storages/open-project-storage-modal.controller.ts
index 6e3ad561e7a5..046c0100bb4c 100644
--- a/frontend/src/stimulus/controllers/dynamic/storages/open-project-storage-modal.controller.ts
+++ b/frontend/src/stimulus/controllers/dynamic/storages/open-project-storage-modal.controller.ts
@@ -36,12 +36,14 @@ export default class OpenProjectStorageModalController extends Controller<HTMLDi
   static values = {
     projectStorageOpenUrl: String,
     redirectUrl: String,
+    subtitleTimeoutText: String,
   };
 
   loadingInterval:number;
   timeoutInterval:number;
   networkErrorHappened:boolean;
   projectStorageOpenUrlValue:string;
+  subtitleTimeoutTextValue:string;
   redirectUrlValue:string;
 
   connect() {
@@ -132,9 +134,7 @@ export default class OpenProjectStorageModalController extends Controller<HTMLDi
       );
     }
     if (waitingSubtitle) {
-      waitingSubtitle.innerHTML = I18n.t(
-        'js.open_project_storage_modal.waiting_subtitle.timeout',
-      );
+      waitingSubtitle.innerHTML = this.subtitleTimeoutTextValue;
     }
   }
 }
diff --git a/frontend/src/stimulus/controllers/dynamic/work-packages/activities-tab/index.controller.ts b/frontend/src/stimulus/controllers/dynamic/work-packages/activities-tab/index.controller.ts
index 9df5c036f223..22b425064386 100644
--- a/frontend/src/stimulus/controllers/dynamic/work-packages/activities-tab/index.controller.ts
+++ b/frontend/src/stimulus/controllers/dynamic/work-packages/activities-tab/index.controller.ts
@@ -358,9 +358,18 @@ export default class IndexController extends Controller {
   private tryScroll(activityId:string, attempts:number, maxAttempts:number) {
     const scrollableContainer = this.getScrollableContainer();
     const activityElement = document.getElementById(`activity-anchor-${activityId}`);
+    const topPadding = 70;
 
     if (activityElement && scrollableContainer) {
-      scrollableContainer.scrollTop = activityElement.offsetTop - 70;
+      scrollableContainer.scrollTop = 0;
+
+      setTimeout(() => {
+        const containerRect = scrollableContainer.getBoundingClientRect();
+        const elementRect = activityElement.getBoundingClientRect();
+        const relativeTop = elementRect.top - containerRect.top;
+
+        scrollableContainer.scrollTop = relativeTop - topPadding;
+      }, 50);
     } else if (attempts < maxAttempts) {
       setTimeout(() => this.tryScroll(activityId, attempts + 1, maxAttempts), 1000);
     }
@@ -371,11 +380,42 @@ export default class IndexController extends Controller {
     this.tryScroll(activityId, 0, maxAttempts);
   }
 
-  private scrollToBottom() {
+  private tryScrollToBottom(attempts:number = 0, maxAttempts:number = 20) {
     const scrollableContainer = this.getScrollableContainer();
-    if (scrollableContainer) {
-      scrollableContainer.scrollTop = scrollableContainer.scrollHeight;
+
+    if (!scrollableContainer) {
+      if (attempts < maxAttempts) {
+        setTimeout(() => this.tryScrollToBottom(attempts + 1, maxAttempts), 1000);
+      }
+      return;
     }
+
+    scrollableContainer.scrollTop = 0;
+
+    let timeoutId:ReturnType<typeof setTimeout>;
+
+    const observer = new MutationObserver(() => {
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+      clearTimeout(timeoutId);
+
+      timeoutId = setTimeout(() => {
+        observer.disconnect();
+        scrollableContainer.scrollTo({
+          top: scrollableContainer.scrollHeight,
+          behavior: 'smooth',
+        });
+      }, 100);
+    });
+
+    observer.observe(scrollableContainer, {
+      childList: true,
+      subtree: true,
+      attributes: true,
+    });
+  }
+
+  private scrollToBottom() {
+    this.tryScrollToBottom();
   }
 
   setFilterToOnlyComments() { this.filterValue = 'only_comments'; }
diff --git a/frontend/src/stimulus/controllers/dynamic/work-packages/relations-tab/scroll.controller.ts b/frontend/src/stimulus/controllers/dynamic/work-packages/relations-tab/scroll.controller.ts
new file mode 100644
index 000000000000..ebf2b4eb5d16
--- /dev/null
+++ b/frontend/src/stimulus/controllers/dynamic/work-packages/relations-tab/scroll.controller.ts
@@ -0,0 +1,16 @@
+import { Controller } from '@hotwired/stimulus';
+
+export default class ScrollController extends Controller {
+  static targets = ['scrollToRow'];
+
+  declare readonly scrollToRowTarget:HTMLElement;
+  declare readonly hasScrollToRowTarget:boolean;
+
+  scrollToRowTargetConnected() {
+    if (this.hasScrollToRowTarget) {
+      setTimeout(() => {
+        this.scrollToRowTarget.scrollIntoView({ behavior: 'smooth', block: 'center' });
+      });
+    }
+  }
+}
diff --git a/frontend/src/stimulus/controllers/flash.controller.ts b/frontend/src/stimulus/controllers/flash.controller.ts
index d09aad6d196d..f97ad77f4d3c 100644
--- a/frontend/src/stimulus/controllers/flash.controller.ts
+++ b/frontend/src/stimulus/controllers/flash.controller.ts
@@ -11,9 +11,10 @@ export default class FlashController extends ApplicationController {
 
   static targets = [
     'item',
+    'flash', // only to detect removal
   ];
 
-  declare readonly itemTargets:HTMLElement;
+  declare readonly itemTargets:HTMLElement[];
 
   reloadPage() {
     window.location.reload();
@@ -25,4 +26,12 @@ export default class FlashController extends ApplicationController {
       setTimeout(() => element.remove(), SUCCESS_AUTOHIDE_TIMEOUT);
     }
   }
+
+  flashTargetDisconnected() {
+    this.itemTargets.forEach((target:HTMLElement) => {
+      if (target.innerHTML === '') {
+        target.remove();
+      }
+    });
+  }
 }
diff --git a/frontend/src/stimulus/controllers/op-application.controller.ts b/frontend/src/stimulus/controllers/op-application.controller.ts
index e1234cc820e9..fa3bb750ff96 100644
--- a/frontend/src/stimulus/controllers/op-application.controller.ts
+++ b/frontend/src/stimulus/controllers/op-application.controller.ts
@@ -8,11 +8,11 @@ export class OpApplicationController extends ApplicationController {
 
   dynamicTargetConnected(target:HTMLElement) {
     const controllers = (target.dataset.controller as string).split(' ');
+    const registered = this.application.controllers.map((controller) => controller.identifier);
 
     controllers.forEach((controller) => {
       const path = this.derivePath(controller);
-
-      if (!this.loaded.has(controller)) {
+      if (!registered.includes(controller) && !this.loaded.has(controller)) {
         this.loaded.add(controller);
         void import(/* webpackChunkName: "[request]" */`./dynamic/${path}.controller`)
           .then((imported:{ default:ControllerConstructor }) => this.application.register(controller, imported.default))
diff --git a/frontend/src/stimulus/controllers/show-when-value-selected.controller.ts b/frontend/src/stimulus/controllers/show-when-value-selected.controller.ts
index 6c28e08c22c4..d29ae2c9c332 100644
--- a/frontend/src/stimulus/controllers/show-when-value-selected.controller.ts
+++ b/frontend/src/stimulus/controllers/show-when-value-selected.controller.ts
@@ -14,9 +14,29 @@ export default class OpShowWhenValueSelectedController extends ApplicationContro
   }
 
   private toggleDisabled(evt:InputEvent):void {
-    const value = (evt.target as HTMLInputElement).value;
-    this.effectTargets.forEach((el) => {
-      el.hidden = !(el.dataset.value === value);
+    const input = evt.target as HTMLInputElement;
+    const targetName = input.dataset.targetName;
+
+    this
+      .effectTargets
+      .filter((el) => targetName === el.dataset.targetName)
+      .forEach((el) => {
+        const disabled = this.willDisable(el, input.value);
+        el.disabled = disabled;
+
+        if (el.dataset.setVisibility === 'true') {
+          el.style.setProperty('visibility', disabled ? 'hidden' : 'visible');
+        } else {
+          el.hidden = disabled;
+        }
     });
   }
+
+  private willDisable(el:HTMLElement, value:string):boolean {
+    if (el.dataset.notValue) {
+      return el.dataset.notValue === value;
+    }
+
+    return !(el.dataset.value === value);
+  }
 }
diff --git a/frontend/src/turbo/input-caption-stream-action.ts b/frontend/src/turbo/input-caption-stream-action.ts
new file mode 100644
index 000000000000..1746be1b006b
--- /dev/null
+++ b/frontend/src/turbo/input-caption-stream-action.ts
@@ -0,0 +1,24 @@
+import { StreamActions, StreamElement } from '@hotwired/turbo';
+
+export function registerInputCaptionStreamAction() {
+  StreamActions.addInputCaption = function addInputCaptionAction(this:StreamElement) {
+    const target = document.querySelector(this.target);
+    if (target) {
+      const formControl = (target as HTMLElement).closest('.FormControl') as HTMLElement;
+
+      if (this.getAttribute('clean_other_captions') === 'true') {
+        formControl
+          .querySelectorAll('.FormControl-caption')
+          .forEach((caption) => caption.remove());
+      }
+
+      const caption = this.getAttribute('caption');
+      if (caption && caption !== '') {
+        const span = document.createElement('span');
+        span.className = 'FormControl-caption';
+        span.innerText = caption;
+        formControl.append(span);
+      }
+    }
+  };
+}
diff --git a/frontend/src/turbo/setup.ts b/frontend/src/turbo/setup.ts
index 0a32ec07b8a0..bec41611609b 100644
--- a/frontend/src/turbo/setup.ts
+++ b/frontend/src/turbo/setup.ts
@@ -4,6 +4,7 @@ import TurboPower from 'turbo_power';
 import { registerDialogStreamAction } from './dialog-stream-action';
 import { addTurboEventListeners } from './turbo-event-listeners';
 import { registerFlashStreamAction } from './flash-stream-action';
+import { registerInputCaptionStreamAction } from './input-caption-stream-action';
 import { addTurboGlobalListeners } from './turbo-global-listeners';
 import { applyTurboNavigationPatch } from './turbo-navigation-patch';
 import { debugLog, whenDebugging } from 'core-app/shared/helpers/debug_output';
@@ -29,6 +30,7 @@ addTurboEventListeners();
 addTurboGlobalListeners();
 registerDialogStreamAction();
 registerFlashStreamAction();
+registerInputCaptionStreamAction();
 
 // Apply navigational patch
 // https://github.com/hotwired/turbo/issues/1300
@@ -39,7 +41,9 @@ TurboPower.initialize(Turbo.StreamActions);
 
 // Error handling when "Content missing" returned
 document.addEventListener('turbo:frame-missing', (event:CustomEvent) => {
-  const { detail: { response, visit } } = event as { detail:{ response:Response, visit:(url:string) => void } };
+  const {
+    detail: { response, visit },
+  } = event as { detail:{ response:Response; visit:(url:string) => void } };
   event.preventDefault();
   visit(response.url);
 });
diff --git a/frontend/src/turbo/turbo-global-listeners.ts b/frontend/src/turbo/turbo-global-listeners.ts
index 1b715fe5c1ba..8ad1914e8fdc 100644
--- a/frontend/src/turbo/turbo-global-listeners.ts
+++ b/frontend/src/turbo/turbo-global-listeners.ts
@@ -64,4 +64,13 @@ export function addTurboGlobalListeners() {
     activateFlashNotice();
     activateFlashError();
   });
+
+  document.addEventListener('turbo:before-morph-element', (event) => {
+    const element = event.target as HTMLElement;
+
+    // In case the element is an OpenProject custom dom element, morphing is prevented.
+    if (element.tagName.toUpperCase().startsWith('OPCE-')) {
+      event.preventDefault();
+    }
+  });
 }
diff --git a/lib/api/decorators/aggregation_group.rb b/lib/api/decorators/aggregation_group.rb
index c3f066747a6e..ce2763211e47 100644
--- a/lib/api/decorators/aggregation_group.rb
+++ b/lib/api/decorators/aggregation_group.rb
@@ -33,23 +33,27 @@ def initialize(group_key, count, query:, current_user:)
         @count = count
         @query = query
 
-        if group_key.is_a?(Array)
-          group_key = set_links!(group_key)
-        end
-
-        @link = ::API::V3::Utilities::ResourceLinkGenerator.make_link(group_key)
+        @links =
+          if group_key.is_a?(Array)
+            group_key.map do |element|
+              {
+                href: ::API::V3::Utilities::ResourceLinkGenerator.make_link(element),
+                title: element.to_s
+              }
+            end
+          else
+            [
+              {
+                href: ::API::V3::Utilities::ResourceLinkGenerator.make_link(group_key)
+              }
+            ]
+          end
 
         super(group_key, current_user:)
       end
 
       links :valueLink do
-        if @links
-          @links
-        elsif @link
-          [{ href: @link }]
-        else
-          []
-        end
+        @links
       end
 
       property :value,
@@ -68,28 +72,14 @@ def model_required?
       attr_reader :count,
                   :query
 
-      ##
-      # Initializes the links collection for this group if the group has multiple keys
-      #
-      # @return [String] A new group key for the multi value custom field.
-      def set_links!(group_key)
-        @links = group_key.map do |opt|
-          {
-            href: ::API::V3::Utilities::ResourceLinkGenerator.make_link(opt),
-            title: opt.to_s
-          }
-        end
-
-        if group_key.present?
-          group_key.map(&:name).sort.join(", ")
-        end
-      end
-
       def value
-        if represented == true || represented == false
+        case represented
+        when TrueClass, FalseClass
           represented
+        when Array
+          represented.empty? ? nil : represented.map(&:to_s).sort.join(", ")
         else
-          represented ? represented.to_s : nil
+          represented&.to_s
         end
       end
 
diff --git a/lib/api/v3/notifications/notification_eager_loading_wrapper.rb b/lib/api/v3/notifications/notification_eager_loading_wrapper.rb
index 55ce073a95c2..509e5776b7fb 100644
--- a/lib/api/v3/notifications/notification_eager_loading_wrapper.rb
+++ b/lib/api/v3/notifications/notification_eager_loading_wrapper.rb
@@ -35,23 +35,6 @@ def wrap(notifications)
             notifications
               .includes(API::V3::Notifications::NotificationRepresenter.to_eager_load)
               .to_a
-              .tap { |loaded_notifications| set_resource(loaded_notifications) }
-          end
-
-          private
-
-          # The resource cannot be loaded by rails eager loading means (include)
-          # because it is a polymorphic association. That being as it is, currently only
-          # work packages are assigned.
-          def set_resource(notifications)
-            work_packages_by_id = WorkPackage
-                                    .includes(:project)
-                                    .where(id: notifications.pluck(:resource_id).uniq)
-                                    .index_by(&:id)
-
-            notifications.each do |notification|
-              notification.resource = work_packages_by_id[notification.resource_id]
-            end
           end
         end
       end
diff --git a/lib/api/v3/notifications/notification_representer.rb b/lib/api/v3/notifications/notification_representer.rb
index 5b67c4dd9a3d..dfc90493b3ca 100644
--- a/lib/api/v3/notifications/notification_representer.rb
+++ b/lib/api/v3/notifications/notification_representer.rb
@@ -104,7 +104,7 @@ def _type
           "Notification"
         end
 
-        self.to_eager_load = %i[actor journal]
+        self.to_eager_load = [:actor, :journal, :reminder, { resource: :project }]
       end
     end
   end
diff --git a/lib/api/v3/notifications/property_factory.rb b/lib/api/v3/notifications/property_factory.rb
index f5786d253ef3..5b450656df9b 100644
--- a/lib/api/v3/notifications/property_factory.rb
+++ b/lib/api/v3/notifications/property_factory.rb
@@ -88,12 +88,7 @@ def concrete_factory_for(notification)
       end
 
       @concrete_factory_for ||= Hash.new do |h, property_key|
-        h[property_key] = if property_key == "shared"
-                            # for some reasons
-                            # API::V3::Notifications::PropertyFactory.const_defined?(property_key.camelcase)
-                            # returns true for shared only to fail on the constantize later on.
-                            API::V3::Notifications::PropertyFactory::Default
-                          elsif API::V3::Notifications::PropertyFactory.const_defined?(property_key.camelcase)
+        h[property_key] = if API::V3::Notifications::PropertyFactory.const_defined?(property_key.camelcase, false)
                             "API::V3::Notifications::PropertyFactory::#{property_key.camelcase}".constantize
                           else
                             API::V3::Notifications::PropertyFactory::Default
diff --git a/lib/api/v3/notifications/property_factory/reminder.rb b/lib/api/v3/notifications/property_factory/reminder.rb
new file mode 100644
index 000000000000..e8bd4e210c2f
--- /dev/null
+++ b/lib/api/v3/notifications/property_factory/reminder.rb
@@ -0,0 +1,45 @@
+# --copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+# ++
+
+module API::V3::Notifications::PropertyFactory
+  module Reminder
+    extend ::API::V3::Utilities::PathHelper
+
+    module_function
+
+    def for(notification)
+      return [] unless notification.reminder
+
+      [
+        ::API::V3::Values::PropertyGenericRepresenter
+          .new(::API::V3::Values::PropertyModel.new(:note, notification.reminder.note),
+               self_link: api_v3_paths.notification_detail(notification.id, 0))
+      ]
+    end
+  end
+end
diff --git a/lib/api/v3/reminders/reminder_collection_representer.rb b/lib/api/v3/reminders/reminder_collection_representer.rb
new file mode 100644
index 000000000000..48a7ebbc56e2
--- /dev/null
+++ b/lib/api/v3/reminders/reminder_collection_representer.rb
@@ -0,0 +1,36 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module API
+  module V3
+    module Reminders
+      class ReminderCollectionRepresenter < ::API::Decorators::OffsetPaginatedCollection
+      end
+    end
+  end
+end
diff --git a/lib/api/v3/reminders/reminder_representer.rb b/lib/api/v3/reminders/reminder_representer.rb
new file mode 100644
index 000000000000..88e78173cd52
--- /dev/null
+++ b/lib/api/v3/reminders/reminder_representer.rb
@@ -0,0 +1,48 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module API
+  module V3
+    module Reminders
+      class ReminderRepresenter < ::API::Decorators::Single
+        include API::Decorators::DateProperty
+        include API::Decorators::LinkedResource
+
+        property :id
+
+        date_time_property :remind_at
+
+        property :note
+
+        associated_resource :creator,
+                            v3_path: :user,
+                            representer: ::API::V3::Users::UserRepresenter
+      end
+    end
+  end
+end
diff --git a/lib/api/v3/reminders/reminders_api.rb b/lib/api/v3/reminders/reminders_api.rb
new file mode 100644
index 000000000000..359445d93a3f
--- /dev/null
+++ b/lib/api/v3/reminders/reminders_api.rb
@@ -0,0 +1,49 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module API
+  module V3
+    module Reminders
+      class RemindersAPI < ::API::OpenProjectAPI
+        resource :reminders do
+          after_validation do
+            authorize_in_project(:view_work_packages, project: @work_package.project)
+          end
+
+          get do
+            reminders = @work_package.reminders
+                                     .upcoming_and_visible_to(User.current)
+            ReminderCollectionRepresenter.new(reminders,
+                                              self_link: api_v3_paths.work_package_reminders(@work_package.id),
+                                              current_user: User.current)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/api/v3/user_preferences/user_preference_representer.rb b/lib/api/v3/user_preferences/user_preference_representer.rb
index b4113392c819..f626a6f875e1 100644
--- a/lib/api/v3/user_preferences/user_preference_representer.rb
+++ b/lib/api/v3/user_preferences/user_preference_representer.rb
@@ -75,7 +75,13 @@ class UserPreferenceRepresenter < ::API::Decorators::Single
                    daily_reminders["times"].map! { |time| time.gsub(/\A(\d{2}:\d{2})\z/, '\1:00+00:00') }
                  end
 
-        property :immediate_reminders
+        property :immediate_reminders,
+                 getter: ->(*) do
+                   immediate_reminders.transform_keys { |k| k.camelize(:lower) }
+                 end,
+                 setter: ->(fragment:, **) do
+                   self.immediate_reminders = fragment.transform_keys(&:underscore)
+                 end
 
         property :pause_reminders,
                  getter: ->(*) do
diff --git a/lib/api/v3/utilities/endpoints/index.rb b/lib/api/v3/utilities/endpoints/index.rb
index a79cc5c61152..8690d786f610 100644
--- a/lib/api/v3/utilities/endpoints/index.rb
+++ b/lib/api/v3/utilities/endpoints/index.rb
@@ -117,7 +117,7 @@ def calculate_resulting_params(query, provided_params)
           end
 
           def calculate_groups(query)
-            return unless query.respond_to?(:group_by) && query.group_by
+            return if !query.respond_to?(:group_by) || !query.group_by
 
             query.group_values.map do |group, count|
               ::API::Decorators::AggregationGroup.new(group, count, query:, current_user: User.current)
diff --git a/lib/api/v3/utilities/path_helper.rb b/lib/api/v3/utilities/path_helper.rb
index 6f46cffc495a..ec04d1085fe5 100644
--- a/lib/api/v3/utilities/path_helper.rb
+++ b/lib/api/v3/utilities/path_helper.rb
@@ -84,7 +84,6 @@ def self.build_path(name, *kwargs)
           def self.resources(name,
                              except: [],
                              only: %i[index show create_form update_form schema])
-
             (Array(only) - Array(except)).each do |method|
               send(method, name)
             end
@@ -216,7 +215,7 @@ def self.custom_field_item(id)
           end
 
           # API::V3::Queries::Filters::QueryFilterInstanceRepresenter need a path derived from a class name.
-          def self.hierarchy_item_filter_adapter(id)
+          def self.hierarchy_item_adapter(id)
             custom_field_item(id)
           end
 
@@ -454,6 +453,10 @@ def self.show_revision(project_id, identifier)
           index :shares
           show :share
 
+          def self.work_package_reminders(id)
+            "#{work_package(id)}/reminders"
+          end
+
           def self.show_user(user_id)
             user_path(user_id)
           end
diff --git a/lib/api/v3/utilities/resource_link_generator.rb b/lib/api/v3/utilities/resource_link_generator.rb
index bb3b003008e5..d1901e6b27fa 100644
--- a/lib/api/v3/utilities/resource_link_generator.rb
+++ b/lib/api/v3/utilities/resource_link_generator.rb
@@ -59,6 +59,8 @@ def determine_path_method(record)
               :activity
             when Changeset
               :revision
+            when ::CustomField::Hierarchy::HierarchyItemAdapter
+              :custom_field_item
             else
               record.class.model_name.singular
             end
diff --git a/lib/api/v3/values/property_generic_representer.rb b/lib/api/v3/values/property_generic_representer.rb
new file mode 100644
index 000000000000..ed814ef2fa38
--- /dev/null
+++ b/lib/api/v3/values/property_generic_representer.rb
@@ -0,0 +1,33 @@
+# --copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+# ++
+
+module API::V3::Values
+  class PropertyGenericRepresenter < PropertyRepresenter
+    property :value
+  end
+end
diff --git a/lib/api/v3/values/schemas/value_schema_factory.rb b/lib/api/v3/values/schemas/value_schema_factory.rb
index de98a68e279e..441bb6734729 100644
--- a/lib/api/v3/values/schemas/value_schema_factory.rb
+++ b/lib/api/v3/values/schemas/value_schema_factory.rb
@@ -29,7 +29,7 @@
 module API::V3::Values::Schemas
   module ValueSchemaFactory
     extend ::API::V3::Utilities::PathHelper
-    SUPPORTED = %w(start_date due_date date).freeze
+    SUPPORTED = %w(start_date due_date date note).freeze
 
     module_function
 
@@ -64,10 +64,13 @@ def i18n_for(property)
       I18n.t("attributes.#{property}")
     end
 
-    def type_for(_property)
-      # This is but a stub. Currently, only 'start_date' and 'due_date'
-      # need to be supported so this simple approach works.
-      "Date"
+    def type_for(property)
+      case property
+      when "start_date", "due_date", "date"
+        "Date"
+      when "note"
+        "String"
+      end
     end
   end
 end
diff --git a/lib/api/v3/work_packages/work_packages_api.rb b/lib/api/v3/work_packages/work_packages_api.rb
index 152033faa665..b13b19cdb563 100644
--- a/lib/api/v3/work_packages/work_packages_api.rb
+++ b/lib/api/v3/work_packages/work_packages_api.rb
@@ -98,6 +98,7 @@ class WorkPackagesAPI < ::API::OpenProjectAPI
             mount ::API::V3::WorkPackages::AvailableProjectsOnEditAPI
             mount ::API::V3::WorkPackages::AvailableRelationCandidatesAPI
             mount ::API::V3::WorkPackages::WorkPackageRelationsAPI
+            mount ::API::V3::Reminders::RemindersAPI
           end
 
           mount ::API::V3::WorkPackages::CreateFormAPI
diff --git a/lib/open_project/journal_formatter/custom_field/plain.rb b/lib/open_project/journal_formatter/custom_field/plain.rb
index 4eae0a2665d5..a7a94fd3dbb9 100644
--- a/lib/open_project/journal_formatter/custom_field/plain.rb
+++ b/lib/open_project/journal_formatter/custom_field/plain.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #-- copyright
 # OpenProject is an open source project management software.
 # Copyright (C) the OpenProject GmbH
@@ -53,6 +55,8 @@ def get_formatted_values(custom_field, values)
 
   def get_modifier_function(custom_field)
     case custom_field.field_format
+    when "hierarchy"
+      :find_item_value
     when "list"
       :find_list_value
     when "user"
@@ -79,13 +83,25 @@ def find_user_value(value, _custom_field)
 
     # Lookup any visible user we can find
     user_lookup = Principal
-      .in_visible_project_or_me(User.current)
-      .where(id: ids)
-      .index_by(&:id)
+                  .in_visible_project_or_me(User.current)
+                  .where(id: ids)
+                  .index_by(&:id)
 
     ids_to_names(ids, user_lookup)
   end
 
+  def find_item_value(value, _custom_field)
+    ids = value.split(",").map(&:to_i)
+
+    items = CustomField::Hierarchy::Item.where(id: ids).index_by(&:id)
+
+    ids.map do |id|
+      next I18n.t(:label_deleted_custom_item) unless items[id]
+
+      items[id].ancestry_path
+    end.join(", ")
+  end
+
   def find_list_value(value, custom_field)
     ids = value.split(",").map(&:to_i)
 
@@ -105,9 +121,9 @@ def find_version_value(value, _custom_field)
 
     # Lookup visible versions we can find
     version_lookup = Version
-      .visible(User.current)
-      .where(id: ids)
-      .index_by(&:id)
+                     .visible(User.current)
+                     .where(id: ids)
+                     .index_by(&:id)
 
     ids_to_names(ids, version_lookup)
   end
diff --git a/lib/open_project/patches/mailer_controller_preview.rb b/lib/open_project/patches/mailer_controller_preview.rb
index 04090d2d853f..52fcc99e442f 100644
--- a/lib/open_project/patches/mailer_controller_preview.rb
+++ b/lib/open_project/patches/mailer_controller_preview.rb
@@ -41,6 +41,6 @@ def extend_content_security_policy
   end
 end
 
-OpenProject::Patches.patch_gem_version "rails", "7.1.5" do
+OpenProject::Patches.patch_gem_version "rails", "7.1.5.1" do
   Rails::MailersController.include OpenProject::Patches::MailerControllerCsp
 end
diff --git a/lib/open_project/plugins/acts_as_op_engine.rb b/lib/open_project/plugins/acts_as_op_engine.rb
index 5e2213a6634b..8cd78d0f83c5 100644
--- a/lib/open_project/plugins/acts_as_op_engine.rb
+++ b/lib/open_project/plugins/acts_as_op_engine.rb
@@ -313,6 +313,23 @@ def class_inflection_override(overrides)
           OpenProject::Inflector.inflection(overrides)
         end
       end
+
+      # Adds a replacement rule for a principal reference. When the module allows adding a
+      # principal (e.g. a user) reference to a model, a replacement rule should be added so
+      # that the user can be deleted, by making sure references to that user are replaced
+      # on that model as well.
+      def replace_principal_reference(class_name, attribute)
+        config.to_prepare do
+          Principals::ReplaceReferencesService.add_replacement(class_name, attribute)
+        end
+      end
+
+      # Like #replace_principal_reference, but allows to add multiple classes and attributes at once.
+      def replace_principal_references(attributes_by_class_name)
+        config.to_prepare do
+          Principals::ReplaceReferencesService.add_replacements(attributes_by_class_name)
+        end
+      end
     end
   end
 end
diff --git a/lib/open_project/static/links.rb b/lib/open_project/static/links.rb
index 3cf20939e294..ed1dcb06eef0 100644
--- a/lib/open_project/static/links.rb
+++ b/lib/open_project/static/links.rb
@@ -305,6 +305,9 @@ def static_links
               },
               troubleshooting: {
                 href: "https://www.openproject.org/docs/user-guide/file-management/nextcloud-integration/#possible-errors-and-troubleshooting"
+              },
+              health_status: {
+                href: "https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/health-status/"
               }
             },
             ical_docs: {
diff --git a/lib/open_project/version.rb b/lib/open_project/version.rb
index e5e6f7a942f5..0cc92323beb0 100644
--- a/lib/open_project/version.rb
+++ b/lib/open_project/version.rb
@@ -32,8 +32,8 @@
 module OpenProject
   module VERSION # :nodoc:
     MAJOR = 15
-    MINOR = 1
-    PATCH = 1
+    MINOR = 2
+    PATCH = 0
 
     class << self
       # Used by semver to define the special version (if any).
diff --git a/lib/primer/open_project/forms/autocompleter.html.erb b/lib/primer/open_project/forms/autocompleter.html.erb
index f21b59f522c7..04d63c65a959 100644
--- a/lib/primer/open_project/forms/autocompleter.html.erb
+++ b/lib/primer/open_project/forms/autocompleter.html.erb
@@ -1,26 +1,28 @@
 <%= render(FormControl.new(input: @input, data: @wrapper_data_attributes)) do %>
-  <% if decorated_select? %>
-    <%= render partial: '/augmented/autocomplete_select_decoration',
-               formats: %i[html],
-               locals: {
-                 input_name: @autocomplete_options.fetch(:inputName) { builder.field_name(@input.name) },
-                 input_id: @autocomplete_options.fetch(:inputId) { builder.field_id(@input.name) },
-                 select_options: select_options.map(&:to_h),
-                 multiple: @autocomplete_options.fetch(:multiple, false),
-                 key: @autocomplete_options.fetch(:resource, ''),
-                 append_to: @autocomplete_options.fetch(:append_to, 'body')
-               } %>
-  <% else %>
-    <%= content_tag(:div, class: ("projects-autocomplete-with-search-icon" if @autocomplete_options.delete(:with_search_icon))) do %>
-      <%= angular_component_tag @autocomplete_options.fetch(:component),
-                                data: @autocomplete_options.delete(:data) { {} },
-                                inputs: @autocomplete_options.merge(
-                                  classes: "ng-select--primerized #{@input.invalid? ? '-error' : ''}",
-                                  inputName: @autocomplete_options.fetch(:inputName) { builder.field_name(@input.name) },
-                                  inputValue: @autocomplete_options.fetch(:inputValue) { builder.object.send(@input.name) },
-                                  defaultData: @autocomplete_options.fetch(:defaultData) { true }
-                                )
-      %>
+  <%= content_tag(:div, **@field_wrap_arguments) do %>
+    <% if decorated_select? %>
+      <%= render partial: '/augmented/autocomplete_select_decoration',
+                 formats: %i[html],
+                 locals: {
+                   input_name: @autocomplete_options.fetch(:inputName) { builder.field_name(@input.name) },
+                   input_id: @autocomplete_options.fetch(:inputId) { builder.field_id(@input.name) },
+                   select_options: select_options.map(&:to_h),
+                   multiple: @autocomplete_options.fetch(:multiple, false),
+                   key: @autocomplete_options.fetch(:resource, ''),
+                   append_to: @autocomplete_options.fetch(:append_to, 'body')
+                 } %>
+    <% else %>
+      <%= content_tag(:div, class: ("projects-autocomplete-with-search-icon" if @autocomplete_options.delete(:with_search_icon))) do %>
+        <%= angular_component_tag @autocomplete_options.fetch(:component),
+                                  data: @autocomplete_options.delete(:data) { {} },
+                                  inputs: @autocomplete_options.merge(
+                                    classes: "ng-select--primerized #{@input.invalid? ? '-error' : ''}",
+                                    inputName: @autocomplete_options.fetch(:inputName) { builder.field_name(@input.name) },
+                                    inputValue: @autocomplete_options.fetch(:inputValue) { builder.object.send(@input.name) },
+                                    defaultData: @autocomplete_options.fetch(:defaultData) { true }
+                                  )
+        %>
+      <% end %>
     <% end %>
   <% end %>
 <% end %>
diff --git a/lib/primer/open_project/forms/autocompleter.rb b/lib/primer/open_project/forms/autocompleter.rb
index 3767fd2b0714..f2d35812d62a 100644
--- a/lib/primer/open_project/forms/autocompleter.rb
+++ b/lib/primer/open_project/forms/autocompleter.rb
@@ -6,6 +6,7 @@ module Forms
       # :nodoc:
       class Autocompleter < Primer::Forms::BaseComponent
         include AngularHelper
+        prepend WrappedInput
 
         delegate :builder, :form, :select_options, to: :@input
 
diff --git a/lib/primer/open_project/forms/color_select.html.erb b/lib/primer/open_project/forms/color_select.html.erb
index ba1af96a830f..a6678dce90de 100644
--- a/lib/primer/open_project/forms/color_select.html.erb
+++ b/lib/primer/open_project/forms/color_select.html.erb
@@ -1,10 +1,12 @@
 <%= render(FormControl.new(input: @input)) do %>
-  <%= builder.hidden_field :color_id %>
-  <%= angular_component_tag("opce-colors-autocompleter",
-                            class: "colors-autocomplete form--select-container -middle",
-                            data: {
-                              colors:,
-                              classes: "ng-select--primerized",
-                              update_input: "#{builder.object_name}[color_id]"
-                            }) %>
+  <%= content_tag(:div, **@field_wrap_arguments) do %>
+    <%= builder.hidden_field :color_id %>
+    <%= angular_component_tag("opce-colors-autocompleter",
+                              class: "colors-autocomplete form--select-container -middle",
+                              data: {
+                                colors:,
+                                classes: "ng-select--primerized",
+                                update_input: "#{builder.object_name}[color_id]"
+                              }) %>
+  <% end %>
 <% end %>
diff --git a/lib/primer/open_project/forms/color_select.rb b/lib/primer/open_project/forms/color_select.rb
index 35721b81b3c3..e24d4ec02518 100644
--- a/lib/primer/open_project/forms/color_select.rb
+++ b/lib/primer/open_project/forms/color_select.rb
@@ -7,6 +7,7 @@ module Forms
       class ColorSelect < Primer::Forms::BaseComponent
         include AngularHelper
         include ColorsHelper
+        prepend WrappedInput
 
         delegate :builder, :form, to: :@input
 
diff --git a/lib/primer/open_project/forms/date_picker.html.erb b/lib/primer/open_project/forms/date_picker.html.erb
new file mode 100644
index 000000000000..7b55923f0a48
--- /dev/null
+++ b/lib/primer/open_project/forms/date_picker.html.erb
@@ -0,0 +1,53 @@
+<%#-- copyright
+OpenProject is an open source project management software.
+Copyright (C) the OpenProject GmbH
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License version 3.
+
+OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+Copyright (C) 2006-2013 Jean-Philippe Lang
+Copyright (C) 2010-2013 the ChiliProject Team
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+See COPYRIGHT and LICENSE files for more details.
+
+++#%>
+
+<%= render(FormControl.new(input: @input, tag: :"primer-datepicker-field")) do %>
+  <%= content_tag(:div, **@field_wrap_arguments) do %>
+    <%# leading spinner implies a leading visual %>
+    <% if @input.leading_visual || @input.leading_spinner? %>
+      <span class="FormControl-input-leadingVisualWrap">
+        <%= render(Primer::Beta::Octicon.new(**@input.leading_visual, data: { target: "primer-text-field.leadingVisual" })) %>
+        <% if @input.leading_spinner? %>
+          <%= render(Primer::Beta::Spinner.new(size: :small, hidden: true, data: { target: "primer-text-field.leadingSpinner" })) %>
+        <% end %>
+      </span>
+    <% end %>
+    <%= render Primer::ConditionalWrapper.new(condition: @input.auto_check_src, tag: "auto-check", csrf: auto_check_authenticity_token, src: @input.auto_check_src) do %>
+      <%= angular_component_tag @datepicker_options.fetch(:component),
+                              inputs: @datepicker_options.merge(
+                                id: @datepicker_options.fetch(:id) { builder.field_id(@input.name) },
+                                name: @datepicker_options.fetch(:name) { builder.field_name(@input.name) },
+                                value: @datepicker_options.fetch(:value) { @input.input_arguments[:value] || builder.object&.send(@input.name) },
+                                inputClassNames: @datepicker_options.fetch(:class) { @input.input_arguments[:class] },
+                                dataAction: @datepicker_options.fetch(:data, {}).fetch(:action, nil)
+                              )
+      %>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/lib/primer/open_project/forms/date_picker.rb b/lib/primer/open_project/forms/date_picker.rb
new file mode 100644
index 000000000000..6c7de2fc830c
--- /dev/null
+++ b/lib/primer/open_project/forms/date_picker.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module Primer
+  module OpenProject
+    module Forms
+      # :nodoc:
+      class DatePicker < Primer::Forms::TextField
+        include AngularHelper
+
+        def initialize(input:, datepicker_options:)
+          super(input:)
+
+          @field_wrap_arguments[:invalid] = true if @input.invalid?
+          @datepicker_options = datepicker_options
+        end
+      end
+    end
+  end
+end
diff --git a/lib/primer/open_project/forms/dsl/input_methods.rb b/lib/primer/open_project/forms/dsl/input_methods.rb
index e2151a300dd5..eca21f89ef75 100644
--- a/lib/primer/open_project/forms/dsl/input_methods.rb
+++ b/lib/primer/open_project/forms/dsl/input_methods.rb
@@ -6,31 +6,39 @@ module Forms
       module Dsl
         module InputMethods
           def autocompleter(**, &)
-            add_input AutocompleterInput.new(builder: @builder, form: @form, **, &)
+            add_input AutocompleterInput.new(builder:, form:, **, &)
           end
 
-          def work_package_autocompleter(**, &)
-            add_input WorkPackageAutocompleterInput.new(builder: @builder, form: @form, **, &)
+          def color_select_list(**, &)
+            add_input ColorSelectInput.new(builder:, form:, **, &)
+          end
+
+          def html_content(**, &)
+            add_input HtmlContentInput.new(builder:, form:, **, &)
           end
 
           def project_autocompleter(**, &)
-            add_input ProjectAutocompleterInput.new(builder: @builder, form: @form, **, &)
+            add_input ProjectAutocompleterInput.new(builder:, form:, **, &)
+          end
+
+          def range_date_picker(**)
+            add_input RangeDatePickerInput.new(builder:, form:, **)
           end
 
           def rich_text_area(**)
-            add_input RichTextAreaInput.new(builder: @builder, form: @form, **)
+            add_input RichTextAreaInput.new(builder:, form:, **)
           end
 
-          def storage_manual_project_folder_selection(**)
-            add_input StorageManualProjectFolderSelectionInput.new(builder: @builder, form: @form, **)
+          def single_date_picker(**)
+            add_input SingleDatePickerInput.new(builder:, form:, **)
           end
 
-          def color_select_list(**, &)
-            add_input ColorSelectInput.new(builder:, form:, **, &)
+          def storage_manual_project_folder_selection(**)
+            add_input StorageManualProjectFolderSelectionInput.new(builder:, form:, **)
           end
 
-          def html_content(**, &)
-            add_input HtmlContentInput.new(builder: @builder, form: @form, **, &)
+          def work_package_autocompleter(**, &)
+            add_input WorkPackageAutocompleterInput.new(builder:, form:, **, &)
           end
         end
       end
diff --git a/lib/primer/open_project/forms/dsl/range_date_picker_input.rb b/lib/primer/open_project/forms/dsl/range_date_picker_input.rb
new file mode 100644
index 000000000000..0b79a36b068c
--- /dev/null
+++ b/lib/primer/open_project/forms/dsl/range_date_picker_input.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module Primer
+  module OpenProject
+    module Forms
+      module Dsl
+        class RangeDatePickerInput < SingleDatePickerInput
+          def derive_datepicker_options(options)
+            options.reverse_merge(
+              component: "opce-range-date-picker"
+            )
+          end
+
+          def type
+            :range_date_picker
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/primer/open_project/forms/dsl/single_date_picker_input.rb b/lib/primer/open_project/forms/dsl/single_date_picker_input.rb
new file mode 100644
index 000000000000..7a356bdfba4c
--- /dev/null
+++ b/lib/primer/open_project/forms/dsl/single_date_picker_input.rb
@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module Primer
+  module OpenProject
+    module Forms
+      module Dsl
+        class SingleDatePickerInput < Primer::Forms::Dsl::TextFieldInput
+          attr_reader :datepicker_options
+
+          def initialize(name:, label:, datepicker_options:, **system_arguments)
+            @datepicker_options = derive_datepicker_options(datepicker_options)
+
+            super(name:, label:, **system_arguments)
+          end
+
+          def derive_datepicker_options(options)
+            options.reverse_merge(
+              component: "opce-single-date-picker"
+            )
+          end
+
+          def to_component
+            DatePicker.new(input: self, datepicker_options:)
+          end
+
+          def type
+            :single_date_picker
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/primer/open_project/forms/wrapped_input.rb b/lib/primer/open_project/forms/wrapped_input.rb
new file mode 100644
index 000000000000..51f77fbda233
--- /dev/null
+++ b/lib/primer/open_project/forms/wrapped_input.rb
@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2024 the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+# ++
+
+module Primer
+  module OpenProject
+    module Forms
+      # Prepend this module to a subclass of Primer::Forms::BaseComponent.
+      # Together with a corresponding dom element in the template this will wrap the input field in
+      # the classes expected by the Primer CSS framework.
+      # The template of the prepended to class would look like this:
+      #
+      # <%= render(FormControl.new(input: @input)) do %>
+      #   <%= content_tag(:div, **@field_wrap_arguments) do %>
+      #     ... actual input field here ...
+      #   <% end %>
+      # <% end %>
+      module WrappedInput
+        extend ActiveSupport::Concern
+
+        included do
+          raise "This module needs to be prepended."
+        end
+
+        def initialize(**)
+          super
+
+          set_field_wrap_arguments
+        end
+
+        def set_field_wrap_arguments
+          wrap_classes = [
+            "FormControl-input-wrap"
+          ]
+          wrap_classes << Primer::Forms::Dsl::Input::INPUT_WIDTH_MAPPINGS[@input.input_width] if @input.input_width
+
+          @field_wrap_arguments = {
+            class: class_names(wrap_classes),
+            hidden: @input.hidden?
+          }
+        end
+      end
+    end
+  end
+end
diff --git a/lib/redmine/menu_manager/top_menu_helper.rb b/lib/redmine/menu_manager/top_menu_helper.rb
index 1881d9b12bf4..059b72f2b604 100644
--- a/lib/redmine/menu_manager/top_menu_helper.rb
+++ b/lib/redmine/menu_manager/top_menu_helper.rb
@@ -138,7 +138,7 @@ def render_direct_login
   end
 
   def render_user_drop_down(items)
-    avatar = avatar(User.current, class: "op-top-menu-user-avatar")
+    avatar = avatar(User.current, class: "op-top-menu-user-avatar", hover_card: { active: false })
     render_menu_dropdown_with_items(
       label: avatar.presence || "",
       label_options: {
diff --git a/lib/tasks/database.rake b/lib/tasks/database.rake
index 47de484b5bce..2562ea8bec92 100644
--- a/lib/tasks/database.rake
+++ b/lib/tasks/database.rake
@@ -29,12 +29,8 @@
 namespace "db:sessions" do
   desc "Expire old sessions from the sessions table"
   task :expire, [:days_ago] => [:environment, "db:load_config"] do |_task, args|
-    # sessions expire after 30 days of inactivity by default
-    days_ago = Integer(args[:days_ago] || 30)
-    expiration_time = Date.today - days_ago.days
-
-    sessions_table = ActiveRecord::SessionStore::Session.table_name
-    ActiveRecord::Base.connection.execute "DELETE FROM #{sessions_table} WHERE updated_at < '#{expiration_time}'"
+    days_ago = args.key?(:days_ago) ? args[:days_ago].to_i : 30
+    Sessions::ClearOldSessionsService.call!(days_ago:)
   end
 end
 
diff --git a/lib_static/redmine/i18n.rb b/lib_static/redmine/i18n.rb
index 243027c58fbd..52dfcf29864d 100644
--- a/lib_static/redmine/i18n.rb
+++ b/lib_static/redmine/i18n.rb
@@ -125,8 +125,7 @@ def link_regex
     def format_time_as_date(time, format: nil)
       return nil unless time
 
-      zone = User.current.time_zone
-      local_date = time.in_time_zone(zone).to_date
+      local_date = in_user_zone(time).to_date
 
       if format
         local_date.strftime(format)
@@ -148,21 +147,29 @@ def format_time_as_date(time, format: nil)
     def format_time(time, include_date: true, format: Setting.time_format)
       return nil unless time
 
-      zone = User.current.time_zone
-      local = time.in_time_zone(zone)
+      local = in_user_zone(time)
 
       (include_date ? "#{format_date(local)} " : "") +
         (format.blank? ? ::I18n.l(local, format: :time) : local.strftime(format))
     end
 
+    ##
+    # Formats the given time as a time string according to the +user+'s time zone
+    # @param time [Time] The time to format.
+    # @param user [User] The user to use for the time zone. Defaults to +User.current+.
+    # @return [Time] The time with the user's time zone applied.
+    def in_user_zone(time, user: User.current)
+      time.in_time_zone(user.time_zone)
+    end
+
     # Returns the offset to UTC (with utc prepended) currently active
     # in the current users time zone. DST is factored in so the offset can
     # shift over the course of the year
-    def formatted_time_zone_offset
+    def formatted_time_zone_offset(user: User.current)
       # Doing User.current.time_zone and format that will not take heed of DST as it has no notion
       # of a current time.
       # https://github.com/rails/rails/issues/7297
-      "UTC#{User.current.time_zone.now.formatted_offset}"
+      "UTC#{user.time_zone.now.formatted_offset}"
     end
 
     def day_name(day)
diff --git a/lookbook/docs/patterns/02-forms.md.erb b/lookbook/docs/patterns/02-forms.md.erb
index 1b395a4fd5b6..b757110c9417 100644
--- a/lookbook/docs/patterns/02-forms.md.erb
+++ b/lookbook/docs/patterns/02-forms.md.erb
@@ -91,6 +91,82 @@ allowing to put some content in between:
 
 This is the regular way of using Primer forms.
 
+
+
+### Basic Interactivity
+
+In many cases, you want to show or hide a certain field based on the value of another field. For this purpose, there is the Stimulus controller `show-when-value-selected`.
+
+To use it, pass the controller to the form, and then use `cause` and `effect` targets together with a `data-value`.
+
+Basic example:
+
+```ruby
+primer_form_with(
+  ...
+  data: { controller: "show-when-value-selected" }
+) do |f|
+  render_inline_form(f) do |my_form|
+    my_form.select_list(
+      name: "frequency",
+      label: "Choose frequency",
+      data: {
+        target_name: "frequency",
+        "show-when-value-selected-target": "cause"
+      }
+    ) do |list|
+      list.option(label: "Foo", value: "foo")
+			list.option(label: "Bar", value: "bar")
+			list.option(label: "Third option", value: "other")
+    end
+
+    # Will be shown when "Foo" is selected
+    my_form.text_field(
+     name: :interval,
+     type: :number,
+     data: {
+        target_name: "frequency",
+        value: "foo"
+        "show-when-value-selected-target": "cause"
+      }
+    end
+
+    # Will be shown when "Bar" is selected
+    my_form.text_field(
+     name: :random,
+     type: :text,
+     data: {
+        target_name: "frequency",
+        value: "bar"
+        "show-when-value-selected-target": "effect"
+      }
+    end
+
+    # Will be shown when not "other" is selected
+    my_form.text_field(
+     name: :random,
+     type: :text,
+     hidden: @my_object.state == 'other'
+     data: {
+        target_name: "frequency",
+        not_value: "other"
+        "show-when-value-selected-target": "effect"
+      }
+    end
+end
+```
+
+Important data inputs:
+
+- `"show-when-value-selected-target": "cause"` marks a field as the emitter of a change. Whenever this input changes, the other fields visibility will be toggled.
+- `"show-when-value-selected-target": "effect"` is the input that will get hidden or shown depending on the selected value
+- `data: { value: 'XYZ'}` or `data-value="XYZ"` the value to be checked against the cause
+- `data: { not_value: 'XYZ'}` or `data-not-value="XYZ"` the value to be checked against the cause, resulting in it being hidden if the selected value is NOT the given one.
+- data: `{ target_name: "abc"}` or `data-target-name="abc"` allows you to define multiple sets of cause/effect handlers
+- If you want the target to be visibly blocked, not hidden, then use `data: { set_visibility: "true" }`. By default, the field will be hidden and removed from DOM computation.
+
+
+
 ### Accessing the form model
 
 When defining a form, the model sometimes needs to be accessed, for instance to remove or add some fields depending on the state of the model.
@@ -308,22 +384,22 @@ administration pages.
 So far, the following helpers are available:
 
   * `text_field(name:, **options)`: renders a text field for the setting called
-  `name`, automatically setting the label, value, and disabled state from the
-  setting's attributes.
+    `name`, automatically setting the label, value, and disabled state from the
+    setting's attributes.
 
   * `check_box(name:, **options)`: renders a checkbox for the setting called
-  `name`, automatically setting the label, checked state, and disabled state
-  from the setting's attributes.
+    `name`, automatically setting the label, checked state, and disabled state
+    from the setting's attributes.
 
   * `radio_button_group(name:, values:, button_options: {}, **options)`: renders
-  a radio button group for the setting called `name` and radio button for each
-  element of `values`, automatically setting the label, checked state, html
-  caption, and disabled state from the setting's attributes.
+    a radio button group for the setting called `name` and radio button for each
+    element of `values`, automatically setting the label, checked state, html
+    caption, and disabled state from the setting's attributes.
 
   * `submit`: renders a submit button with the label "Save" and the primary
-  scheme.
+    scheme.
 
   * `form`: the form builder instance if you need to render some form elements
-  normally handled by the settings form decorator in another way than intended.
-  Any call to a method that is not defined on the settings form decorator will
-  be forwarded to this form builder instance so its usage is transparent.
+    normally handled by the settings form decorator in another way than intended.
+    Any call to a method that is not defined on the settings form decorator will
+    be forwarded to this form builder instance so its usage is transparent.
diff --git a/lookbook/docs/patterns/12-tables.md.erb b/lookbook/docs/patterns/12-tables.md.erb
index cb841e6bf0cf..2cafad9ffdee 100644
--- a/lookbook/docs/patterns/12-tables.md.erb
+++ b/lookbook/docs/patterns/12-tables.md.erb
@@ -77,8 +77,19 @@ main_column :title
 ```
 Note: Ideally, one one main column will be present for each table.
 
+#### Footer
 
+Set `has_footer?` to true to add a footer to the table, defining the component/content to be rendered with the `footer` method.
 
+```ruby
+def has_footer?
+  true
+end
+
+def footer
+  render CustomFooterComponent.new(...)
+end
+```
 
 ## Best practices
 
diff --git a/lookbook/docs/patterns/25-hover-cards.md.erb b/lookbook/docs/patterns/25-hover-cards.md.erb
index 2bb9f2bc0a9d..18474ed9eaee 100644
--- a/lookbook/docs/patterns/25-hover-cards.md.erb
+++ b/lookbook/docs/patterns/25-hover-cards.md.erb
@@ -1,8 +1,10 @@
-The HoverCard is a pattern related to the `Primer::Beta::Popover` and is used to show additional contexual information on certain kinds of resources like work packages and users. The hover card is opened by hovering over a certain trigger. When hovering outside of the card or its trigger, the popover is closed again.
+The HoverCard is a pattern related to the `Primer::Beta::Popover` and is used to show additional contextual information on certain kinds of resources like work packages and users. The hover card is opened by hovering over a certain trigger. When hovering outside of the card or its trigger, the popover is closed again.
 
 ## Overview
 
-![Exemplary hover card](<%= image_path('lookbook/hover_card.png') %>)
+![Exemplary work package hover card](<%= image_path('lookbook/hover_card.png') %>)
+
+![Exemplary user hover card](<%= image_path('lookbook/user_hover_card.png') %>)
 
 ## Anatomy
 
@@ -27,7 +29,7 @@ The HoverCard always consists of two basic parts:
 ## Used in
 
 - WorkPackage preview when linking via `#ID`
-- Soon: User preview when hovering the avatar
+- User preview when hovering the avatar
 
 ## Technical notes
 
@@ -61,13 +63,27 @@ Additionally, the trigger element needs to pass the URL for the `turboFrame` as
      class="op-hover-card--preview-trigger">
     #14
   </a>
+
+  <!-- This is how it would look like to provide a hover card trigger to a picture of a user. In reality, you would
+       probably apply the trigger to an <op-principal> tag. -->
+  <a href="users/14"
+     data-hover-card-url="users/14/hover_card"
+     class="op-hover-card--preview-trigger">
+    <img src="user_avatar.png" alt="">
+  </a>
 ```
 
+Note that the user example is simplified. For actual use in the application, it is recommended to use the `AvatarComponent`, which offers an option for hover cards.
+
 **Actually rendered card content**:
 ```html
   <!-- app/components/work_packages/hover_card/show.html.erb -->
   <turbo-frame id="op-hover-card-body">
     &lt;%= render WorkPackages::HoverCardComponent.new(id: 14) %&gt;
   </turbo-frame>
-  %&gt;
+
+  <!-- app/components/users/hover_card/show.html.erb -->
+  <turbo-frame id="op-hover-card-body">
+    &lt;%= render Users::HoverCardComponent.new(id: 14) %&gt;
+  </turbo-frame>
 ```
diff --git a/lookbook/previews/open_project/common/autocomplete_preview.rb b/lookbook/previews/open_project/common/autocomplete_preview.rb
index 607cfd7b193d..a4778582f622 100644
--- a/lookbook/previews/open_project/common/autocomplete_preview.rb
+++ b/lookbook/previews/open_project/common/autocomplete_preview.rb
@@ -48,6 +48,10 @@ def project
       def project_with_search_icon
         render_with_template
       end
+
+      def color
+        render_with_template
+      end
     end
   end
 end
diff --git a/lookbook/previews/open_project/common/autocomplete_preview/color.html.erb b/lookbook/previews/open_project/common/autocomplete_preview/color.html.erb
new file mode 100644
index 000000000000..b093e09b04ee
--- /dev/null
+++ b/lookbook/previews/open_project/common/autocomplete_preview/color.html.erb
@@ -0,0 +1,27 @@
+
+<%= stylesheet_link_tag "/highlighting/styles/#{highlight_css_version_tag}",
+                        media: :all,
+                        skip_pipeline: true %>
+
+<%
+  the_form = Class.new(ApplicationForm) do
+    form do |f|
+      f.color_select_list(
+        name: :id,
+        label: Color.model_name.human,
+        caption: 'Caption: The dropdown might be offset due to the iFrame around it. This will not happen in production.'
+      )
+    end
+  end
+
+  model = Status.new
+%>
+
+
+<%= primer_form_with(
+      model:,
+      url: '/abc',
+      id: 'asdf') do |f|
+  render(the_form.new(f))
+end
+%>
diff --git a/lookbook/previews/open_project/common/datepicker_preview.rb b/lookbook/previews/open_project/common/datepicker_preview.rb
index c9bdeaca41ef..4359c5d1dc24 100644
--- a/lookbook/previews/open_project/common/datepicker_preview.rb
+++ b/lookbook/previews/open_project/common/datepicker_preview.rb
@@ -28,8 +28,10 @@ class DatepickerPreview < Lookbook::Preview
       # before using or contributing to date pickers.
       #
       # @param value date
-      def single(value: Time.zone.today.iso8601)
-        render_with_template(locals: { value: })
+      # @param in_dialog toggle
+      # @param icon [Symbol] octicon
+      def single(value: Time.zone.today, in_dialog: false, icon: :calendar)
+        render_with_template(locals: { value:, in_dialog:, icon: })
       end
 
       ##
@@ -48,8 +50,10 @@ def single(value: Time.zone.today.iso8601)
       # before using or contributing to date pickers.
       #
       # @param value text
-      def range(value: "#{Time.zone.today.iso8601} - #{Time.zone.today.iso8601}")
-        render_with_template(locals: { value: })
+      # @param in_dialog toggle
+      # @param icon [Symbol] octicon
+      def range(value: "#{Time.zone.today.iso8601} - #{Time.zone.today.iso8601}", in_dialog: false, icon: :calendar)
+        render_with_template(locals: { value:, in_dialog:, icon: })
       end
     end
   end
diff --git a/lookbook/previews/open_project/common/datepicker_preview/range.html.erb b/lookbook/previews/open_project/common/datepicker_preview/range.html.erb
index 559e35bba55a..ca2e4295e87e 100644
--- a/lookbook/previews/open_project/common/datepicker_preview/range.html.erb
+++ b/lookbook/previews/open_project/common/datepicker_preview/range.html.erb
@@ -1 +1,58 @@
-<%= tag :'opce-range-date-picker', value: %>
+<%
+  the_form = Class.new(ApplicationForm) do
+    form do |query_form|
+      query_form.range_date_picker(
+          name: :date,
+          label: 'Date',
+          leading_visual: { icon: },
+          value: value,
+          datepicker_options: { inDialog: in_dialog }
+        )
+
+      query_form.range_date_picker(
+          name: :date,
+          label: 'Date',
+          leading_visual: { icon: },
+          value: value,
+          datepicker_options: { inDialog: in_dialog }
+        )
+
+      query_form.range_date_picker(
+          name: :date,
+          label: 'Date',
+          leading_visual: { icon: },
+          value: value,
+          datepicker_options: { inDialog: in_dialog }
+        )
+    end
+  end
+%>
+
+<% if in_dialog %>
+  <%= render(Primer::Alpha::Dialog.new(title: "Dialog Title",
+                                       size: :large,
+                                       open: true,
+                                       id: "my-dialog")) do |d| %>
+    <% d.with_show_button { "Show dialog" } %>
+    <% d.with_header(variant: :medium) %>
+
+    <%= render(Primer::Alpha::Dialog::Body.new) do
+      primer_form_with(
+            url: '/abc',
+            id: "my-form") do |f|
+         render(the_form.new(f))
+      end
+    end %>
+
+    <%= d.with_footer do %>
+      <%= render(Primer::Beta::Button.new(data: { "close-dialog-id": "my-dialog" })) { I18n.t(:button_cancel) } %>
+      <%= render(Primer::Beta::Button.new(scheme: :primary, type: :submit, form: "my-form")) { I18n.t(:button_apply) } %>
+    <% end %>
+  <% end %>
+<% else %>
+  <%= primer_form_with(
+            url: '/abc',
+            id: "my-form") do |f|
+         render(the_form.new(f))
+  end %>
+<% end %>
diff --git a/lookbook/previews/open_project/common/datepicker_preview/single.html.erb b/lookbook/previews/open_project/common/datepicker_preview/single.html.erb
index bd6afbdcdc15..8f5f34ef2765 100644
--- a/lookbook/previews/open_project/common/datepicker_preview/single.html.erb
+++ b/lookbook/previews/open_project/common/datepicker_preview/single.html.erb
@@ -1 +1,58 @@
-<%= tag :'opce-single-date-picker', value: %>
+<%
+  the_form = Class.new(ApplicationForm) do
+    form do |query_form|
+      query_form.single_date_picker(
+          name: :date,
+          label: 'Date',
+          leading_visual: { icon: },
+          value: value.iso8601,
+          datepicker_options: { inDialog: in_dialog }
+        )
+
+      query_form.single_date_picker(
+          name: :date,
+          label: 'Date',
+          leading_visual: { icon: },
+          value: value.iso8601,
+          datepicker_options: { inDialog: in_dialog }
+        )
+
+      query_form.single_date_picker(
+          name: :date,
+          label: 'Date',
+          leading_visual: { icon: },
+          value: value.iso8601,
+          datepicker_options: { inDialog: in_dialog }
+        )
+    end
+  end
+%>
+
+<% if in_dialog %>
+  <%= render(Primer::Alpha::Dialog.new(title: "Dialog Title",
+                                       size: :large,
+                                       open: true,
+                                       id: "my-dialog")) do |d| %>
+    <% d.with_show_button { "Show dialog" } %>
+    <% d.with_header(variant: :medium) %>
+
+    <%= render(Primer::Alpha::Dialog::Body.new) do
+      primer_form_with(
+            url: '/abc',
+            id: "my-form") do |f|
+         render(the_form.new(f))
+      end
+    end %>
+
+    <%= d.with_footer do %>
+      <%= render(Primer::Beta::Button.new(data: { "close-dialog-id": "my-dialog" })) { I18n.t(:button_cancel) } %>
+      <%= render(Primer::Beta::Button.new(scheme: :primary, type: :submit, form: "my-form")) { I18n.t(:button_apply) } %>
+    <% end %>
+  <% end %>
+<% else %>
+  <%= primer_form_with(
+            url: '/abc',
+            id: "my-form") do |f|
+         render(the_form.new(f))
+  end %>
+<% end %>
diff --git a/lookbook/previews/open_project/enterprise_edition/banner_component_preview.rb b/lookbook/previews/open_project/enterprise_edition/banner_component_preview.rb
new file mode 100644
index 000000000000..a6ce8c932c6d
--- /dev/null
+++ b/lookbook/previews/open_project/enterprise_edition/banner_component_preview.rb
@@ -0,0 +1,79 @@
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2024 the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+# ++
+
+module OpenProject
+  module EnterpriseEdition
+    # @logical_path OpenProject/EnterpriseEdition
+    class BannerComponentPreview < Lookbook::Preview
+      # The easiest way to render the banner component is to provide a feature key and
+      # have the assorted data structures match the expectations.
+      # The text will be fetched from the i18n files:
+      # ```
+      # en:
+      #   ee:
+      #     # Title used unless it is overwritten for the specific feature
+      #     title: "Enterprise add-on"
+      #     # Title of the link used unless it is overwritten for the specific feature
+      #     link_title: "More information"
+      #     upsale:
+      #       [feature_key]:
+      #         # Title used for this feature only. If this is missing, the default title is used.
+      #         title: "A splendid feature"
+      #         # Could also be description_html if necessary
+      #         description: "This is a splendid feature that you should use. It just might transform your life."
+      #         # Title of the link used for this feature only. If this is missing, the default link title is used.
+      #         title_link: "Even more information"
+      # ```
+      #
+      # The href is inferred from `OpenProject::Static::Links.enterprise_docs[feature_key][:href]`.
+      #
+      # The value of `EnterpriseToken.show_banners?` is used to determine whether the banner should be shown. For this
+      # example, that value is overwritten as the banner might otherwise not show up in the preview.
+      def default
+        render(
+          ::EnterpriseEdition::BannerComponent
+            .new(:form_configuration,
+                 skip_render: false)
+        )
+      end
+
+      # The defaults can be completely overwritten. This should be used sparingly.
+      def manual_overwrite
+        render(
+          ::EnterpriseEdition::BannerComponent
+            .new(nil,
+                 title: "A splendid feature",
+                 description: "This is a splendid feature that you should use. It just might transform your life.",
+                 href: "https://www.openproject.org",
+                 link_title: "Get more information",
+                 skip_render: false)
+        )
+      end
+    end
+  end
+end
diff --git a/lookbook/previews/open_project/projects/life_cycle_type_component_preview.rb b/lookbook/previews/open_project/projects/life_cycle_type_component_preview.rb
new file mode 100644
index 000000000000..319c4b19c779
--- /dev/null
+++ b/lookbook/previews/open_project/projects/life_cycle_type_component_preview.rb
@@ -0,0 +1,14 @@
+module OpenProject
+  module Projects
+    # @logical_path OpenProject/Projects
+    class LifeCycleTypeComponentPreview < Lookbook::Preview
+      def gate
+        render_with_template(locals: { model: Project::GateDefinition.new(id: 1, name: "The first gate") })
+      end
+
+      def stage
+        render_with_template(locals: { model: Project::StageDefinition.new(id: 1, name: "The first stage") })
+      end
+    end
+  end
+end
diff --git a/lookbook/previews/open_project/projects/life_cycle_type_component_preview/gate.html.erb b/lookbook/previews/open_project/projects/life_cycle_type_component_preview/gate.html.erb
new file mode 100644
index 000000000000..442cbfcb2e3e
--- /dev/null
+++ b/lookbook/previews/open_project/projects/life_cycle_type_component_preview/gate.html.erb
@@ -0,0 +1,6 @@
+<!-- Depends on having the color defined in the highlighting/styles.css.erb file. -->
+<style>
+  .__hl_inline_life_cycle_step_definition_1 { color: red; }
+</style>
+
+<%= render(::Projects::LifeCycleTypeComponent.new(model)) %>
diff --git a/lookbook/previews/open_project/projects/life_cycle_type_component_preview/stage.html.erb b/lookbook/previews/open_project/projects/life_cycle_type_component_preview/stage.html.erb
new file mode 100644
index 000000000000..442cbfcb2e3e
--- /dev/null
+++ b/lookbook/previews/open_project/projects/life_cycle_type_component_preview/stage.html.erb
@@ -0,0 +1,6 @@
+<!-- Depends on having the color defined in the highlighting/styles.css.erb file. -->
+<style>
+  .__hl_inline_life_cycle_step_definition_1 { color: red; }
+</style>
+
+<%= render(::Projects::LifeCycleTypeComponent.new(model)) %>
diff --git a/lookbook/previews/open_project/users/avatar_component_preview.rb b/lookbook/previews/open_project/users/avatar_component_preview.rb
index afc90b99f790..b2e500a4281d 100644
--- a/lookbook/previews/open_project/users/avatar_component_preview.rb
+++ b/lookbook/previews/open_project/users/avatar_component_preview.rb
@@ -3,13 +3,17 @@
 module OpenProject::Users
   # @logical_path OpenProject/Users
   class AvatarComponentPreview < Lookbook::Preview
-    # Renders a user avatar using the OpenProject opce-principal web component
+    # Renders a user avatar using the OpenProject opce-principal web component. Note that the hover card options
+    # have no effect in this lookbook.
     # @param size select { choices: [default, medium, mini] }
     # @param link toggle
     # @param show_name toggle
-    def default(size: :default, link: true, show_name: true)
+    # @param hover_card toggle
+    # @param hover_card_target select { choices: [default, custom] }
+    def default(size: :default, link: true, show_name: true, hover_card: true, hover_card_target: :default)
       user = FactoryBot.build_stubbed(:user)
-      render(Users::AvatarComponent.new(user:, size:, link:, show_name:))
+      render(Users::AvatarComponent.new(user:, size:, link:, show_name:,
+                                        hover_card: { active: hover_card, target: hover_card_target }))
     end
 
     def sizes
diff --git a/lookbook/previews/work_packages/reminder/modal_body_component_preview.rb b/lookbook/previews/work_packages/reminder/modal_body_component_preview.rb
new file mode 100644
index 000000000000..d699da6cb031
--- /dev/null
+++ b/lookbook/previews/work_packages/reminder/modal_body_component_preview.rb
@@ -0,0 +1,22 @@
+module WorkPackages
+  module Reminder
+    # @logical_path OpenProject/WorkPackages/Reminder
+    class ModalBodyComponentPreview < Lookbook::Preview
+      def new
+        remindable = FactoryBot.build_stubbed(:work_package)
+        reminder = FactoryBot.build(:reminder, remindable:)
+        errors = []
+
+        render_with_template(locals: { remindable:, reminder:, errors: })
+      end
+
+      def edit
+        remindable = FactoryBot.build_stubbed(:work_package)
+        reminder = FactoryBot.build_stubbed(:reminder, remindable:)
+        errors = []
+
+        render_with_template(locals: { remindable:, reminder:, errors: })
+      end
+    end
+  end
+end
diff --git a/lookbook/previews/work_packages/reminder/modal_body_component_preview/edit.html.erb b/lookbook/previews/work_packages/reminder/modal_body_component_preview/edit.html.erb
new file mode 100644
index 000000000000..06345fa8b907
--- /dev/null
+++ b/lookbook/previews/work_packages/reminder/modal_body_component_preview/edit.html.erb
@@ -0,0 +1,8 @@
+<%=
+  render(Primer::Alpha::Dialog.new(title: "Edit reminder")) do |d|
+    d.with_show_button(icon: :clock, "aria-label": "Edit reminder")
+    d.with_body do
+      render(WorkPackages::Reminder::ModalBodyComponent.new(remindable:, reminder:, errors:))
+    end
+  end
+%>
diff --git a/lookbook/previews/work_packages/reminder/modal_body_component_preview/new.html.erb b/lookbook/previews/work_packages/reminder/modal_body_component_preview/new.html.erb
new file mode 100644
index 000000000000..05f7eaae76ce
--- /dev/null
+++ b/lookbook/previews/work_packages/reminder/modal_body_component_preview/new.html.erb
@@ -0,0 +1,8 @@
+<%=
+  render(Primer::Alpha::Dialog.new(title: "Create reminder")) do |d|
+    d.with_show_button(icon: :clock, "aria-label": "Create reminder")
+    d.with_body do
+      render(WorkPackages::Reminder::ModalBodyComponent.new(remindable:, reminder:, errors:))
+    end
+  end
+%>
diff --git a/modules/auth_saml/app/constants/saml/defaults.rb b/modules/auth_saml/app/constants/saml/defaults.rb
index 493129d56527..4c45a2374720 100644
--- a/modules/auth_saml/app/constants/saml/defaults.rb
+++ b/modules/auth_saml/app/constants/saml/defaults.rb
@@ -30,7 +30,7 @@
 
 module Saml
   module Defaults
-    NAME_IDENTIFIER_FORMAT = "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
+    NAME_IDENTIFIER_FORMAT = "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified"
 
     SIGNATURE_METHODS = {
       "RSA SHA-1" => XMLSecurity::Document::RSA_SHA1,
diff --git a/modules/auth_saml/config/locales/crowdin/cs.yml b/modules/auth_saml/config/locales/crowdin/cs.yml
index ca69cc275b7a..3294730c4b88 100644
--- a/modules/auth_saml/config/locales/crowdin/cs.yml
+++ b/modules/auth_saml/config/locales/crowdin/cs.yml
@@ -2,40 +2,40 @@ cs:
   activemodel:
     attributes:
       saml/provider:
-        display_name: Name
-        identifier: Identifier
-        secret: Secret
-        scope: Scope
-        assertion_consumer_service_url: ACS (Assertion consumer service) URL
-        limit_self_registration: Limit self registration
-        sp_entity_id: Service entity ID
+        display_name: Název
+        identifier: Identifikátor
+        secret: Tajné
+        scope: Rozsah
+        assertion_consumer_service_url: Adresa URL služby ACS (Assertion consumer service)
+        limit_self_registration: Omezit vlastní registraci
+        sp_entity_id: ID entity služby
         metadata_url: Identity provider metadata URL
-        name_identifier_format: Name identifier format
+        name_identifier_format: Formát identifikátoru názvu
         idp_sso_service_url: Identity provider login endpoint
         idp_slo_service_url: Identity provider logout endpoint
         idp_cert: Public certificate of identity provider
-        authn_requests_signed: Sign SAML AuthnRequests
-        want_assertions_signed: Require signed responses
-        want_assertions_encrypted: Require encrypted responses
+        authn_requests_signed: Podepsat SAML AuthnRequests
+        want_assertions_signed: Požadovat podepsané odpovědi
+        want_assertions_encrypted: Vyžadovat šifrované odpovědi
         certificate: Certificate used by OpenProject for SAML requests
         private_key: Corresponding private key for OpenProject SAML requests
-        signature_method: Signature algorithm
-        digest_method: Digest algorithm
-        format: "Format"
-        icon: "Custom icon"
+        signature_method: Algoritmus podpisu
+        digest_method: Algoritmus výběru
+        format: "Formát"
+        icon: "Vlastní ikona"
   activerecord:
     errors:
       models:
         saml/provider:
           invalid_certificate: "is not a valid PEM-formatted certificate: %{additional_message}"
           invalid_private_key: "is not a valid PEM-formatted private key: %{additional_message}"
-          certificate_expired: "is expired and can no longer be used."
-          unmatched_private_key: "does not belong to the given certificate"
+          certificate_expired: "vypršela platnost a nelze již dále používat."
+          unmatched_private_key: "nepatří k danému certifikátu"
   saml:
-    menu_title: SAML providers
-    delete_title: Delete SAML provider
+    menu_title: Poskytovatelé SAML
+    delete_title: Smazat poskytovatele SAML
     info:
-      title: "SAML Protocol Configuration Parameters"
+      title: "Parametry konfigurace SAML protokolu"
       description: >
         Use these parameters to configure your identity provider connection to OpenProject.
     metadata_parser:
@@ -44,40 +44,40 @@ cs:
       error: "Failed to retrieve the identity provider metadata: %{error}"
     providers:
       label_empty_title: "No SAML providers configured yet."
-      label_empty_description: "Add a provider to see them here."
-      label_automatic_configuration: Automatic configuration
+      label_empty_description: "Přidejte poskytovatele, abyste je viděli zde."
+      label_automatic_configuration: Automatická konfigurace
       label_metadata: Metadata
-      label_metadata_endpoint: OpenProject metadata endpoint
-      label_openproject_information: OpenProject information
+      label_metadata_endpoint: endpoint metadat OpenProject
+      label_openproject_information: Informace o OpenProject
       label_configuration_details: "Identity provider endpoints and certificates"
-      label_configuration_encryption: "Signatures and Encryption"
+      label_configuration_encryption: "Podpisy a šifrování"
       label_add_new: New SAML identity provider
       label_edit: Edit SAML identity provider %{name}
-      label_uid: Internal user id
-      label_mapping: Mapping
+      label_uid: Interní ID uživatele
+      label_mapping: Mapování
       label_requested_attribute_for: "Requested attribute for: %{attribute}"
       no_results_table: No SAML identity providers have been defined yet.
-      plural: SAML identity providers
-      singular: SAML identity provider
-      requested_attributes: Requested attributes
-      attribute_mapping: Attribute mapping
+      plural: Poskytovatelé SAML identity
+      singular: Poskytovatel identity SAML
+      requested_attributes: Požadované atributy
+      attribute_mapping: Mapování atributů
       attribute_mapping_text: >
         The following fields control which attributes provided by the SAML identity provider are used to provide user attributes in OpenProject
       metadata:
         dialog: "This is the URL where the OpenProject SAML metadata is available. Optionally use it to configure your identity provider:"
       upsale:
-        description: Connect OpenProject to a SAML identity provider
+        description: Připojit OpenProject k poskytovateli identity SAML
       request_attributes:
-        title: 'Requested attributes'
+        title: 'Požadované atributy'
         legend: >
           These attributes are added to the SAML XML metadata to signify to the identify provider which attributes OpenProject requires. You may still need to explicitly configure your identity provider to send these attributes. Please refer to your IdP's documentation.
-        name: 'Requested attribute key'
-        format: 'Attribute format'
+        name: 'Požadovaný klíč atributu'
+        format: 'Formát atributu'
       section_headers:
-        configuration: "Primary configuration"
-        attributes: "Attributes"
+        configuration: "Primární konfigurace"
+        attributes: "Atributy"
       section_texts:
-        display_name: "Configure the display name of the SAML provider."
+        display_name: "Nastavte zobrazovaný název poskytovatele SAML."
         metadata: "Pre-fill configuration using a metadata URL or by pasting metadata XML"
         metadata_form: "If your identity provider has a metadata endpoint or XML download, add it below to pre-fill the configuration."
         metadata_form_banner: "Editing the metadata may override existing values in other sections. "
@@ -89,8 +89,8 @@ cs:
         requested_attributes: "Define the set of attributes to be requested in the SAML request sent to your identity provider."
       seeded_from_env: "This provider was seeded from the environment configuration. It cannot be edited."
     settings:
-      metadata_none: "I don't have metadata"
-      metadata_url: "Metadata URL"
+      metadata_none: "Nemám metadata"
+      metadata_url: "URL metadat"
       metadata_xml: "Metadata XML"
     instructions:
       documentation_link: >
@@ -152,4 +152,4 @@ cs:
       icon: >
         Optionally provide a public URL to an icon graphic that will be displayed next to the provider name.
       metadata_for_idp: >
-        This information might be requested by your SAML identity provider.
+        Tyto informace mohou být požadovány vaším poskytovatelem SAML.
diff --git a/modules/auth_saml/config/locales/crowdin/ms.yml b/modules/auth_saml/config/locales/crowdin/ms.yml
index 9ea882adba52..21075b23c1bc 100644
--- a/modules/auth_saml/config/locales/crowdin/ms.yml
+++ b/modules/auth_saml/config/locales/crowdin/ms.yml
@@ -6,150 +6,150 @@ ms:
         identifier: Pengenalan
         secret: Sulit
         scope: Skop
-        assertion_consumer_service_url: ACS (Assertion consumer service) URL
-        limit_self_registration: Limit self registration
-        sp_entity_id: Service entity ID
-        metadata_url: Identity provider metadata URL
-        name_identifier_format: Name identifier format
-        idp_sso_service_url: Identity provider login endpoint
-        idp_slo_service_url: Identity provider logout endpoint
-        idp_cert: Public certificate of identity provider
-        authn_requests_signed: Sign SAML AuthnRequests
-        want_assertions_signed: Require signed responses
-        want_assertions_encrypted: Require encrypted responses
-        certificate: Certificate used by OpenProject for SAML requests
-        private_key: Corresponding private key for OpenProject SAML requests
-        signature_method: Signature algorithm
-        digest_method: Digest algorithm
+        assertion_consumer_service_url: URL ACS (Perkhidmatan pengguna Penegasan).
+        limit_self_registration: Hadkan pendaftaran diri
+        sp_entity_id: ID entiti perkhidmatan
+        metadata_url: URL metadata pembekal identiti
+        name_identifier_format: Format pengecam nama
+        idp_sso_service_url: Titik akhir log masuk pembekal identiti
+        idp_slo_service_url: Titik akhir logout pembekal identiti
+        idp_cert: Sijil awam pemberi identiti
+        authn_requests_signed: Tandatangan SAML AuthnRequests
+        want_assertions_signed: Memerlukan jawapan yang ditandatangani
+        want_assertions_encrypted: Memerlukan respons yang disulitkan
+        certificate: Sijil yang digunakan oleh OpenProject untuk permintaan SAML
+        private_key: Kunci persendirian yang sepadan untuk permintaan OpenProject SAML
+        signature_method: Algoritma tandatangan
+        digest_method: Algoritma penghadaman
         format: "Format"
-        icon: "Custom icon"
+        icon: "Ikon tersuai"
   activerecord:
     errors:
       models:
         saml/provider:
-          invalid_certificate: "is not a valid PEM-formatted certificate: %{additional_message}"
-          invalid_private_key: "is not a valid PEM-formatted private key: %{additional_message}"
-          certificate_expired: "is expired and can no longer be used."
-          unmatched_private_key: "does not belong to the given certificate"
+          invalid_certificate: "bukan sijil berformat PEM yang sah: %{additional_message}"
+          invalid_private_key: "bukan kunci peribadi berformat PEM yang sah: %{additional_message}"
+          certificate_expired: "telah tamat tempoh dan tidak boleh digunakan lagi."
+          unmatched_private_key: "tidak tergolong dalam sijil yang diberikan"
   saml:
-    menu_title: SAML providers
-    delete_title: Delete SAML provider
+    menu_title: Penyedia SAML
+    delete_title: Padam Penyedia SAML
     info:
-      title: "SAML Protocol Configuration Parameters"
+      title: "Parameter Konfigurasi Protokol SAML"
       description: >
-        Use these parameters to configure your identity provider connection to OpenProject.
+        Gunakan parameter ini untuk mengkonfigurasi sambungan pembekal identiti anda kepada OpenProject.
     metadata_parser:
-      success: "Successfully updated the configuration using the identity provider metadata."
-      invalid_url: "Provided metadata URL is invalid. Provide a HTTP(s) URL."
-      error: "Failed to retrieve the identity provider metadata: %{error}"
+      success: "Berjaya mengemas kini konfigurasi menggunakan metadata pembekal identiti."
+      invalid_url: "URL metadata yang diberikan adalah tidak sah. Sediakan URL HTTP."
+      error: "Gagal mendapatkan semula metadata pembekal identiti: %{error}"
     providers:
-      label_empty_title: "No SAML providers configured yet."
-      label_empty_description: "Add a provider to see them here."
-      label_automatic_configuration: Automatic configuration
+      label_empty_title: "Tiada pembekal SAML dikonfigurasikan lagi."
+      label_empty_description: "Tambah pembekal untuk melihat mereka di sini."
+      label_automatic_configuration: Konfigurasi automatik
       label_metadata: Metadata
-      label_metadata_endpoint: OpenProject metadata endpoint
-      label_openproject_information: OpenProject information
-      label_configuration_details: "Identity provider endpoints and certificates"
-      label_configuration_encryption: "Signatures and Encryption"
-      label_add_new: New SAML identity provider
-      label_edit: Edit SAML identity provider %{name}
-      label_uid: Internal user id
+      label_metadata_endpoint: Titik akhir metadata OpenProject
+      label_openproject_information: Maklumat OpenProject
+      label_configuration_details: "Titik akhir dan sijil pembekal identiti"
+      label_configuration_encryption: "Tandatangan dan Penyulitan"
+      label_add_new: Pembekal identiti SAML baharu
+      label_edit: Edit pembekal identiti SAML %{name}
+      label_uid: Id pengguna dalaman
       label_mapping: Mapping
-      label_requested_attribute_for: "Requested attribute for: %{attribute}"
-      no_results_table: No SAML identity providers have been defined yet.
-      plural: SAML identity providers
-      singular: SAML identity provider
-      requested_attributes: Requested attributes
-      attribute_mapping: Attribute mapping
+      label_requested_attribute_for: "Atribut yang diminta untuk: %{attribute}"
+      no_results_table: Tiada pembekal identiti SAML telah ditakrifkan lagi.
+      plural: Pembekal identiti SAML
+      singular: Pembekal identiti SAML
+      requested_attributes: Atribut yang diminta
+      attribute_mapping: Pemetaan atribut
       attribute_mapping_text: >
-        The following fields control which attributes provided by the SAML identity provider are used to provide user attributes in OpenProject
+        Medan berikut mengawal atribut yang disediakan oleh pembekal identiti SAML digunakan untuk menyediakan atribut pengguna dalam OpenProject
       metadata:
-        dialog: "This is the URL where the OpenProject SAML metadata is available. Optionally use it to configure your identity provider:"
+        dialog: "Ini ialah URL tempat metadata SAML OpenProject tersedia. Gunakan pilihan ini untuk mengkonfigurasi pembekal identiti anda:"
       upsale:
-        description: Connect OpenProject to a SAML identity provider
+        description: Sambungkan OpenProject kepada pembekal identiti SAML
       request_attributes:
-        title: 'Requested attributes'
+        title: 'Atribut yang diminta'
         legend: >
-          These attributes are added to the SAML XML metadata to signify to the identify provider which attributes OpenProject requires. You may still need to explicitly configure your identity provider to send these attributes. Please refer to your IdP's documentation.
-        name: 'Requested attribute key'
-        format: 'Attribute format'
+          Atribut ini ditambahkan pada metadata XML SAML untuk menandakan kepada pembekal mengenal pasti yang memerlukan atribut OpenProject. Anda mungkin masih perlu mengkonfigurasi pembekal identiti anda secara eksplisit untuk menghantar atribut ini. Sila rujuk kepada dokumentasi IdP anda.
+        name: 'Kunci atribut yang diminta'
+        format: 'Format atribut'
       section_headers:
-        configuration: "Primary configuration"
-        attributes: "Attributes"
+        configuration: "Konfigurasi utama"
+        attributes: "Atribut"
       section_texts:
-        display_name: "Configure the display name of the SAML provider."
-        metadata: "Pre-fill configuration using a metadata URL or by pasting metadata XML"
-        metadata_form: "If your identity provider has a metadata endpoint or XML download, add it below to pre-fill the configuration."
-        metadata_form_banner: "Editing the metadata may override existing values in other sections. "
-        configuration: "Configure the endpoint URLs for the identity provider, certificates, and further SAML options."
-        configuration_metadata: "This information has been pre-filled using the supplied metadata. In most cases, they do not require editing."
-        encryption: "Configure assertion signatures and encryption for SAML requests and responses."
-        encryption_form: "You may optionally want to encrypt the assertion response, or have requests from OpenProject signed."
-        mapping: "Manually adjust the mapping between the SAML response and user attributes in OpenProject."
-        requested_attributes: "Define the set of attributes to be requested in the SAML request sent to your identity provider."
-      seeded_from_env: "This provider was seeded from the environment configuration. It cannot be edited."
+        display_name: "Konfigurasikan nama paparan pembekal SAML."
+        metadata: "Konfigurasi praisi menggunakan URL metadata atau dengan menampal metadata XML"
+        metadata_form: "Jika pembekal identiti anda mempunyai titik akhir metadata atau muat turun XML, tambahkannya di bawah untuk praisi konfigurasi."
+        metadata_form_banner: "Mengedit metadata mungkin mengatasi nilai sedia ada dalam bahagian lain."
+        configuration: "Konfigurasikan URL titik akhir untuk pembekal identiti, sijil dan pilihan SAML selanjutnya."
+        configuration_metadata: "Maklumat ini telah diisi terlebih dahulu menggunakan metadata yang dibekalkan. Dalam kebanyakan kes, mereka tidak memerlukan penyuntingan."
+        encryption: "Konfigurasikan tandatangan penegasan dan penyulitan untuk permintaan dan respons SAML."
+        encryption_form: "Anda mungkin mahu menyulitkan respons penegasan atau meminta permintaan daripada OpenProject ditandatangani."
+        mapping: "Laraskan pemetaan secara manual antara respons SAML dan atribut pengguna dalam OpenProject."
+        requested_attributes: "Tentukan set atribut yang akan diminta dalam permintaan SAML yang dihantar kepada pembekal identiti anda."
+      seeded_from_env: "Pembekal ini telah dipilih daripada konfigurasi persekitaran. Ia tidak boleh diedit."
     settings:
-      metadata_none: "I don't have metadata"
+      metadata_none: "Saya tidak mempunyai metadata"
       metadata_url: "Metadata URL"
       metadata_xml: "Metadata XML"
     instructions:
       documentation_link: >
-        Please refer to our [documentation on configuring SAML providers](docs_url) for more information on these configuration options.
+        Sila rujuk kepada [dokumentasi tentang mengkonfigurasi penyedia SAML](docs_url) kami untuk mendapatkan maklumat lanjut tentang pilihan konfigurasi ini.
       display_name: >
-        The name of the provider. This will be displayed as the login button and in the list of providers.
+        Nama pembekal. Ini akan dipaparkan sebagai butang log masuk dan dalam senarai pembekal.
       metadata_none: >
-        Your identity provider does not have a metadata endpoint or XML download option. You can configure it manually.
+        Pembekal identiti anda tidak mempunyai titik akhir metadata atau pilihan muat turun XML. Anda boleh mengkonfigurasinya secara manual.
       metadata_url: >
-        Your identity provider provides a metadata URL.
+        Pembekal identiti anda menyediakan URL metadata.
       metadata_xml: >
-        Your identity provider provides a metadata XML download.
+        Pembekal identiti anda menyediakan muat turun XML metadata.
       limit_self_registration: >
-        If enabled users can only register using this provider if the self registration setting allows for it.
+        Jika didayakan pengguna hanya boleh mendaftar menggunakan pembekal ini jika tetapan pendaftaran sendiri membenarkannya.
       sp_entity_id: >
-        The entity ID of the service provider (SP). Sometimes also referred to as Audience. This is the unique client identifier of the OpenProject instance.
+        ID entiti pembekal perkhidmatan (SP). Kadang-kadang juga dirujuk sebagai Khalayak. Ini ialah pengecam pelanggan unik bagi contoh OpenProject.
       idp_sso_service_url: >
-        The URL of the identity provider login endpoint.
+        URL titik akhir log masuk pembekal identiti.
       idp_slo_service_url: >
-        The URL of the identity provider login endpoint.
+        URL titik akhir log masuk pembekal identiti.
       idp_cert: >
-        Enter the X509 PEM-formatted public certificate of the identity provider. You can enter multiple certificates by separating them with a newline.
+        Masukkan sijil awam berformat PEM X509 bagi pembekal identiti. Anda boleh memasukkan berbilang sijil dengan memisahkannya dengan baris baharu.
       name_identifier_format: >
-        Set the name identifier format to be used for the SAML assertion.
+        Tetapkan format pengecam nama untuk digunakan untuk penegasan SAML.
       sp_metadata_endpoint: >
-        This is the URL where the OpenProject SAML metadata is available. Optionally use it to configure your identity provider.
+        Ini ialah URL tempat metadata SAML OpenProject tersedia. Gunakan pilihan ini untuk mengkonfigurasi pembekal identiti anda.
       mapping: >
-        Configure the mapping between the SAML response and user attributes in OpenProject. You can configure multiple attribute names to look for. OpenProject will choose the first available attribute from the SAML response.
+        Konfigurasikan pemetaan antara respons SAML dan atribut pengguna dalam OpenProject. Anda boleh mengkonfigurasi berbilang nama atribut untuk dicari. OpenProject akan memilih atribut pertama yang tersedia daripada respons SAML.
       mapping_login: >
-        SAML attributes from the response used for the login.
+        Atribut SAML daripada respons yang digunakan untuk log masuk.
       mapping_mail: >
-        SAML attributes from the response used for the email of the user.
+        Atribut SAML daripada respons yang digunakan untuk e-mel pengguna.
       mapping_firstname: >
-        SAML attributes from the response used for the given name.
+        Atribut SAML daripada respons yang digunakan untuk nama yang diberikan.
       mapping_lastname: >
-        SAML attributes from the response used for the last name.
+        Atribut SAML daripada respons yang digunakan untuk nama keluarga.
       mapping_uid: >
-        SAML attribute to use for the internal user ID. Leave empty to use the name_id attribute instead
+        Atribut SAML untuk digunakan untuk ID pengguna dalaman. Biarkan kosong untuk menggunakan atribut name_id sebaliknya
       request_uid: >
-        SAML attribute to request for the internal user ID. By default, the name_id will be used for this field.
+        Atribut SAML untuk meminta ID pengguna dalaman. Secara lalai, name_id akan digunakan untuk medan ini.
       requested_attributes: >
-        These attributes are added to the SAML request XML to communicate to the identity provider which attributes OpenProject requires.
+        Atribut ini ditambahkan pada XML permintaan SAML untuk berkomunikasi dengan pembekal identiti yang memerlukan atribut OpenProject.
       requested_format: >
-        The format of the requested attribute. This is used to specify the format of the attribute in the SAML request. Please see [documentation on configuring requested attributes](docs_url) for more information.
+        Format atribut yang diminta. Ini digunakan untuk menentukan format atribut dalam permintaan SAML. Sila lihat [dokumentasi tentang mengkonfigurasi atribut yang diminta](docs_url) untuk mendapatkan maklumat lanjut.
       authn_requests_signed: >
-        If checked, OpenProject will sign the SAML AuthnRequest. You will have to provide a signing certificate and private key using the fields below.
+        Jika ditandakan, OpenProject akan menandatangani SAML AuthnRequest. Anda perlu memberikan sijil tandatangan dan kunci peribadi menggunakan medan di bawah.
       want_assertions_signed: >
-        If checked, OpenProject will required signed responses from the identity provider using it's own certificate keypair. OpenProject will verify the signature against the certificate from the basic configuration section.
+        Jika ditandakan, OpenProject akan memerlukan respons yang ditandatangani daripada pembekal identiti menggunakan pasangan kunci sijilnya sendiri. OpenProject akan mengesahkan tandatangan terhadap sijil dari bahagian konfigurasi asas.
       want_assertions_encrypted: >
-        If enabled, require the identity provider to encrypt the assertion response using the certificate pair that you provide.
+        Jika didayakan, minta pembekal identiti menyulitkan respons penegasan menggunakan pasangan sijil yang anda berikan.
       certificate: >
-        Enter the X509 PEM-formatted certificate used by OpenProject for signing SAML requests.
+        Masukkan sijil berformat PEM X509 yang digunakan oleh OpenProject untuk menandatangani permintaan SAML.
       private_key: >
-        Enter the X509 PEM-formatted private key for the above certificate. This needs to be an RSA private key.
+        Masukkan kunci peribadi berformat PEM X509 untuk sijil di atas. Ini mestilah kunci persendirian RSA.
       signature_method: >
-        Select the signature algorithm to use for the SAML request signature performed by OpenProject (Default: %{default_option}).
+        Pilih algoritma tandatangan untuk digunakan untuk tandatangan permintaan SAML yang dilakukan oleh OpenProject (Lalai: %{default_option}).
       digest_method: >
-        Select the digest algorithm to use for the SAML request signature performed by OpenProject (Default: %{default_option}).
+        Pilih algoritma ringkasan untuk digunakan untuk tandatangan permintaan SAML yang dilakukan oleh OpenProject (Lalai: %{default_option}).
       icon: >
-        Optionally provide a public URL to an icon graphic that will be displayed next to the provider name.
+        Secara pilihan, berikan URL awam kepada grafik ikon yang akan dipaparkan di sebelah nama pembekal.
       metadata_for_idp: >
-        This information might be requested by your SAML identity provider.
+        Maklumat ini mungkin diminta oleh pembekal identiti SAML anda.
diff --git a/modules/auth_saml/spec/services/saml/providers/set_attributes_service_spec.rb b/modules/auth_saml/spec/services/saml/providers/set_attributes_service_spec.rb
index 1c389d585608..55d0861b842f 100644
--- a/modules/auth_saml/spec/services/saml/providers/set_attributes_service_spec.rb
+++ b/modules/auth_saml/spec/services/saml/providers/set_attributes_service_spec.rb
@@ -60,7 +60,7 @@
         expect(subject.slug).to eq "saml-foo"
         expect(subject.creator).to eq(current_user)
         expect(subject.sp_entity_id).to eq(OpenProject::StaticRouting::StaticUrlHelpers.new.root_url)
-        expect(subject.name_identifier_format).to eq("urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress")
+        expect(subject.name_identifier_format).to eq("urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified")
         expect(subject.signature_method).to eq(Saml::Defaults::SIGNATURE_METHODS["RSA SHA-1"])
         expect(subject.digest_method).to eq(Saml::Defaults::DIGEST_METHODS["SHA-1"])
 
diff --git a/modules/avatars/app/helpers/avatar_helper.rb b/modules/avatars/app/helpers/avatar_helper.rb
index 97672ef0dc4c..97f9eea7486b 100644
--- a/modules/avatars/app/helpers/avatar_helper.rb
+++ b/modules/avatars/app/helpers/avatar_helper.rb
@@ -45,8 +45,8 @@ module AvatarHelper
 
   # Returns the avatar image tag for the given +user+ if avatars are enabled
   # +user+ can be a User or a string that will be scanned for an email address (eg. 'joe <joe@foo.bar>')
-  def avatar(principal, size: "default", hide_name: true, name_classes: "", **)
-    build_principal_avatar_tag(principal, size:, hide_name:, name_classes:, **)
+  def avatar(principal, size: "default", hide_name: true, hover_card: { active: true, target: :default }, name_classes: "", **)
+    build_principal_avatar_tag(principal, size:, hide_name:, hover_card:, name_classes:, **)
   rescue StandardError => e
     Rails.logger.error "Failed to create avatar for #{principal}: #{e}"
     "".html_safe
@@ -99,22 +99,27 @@ def build_principal_avatar_tag(user, **)
       id: user.id
     }
 
+    inputs = {
+      principal:,
+      link: tag_options[:link],
+      size: tag_options[:size],
+      hideName: tag_options[:hide_name],
+      nameClasses: tag_options[:name_classes],
+      title: tag_options.fetch(:title, "")
+    }
+
+    inputs = hover_card_options(user, inputs, tag_options)
+
     angular_component_tag "opce-principal",
                           class: tag_options[:class],
-                          inputs: {
-                            principal:,
-                            link: tag_options[:link],
-                            size: tag_options[:size],
-                            hideName: tag_options[:hide_name],
-                            nameClasses: tag_options[:name_classes],
-                            title: tag_options.fetch(:title, "")
-                          }
+                          inputs:
   end
 
   def merge_default_avatar_options(user, options)
     default_options = {
       size: "default",
-      hide_name: true
+      hide_name: true,
+      hover_card: {}
     }
 
     default_options[:title] = h(user.name) if user.respond_to?(:name)
@@ -136,4 +141,22 @@ def extract_email_address(object)
       object.mail
     end
   end
+
+  private
+
+  def hover_card_options(user, inputs = {}, tag_options = {})
+    # The hover card will be triggered by hovering over the avatar (if enabled)
+    hover_card = tag_options[:hover_card]
+    if hover_card.fetch(:active, true)
+      inputs[:hoverCard] = true
+      inputs[:hoverCardModalTarget] = hover_card.fetch(:target, :default)
+
+      inputs[:hoverCardUrl] = hover_card_user_path(user.id)
+    else
+      # We must explicitly set this to false since the angular renderer defines their own default to `true`
+      inputs[:hoverCard] = false
+    end
+
+    inputs
+  end
 end
diff --git a/modules/avatars/spec/helpers/avatar_helper_spec.rb b/modules/avatars/spec/helpers/avatar_helper_spec.rb
index bee8c25b06e6..37b0149856d6 100644
--- a/modules/avatars/spec/helpers/avatar_helper_spec.rb
+++ b/modules/avatars/spec/helpers/avatar_helper_spec.rb
@@ -24,22 +24,27 @@
     allow(user).to receive(:local_avatar_attachment).and_return avatar_stub
   end
 
-  def expected_user_avatar_tag(user)
+  def expected_user_avatar_tag(user, hover_card: true, modal_target: "default", hover_card_url: "/users/#{user.id}/hover_card")
     principal = {
       href: "/api/v3/users/#{user.id}",
       name: user.name,
       id: user.id
     }
 
-    angular_component_tag "opce-principal",
-                          inputs: {
-                            principal:,
-                            hideName: true,
-                            nameClasses: "",
-                            link: nil,
-                            title: user.name,
-                            size: "default"
-                          }
+    inputs = {
+      principal:,
+      hideName: true,
+      nameClasses: "",
+      link: nil,
+      title: user.name,
+      size: "default",
+      hoverCard: hover_card
+    }
+
+    inputs[:hoverCardModalTarget] = modal_target if hover_card
+    inputs[:hoverCardUrl] = hover_card_url if hover_card
+
+    angular_component_tag "opce-principal", inputs:
   end
 
   def local_expected_url(user)
@@ -210,4 +215,16 @@ def gravatar_expected_url(digest, options = {})
       expect(helper.avatar(user)).to be_html_eql(expected_user_avatar_tag(user))
     end
   end
+
+  context "when using hover cards" do
+    it "can be disabled" do
+      avatar = helper.avatar(user, hover_card: { active: false })
+      expect(avatar).to be_html_eql(expected_user_avatar_tag(user, hover_card: false))
+    end
+
+    it "provides a custom modal target" do
+      avatar = helper.avatar(user, hover_card: { target: :custom })
+      expect(avatar).to be_html_eql(expected_user_avatar_tag(user, modal_target: :custom))
+    end
+  end
 end
diff --git a/modules/backlogs/app/views/projects/settings/backlogs/show.html.erb b/modules/backlogs/app/views/projects/settings/backlogs/show.html.erb
index 6a1881bda2ed..ab0a4eb1b0e3 100644
--- a/modules/backlogs/app/views/projects/settings/backlogs/show.html.erb
+++ b/modules/backlogs/app/views/projects/settings/backlogs/show.html.erb
@@ -27,9 +27,14 @@ See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
 
-<%= toolbar title: t('backlogs.definition_of_done'), html: { class: '-minimum-title' } do -%>
-  <%= render partial: 'projects/settings/form_toolbar', locals: { form_name: "edit_project_#{@project.id}" } %>
-<% end %>
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { t('backlogs.definition_of_done') }
+    header.with_breadcrumbs([{ href: project_overview_path(@project.id), text: @project.name  },
+                             { href: project_settings_general_path(@project.id), text: I18n.t(:label_project_settings) },
+                             t('backlogs.definition_of_done')])
+  end
+%>
 
 <%= styled_form_tag(project_settings_backlogs_path(@project),
                     method: :patch,
diff --git a/modules/backlogs/app/views/rb_master_backlogs/index.html.erb b/modules/backlogs/app/views/rb_master_backlogs/index.html.erb
index ffce9b30930c..b52c34815882 100644
--- a/modules/backlogs/app/views/rb_master_backlogs/index.html.erb
+++ b/modules/backlogs/app/views/rb_master_backlogs/index.html.erb
@@ -30,17 +30,25 @@ See COPYRIGHT and LICENSE files for more details.
 <div class='contextual'></div>
 <% html_title t(:label_backlogs) %>
 
-<%= toolbar title: t(:label_backlogs) do %>
-    <li class="toolbar-item">
-      <%= link_to_if_authorized({ controller: '/versions', action: 'new', project_id: @project },
-                                { class: 'button -primary',
-                                  aria: { label: t(:label_version_new) },
-                                  title: t(:label_version_new) }) do %>
-          <%= op_icon('button--icon icon-add') %>
-          <span class="button--text"><%= t('activerecord.models.version') %></span>
-      <% end %>
-    </li>
-<% end %>
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { t(:label_backlogs) }
+    header.with_breadcrumbs( [{ href: project_overview_path(@project.id), text: @project.name },
+                              t(:label_backlogs)
+                             ])
+  end
+%>
+
+<%= render(Primer::OpenProject::SubHeader.new) do |subheader|
+  subheader.with_action_button(scheme: :primary,
+                               aria: { label: t(:label_version_new) },
+                               title: t(:label_version_new),
+                               tag: :a,
+                               href: url_for({ controller: '/versions', action: 'new', project_id: @project })) do |button|
+    button.with_leading_visual_icon(icon: :plus)
+    t('activerecord.models.version')
+  end
+end %>
 
 <% if (@owner_backlogs.empty? && @sprint_backlogs.empty?) %>
   <%= no_results_box action_url: new_project_version_path(@project),
diff --git a/modules/backlogs/app/views/rb_taskboards/show.html.erb b/modules/backlogs/app/views/rb_taskboards/show.html.erb
index 109957ea32cb..ad5c7d12ebe8 100644
--- a/modules/backlogs/app/views/rb_taskboards/show.html.erb
+++ b/modules/backlogs/app/views/rb_taskboards/show.html.erb
@@ -28,7 +28,17 @@ See COPYRIGHT and LICENSE files for more details.
 ++#%>
 
 <% html_title @sprint.name %>
-<%= toolbar title: @sprint.name do %>
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { @sprint.name }
+    header.with_breadcrumbs([{ href: project_overview_path(@project.id), text: @project.name },
+                             { href: backlogs_project_backlogs_path(@project), text: t(:label_backlogs) },
+                             @sprint.name])
+  end
+%>
+<%# we decided to keep current toolbar design for taskboard %>
+<div class="toolbar-container">
+  <div class="toolbar toolbar_empty-title">
   <li class="toolbar-item toolbar-input-group" id="col_width">
     <div>
       <label for="col_width_input"><%= t('backlogs.column_width') %></label>
@@ -40,10 +50,8 @@ See COPYRIGHT and LICENSE files for more details.
       <%= show_burndown_link(@project, @sprint) %>
     </li>
   <% end %>
-<% end %>
-
-<% breadcrumb_paths(link_to(t(:label_backlogs), backlogs_project_backlogs_path(@project)), link_to(@sprint.name, backlogs_project_backlogs_path(@sprint))) %>
-
+  </div>
+</div>
 <div id='rb'>
   <div id="taskboard">
     <table id="board_header" cellspacing="0">
diff --git a/modules/backlogs/spec/features/resolved_status_spec.rb b/modules/backlogs/spec/features/resolved_status_spec.rb
index ce72102dc5ed..3e094570a960 100644
--- a/modules/backlogs/spec/features/resolved_status_spec.rb
+++ b/modules/backlogs/spec/features/resolved_status_spec.rb
@@ -27,6 +27,7 @@
 #++
 
 require "spec_helper"
+require_relative "../support/pages/projects/settings/backlogs"
 
 RSpec.describe "Resolved status" do
   let!(:project) do
@@ -42,14 +43,14 @@
     create(:user,
            member_with_roles: { project => role })
   end
-  let(:settings_page) { Pages::Projects::Settings.new(project) }
+  let(:settings_page) { Pages::Projects::Settings::Backlogs.new(project) }
 
   before do
     login_as current_user
   end
 
   it "allows setting a status as done although it is not closed" do
-    settings_page.visit_tab! "backlogs"
+    settings_page.visit!
 
     check status.name
     click_button "Save"
diff --git a/modules/backlogs/spec/support/pages/projects/settings/backlogs.rb b/modules/backlogs/spec/support/pages/projects/settings/backlogs.rb
new file mode 100644
index 000000000000..8c68637908ef
--- /dev/null
+++ b/modules/backlogs/spec/support/pages/projects/settings/backlogs.rb
@@ -0,0 +1,49 @@
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2010-2024 the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+# ++
+
+require "support/pages/page"
+
+module Pages
+  module Projects
+    module Settings
+      class Backlogs < Pages::Page
+        attr_reader :project
+
+        def initialize(project)
+          super()
+
+          @project = project
+        end
+
+        def path
+          "/projects/#{project.identifier}/settings/backlogs"
+        end
+      end
+    end
+  end
+end
diff --git a/modules/bim/app/controllers/bim/bcf/issues_controller.rb b/modules/bim/app/controllers/bim/bcf/issues_controller.rb
index 6ae7a6681fa1..b9cb9066c739 100644
--- a/modules/bim/app/controllers/bim/bcf/issues_controller.rb
+++ b/modules/bim/app/controllers/bim/bcf/issues_controller.rb
@@ -46,10 +46,6 @@ class IssuesController < BaseController
 
       def upload; end
 
-      def index
-        redirect_to action: :upload
-      end
-
       def prepare_import
         render_next
       rescue StandardError => e
diff --git a/modules/bim/app/models/bim/queries/work_packages/filter/bcf_issue_associated_filter.rb b/modules/bim/app/models/bim/queries/work_packages/filter/bcf_issue_associated_filter.rb
index a92b82e8ef2b..1ce6ffce8a2f 100644
--- a/modules/bim/app/models/bim/queries/work_packages/filter/bcf_issue_associated_filter.rb
+++ b/modules/bim/app/models/bim/queries/work_packages/filter/bcf_issue_associated_filter.rb
@@ -41,6 +41,10 @@ def allowed_values
       ]
     end
 
+    def human_name
+      I18n.t("bcf.label_bcf_issue_associated")
+    end
+
     def where
       if associated?
         ::Queries::Operators::All.sql_for_field(values, ::Bim::Bcf::Issue.table_name, "id")
diff --git a/modules/bim/app/views/bim/bcf/issues/configure_invalid_people.html.erb b/modules/bim/app/views/bim/bcf/issues/configure_invalid_people.html.erb
index 8a2d8eb4320e..8f8587dd1a2a 100644
--- a/modules/bim/app/views/bim/bcf/issues/configure_invalid_people.html.erb
+++ b/modules/bim/app/views/bim/bcf/issues/configure_invalid_people.html.erb
@@ -1,4 +1,11 @@
-<%= toolbar title: t('bcf.bcf_xml.import_title') %>
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { t("bcf.bcf_xml.import_title") }
+    header.with_breadcrumbs([{ href: project_overview_path(@project.id), text: @project.name  },
+                             { href: defaults_bcf_project_ifc_models_path(@project.identifier), text: I18n.t(:"bcf.label_bcf") },
+                             t("bcf.bcf_xml.import_title")])
+  end
+%>
 
 <%= styled_form_tag({ action: :configure_import }, multipart: true, method: :post) do %>
   <%= render partial: 'import_errors', locals: { error_message: t('bcf.bcf_xml.import.invalid_emails_found'),
diff --git a/modules/bim/app/views/bim/bcf/issues/configure_non_members.html.erb b/modules/bim/app/views/bim/bcf/issues/configure_non_members.html.erb
index d68dd121e82b..c0710cf4b6bc 100644
--- a/modules/bim/app/views/bim/bcf/issues/configure_non_members.html.erb
+++ b/modules/bim/app/views/bim/bcf/issues/configure_non_members.html.erb
@@ -1,4 +1,11 @@
-<%= toolbar title: t('bcf.bcf_xml.import_title') %>
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { t("bcf.bcf_xml.import_title") }
+    header.with_breadcrumbs([{ href: project_overview_path(@project.id), text: @project.name  },
+                             { href: defaults_bcf_project_ifc_models_path(@project.identifier), text: I18n.t(:"bcf.label_bcf") },
+                             t("bcf.bcf_xml.import_title")])
+  end
+%>
 
 <%= styled_form_tag({ action: :configure_import }, multipart: true, method: :post) do %>
   <%= render partial: 'import_errors', locals: { error_message: t('bcf.bcf_xml.import.non_members_found'),
@@ -35,4 +42,3 @@
                 class: 'button' %>
   <% end %>
 <% end %>
-
diff --git a/modules/bim/app/views/bim/bcf/issues/configure_unknown_mails.html.erb b/modules/bim/app/views/bim/bcf/issues/configure_unknown_mails.html.erb
index f0ff818f2159..c37e4087c61a 100644
--- a/modules/bim/app/views/bim/bcf/issues/configure_unknown_mails.html.erb
+++ b/modules/bim/app/views/bim/bcf/issues/configure_unknown_mails.html.erb
@@ -1,4 +1,11 @@
-<%= toolbar title: t('bcf.bcf_xml.import_title') %>
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { t("bcf.bcf_xml.import_title") }
+    header.with_breadcrumbs([{ href: project_overview_path(@project.id), text: @project.name  },
+                             { href: defaults_bcf_project_ifc_models_path(@project.identifier), text: I18n.t(:"bcf.label_bcf") },
+                             t("bcf.bcf_xml.import_title")])
+  end
+%>
 
 <%= styled_form_tag({ action: :configure_import }, multipart: true, method: :post) do %>
   <%= render partial: 'import_errors', locals: { error_message: t('bcf.bcf_xml.import.unknown_emails_found'),
diff --git a/modules/bim/app/views/bim/bcf/issues/configure_unknown_priorities.html.erb b/modules/bim/app/views/bim/bcf/issues/configure_unknown_priorities.html.erb
index 9202a214d757..a62a19feb037 100644
--- a/modules/bim/app/views/bim/bcf/issues/configure_unknown_priorities.html.erb
+++ b/modules/bim/app/views/bim/bcf/issues/configure_unknown_priorities.html.erb
@@ -1,4 +1,11 @@
-<%= toolbar title: t('bcf.bcf_xml.import_title') %>
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { t("bcf.bcf_xml.import_title") }
+    header.with_breadcrumbs([{ href: project_overview_path(@project.id), text: @project.name  },
+                             { href: defaults_bcf_project_ifc_models_path(@project.identifier), text: I18n.t(:"bcf.label_bcf") },
+                             t("bcf.bcf_xml.import_title")])
+  end
+%>
 
 <%= styled_form_tag({ action: :configure_import }, multipart: true, method: :post, class: '-vertical') do %>
   <%= render partial: 'import_errors', locals: { error_message: t('bcf.bcf_xml.import.invalid_priorities_found'),
diff --git a/modules/bim/app/views/bim/bcf/issues/configure_unknown_statuses.html.erb b/modules/bim/app/views/bim/bcf/issues/configure_unknown_statuses.html.erb
index c9b8a324acc3..da24692033b9 100644
--- a/modules/bim/app/views/bim/bcf/issues/configure_unknown_statuses.html.erb
+++ b/modules/bim/app/views/bim/bcf/issues/configure_unknown_statuses.html.erb
@@ -1,4 +1,11 @@
-<%= toolbar title: t('bcf.bcf_xml.import_title') %>
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { t("bcf.bcf_xml.import_title") }
+    header.with_breadcrumbs([{ href: project_overview_path(@project.id), text: @project.name  },
+                             { href: defaults_bcf_project_ifc_models_path(@project.identifier), text: I18n.t(:"bcf.label_bcf") },
+                             t("bcf.bcf_xml.import_title")])
+  end
+%>
 
 <%= styled_form_tag({ action: :configure_import }, multipart: true, method: :post, class: '-vertical') do %>
   <%= render partial: 'import_errors', locals: { error_message: t('bcf.bcf_xml.import.invalid_statuses_found'),
diff --git a/modules/bim/app/views/bim/bcf/issues/configure_unknown_types.html.erb b/modules/bim/app/views/bim/bcf/issues/configure_unknown_types.html.erb
index b665d4764c05..23fd542d7adb 100644
--- a/modules/bim/app/views/bim/bcf/issues/configure_unknown_types.html.erb
+++ b/modules/bim/app/views/bim/bcf/issues/configure_unknown_types.html.erb
@@ -1,4 +1,11 @@
-<%= toolbar title: t('bcf.bcf_xml.import_title') %>
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { t("bcf.bcf_xml.import_title") }
+    header.with_breadcrumbs([{ href: project_overview_path(@project.id), text: @project.name  },
+                             { href: defaults_bcf_project_ifc_models_path(@project.identifier), text: I18n.t(:"bcf.label_bcf") },
+                             t("bcf.bcf_xml.import_title")])
+  end
+%>
 
 <%= styled_form_tag({ action: :configure_import }, multipart: true, method: :post, class: '-vertical') do %>
   <%= render partial: 'import_errors', locals: { error_message: t('bcf.bcf_xml.import.invalid_types_found'),
diff --git a/modules/bim/app/views/bim/bcf/issues/index.html.erb b/modules/bim/app/views/bim/bcf/issues/index.html.erb
deleted file mode 100644
index 7001d48e0dda..000000000000
--- a/modules/bim/app/views/bim/bcf/issues/index.html.erb
+++ /dev/null
@@ -1,28 +0,0 @@
-<link rel="stylesheet" href="/highlighting/styles.css" />
-
-<%= toolbar title: t('bcf.issues'), html: {class: '-with-dropdown'} do %>
-  <li class="toolbar-item drop-down">
-
-  </li>
-    <li class="toolbar-item">
-      <%= link_to({ action: 'upload' },
-                title: I18n.t(:label_import),
-                class: 'button import-bcf-button') do %>
-        <%= op_icon('button--icon icon-import') %>
-        <span class="button--text"><%= t(:label_import) %></span>
-      <% end %>
-    </li>
-    <li class="toolbar-item">
-      <% query = { f: ['bcfIssueAssociated', '=', ['t']] } %>
-      <%= link_to(project_work_packages_with_query_path(@project, query, format: :bcf),
-                title: t('bcf.bcf_xml.export'),
-                class: 'button export-bcf-button') do %>
-        <%= op_icon('button--icon icon-export') %>
-        <span class="button--text"><%= t('bcf.bcf_xml.export') %></span>
-      <% end %>
-    </li>
-<% end %>
-
-<%= render partial: 'render_issues', locals: { issues: @issues } %>
-
-<%= pagination_links_full @issues %>
diff --git a/modules/bim/app/views/bim/bcf/issues/perform_import.html.erb b/modules/bim/app/views/bim/bcf/issues/perform_import.html.erb
index cd7a1196affb..f04c750c7175 100644
--- a/modules/bim/app/views/bim/bcf/issues/perform_import.html.erb
+++ b/modules/bim/app/views/bim/bcf/issues/perform_import.html.erb
@@ -1,6 +1,14 @@
 <link rel="stylesheet" href="/highlighting/styles.css" />
 
-<%= toolbar title: t(:label_summary) %>
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { t(:label_summary) }
+    header.with_breadcrumbs([{ href: project_overview_path(@project.id), text: @project.name  },
+                             { href: defaults_bcf_project_ifc_models_path(@project.identifier), text: I18n.t(:"bcf.label_bcf") },
+                             I18n.t("menus.breadcrumb.nested_element", section_header: t("bcf.bcf_xml.import_title"), title: t(:label_summary)).html_safe],
+                            selected_item_font_weight: :normal)
+  end
+%>
 
 <%= link_to t('bcf.bcf_xml.import.button_back_to_list'),
             defaults_bcf_project_ifc_models_path(@project),
diff --git a/modules/bim/app/views/bim/bcf/issues/upload.html.erb b/modules/bim/app/views/bim/bcf/issues/upload.html.erb
index ed39731dee5c..198f8aea6889 100644
--- a/modules/bim/app/views/bim/bcf/issues/upload.html.erb
+++ b/modules/bim/app/views/bim/bcf/issues/upload.html.erb
@@ -1,4 +1,11 @@
-<%= toolbar title: t('bcf.bcf_xml.import_title') %>
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { t("bcf.bcf_xml.import_title") }
+    header.with_breadcrumbs([{ href: project_overview_path(@project.id), text: @project.name  },
+                             { href: defaults_bcf_project_ifc_models_path(@project.identifier), text: I18n.t(:"bcf.label_bcf") },
+                             t("bcf.bcf_xml.import_title")])
+  end
+%>
 
 <%= form_tag({ action: :prepare_import }, multipart: true, method: :post) do %>
 
diff --git a/modules/bim/app/views/bim/ifc_models/ifc_models/edit.html.erb b/modules/bim/app/views/bim/ifc_models/ifc_models/edit.html.erb
index 65054e79ed8e..e98dbc578d3a 100644
--- a/modules/bim/app/views/bim/ifc_models/ifc_models/edit.html.erb
+++ b/modules/bim/app/views/bim/ifc_models/ifc_models/edit.html.erb
@@ -27,7 +27,15 @@ See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
 
-<%= toolbar title: Bim::IfcModels::IfcModel.model_name.human %>
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { @ifc_model.title }
+    header.with_breadcrumbs([{ href: project_overview_path(@project.id), text: @project.name  },
+                             { href: defaults_bcf_project_ifc_models_path(@project.identifier), text: I18n.t(:"bcf.label_bcf") },
+                             { href: bcf_project_ifc_models_path(@project.identifier), text: I18n.t(:"ifc_models.label_ifc_models") },
+                             @ifc_model.title ])
+  end
+%>
 
 <%= labelled_tabular_form_for @ifc_model, url: bcf_project_ifc_model_path(@project, @ifc_model), method: 'PATCH' do |f| -%>
   <%= error_messages_for @ifc_model %>
diff --git a/modules/bim/app/views/bim/ifc_models/ifc_models/index.html.erb b/modules/bim/app/views/bim/ifc_models/ifc_models/index.html.erb
index 28ad26a7568b..66d13427440c 100644
--- a/modules/bim/app/views/bim/ifc_models/ifc_models/index.html.erb
+++ b/modules/bim/app/views/bim/ifc_models/ifc_models/index.html.erb
@@ -28,30 +28,41 @@ See COPYRIGHT and LICENSE files for more details.
 ++#%>
 <% html_title(t('ifc_models.label_ifc_models')) -%>
 
-<%= toolbar title: t('ifc_models.label_ifc_models') do %>
-  <% if User.current.allowed_in_project?(:manage_ifc_models, @project) %>
-    <li class="toolbar-item">
-      <%= link_to new_bcf_project_ifc_model_path,
-                  { class: 'button -primary',
-                    aria: { label: t(:'ifc_models.label_new_ifc_model') },
-                    title: t(:'ifc_models.label_new_ifc_model') } do %>
-        <%= op_icon('button--icon icon-add') %>
-        <span class="button--text"><%= ::Bim::IfcModels::IfcModel.model_name.human %></span>
-      <% end %>
-    </li>
-  <% end %>
-  <% if @ifc_models.defaults.any? %>
-    <li class="toolbar-item">
-      <%= link_to defaults_bcf_project_ifc_models_path,
-                  { class: 'button',
-                    aria: { label: t('ifc_models.label_show_defaults') },
-                    title: t('ifc_models.label_show_defaults') } do %>
-        <%= op_icon('button--icon icon-watched') %>
-        <span class="button--text"><%= t('ifc_models.label_show_defaults') %></span>
-      <% end %>
-    </li>
-  <% end %>
-<% end %>
+<%=
+    render Primer::OpenProject::PageHeader.new do |header|
+      header.with_title { t("ifc_models.label_ifc_models") }
+      header.with_breadcrumbs([{ href: project_overview_path(@project.id), text: @project.name  },
+                               { href: defaults_bcf_project_ifc_models_path(@project.identifier), text: I18n.t(:"bcf.label_bcf") },
+                               t("ifc_models.label_ifc_models")])
+
+      header.with_action_button(tag: :a,
+                                mobile_icon: :"eye",
+                                mobile_label: t("ifc_models.label_show_defaults"),
+                                href: defaults_bcf_project_ifc_models_path,
+                                aria: { label: I18n.t("ifc_models.label_show_defaults") },
+                                data: { test_selector: "ifc-show-default-button" },
+                                title: I18n.t("ifc_models.label_show_defaults")) do |button|
+        button.with_leading_visual_icon(icon: :"eye")
+        t("ifc_models.label_show_defaults")
+      end
+    end
+%>
+
+<%=
+    if User.current.allowed_in_project?(:manage_ifc_models, @project)
+      render(Primer::OpenProject::SubHeader.new) do |subheader|
+        subheader.with_action_button(scheme: :primary,
+                                     aria: { label: I18n.t("ifc_models.label_new_ifc_model") },
+                                     data: { test_selector: "ifc-create-button" },
+                                     title: I18n.t("ifc_models.label_new_ifc_model"),
+                                     tag: :a,
+                                     href: new_bcf_project_ifc_model_path) do |button|
+          button.with_leading_visual_icon(icon: :plus)
+          ::Bim::IfcModels::IfcModel.model_name.human
+        end
+      end
+    end
+%>
 
 <% if @ifc_models.defaults.empty? %>
   <%= render partial: 'no_default_notice', locals: { project: @project } %>
diff --git a/modules/bim/app/views/bim/ifc_models/ifc_models/new.html.erb b/modules/bim/app/views/bim/ifc_models/ifc_models/new.html.erb
index 6a0e674f50a7..2cfcf70d542e 100644
--- a/modules/bim/app/views/bim/ifc_models/ifc_models/new.html.erb
+++ b/modules/bim/app/views/bim/ifc_models/ifc_models/new.html.erb
@@ -26,7 +26,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
-<%= toolbar title: t('ifc_models.label_new_ifc_model') %>
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { t("ifc_models.label_new_ifc_model") }
+    header.with_breadcrumbs([{ href: project_overview_path(@project.id), text: @project.name  },
+                             { href: defaults_bcf_project_ifc_models_path(@project.identifier), text: I18n.t(:"bcf.label_bcf") },
+                             { href: bcf_project_ifc_models_path(@project.identifier), text: I18n.t(:"ifc_models.label_ifc_models") },
+                             t("ifc_models.label_new_ifc_model")])
+  end
+%>
+
 
 <%= labelled_tabular_form_for @ifc_model, url: bcf_project_ifc_models_path(@project), html: { multipart: true } do |f| -%>
   <%= error_messages_for @ifc_model %>
diff --git a/modules/bim/config/locales/crowdin/af.yml b/modules/bim/config/locales/crowdin/af.yml
index 00e78e306103..aeff38e4ab86 100644
--- a/modules/bim/config/locales/crowdin/af.yml
+++ b/modules/bim/config/locales/crowdin/af.yml
@@ -9,6 +9,7 @@ af:
     label_bcf: 'BSF'
     label_imported_failed: 'Mislukte invoer van BSF-onderwerpe'
     label_imported_successfully: 'BSF-onderwerpe is suksesvol ingevoer'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "Kwessies"
     recommended: 'aanbeveelde'
     not_recommended: 'nie aanbeveel nie'
diff --git a/modules/bim/config/locales/crowdin/ar.yml b/modules/bim/config/locales/crowdin/ar.yml
index 11ca419ea133..7ebcd439c854 100644
--- a/modules/bim/config/locales/crowdin/ar.yml
+++ b/modules/bim/config/locales/crowdin/ar.yml
@@ -9,6 +9,7 @@ ar:
     label_bcf: 'BCF'
     label_imported_failed: 'فشل استيراد مواضيع BCF'
     label_imported_successfully: 'تم استيراد موضوعات BCF بنجاح'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "مشاكل"
     recommended: 'موصى بها'
     not_recommended: 'غير موصى بها'
diff --git a/modules/bim/config/locales/crowdin/az.yml b/modules/bim/config/locales/crowdin/az.yml
index 7d8823bf14be..65591209d6b0 100644
--- a/modules/bim/config/locales/crowdin/az.yml
+++ b/modules/bim/config/locales/crowdin/az.yml
@@ -9,6 +9,7 @@ az:
     label_bcf: 'BCF'
     label_imported_failed: 'Failed imports of BCF topics'
     label_imported_successfully: 'Successfully imported BCF topics'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "Issues"
     recommended: 'recommended'
     not_recommended: 'not recommended'
diff --git a/modules/bim/config/locales/crowdin/be.yml b/modules/bim/config/locales/crowdin/be.yml
index ba9dc4cde091..1269b044823c 100644
--- a/modules/bim/config/locales/crowdin/be.yml
+++ b/modules/bim/config/locales/crowdin/be.yml
@@ -9,6 +9,7 @@ be:
     label_bcf: 'BCF'
     label_imported_failed: 'Failed imports of BCF topics'
     label_imported_successfully: 'Successfully imported BCF topics'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "Issues"
     recommended: 'recommended'
     not_recommended: 'not recommended'
diff --git a/modules/bim/config/locales/crowdin/bg.yml b/modules/bim/config/locales/crowdin/bg.yml
index a78afaf5c3b1..8e8f97b9f6ac 100644
--- a/modules/bim/config/locales/crowdin/bg.yml
+++ b/modules/bim/config/locales/crowdin/bg.yml
@@ -9,6 +9,7 @@ bg:
     label_bcf: 'BCF'
     label_imported_failed: 'Failed imports of BCF topics'
     label_imported_successfully: 'Successfully imported BCF topics'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "Issues"
     recommended: 'recommended'
     not_recommended: 'not recommended'
diff --git a/modules/bim/config/locales/crowdin/ca.yml b/modules/bim/config/locales/crowdin/ca.yml
index 155aaf7d266d..af2ea128aa7e 100644
--- a/modules/bim/config/locales/crowdin/ca.yml
+++ b/modules/bim/config/locales/crowdin/ca.yml
@@ -9,6 +9,7 @@ ca:
     label_bcf: 'BCF'
     label_imported_failed: 'Importació de temes BCF no reeixida'
     label_imported_successfully: 'S''ha importat els temes BCF correctament.'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "Problemes"
     recommended: 'recomanat'
     not_recommended: 'no recomanat'
diff --git a/modules/bim/config/locales/crowdin/ckb-IR.yml b/modules/bim/config/locales/crowdin/ckb-IR.yml
index 63c610ae7f6f..d149aea8e9fa 100644
--- a/modules/bim/config/locales/crowdin/ckb-IR.yml
+++ b/modules/bim/config/locales/crowdin/ckb-IR.yml
@@ -9,6 +9,7 @@ ckb-IR:
     label_bcf: 'BCF'
     label_imported_failed: 'Failed imports of BCF topics'
     label_imported_successfully: 'Successfully imported BCF topics'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "Issues"
     recommended: 'recommended'
     not_recommended: 'not recommended'
diff --git a/modules/bim/config/locales/crowdin/cs.seeders.yml b/modules/bim/config/locales/crowdin/cs.seeders.yml
index b7b63928f8d8..541aa80fbb1b 100644
--- a/modules/bim/config/locales/crowdin/cs.seeders.yml
+++ b/modules/bim/config/locales/crowdin/cs.seeders.yml
@@ -365,16 +365,7 @@ cs:
                 item_4:
                   subject: Instalace servisních systémů budovy
                   description: |-
-                    ## Goal
-
-                    *   All building service systems are ready to be used
-
-                    ## Description
 
-                    *   Installing the heating system
-                    *   Installing the climate system
-                    *   Electrical installation
-                    *   ...
                 item_5:
                   subject: Závěrečné úpravy
                   description: |-
@@ -404,7 +395,7 @@ cs:
                     *   Bring some drinks, snacks and your smile
         demo-bim-project:
           name: "(Demo) BIM projekt"
-          status_explanation: All tasks and sub-projects are on schedule. The people involved know their tasks. The system is completely set up.
+          status_explanation: Všechny úkoly a dílčí projekty probíhají podle harmonogramu. Zúčastněné osoby znají své úkoly. Systém je kompletně nastaven.
           description: Toto je krátké shrnutí cílů tohoto demo BIM projektu.
           news:
             item_0:
@@ -433,24 +424,24 @@ cs:
                 options:
                   name: Začínáme
                   text: |
-                    We are glad you joined! We suggest to try a few things to get started in OpenProject.
+                    Jsme rádi, že jste se k nám připojili! Doporučujeme vyzkoušet několik věcí, které vám pomohou začít s OpenProjectem.
 
-                    This demo project offers roles, workflows and work packages that are specialized for BIM.
+                    Tento ukázkový projekt nabízí role, pracovní postupy a pracovní balíčky, které jsou specializované na BIM.
 
-                    _Try the following steps:_
+                    Vyzkoušejte si následující kroky:_
 
-                    1.  _Invite new members to your project:_ → Go to [Members]({{opSetting:base_url}}/projects/demo-bim-project/members) in the project navigation.
-                    2.  _Upload and view 3D-models in IFC format:_ → Go to [BCF]({{opSetting:base_url}}/projects/demo-bim-project/bcf) in the project navigation.
-                    3.  _Create and manage BCF issues linked directly in the IFC model:_ → Go to [BCF]({{opSetting:base_url}}/projects/demo-bim-project/bcf) → Create.
-                    4.  _View the work in your projects:_ → Go to [Work packages]({{opSetting:base_url}}/projects/demo-bim-project/work_packages?query_props=%7B%22c%22%3A%5B%22type%22%2C%22id%22%2C%22subject%22%2C%22status%22%2C%22assignee%22%2C%22priority%22%5D%2C%22hl%22%3A%22priority%22%2C%22hi%22%3Atrue%2C%22g%22%3A%22%22%2C%22t%22%3A%22startDate%3Aasc%22%2C%22f%22%3A%5B%7B%22n%22%3A%22bcfIssueAssociated%22%2C%22o%22%3A%22%3D%22%2C%22v%22%3A%5B%22f%22%5D%7D%5D%2C%22pa%22%3A1%2C%22pp%22%3A100%2C%22dr%22%3A%22list%22%7D) in the project navigation.
-                    5.  _Create a new work package:_ → Go to [Work packages → Create]({{opSetting:base_url}}/projects/demo-bim-project/work_packages/new?query_props=%7B%22c%22%3A%5B%22type%22%2C%22id%22%2C%22subject%22%2C%22status%22%2C%22assignee%22%2C%22priority%22%5D%2C%22hl%22%3A%22priority%22%2C%22hi%22%3Atrue%2C%22g%22%3A%22%22%2C%22t%22%3A%22startDate%3Aasc%22%2C%22f%22%3A%5B%7B%22n%22%3A%22bcfIssueAssociated%22%2C%22o%22%3A%22%3D%22%2C%22v%22%3A%5B%22f%22%5D%7D%5D%2C%22pa%22%3A1%2C%22pp%22%3A100%2C%22dr%22%3A%22list%22%7D&type=11).
-                    6.  _Create and update a Gantt chart:_ → Go to [Gantt chart]({{opSetting:base_url}}/projects/demo-bim-project/work_packages?query_props=%7B%22c%22%3A%5B%22type%22%2C%22id%22%2C%22subject%22%2C%22assignee%22%2C%22responsible%22%5D%2C%22tv%22%3Atrue%2C%22tzl%22%3A%22weeks%22%2C%22hl%22%3A%22priority%22%2C%22hi%22%3Atrue%2C%22g%22%3A%22%22%2C%22t%22%3A%22startDate%3Aasc%22%2C%22f%22%3A%5B%5D%2C%22pa%22%3A1%2C%22pp%22%3A100%2C%22dr%22%3A%22list%22%7D) in the project navigation.
-                    7.  _Activate further modules:_ → Go to [Project settings → Modules]({{opSetting:base_url}}/projects/demo-bim-project/settings/modules).
-                    8.  _Check out the tile view to get an overview of your BCF issues:_ → Go to [Work packages]({{opSetting:base_url}}/projects/demo-bim-project/work_packages?query_props=%7B%22c%22%3A%5B%22type%22%2C%22id%22%2C%22subject%22%2C%22status%22%2C%22assignee%22%2C%22priority%22%5D%2C%22hl%22%3A%22priority%22%2C%22hi%22%3Atrue%2C%22g%22%3A%22%22%2C%22t%22%3A%22id%3Aasc%22%2C%22f%22%3A%5B%5D%2C%22pa%22%3A1%2C%22pp%22%3A100%2C%22dr%22%3A%22card%22%7D)
-                    9.  _Working agile? Create a new board:_ → Go to [Boards]({{opSetting:base_url}}/projects/demo-bim-project/boards)
+                    1. Vyzkoušejte si, jak se pracuje s projektem.  _Pozvěte nové členy do svého projektu:_ → Přejděte do sekce [Členové]({{opSetting:base_url}}/projects/demo-bim-project/members) v navigaci projektu.
+                    2.  _Nahrajte a zobrazte 3D-modely ve formátu IFC:_ → Přejděte na [BCF]({{opSetting:base_url}}/projects/demo-bim-project/bcf) v navigaci projektu.
+                    3.  _Create and manage BCF issues linked directly in IFC model:_ → Přejděte do [BCF]({{opSetting:base_url}}/projects/demo-bim-project/bcf) → Create.
+                    4.  _Pohled na práce ve vašich projektech:_ → Přejděte do [Work packages]({{opSetting:base_url}}/projects/demo-bim-project/work_packages?query_props=%7B%22c%22%3A%5B%22type%22%2C%22id%22%2C%22subject%22%2C%22status%22%2C%22assignee%22%2C%22priority%22%5D%2C%22hl%22%3A%22priority%22%2C%22hi%22%3Atrue%2C%22g%22%3A%22%22%2C%22t%22%3A%22startDate%3Aasc%22%2C%22f%22%3A%5B%7B%22n%22%3A%22bcfIssueAssociated%22%2C%22o%22%3A%22%3D%22%2C%22v%22%3A%5B%22f%22%5D%7D%5D%2C%22pa%22%3A1%2C%22pp%22%3A100%2C%22dr%22%3A%22list%22%7D) v navigaci projektu.
+                    5.  _Create a new work package:_ → Přejděte na [Work packages → Create]({{opSetting:base_url}}/projects/demo-bim-project/work_packages/new?query_props=%7B%22c%22%3A%5B%22type%22%2C%22id%22%2C%22subject%22%2C%22status%22%2C%22assignee%22%2C%22priority%22%5D%2C%22hl%22%3A%22priority%22%2C%22hi%22%3Atrue%2C%22g%22%3A%22%22%2C%22t%22%3A%22startDate%3Aasc%22%2C%22f%22%3A%5B%7B%22n%22%3A%22bcfIssueAssociated%22%2C%22o%22%3A%22%3D%22%2C%22v%22%3A%5B%22f%22%5D%7D%5D%2C%22pa%22%3A1%2C%22pp%22%3A100%2C%22dr%22%3A%22list%22%7D&type=11).
+                    6.  _Create and update a Gantt chart:_ → Přejděte na [Gantt chart]({{opSetting:base_url}}/projects/demo-bim-project/work_packages?query_props=%7B%22c%22%3A%5B%22type%22%2C%22id%22%2C%22subject%22%2C%22assignee%22%2C%22responsible%22%5D%2C%22tv%22%3Atrue%2C%22tzl%22%3A%22weeks%22%2C%22hl%22%3A%22priority%22%2C%22hi%22%3Atrue%2C%22g%22%3A%22%22%2C%22t%22%3A%22startDate%3Aasc%22%2C%22f%22%3A%5B%5D%2C%22pa%22%3A1%2C%22pp%22%3A100%2C%22dr%22%3A%22list%22%7D) v navigaci projektu.
+                    7.  _Aktivujte další moduly:_ → Přejděte do [Nastavení projektu → Moduly]({{opSetting:base_url}}/projects/demo-bim-project/settings/modules).
+                    8.  _Check out the tile view to get an overview of your BCF issues:_ → Přejděte do [Work packages]({{opSetting:base_url}}/projects/demo-bim-project/work_packages?query_props=%7B%22c%22%3A%5B%22type%22%2C%22id%22%2C%22subject%22%2C%22status%22%2C%22assignee%22%2C%22priority%22%5D%2C%22hl%22%3A%22priority%22%2C%22hi%22%3Atrue%2C%22g%22%3A%22%22%2C%22t%22%3A%22id%3Aasc%22%2C%22f%22%3A%5B%5D%2C%22pa%22%3A1%2C%22pp%22%3A100%2C%22dr%22%3A%22card%22%7D)
+                    9.  _Pracujete agilně? Vytvořte si novou nástěnku:_ → Přejděte na [Nástěnky]({{opSetting:base_url}}/projects/demo-bim-project/boards)
 
-                    Here you will find our [User Guides](https://www.openproject.org/docs/user-guide/).
-                    Please let us know if you have any questions or need support. Contact us: [support\[at\]openproject.com](mailto:support@openproject.com).
+                    Zde najdete naše [Uživatelské příručky](https://www.openproject.org/docs/user-guide/).
+                    Dejte nám prosím vědět, pokud máte nějaké dotazy nebo potřebujete podporu. Kontaktujte nás: [support\[at\]openproject.com](mailto:support@openproject.com).
               item_4:
                 options:
                   name: Členové
diff --git a/modules/bim/config/locales/crowdin/cs.yml b/modules/bim/config/locales/crowdin/cs.yml
index 14cb64db1b34..e0abce3e1827 100644
--- a/modules/bim/config/locales/crowdin/cs.yml
+++ b/modules/bim/config/locales/crowdin/cs.yml
@@ -9,6 +9,7 @@ cs:
     label_bcf: 'BCF'
     label_imported_failed: 'Selhalo importování témat BCF'
     label_imported_successfully: 'Importovaná témata BCF úspěšně'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "Problémy"
     recommended: 'doporučeno'
     not_recommended: 'nedoporučeno'
diff --git a/modules/bim/config/locales/crowdin/da.yml b/modules/bim/config/locales/crowdin/da.yml
index 484e0b0cdc2c..a07856feffa0 100644
--- a/modules/bim/config/locales/crowdin/da.yml
+++ b/modules/bim/config/locales/crowdin/da.yml
@@ -9,6 +9,7 @@ da:
     label_bcf: 'BCF'
     label_imported_failed: 'Failed imports of BCF topics'
     label_imported_successfully: 'Successfully imported BCF topics'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "Issues"
     recommended: 'recommended'
     not_recommended: 'not recommended'
diff --git a/modules/bim/config/locales/crowdin/de.yml b/modules/bim/config/locales/crowdin/de.yml
index 88b080092141..fda29f5c2ecb 100644
--- a/modules/bim/config/locales/crowdin/de.yml
+++ b/modules/bim/config/locales/crowdin/de.yml
@@ -9,6 +9,7 @@ de:
     label_bcf: 'BCF'
     label_imported_failed: 'Fehler beim Import von BCF-Themen'
     label_imported_successfully: 'Erfolgreich importierte Einträge'
+    label_bcf_issue_associated: "Zugeordneter BCF-Fall"
     issues: "Probleme"
     recommended: 'empfohlen'
     not_recommended: 'nicht empfohlen'
diff --git a/modules/bim/config/locales/crowdin/el.yml b/modules/bim/config/locales/crowdin/el.yml
index 5a8acb456cd1..abd8826b8637 100644
--- a/modules/bim/config/locales/crowdin/el.yml
+++ b/modules/bim/config/locales/crowdin/el.yml
@@ -9,6 +9,7 @@ el:
     label_bcf: 'BCF'
     label_imported_failed: 'Αποτυχημένες εισαγωγές των θεμάτων BCF'
     label_imported_successfully: 'Επιτυχής εισαγωγή θέματων BCF'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "Ζητήματα"
     recommended: 'προτεινόμενο'
     not_recommended: 'δεν συνιστάται'
diff --git a/modules/bim/config/locales/crowdin/eo.yml b/modules/bim/config/locales/crowdin/eo.yml
index 38181d844d4e..6a32b767e8c1 100644
--- a/modules/bim/config/locales/crowdin/eo.yml
+++ b/modules/bim/config/locales/crowdin/eo.yml
@@ -9,6 +9,7 @@ eo:
     label_bcf: 'BCF'
     label_imported_failed: 'Failed imports of BCF topics'
     label_imported_successfully: 'Successfully imported BCF topics'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "Issues"
     recommended: 'recommended'
     not_recommended: 'not recommended'
diff --git a/modules/bim/config/locales/crowdin/es.yml b/modules/bim/config/locales/crowdin/es.yml
index a10876169bee..7874295e90f6 100644
--- a/modules/bim/config/locales/crowdin/es.yml
+++ b/modules/bim/config/locales/crowdin/es.yml
@@ -9,6 +9,7 @@ es:
     label_bcf: 'BCF'
     label_imported_failed: 'No se pudieron importar los temas de BCF'
     label_imported_successfully: 'Los temas de BCF se importaron correctamente'
+    label_bcf_issue_associated: "Problema de BCF asociado"
     issues: "Incidencias"
     recommended: 'recomendado'
     not_recommended: 'no recomendado'
diff --git a/modules/bim/config/locales/crowdin/et.yml b/modules/bim/config/locales/crowdin/et.yml
index d52d1ab243b1..c715b81577a8 100644
--- a/modules/bim/config/locales/crowdin/et.yml
+++ b/modules/bim/config/locales/crowdin/et.yml
@@ -9,6 +9,7 @@ et:
     label_bcf: 'BCF'
     label_imported_failed: 'Failed imports of BCF topics'
     label_imported_successfully: 'Successfully imported BCF topics'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "Issues"
     recommended: 'recommended'
     not_recommended: 'not recommended'
diff --git a/modules/bim/config/locales/crowdin/eu.yml b/modules/bim/config/locales/crowdin/eu.yml
index c122c85cb45e..80e1a788ff51 100644
--- a/modules/bim/config/locales/crowdin/eu.yml
+++ b/modules/bim/config/locales/crowdin/eu.yml
@@ -9,6 +9,7 @@ eu:
     label_bcf: 'BCF'
     label_imported_failed: 'Failed imports of BCF topics'
     label_imported_successfully: 'Successfully imported BCF topics'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "Issues"
     recommended: 'recommended'
     not_recommended: 'not recommended'
diff --git a/modules/bim/config/locales/crowdin/fa.yml b/modules/bim/config/locales/crowdin/fa.yml
index cd6bec3ebd3d..7acc2eab619d 100644
--- a/modules/bim/config/locales/crowdin/fa.yml
+++ b/modules/bim/config/locales/crowdin/fa.yml
@@ -9,6 +9,7 @@ fa:
     label_bcf: 'BCF'
     label_imported_failed: 'Failed imports of BCF topics'
     label_imported_successfully: 'موضوعات BCF با موفقیت درون‌ریزی شد'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "مشکلات"
     recommended: 'پیشنهادی'
     not_recommended: 'پیشنهاد نشده'
diff --git a/modules/bim/config/locales/crowdin/fi.yml b/modules/bim/config/locales/crowdin/fi.yml
index af8f559a5478..b1ccee6c520d 100644
--- a/modules/bim/config/locales/crowdin/fi.yml
+++ b/modules/bim/config/locales/crowdin/fi.yml
@@ -9,6 +9,7 @@ fi:
     label_bcf: 'BCF'
     label_imported_failed: 'Failed imports of BCF topics'
     label_imported_successfully: 'Successfully imported BCF topics'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "Issues"
     recommended: 'suositellut'
     not_recommended: 'not recommended'
diff --git a/modules/bim/config/locales/crowdin/fil.yml b/modules/bim/config/locales/crowdin/fil.yml
index 7fcffceffb30..81ff5c18889d 100644
--- a/modules/bim/config/locales/crowdin/fil.yml
+++ b/modules/bim/config/locales/crowdin/fil.yml
@@ -9,6 +9,7 @@ fil:
     label_bcf: 'BCF'
     label_imported_failed: 'Failed imports of BCF topics'
     label_imported_successfully: 'Successfully imported BCF topics'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "Issues"
     recommended: 'recommended'
     not_recommended: 'not recommended'
diff --git a/modules/bim/config/locales/crowdin/fr.yml b/modules/bim/config/locales/crowdin/fr.yml
index 9e4ab945797c..2c80bc1ce45f 100644
--- a/modules/bim/config/locales/crowdin/fr.yml
+++ b/modules/bim/config/locales/crowdin/fr.yml
@@ -9,6 +9,7 @@ fr:
     label_bcf: 'BCF'
     label_imported_failed: 'Impossible d''importer les sujets BCF'
     label_imported_successfully: 'Sujets BCF importés avec succès'
+    label_bcf_issue_associated: "Question BCF associée"
     issues: "Problèmes"
     recommended: 'recommandé'
     not_recommended: 'déconseillé'
diff --git a/modules/bim/config/locales/crowdin/he.yml b/modules/bim/config/locales/crowdin/he.yml
index a1eda3ce2252..50d6bdd12b1f 100644
--- a/modules/bim/config/locales/crowdin/he.yml
+++ b/modules/bim/config/locales/crowdin/he.yml
@@ -9,6 +9,7 @@ he:
     label_bcf: 'BCF'
     label_imported_failed: 'Failed imports of BCF topics'
     label_imported_successfully: 'Successfully imported BCF topics'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "Issues"
     recommended: 'recommended'
     not_recommended: 'not recommended'
diff --git a/modules/bim/config/locales/crowdin/hi.yml b/modules/bim/config/locales/crowdin/hi.yml
index b443b6c6159c..c6b599d9e651 100644
--- a/modules/bim/config/locales/crowdin/hi.yml
+++ b/modules/bim/config/locales/crowdin/hi.yml
@@ -9,6 +9,7 @@ hi:
     label_bcf: 'BCF'
     label_imported_failed: 'Failed imports of BCF topics'
     label_imported_successfully: 'Successfully imported BCF topics'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "Issues"
     recommended: 'recommended'
     not_recommended: 'not recommended'
diff --git a/modules/bim/config/locales/crowdin/hr.yml b/modules/bim/config/locales/crowdin/hr.yml
index 3bb911736ff0..0b91a958972a 100644
--- a/modules/bim/config/locales/crowdin/hr.yml
+++ b/modules/bim/config/locales/crowdin/hr.yml
@@ -9,6 +9,7 @@ hr:
     label_bcf: 'BCF'
     label_imported_failed: 'Failed imports of BCF topics'
     label_imported_successfully: 'Successfully imported BCF topics'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "Issues"
     recommended: 'recommended'
     not_recommended: 'not recommended'
diff --git a/modules/bim/config/locales/crowdin/hu.yml b/modules/bim/config/locales/crowdin/hu.yml
index 2bbd50f01874..31dc9b7661d2 100644
--- a/modules/bim/config/locales/crowdin/hu.yml
+++ b/modules/bim/config/locales/crowdin/hu.yml
@@ -9,6 +9,7 @@ hu:
     label_bcf: 'BCF'
     label_imported_failed: 'Hiba a BCF topocs importálásakor'
     label_imported_successfully: 'Sikeres BCF import'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "Feladat"
     recommended: 'Ajánlott'
     not_recommended: 'nem ajánlott'
diff --git a/modules/bim/config/locales/crowdin/id.yml b/modules/bim/config/locales/crowdin/id.yml
index 77bc93dfeabe..62a96cb4f14c 100644
--- a/modules/bim/config/locales/crowdin/id.yml
+++ b/modules/bim/config/locales/crowdin/id.yml
@@ -9,6 +9,7 @@ id:
     label_bcf: 'BCF'
     label_imported_failed: 'Gagal mengimport topik BCF'
     label_imported_successfully: 'Berhasil mengimport topik BCF'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "Masalah"
     recommended: 'Disarankan'
     not_recommended: 'Tidak disarankan'
diff --git a/modules/bim/config/locales/crowdin/it.yml b/modules/bim/config/locales/crowdin/it.yml
index 1e227d617269..91c507cf0864 100644
--- a/modules/bim/config/locales/crowdin/it.yml
+++ b/modules/bim/config/locales/crowdin/it.yml
@@ -9,6 +9,7 @@ it:
     label_bcf: 'BCF'
     label_imported_failed: 'Importazione di argomenti BCF non riuscita'
     label_imported_successfully: 'Argomenti BCF importati con successo'
+    label_bcf_issue_associated: "Problema BCF associato"
     issues: "Problemi"
     recommended: 'consigliato'
     not_recommended: 'non consigliato'
diff --git a/modules/bim/config/locales/crowdin/ja.yml b/modules/bim/config/locales/crowdin/ja.yml
index 0ea3c866dfb7..9f900f84fa1d 100644
--- a/modules/bim/config/locales/crowdin/ja.yml
+++ b/modules/bim/config/locales/crowdin/ja.yml
@@ -9,6 +9,7 @@ ja:
     label_bcf: 'BCF'
     label_imported_failed: 'BCFトピックのインポートに失敗しました'
     label_imported_successfully: 'BCFトピックを正常にインポートしました'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "チケット"
     recommended: '推奨'
     not_recommended: '非推奨'
diff --git a/modules/bim/config/locales/crowdin/ka.yml b/modules/bim/config/locales/crowdin/ka.yml
index bdc43b04e070..70fca6f04f69 100644
--- a/modules/bim/config/locales/crowdin/ka.yml
+++ b/modules/bim/config/locales/crowdin/ka.yml
@@ -9,6 +9,7 @@ ka:
     label_bcf: 'BCF'
     label_imported_failed: 'Failed imports of BCF topics'
     label_imported_successfully: 'Successfully imported BCF topics'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "შენიშვნები"
     recommended: 'რეკომენდებულია'
     not_recommended: 'not recommended'
diff --git a/modules/bim/config/locales/crowdin/kk.yml b/modules/bim/config/locales/crowdin/kk.yml
index 8d7d35ffd47a..ae4970022096 100644
--- a/modules/bim/config/locales/crowdin/kk.yml
+++ b/modules/bim/config/locales/crowdin/kk.yml
@@ -9,6 +9,7 @@ kk:
     label_bcf: 'BCF'
     label_imported_failed: 'Failed imports of BCF topics'
     label_imported_successfully: 'Successfully imported BCF topics'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "Issues"
     recommended: 'recommended'
     not_recommended: 'not recommended'
diff --git a/modules/bim/config/locales/crowdin/ko.yml b/modules/bim/config/locales/crowdin/ko.yml
index 7676527e9ad1..e901b19e4c33 100644
--- a/modules/bim/config/locales/crowdin/ko.yml
+++ b/modules/bim/config/locales/crowdin/ko.yml
@@ -9,6 +9,7 @@ ko:
     label_bcf: 'BCF'
     label_imported_failed: 'BCF 항목 가져오기 실패'
     label_imported_successfully: 'BCF 항목 가져오기 성공'
+    label_bcf_issue_associated: "BCF 이슈 관련"
     issues: "이슈"
     recommended: '추천'
     not_recommended: '추천하지 않음'
diff --git a/modules/bim/config/locales/crowdin/lt.yml b/modules/bim/config/locales/crowdin/lt.yml
index 7073e36534fb..96a0ffd308ed 100644
--- a/modules/bim/config/locales/crowdin/lt.yml
+++ b/modules/bim/config/locales/crowdin/lt.yml
@@ -9,6 +9,7 @@ lt:
     label_bcf: 'BCF'
     label_imported_failed: 'BCF temų importas nepavyko'
     label_imported_successfully: 'BCF temos sėkmingai importuotos'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "Trūkumai"
     recommended: 'rekomenduojama'
     not_recommended: 'nerekomenduojama'
diff --git a/modules/bim/config/locales/crowdin/lv.yml b/modules/bim/config/locales/crowdin/lv.yml
index 96d2e45449a9..35be104e340c 100644
--- a/modules/bim/config/locales/crowdin/lv.yml
+++ b/modules/bim/config/locales/crowdin/lv.yml
@@ -9,6 +9,7 @@ lv:
     label_bcf: 'BCF'
     label_imported_failed: 'Failed imports of BCF topics'
     label_imported_successfully: 'Successfully imported BCF topics'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "Issues"
     recommended: 'recommended'
     not_recommended: 'not recommended'
diff --git a/modules/bim/config/locales/crowdin/mn.yml b/modules/bim/config/locales/crowdin/mn.yml
index e040cc037792..7587b60f15ec 100644
--- a/modules/bim/config/locales/crowdin/mn.yml
+++ b/modules/bim/config/locales/crowdin/mn.yml
@@ -9,6 +9,7 @@ mn:
     label_bcf: 'BCF'
     label_imported_failed: 'Failed imports of BCF topics'
     label_imported_successfully: 'Successfully imported BCF topics'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "Issues"
     recommended: 'recommended'
     not_recommended: 'not recommended'
diff --git a/modules/bim/config/locales/crowdin/ms.yml b/modules/bim/config/locales/crowdin/ms.yml
index dff87b50b925..84d0cd041b5e 100644
--- a/modules/bim/config/locales/crowdin/ms.yml
+++ b/modules/bim/config/locales/crowdin/ms.yml
@@ -9,6 +9,7 @@ ms:
     label_bcf: 'BCF'
     label_imported_failed: 'Import topik BCF yang gagal'
     label_imported_successfully: 'Import topik BCF yang berjaya'
+    label_bcf_issue_associated: "Isu BCF berkaitan"
     issues: "Isu-isu"
     recommended: 'disarankan'
     not_recommended: 'tidak disarankan'
diff --git a/modules/bim/config/locales/crowdin/ne.yml b/modules/bim/config/locales/crowdin/ne.yml
index e232369a455f..2be6b0381808 100644
--- a/modules/bim/config/locales/crowdin/ne.yml
+++ b/modules/bim/config/locales/crowdin/ne.yml
@@ -9,6 +9,7 @@ ne:
     label_bcf: 'BCF'
     label_imported_failed: 'Failed imports of BCF topics'
     label_imported_successfully: 'Successfully imported BCF topics'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "Issues"
     recommended: 'recommended'
     not_recommended: 'not recommended'
diff --git a/modules/bim/config/locales/crowdin/nl.yml b/modules/bim/config/locales/crowdin/nl.yml
index bc932dd36242..78cf3ea2c696 100644
--- a/modules/bim/config/locales/crowdin/nl.yml
+++ b/modules/bim/config/locales/crowdin/nl.yml
@@ -9,6 +9,7 @@ nl:
     label_bcf: 'BCF'
     label_imported_failed: 'Mislukte import van BCF onderwerpen'
     label_imported_successfully: 'Succesvol BCF onderwerpen geïmporteerd'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "Problemen"
     recommended: 'aanbevolen'
     not_recommended: 'niet aanbevolen'
diff --git a/modules/bim/config/locales/crowdin/no.yml b/modules/bim/config/locales/crowdin/no.yml
index ae655052c08a..7681c1727688 100644
--- a/modules/bim/config/locales/crowdin/no.yml
+++ b/modules/bim/config/locales/crowdin/no.yml
@@ -9,6 +9,7 @@
     label_bcf: 'BCF'
     label_imported_failed: 'Kunne ikke importere BCF-emner'
     label_imported_successfully: 'Vellykket importert av BCF-emner'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "Problemer"
     recommended: 'anbefalt'
     not_recommended: 'ikke anbefalt'
diff --git a/modules/bim/config/locales/crowdin/pl.yml b/modules/bim/config/locales/crowdin/pl.yml
index 80c3d0088a03..f1511f0f135a 100644
--- a/modules/bim/config/locales/crowdin/pl.yml
+++ b/modules/bim/config/locales/crowdin/pl.yml
@@ -9,6 +9,7 @@ pl:
     label_bcf: 'BCF'
     label_imported_failed: 'Nieudane importy tematów BCF'
     label_imported_successfully: 'Zaimportowane z powodzeniem tematy BCF'
+    label_bcf_issue_associated: "Powiązano problem BCF"
     issues: "Problemy"
     recommended: 'zalecane'
     not_recommended: 'niezalecane'
diff --git a/modules/bim/config/locales/crowdin/pt-BR.yml b/modules/bim/config/locales/crowdin/pt-BR.yml
index 9c8b89a127b9..300758199f3b 100644
--- a/modules/bim/config/locales/crowdin/pt-BR.yml
+++ b/modules/bim/config/locales/crowdin/pt-BR.yml
@@ -9,6 +9,7 @@ pt-BR:
     label_bcf: 'BCF'
     label_imported_failed: 'Importação de tópicos BCF falhou'
     label_imported_successfully: 'Tópicos BCF importados com sucesso'
+    label_bcf_issue_associated: "Problema associado ao BCF"
     issues: "Problemas"
     recommended: 'recomendado'
     not_recommended: 'não recomendado'
diff --git a/modules/bim/config/locales/crowdin/pt-PT.yml b/modules/bim/config/locales/crowdin/pt-PT.yml
index ce55bd40cda8..2b87bfda0510 100644
--- a/modules/bim/config/locales/crowdin/pt-PT.yml
+++ b/modules/bim/config/locales/crowdin/pt-PT.yml
@@ -9,6 +9,7 @@ pt-PT:
     label_bcf: 'BCF'
     label_imported_failed: 'A importação de tópicos BCF falhou'
     label_imported_successfully: 'Tópicos BCF importados com sucesso'
+    label_bcf_issue_associated: "Questão BCF associada"
     issues: "Problemas"
     recommended: 'recomendado'
     not_recommended: 'não recomendado'
diff --git a/modules/bim/config/locales/crowdin/ro.yml b/modules/bim/config/locales/crowdin/ro.yml
index 16677886f798..f845ef941565 100644
--- a/modules/bim/config/locales/crowdin/ro.yml
+++ b/modules/bim/config/locales/crowdin/ro.yml
@@ -9,6 +9,7 @@ ro:
     label_bcf: 'BCF'
     label_imported_failed: 'Importuri eșuate de subiecte BCF'
     label_imported_successfully: 'Ați importat cu succes subiectele BCF'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "Sunt câteva probleme cu produsele din coșul tău. Te rog mergi înapoi la pagina coșului și remediază aceste probleme înainte de finalizarea comenzii."
     recommended: 'recomandat'
     not_recommended: 'Recomandat'
diff --git a/modules/bim/config/locales/crowdin/ru.seeders.yml b/modules/bim/config/locales/crowdin/ru.seeders.yml
index fc7dd977d2fe..ec9143a5805f 100644
--- a/modules/bim/config/locales/crowdin/ru.seeders.yml
+++ b/modules/bim/config/locales/crowdin/ru.seeders.yml
@@ -32,7 +32,7 @@ ru:
           name: Другие
       types:
         item_0:
-          name: Задание
+          name: Задача
         item_1:
           name: Веха
         item_2:
diff --git a/modules/bim/config/locales/crowdin/ru.yml b/modules/bim/config/locales/crowdin/ru.yml
index 9c6dccc7c3ae..eda54c4ccd1e 100644
--- a/modules/bim/config/locales/crowdin/ru.yml
+++ b/modules/bim/config/locales/crowdin/ru.yml
@@ -9,6 +9,7 @@ ru:
     label_bcf: 'BCF'
     label_imported_failed: 'Неудачный импорт тем BCF'
     label_imported_successfully: 'Успешно импортированные темы BCF'
+    label_bcf_issue_associated: "Связанная проблема BCF"
     issues: "Замечания"
     recommended: 'рекомендуется'
     not_recommended: 'не рекомендуется'
diff --git a/modules/bim/config/locales/crowdin/rw.yml b/modules/bim/config/locales/crowdin/rw.yml
index c7787ca82930..bc85639e1900 100644
--- a/modules/bim/config/locales/crowdin/rw.yml
+++ b/modules/bim/config/locales/crowdin/rw.yml
@@ -9,6 +9,7 @@ rw:
     label_bcf: 'BCF'
     label_imported_failed: 'Failed imports of BCF topics'
     label_imported_successfully: 'Successfully imported BCF topics'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "Issues"
     recommended: 'recommended'
     not_recommended: 'not recommended'
diff --git a/modules/bim/config/locales/crowdin/si.yml b/modules/bim/config/locales/crowdin/si.yml
index 0073510451eb..ed5d98a46a04 100644
--- a/modules/bim/config/locales/crowdin/si.yml
+++ b/modules/bim/config/locales/crowdin/si.yml
@@ -9,6 +9,7 @@ si:
     label_bcf: 'BCF'
     label_imported_failed: 'BCF මාතෘකා ආනයනය අසමත්'
     label_imported_successfully: 'සාර්ථකව ආනයනය BCF මාතෘකා'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "ගැටළු"
     recommended: 'නිර්දේශ'
     not_recommended: 'නිර්දේශ කර නැත'
diff --git a/modules/bim/config/locales/crowdin/sk.yml b/modules/bim/config/locales/crowdin/sk.yml
index 115cc3abb16b..83cece88924f 100644
--- a/modules/bim/config/locales/crowdin/sk.yml
+++ b/modules/bim/config/locales/crowdin/sk.yml
@@ -9,6 +9,7 @@ sk:
     label_bcf: 'BCF'
     label_imported_failed: 'Failed imports of BCF topics'
     label_imported_successfully: 'Successfully imported BCF topics'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "Issues"
     recommended: 'recommended'
     not_recommended: 'not recommended'
diff --git a/modules/bim/config/locales/crowdin/sl.yml b/modules/bim/config/locales/crowdin/sl.yml
index 21dd1a15ba2d..2f2aa2d9b175 100644
--- a/modules/bim/config/locales/crowdin/sl.yml
+++ b/modules/bim/config/locales/crowdin/sl.yml
@@ -9,6 +9,7 @@ sl:
     label_bcf: 'BCF'
     label_imported_failed: 'Uvoz tematike BCF ni uspel'
     label_imported_successfully: 'Uspešno vnesena tematika BCF'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "Zahtevki"
     recommended: 'Priporočeno'
     not_recommended: 'ni priporočeno'
diff --git a/modules/bim/config/locales/crowdin/sr.yml b/modules/bim/config/locales/crowdin/sr.yml
index c58bfc06be4d..70c241a8fcf5 100644
--- a/modules/bim/config/locales/crowdin/sr.yml
+++ b/modules/bim/config/locales/crowdin/sr.yml
@@ -9,6 +9,7 @@ sr:
     label_bcf: 'BCF'
     label_imported_failed: 'Failed imports of BCF topics'
     label_imported_successfully: 'Successfully imported BCF topics'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "Issues"
     recommended: 'recommended'
     not_recommended: 'not recommended'
diff --git a/modules/bim/config/locales/crowdin/sv.yml b/modules/bim/config/locales/crowdin/sv.yml
index 565c0cd636c8..c6ba765552d5 100644
--- a/modules/bim/config/locales/crowdin/sv.yml
+++ b/modules/bim/config/locales/crowdin/sv.yml
@@ -9,6 +9,7 @@ sv:
     label_bcf: 'BCF'
     label_imported_failed: 'Misslyckad import av BCF-ämnen'
     label_imported_successfully: 'BCF-ämnen har importerats'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "Problem"
     recommended: 'rekommenderad'
     not_recommended: 'rekommenderas inte'
diff --git a/modules/bim/config/locales/crowdin/th.yml b/modules/bim/config/locales/crowdin/th.yml
index 8097ec79f63a..32f3ebf94e45 100644
--- a/modules/bim/config/locales/crowdin/th.yml
+++ b/modules/bim/config/locales/crowdin/th.yml
@@ -9,6 +9,7 @@ th:
     label_bcf: 'BCF'
     label_imported_failed: 'Failed imports of BCF topics'
     label_imported_successfully: 'Successfully imported BCF topics'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "Issues"
     recommended: 'recommended'
     not_recommended: 'not recommended'
diff --git a/modules/bim/config/locales/crowdin/tr.yml b/modules/bim/config/locales/crowdin/tr.yml
index 620324c49d7f..0b61a6b81f31 100644
--- a/modules/bim/config/locales/crowdin/tr.yml
+++ b/modules/bim/config/locales/crowdin/tr.yml
@@ -9,6 +9,7 @@ tr:
     label_bcf: 'BCF'
     label_imported_failed: 'BCF konularının başarısız ithalatı'
     label_imported_successfully: 'BCF konuları başarıyla içe aktarıldı'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "Sorunlar"
     recommended: 'Tavsiye edilen'
     not_recommended: 'tavsiye edilmez'
diff --git a/modules/bim/config/locales/crowdin/uk.yml b/modules/bim/config/locales/crowdin/uk.yml
index b067b682121b..980d0c48d934 100644
--- a/modules/bim/config/locales/crowdin/uk.yml
+++ b/modules/bim/config/locales/crowdin/uk.yml
@@ -9,6 +9,7 @@ uk:
     label_bcf: 'BCF'
     label_imported_failed: 'Не вдалося імпортувати BFC теми'
     label_imported_successfully: 'Успішно завантажено BCF теми'
+    label_bcf_issue_associated: "Зв’язана проблема BCF"
     issues: "Задачі"
     recommended: 'рекомендовано'
     not_recommended: 'не рекомендується'
diff --git a/modules/bim/config/locales/crowdin/uz.yml b/modules/bim/config/locales/crowdin/uz.yml
index 468866f74686..586ed9485ae7 100644
--- a/modules/bim/config/locales/crowdin/uz.yml
+++ b/modules/bim/config/locales/crowdin/uz.yml
@@ -9,6 +9,7 @@ uz:
     label_bcf: 'BCF'
     label_imported_failed: 'Failed imports of BCF topics'
     label_imported_successfully: 'Successfully imported BCF topics'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "Issues"
     recommended: 'recommended'
     not_recommended: 'not recommended'
diff --git a/modules/bim/config/locales/crowdin/vi.yml b/modules/bim/config/locales/crowdin/vi.yml
index df7002050e26..e998a3eba566 100644
--- a/modules/bim/config/locales/crowdin/vi.yml
+++ b/modules/bim/config/locales/crowdin/vi.yml
@@ -9,6 +9,7 @@ vi:
     label_bcf: 'BCF'
     label_imported_failed: 'Nhập các chủ đề BCF thất bại'
     label_imported_successfully: 'Đã nhập các chủ đề BCF thành công'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "Các vấn đề"
     recommended: 'khuyến nghị'
     not_recommended: 'không khuyến nghị'
diff --git a/modules/bim/config/locales/crowdin/zh-CN.yml b/modules/bim/config/locales/crowdin/zh-CN.yml
index 34121ece8a78..4f3239732f93 100644
--- a/modules/bim/config/locales/crowdin/zh-CN.yml
+++ b/modules/bim/config/locales/crowdin/zh-CN.yml
@@ -9,6 +9,7 @@ zh-CN:
     label_bcf: 'BCF'
     label_imported_failed: '导入 BCF 主题失败'
     label_imported_successfully: '已成功导入 BCF 主题'
+    label_bcf_issue_associated: "相关的 BCF 问题"
     issues: "问题"
     recommended: '推荐'
     not_recommended: '不推荐'
diff --git a/modules/bim/config/locales/crowdin/zh-TW.yml b/modules/bim/config/locales/crowdin/zh-TW.yml
index 1fed792db0ab..e4bfd930797e 100644
--- a/modules/bim/config/locales/crowdin/zh-TW.yml
+++ b/modules/bim/config/locales/crowdin/zh-TW.yml
@@ -9,6 +9,7 @@ zh-TW:
     label_bcf: 'BCF'
     label_imported_failed: '無法匯入 BCF 主題'
     label_imported_successfully: ' '
+    label_bcf_issue_associated: "相關 BCF 問題"
     issues: "問題集"
     recommended: '推薦'
     not_recommended: '不推薦'
diff --git a/modules/bim/config/locales/en.yml b/modules/bim/config/locales/en.yml
index a500501d80ce..d8636669aa9a 100644
--- a/modules/bim/config/locales/en.yml
+++ b/modules/bim/config/locales/en.yml
@@ -11,6 +11,7 @@ en:
     label_bcf: 'BCF'
     label_imported_failed: 'Failed imports of BCF topics'
     label_imported_successfully: 'Successfully imported BCF topics'
+    label_bcf_issue_associated: "BCF issue associated"
     issues: "Issues"
     recommended: 'recommended'
     not_recommended: 'not recommended'
diff --git a/modules/bim/config/routes.rb b/modules/bim/config/routes.rb
index 18ced9377ee2..b6e8c749e3af 100644
--- a/modules/bim/config/routes.rb
+++ b/modules/bim/config/routes.rb
@@ -33,7 +33,7 @@
     scope "projects/:project_id", as: "project" do
       get "bcf/menu" => "bim/menus#show"
 
-      resources :issues, controller: "bim/bcf/issues" do
+      resources :issues, controller: "bim/bcf/issues", except: :index do
         get :upload, action: :upload, on: :collection
         post :prepare_import, action: :prepare_import, on: :collection
         post :configure_import, action: :configure_import, on: :collection
diff --git a/modules/bim/lib/open_project/bim/engine.rb b/modules/bim/lib/open_project/bim/engine.rb
index fb7deae4ad75..53e9e5a3aff8 100644
--- a/modules/bim/lib/open_project/bim/engine.rb
+++ b/modules/bim/lib/open_project/bim/engine.rb
@@ -57,12 +57,12 @@ class Engine < ::Rails::Engine
                    dependencies: %i[view_ifc_models],
                    contract_actions: { ifc_models: %i[create update destroy] }
         permission :view_linked_issues,
-                   { "bim/bcf/issues": %i[index] },
+                   {},
                    permissible_on: :project,
                    dependencies: %i[view_work_packages],
                    contract_actions: { bcf: %i[read] }
         permission :manage_bcf,
-                   { "bim/bcf/issues": %i[index upload prepare_import configure_import perform_import] },
+                   { "bim/bcf/issues": %i[upload prepare_import configure_import perform_import] },
                    permissible_on: :project,
                    dependencies: %i[view_linked_issues
                                     view_work_packages
diff --git a/modules/bim/spec/models/queries/work_packages/filter/bcf_issue_associated_filter_spec.rb b/modules/bim/spec/models/queries/work_packages/filter/bcf_issue_associated_filter_spec.rb
index d935b80db580..58a2be69a24e 100644
--- a/modules/bim/spec/models/queries/work_packages/filter/bcf_issue_associated_filter_spec.rb
+++ b/modules/bim/spec/models/queries/work_packages/filter/bcf_issue_associated_filter_spec.rb
@@ -35,6 +35,7 @@
     let(:model) { WorkPackage }
     let(:class_key) { :bcf_issue_associated }
     let(:type) { :list }
+    let(:human_name) { "BCF issue associated" }
 
     describe "#available?" do
       context "if bim is enabled", with_config: { edition: "bim" } do
diff --git a/modules/bim/spec/support/pages/ifc_models/index.rb b/modules/bim/spec/support/pages/ifc_models/index.rb
index 581b3a6f498c..76ca8d071a58 100644
--- a/modules/bim/spec/support/pages/ifc_models/index.rb
+++ b/modules/bim/spec/support/pages/ifc_models/index.rb
@@ -50,7 +50,7 @@ def model_listed(listed, model_name)
 
       def add_model_allowed(allowed)
         if allowed
-          click_toolbar_button "IFC model"
+          click_toolbar_button "ifc-create-button"
 
           expect_correct_page_loaded '.button[type="submit"]'
           expect(page).to have_current_path new_bcf_project_ifc_model_path(project)
@@ -112,7 +112,7 @@ def expect_model_active(model, active = true)
       end
 
       def show_defaults(models = [])
-        click_toolbar_button "Show defaults"
+        click_toolbar_button "ifc-show-default-button"
 
         expect_correct_page_loaded '[data-test-selector="op-ifc-viewer--container"]'
 
@@ -135,10 +135,8 @@ def click_model_link(model_name)
         end
       end
 
-      def click_toolbar_button(name)
-        within ".toolbar" do
-          page.find(".button", text: name).click
-        end
+      def click_toolbar_button(test_selector)
+        page.find_test_selector(test_selector).click
       end
 
       def click_table_icon(model_name, icon_class)
diff --git a/modules/boards/app/views/boards/boards/new.html.erb b/modules/boards/app/views/boards/boards/new.html.erb
index acaea1c006d5..cc500c5c5b69 100644
--- a/modules/boards/app/views/boards/boards/new.html.erb
+++ b/modules/boards/app/views/boards/boards/new.html.erb
@@ -28,13 +28,25 @@ See COPYRIGHT and LICENSE files for more details.
 ++#%>
 
 <% html_title t('boards.label_create_new_board') %>
-<%= toolbar title: t('boards.label_create_new_board') %>
+
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title {  t('boards.label_create_new_board') }
+    header.with_breadcrumbs( [*([ href: home_path, text: organization_name ] unless @project),
+                              *([ href: project_overview_path(@project.id), text: @project.name ] if @project),
+                              *([ href: project_work_package_boards_path(@project.id), text: t("boards.label_boards") ] if @project),
+                              t('boards.label_create_new_board')
+                             ])
+  end
+%>
+
 <%= labelled_tabular_form_for @board_grid,
                               url: { controller: '/boards/boards', action: 'create', project_id: @project },
                               html: {
                                 id: 'board-form',
                                 data: { turbo: false }
                               } do |f| -%>
+                                                                     
   <%= render :partial => 'form', :locals => {:f => f} %>
   <%= styled_button_tag t(:button_create), class: '-primary' %>
   <%= link_to t(:button_cancel), { controller: 'boards/boards', action: :index },
diff --git a/modules/boards/config/locales/crowdin/js-cs.yml b/modules/boards/config/locales/crowdin/js-cs.yml
index 939db8e134da..c067a0b2a01a 100644
--- a/modules/boards/config/locales/crowdin/js-cs.yml
+++ b/modules/boards/config/locales/crowdin/js-cs.yml
@@ -62,7 +62,7 @@ cs:
           status: Stav
           version: Verze
           subproject: Podprojekt
-          subtasks: rodič-potomek
+          subtasks: nadřazený-podřazený
           basic: Základní
         select_attribute: "Atribut akce"
       add_list_modal:
diff --git a/modules/budgets/app/components/budgets/show_page_header_component.html.erb b/modules/budgets/app/components/budgets/show_page_header_component.html.erb
new file mode 100644
index 000000000000..bca91081ef5b
--- /dev/null
+++ b/modules/budgets/app/components/budgets/show_page_header_component.html.erb
@@ -0,0 +1,51 @@
+<%=
+  render(Primer::OpenProject::PageHeader.new) do |header|
+    header.with_title { t(:label_budget_id,  id:  @budget.id) }
+    header.with_breadcrumbs(breadcrumb_items)
+
+    if authorize_for(:budgets, :edit)
+      header.with_action_button(tag: :a,
+                                mobile_icon: :pencil,
+                                mobile_label: t(:button_edit),
+                                size: :medium,
+                                href: url_for({ controller: 'budgets', action: 'edit',  id: @budget }),
+                                aria: { label: t(:button_update) },
+                                data: {test_selector: "budget-edit-button" },
+                                title: t(:button_update)) do |button|
+        button.with_leading_visual_icon(icon: :pencil)
+        t(:button_update)
+      end
+    end
+    if authorize_for(:budgets, :copy)
+      header.with_action_button(tag: :a,
+                                mobile_icon: :copy,
+                                mobile_label: t(:button_copy),
+                                size: :medium,
+                                href: url_for({ controller: 'budgets', action: 'copy', id: @budget }),
+                                aria: { label: I18n.t(:button_copy) },
+                                data: {test_selector: "budget-copy-button" },
+                                title: I18n.t(:button_copy)) do |button|
+        button.with_leading_visual_icon(icon: :copy)
+        t(:button_copy)
+      end
+    end
+    if authorize_for(:budgets, :destroy)
+      header.with_action_button(tag: :a,
+                                scheme: :danger,
+                                mobile_icon: :trash,
+                                mobile_label: t(:button_delete),
+                                size: :medium,
+                                href: url_for({ controller: 'budgets', action: 'destroy', id: @budget }),
+                                aria: { label: I18n.t(:button_delete) },
+                                data: {
+                                  confirm: I18n.t(:text_are_you_sure),
+                                  method: :delete,
+                                  test_selector: "budget-delete-button",
+                                },
+                                title: I18n.t(:button_delete)) do |button|
+        button.with_leading_visual_icon(icon: :trash)
+        t(:button_delete)
+      end
+    end
+  end
+%>
diff --git a/modules/budgets/app/components/budgets/show_page_header_component.rb b/modules/budgets/app/components/budgets/show_page_header_component.rb
new file mode 100644
index 000000000000..198df535ee1a
--- /dev/null
+++ b/modules/budgets/app/components/budgets/show_page_header_component.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+# ++
+
+module Budgets
+  class ShowPageHeaderComponent < ApplicationComponent
+    include OpPrimer::ComponentHelpers
+    include ApplicationHelper
+
+    def initialize(budget:, project:)
+      super
+
+      @budget = budget
+      @project = project
+    end
+
+    def breadcrumb_items
+      [{ href: project_overview_path(@project.id), text: @project.name },
+       { href: projects_budgets_path(@project.id), text: t(:label_budget_plural) },
+       t(:label_budget_id, id: @budget.id)]
+    end
+  end
+end
diff --git a/modules/budgets/app/views/budgets/destroy_info.html.erb b/modules/budgets/app/views/budgets/destroy_info.html.erb
index ac3a43a50ef3..2986837d0681 100644
--- a/modules/budgets/app/views/budgets/destroy_info.html.erb
+++ b/modules/budgets/app/views/budgets/destroy_info.html.erb
@@ -28,7 +28,15 @@ See COPYRIGHT and LICENSE files for more details.
 ++#%>
 
 <% html_title "#{t(:button_delete)} #{t(:label_budget_id, id: @budget.id)}: #{@budget.subject}" %>
-<%= toolbar title: "#{t(:button_delete)} #{t(:label_budget_id, id: @budget.id)}: #{@budget.subject}" %>
+
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { "#{t(:button_delete)} #{@budget.subject}" }
+    header.with_breadcrumbs([{href: project_overview_path(@project.identifier), text: @project.name},
+                             {href: projects_budgets_path(@project.identifier), text: I18n.t(:label_budget_plural)},
+                             "#{t(:button_delete)} #{@budget.subject}"])
+  end
+%>
 
 <%= styled_form_tag(budget_path(@budget), method: :delete) do %>
   <section class="form--section">
diff --git a/modules/budgets/app/views/budgets/edit.html.erb b/modules/budgets/app/views/budgets/edit.html.erb
index 96f1923080c4..d8822528fa0b 100644
--- a/modules/budgets/app/views/budgets/edit.html.erb
+++ b/modules/budgets/app/views/budgets/edit.html.erb
@@ -28,6 +28,13 @@ See COPYRIGHT and LICENSE files for more details.
 ++#%>
 
 <% html_title "#{t(:label_edit)} #{t(:label_budget_id, id: @budget.id)}: #{@budget.subject}" %>
-<%= toolbar title: t(:label_budget_id, id: @budget.id) %>
 
+<%=
+  render(Primer::OpenProject::PageHeader.new) do |header|
+    header.with_title { t(:label_budget_id, id: @budget.id) }
+    header.with_breadcrumbs([{ href: project_overview_path(@project.id), text: @project.name },
+                             { href: projects_budgets_path(@project.id), text: t(:label_budget_plural) },
+                             t(:label_budget_id, id: @budget.id)])
+  end
+%>
 <%= render :partial => 'edit' %>
diff --git a/modules/budgets/app/views/budgets/index.html.erb b/modules/budgets/app/views/budgets/index.html.erb
index bba83f521578..39d04c5e8fdb 100644
--- a/modules/budgets/app/views/budgets/index.html.erb
+++ b/modules/budgets/app/views/budgets/index.html.erb
@@ -26,18 +26,28 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
-
 <% html_title(t(:label_budget_plural)) %>
-<%= toolbar title: t(:label_budget_plural) do %>
-  <% if authorize_for(:budgets, :new) %>
-    <li class="toolbar-item">
-      <a href="<%= new_projects_budget_path(@project) %>" aria-label="<%= I18n.t(:button_add_budget) %>" id="add-budget-button" title="<%= I18n.t(:button_add_budget) %>" class="button -primary">
-        <%= op_icon('button--icon icon-add') %>
-        <span class="button--text"><%= t(:label_budget) %></span>
-      </a>
-    </li>
-  <% end %>
-<% end %>
+
+<%=
+  render(Primer::OpenProject::PageHeader.new) do |header|
+    header.with_title { t(:label_budget_plural) }
+    header.with_breadcrumbs([{ href: project_overview_path(@project.id), text: @project.name },
+                             t(:label_budget_plural)])
+  end
+%>
+<%=
+  render(Primer::OpenProject::SubHeader.new) do |subheader|
+    subheader.with_action_button(scheme: :primary,
+                                 aria: { label: I18n.t(:button_add_budget) },
+                                 data: { test_selector: "budget-create-button" },
+                                 title: I18n.t(:button_add_budget),
+                                 tag: :a,
+                                 href: new_projects_budget_path(@project)) do |button|
+      button.with_leading_visual_icon(icon: :plus)
+      t(:label_budget)
+    end
+  end
+%>
 
 <% if @budgets.empty? %>
   <%= no_results_box %>
diff --git a/modules/budgets/app/views/budgets/new.html.erb b/modules/budgets/app/views/budgets/new.html.erb
index 7a4711af90bd..19c9ac07a75d 100644
--- a/modules/budgets/app/views/budgets/new.html.erb
+++ b/modules/budgets/app/views/budgets/new.html.erb
@@ -28,7 +28,15 @@ See COPYRIGHT and LICENSE files for more details.
 ++#%>
 
 <% html_title(t(:label_budget_new)) %>
-<%= toolbar title: t(:label_budget_new) %>
+
+<%=
+  render(Primer::OpenProject::PageHeader.new) do |header|
+    header.with_title { t(:label_budget_new) }
+    header.with_breadcrumbs([{ href: project_overview_path(@project.id), text: @project.name },
+                             { href: projects_budgets_path(@project.id), text: t(:label_budget_plural) },
+                            t(:label_budget_new)])
+  end
+%>
 
 <%= labelled_tabular_form_for @budget,
                               :url => projects_budgets_path(@project),
diff --git a/modules/budgets/app/views/budgets/show.html.erb b/modules/budgets/app/views/budgets/show.html.erb
index 091bdfc329d4..331837a5d546 100644
--- a/modules/budgets/app/views/budgets/show.html.erb
+++ b/modules/budgets/app/views/budgets/show.html.erb
@@ -26,34 +26,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
-
 <% html_title "#{t(:label_budget_id, id: @budget.id)}: #{@budget.subject}" %>
-<%= toolbar title: t(:label_budget_id,  id:  @budget.id) do %>
-  <% if authorize_for(:budgets, :edit) %>
-    <li class="toolbar-item">
-      <%= link_to({ controller: 'budgets', action: 'edit',  id: @budget }, class: 'button', accesskey: accesskey(:edit)) do %>
-        <%= op_icon('button--icon icon-edit') %>
-        <span class="button--text"><%= t(:button_update) %></span>
-      <% end %>
-    </li>
-  <% end %>
-  <% if authorize_for(:budgets, :copy) %>
-    <li class="toolbar-item hidden-for-tablet">
-      <%= link_to({ controller: 'budgets', action: 'copy', id: @budget }, class: 'button') do %>
-        <%= op_icon('button--icon icon-copy') %>
-        <span class="button--text"><%= t(:button_copy) %></span>
-      <% end %>
-    </li>
-  <% end %>
-  <% if authorize_for(:budgets, :destroy) %>
-    <li class="toolbar-item">
-      <%= link_to({ controller: 'budgets', action: 'destroy', id: @budget }, class: 'button', method: :delete) do %>
-        <%= op_icon('button--icon icon-delete') %>
-        <span class="button--text"><%= t(:button_delete) %></span>
-      <% end %>
-    </li>
-  <% end %>
-<% end %>
+
+<%= render Budgets::ShowPageHeaderComponent.new(budget: @budget, project: @project) %>
 
 <div class="<%= @budget.css_classes %> details">
   <h3><%=h @budget.subject %></h3>
diff --git a/modules/budgets/spec/features/budgets/attachment_upload_spec.rb b/modules/budgets/spec/features/budgets/attachment_upload_spec.rb
index 54b5f8068e79..38d379e14171 100644
--- a/modules/budgets/spec/features/budgets/attachment_upload_spec.rb
+++ b/modules/budgets/spec/features/budgets/attachment_upload_spec.rb
@@ -46,9 +46,7 @@
   it "can upload an image to new and existing budgets via drag & drop" do
     visit projects_budgets_path(project)
 
-    within ".toolbar-items" do
-      click_on "Budget"
-    end
+    page.find_test_selector("budget-create-button").click
 
     fill_in "Subject", with: "New budget"
 
@@ -65,9 +63,7 @@
     expect(page).to have_content("Image uploaded on creation")
     attachments_list.expect_attached("image.png")
 
-    within ".toolbar-items" do
-      click_on "Update"
-    end
+    page.find_test_selector("budget-edit-button").click
 
     editor.drag_attachment image_fixture.path, "Image uploaded the second time"
 
@@ -84,9 +80,7 @@
   it "can upload an image to new and existing budgets via drag & drop on attachment list" do
     visit projects_budgets_path(project)
 
-    within ".toolbar-items" do
-      click_on "Budget"
-    end
+    page.find_test_selector("budget-create-button").click
 
     fill_in "Subject", with: "New budget"
     editor.set_markdown "Some content because it's required"
@@ -102,9 +96,7 @@
 
     attachments_list.expect_attached("image.png")
 
-    within ".toolbar-items" do
-      click_on "Update"
-    end
+    page.find_test_selector("budget-edit-button").click
 
     # adding an image
     editor.attachments_list.drag_enter
diff --git a/modules/budgets/spec/support/pages/destroy_info.rb b/modules/budgets/spec/support/pages/destroy_info.rb
index 378756d8c617..692d409f599c 100644
--- a/modules/budgets/spec/support/pages/destroy_info.rb
+++ b/modules/budgets/spec/support/pages/destroy_info.rb
@@ -38,7 +38,7 @@ def initialize(budget)
 
     def expect_loaded
       expect(page)
-        .to have_content("#{I18n.t(:button_delete)} #{I18n.t(:label_budget_id, id: budget.id)}: #{budget.subject}")
+        .to have_content("#{I18n.t(:button_delete)} #{budget.subject}")
     end
 
     def expect_reassign_option
diff --git a/modules/budgets/spec/support/pages/edit_budget.rb b/modules/budgets/spec/support/pages/edit_budget.rb
index 5e78629cf73f..cabf1c755834 100644
--- a/modules/budgets/spec/support/pages/edit_budget.rb
+++ b/modules/budgets/spec/support/pages/edit_budget.rb
@@ -40,14 +40,12 @@ def initialize(budget_id)
     end
 
     def click_copy
-      within ".toolbar-items" do
-        click_link "Copy"
-      end
+      page.find_test_selector("budget-copy-button").click
     end
 
     def click_delete
-      within ".toolbar-items" do
-        click_link "Delete"
+      accept_confirm do
+        page.find_test_selector("budget-delete-button").click
       end
     end
 
diff --git a/modules/calendar/app/views/calendar/calendars/new.html.erb b/modules/calendar/app/views/calendar/calendars/new.html.erb
index cc40c710dfd1..d26aa576d874 100644
--- a/modules/calendar/app/views/calendar/calendars/new.html.erb
+++ b/modules/calendar/app/views/calendar/calendars/new.html.erb
@@ -28,7 +28,17 @@ See COPYRIGHT and LICENSE files for more details.
 ++#%>
 
 <% html_title t(:label_new_calendar) %>
-<%= toolbar title: t(:label_new_calendar) %>
+
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { t(:label_new_calendar) }
+    header.with_breadcrumbs( [{ href: home_path, text: organization_name },
+                              { href: calendars_path, text: t(:label_calendar_plural) },
+                              t(:label_new_calendar)
+                             ])
+  end
+%>
+
 <%= labelled_tabular_form_for @view, url: { controller: '/calendar/calendars', action: 'create' }, :html => {:id => 'calendar-form'} do |f| -%>
   <%= render :partial => 'form', :locals => {:f => f} %>
   <%= styled_button_tag t(:button_create), class: '-primary' %>
diff --git a/modules/calendar/config/locales/crowdin/js-fa.yml b/modules/calendar/config/locales/crowdin/js-fa.yml
index 1b326afc5870..8108e1b6cc53 100644
--- a/modules/calendar/config/locales/crowdin/js-fa.yml
+++ b/modules/calendar/config/locales/crowdin/js-fa.yml
@@ -2,7 +2,7 @@
 fa:
   js:
     calendar:
-      create_new: 'ساخت تقویم جدید'
-      title: 'تقویم'
+      create_new: 'ساخت تقویم جدیدجدید'
+      title: 'تقویم‌ها'
       too_many: 'در کل %{count} بسته کاری وجود دارد، اما فقط %{max} می‌تواند نشان داده شود.'
       unsaved_title: 'تقویم بی نام'
diff --git a/modules/costs/app/views/hourly_rates/edit.html.erb b/modules/costs/app/views/hourly_rates/edit.html.erb
index d8a03409a7b0..96a630f690c8 100644
--- a/modules/costs/app/views/hourly_rates/edit.html.erb
+++ b/modules/costs/app/views/hourly_rates/edit.html.erb
@@ -29,7 +29,23 @@ See COPYRIGHT and LICENSE files for more details.
 
 <% html_title t(:label_administration), "#{t(:label_edit)} #{I18n.t((@project.nil? ? :caption_default_rate_history_for : :caption_rate_history_for), user: ' ')} #{@user.name}" %>
 
-<%= toolbar title: (@project.nil? ? t(:caption_default_rate_history_for, user: @user.name) :  t(:caption_rate_history_for_project, user: @user.name, project: @project.name) ) %>
+<%
+  breadcrumb_items = if @project
+                       [{href: project_overview_path(@project.identifier), text: @project.name},
+                        {href: projects_budgets_path(@project.identifier), text: I18n.t(:label_budget_plural)}]
+                     else
+                        [{ href: home_path, text: organization_name}]
+                     end
+%>
+
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { t(:caption_default_rate_history_for, user: @user.name) }
+    header.with_breadcrumbs([*(breadcrumb_items),
+                             t(:caption_default_rate_history_for, user: @user.name)])
+  end
+%>
+
 
 <%- default_rate = @user.current_default_rate -%>
 <% if default_rate%>
diff --git a/modules/costs/app/views/hourly_rates/show.html.erb b/modules/costs/app/views/hourly_rates/show.html.erb
index ed75efed51e2..58ff0dee3907 100644
--- a/modules/costs/app/views/hourly_rates/show.html.erb
+++ b/modules/costs/app/views/hourly_rates/show.html.erb
@@ -29,15 +29,28 @@ See COPYRIGHT and LICENSE files for more details.
 
 <% html_title t(:label_administration), t(:caption_rate_history_for, user: @user.name) %>
 
-<%= toolbar title: t(:caption_rate_history_for, :user => @user.name) %>
+<%
+  breadcrumb_items = if @project
+                       [{href: project_overview_path(@project.identifier), text: @project.name},
+                        {href: projects_budgets_path(@project.identifier), text: I18n.t(:label_budget_plural)}]
+                     else
+                       [{ href: home_path, text: organization_name}]
+                     end
+%>
+
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { t(:caption_default_rate_history_for, user: @user.name) }
+    header.with_breadcrumbs([*(breadcrumb_items),
+                             t(:caption_default_rate_history_for, user: @user.name)])
+  end
+%>
 
 <% if @project %>
   <% html_title t(:caption_rate_history_for, user: @user.name) %>
 
   <%= render :partial => 'list_project' %>
 <% else %>
-  <% html_title t(:label_administration), t(:caption_rate_history_for, user: @user.name) %>
-
   <%= render :partial => 'list_default' %>
   <%= render :partial => 'list' %>
 <% end %>
diff --git a/modules/costs/app/views/projects/settings/time_entry_activities/show.html.erb b/modules/costs/app/views/projects/settings/time_entry_activities/show.html.erb
index 1e3930c9fe3b..e4efde66e1ec 100644
--- a/modules/costs/app/views/projects/settings/time_entry_activities/show.html.erb
+++ b/modules/costs/app/views/projects/settings/time_entry_activities/show.html.erb
@@ -26,9 +26,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
-<%= toolbar title: t(:enumeration_activities), html: { class: '-minimum-title' } do -%>
-  <%= render partial: 'projects/settings/form_toolbar', locals: { form_name: "edit_project_#{@project.id}" } %>
-<% end %>
+
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { t(:enumeration_activities) }
+    header.with_breadcrumbs([{ href: project_overview_path(@project.id), text: @project.name  },
+                             { href: project_settings_general_path(@project.id), text: I18n.t(:label_project_settings) },
+                             t(:enumeration_activities)])
+  end
+%>
 
 <% if TimeEntryActivity.any? %>
   <%= labelled_tabular_form_for @project,
diff --git a/modules/costs/config/locales/crowdin/cs.yml b/modules/costs/config/locales/crowdin/cs.yml
index 22fc70c3b354..05cf93f01165 100644
--- a/modules/costs/config/locales/crowdin/cs.yml
+++ b/modules/costs/config/locales/crowdin/cs.yml
@@ -136,8 +136,8 @@ cs:
   permission_view_own_time_entries: "Zobrazit vlastní strávený čas"
   project_module_costs: "Čas a náklady"
   setting_allow_tracking_start_and_end_times: "Allow users to track start and end time on time records"
-  setting_costs_currency: "Currency"
-  setting_costs_currency_format: "Format of currency"
+  setting_costs_currency: "Měna"
+  setting_costs_currency_format: "Formát měny"
   setting_enforce_tracking_start_and_end_times: "Force users to set start and end time on time records"
   text_assign_time_and_cost_entries_to_project: "Přiřadit nahlášené hodiny a náklady projektu"
   text_destroy_cost_entries_question: "%{cost_entries} byl nahlášen k pracovním balíčkům, které se chystáte odstranit. Co chcete udělat?"
diff --git a/modules/costs/config/locales/crowdin/ms.yml b/modules/costs/config/locales/crowdin/ms.yml
index b87c59e96392..c7abc39db861 100644
--- a/modules/costs/config/locales/crowdin/ms.yml
+++ b/modules/costs/config/locales/crowdin/ms.yml
@@ -108,7 +108,7 @@ ms:
   label_rate: "Kadar"
   label_rate_plural: "Kadar-kadar"
   label_status_finished: "Telah selesai"
-  label_show: "Show"
+  label_show: "Papar"
   label_units: "Unit kos"
   label_user: "Pengguna"
   label_until: "sehingga"
@@ -132,10 +132,10 @@ ms:
   permission_view_own_hourly_rate: "Lihat kadar jam sendiri"
   permission_view_own_time_entries: "Lihat masa yang digunakan sendiri"
   project_module_costs: "Masa dan kos"
-  setting_allow_tracking_start_and_end_times: "Allow users to track start and end time on time records"
-  setting_costs_currency: "Currency"
-  setting_costs_currency_format: "Format of currency"
-  setting_enforce_tracking_start_and_end_times: "Force users to set start and end time on time records"
+  setting_allow_tracking_start_and_end_times: "Benarkan pengguna menjejak masa mula dan tamat pada rekod masa"
+  setting_costs_currency: "Mata wang"
+  setting_costs_currency_format: "Format mata wang"
+  setting_enforce_tracking_start_and_end_times: "Paksa pengguna untuk menetapkan masa mula dan tamat pada rekod masa"
   text_assign_time_and_cost_entries_to_project: "Tetapkan jam dan kos yang dilaporkan ke projek"
   text_destroy_cost_entries_question: "%{cost_entries} dilaporkan pada pakej kerja yang anda ingin padamkan. Apakah yang anda ingin lakukan ?"
   text_destroy_time_and_cost_entries: "Padam jam dan kos yang dilaporkan"
diff --git a/modules/documents/app/views/documents/edit.html.erb b/modules/documents/app/views/documents/edit.html.erb
index 951b6921c283..24085fae3c59 100644
--- a/modules/documents/app/views/documents/edit.html.erb
+++ b/modules/documents/app/views/documents/edit.html.erb
@@ -27,7 +27,14 @@ See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
 
-<%= toolbar title: Document.model_name.human %>
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { @document.title }
+    header.with_breadcrumbs( [{ href: project_overview_path(@project.id), text: @project.name },
+                              { href: project_documents_path(@project), text: t(:label_document_plural) },
+                              @document.title])
+  end
+%>
 
 <%= labelled_tabular_form_for @document, url: document_path(@document), method: 'PATCH' do |f| -%>
   <%= render partial: "documents/form", locals: { f: f } %>
diff --git a/modules/documents/app/views/documents/index.html.erb b/modules/documents/app/views/documents/index.html.erb
index 61cfb2268def..842896b22362 100644
--- a/modules/documents/app/views/documents/index.html.erb
+++ b/modules/documents/app/views/documents/index.html.erb
@@ -27,20 +27,30 @@ See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
 
-<%= toolbar title: t(:label_document_plural) do %>
-  <% if authorize_for(:documents, :new) %>
-    <li class="toolbar-item">
-      <%= link_to({:controller => '/documents', :action => 'new', :project_id => @project},
-                  { class: 'button -primary',
-                    aria: {label: t(:label_document_new)},
-                    title: t(:label_document_new)}) do %>
-        <%= op_icon('button--icon icon-add') %>
-        <span class="button--text"><%= t('activerecord.models.document') %></span>
-      <% end %>
-    </li>
-  <% end %>
+<%=
+  render(Primer::OpenProject::PageHeader.new) do |header|
+    header.with_title { t(:label_document_plural) }
+    header.with_breadcrumbs([{ href: project_overview_path(@project.id), text: @project.name },
+                             t(:label_document_plural)])
+  end
+%>
+
+<% if authorize_for(:documents, :new) %>
+  <%=
+    render(Primer::OpenProject::SubHeader.new) do |subheader|
+      subheader.with_action_button(scheme: :primary,
+                                   aria: { label: t(:label_document_new) },
+                                   title: t(:label_document_new),
+                                   tag: :a,
+                                   href: url_for({:controller => '/documents', :action => 'new', :project_id => @project})) do |button|
+        button.with_leading_visual_icon(icon: :plus)
+        t('activerecord.models.document')
+      end
+    end
+  %>
 <% end %>
 
+
 <% if @grouped.empty? %>
   <%= no_results_box %>
 <% end %>
diff --git a/modules/documents/app/views/documents/new.html.erb b/modules/documents/app/views/documents/new.html.erb
index e6dd45fdd91b..da9df9c9d7e3 100644
--- a/modules/documents/app/views/documents/new.html.erb
+++ b/modules/documents/app/views/documents/new.html.erb
@@ -26,7 +26,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
-<%= toolbar title: t(:label_document_new) %>
+
+<%=
+  render(Primer::OpenProject::PageHeader.new) do |header|
+    header.with_title { t(:label_document_new) }
+    header.with_breadcrumbs([{ href: project_overview_path(@project.id), text: @project.name },
+                             { href: project_documents_path(@project.id), text: t(:label_document_plural) },
+                            t(:label_document_new)])
+  end
+%>
 
 <%= labelled_tabular_form_for @document, url: project_documents_path(@project), html: { multipart: true } do |f| -%>
   <%= render :partial => 'documents/form', locals: { f: f } %>
diff --git a/modules/documents/app/views/documents/show.html.erb b/modules/documents/app/views/documents/show.html.erb
index 4fa3c74d7d9e..35abd864ab38 100644
--- a/modules/documents/app/views/documents/show.html.erb
+++ b/modules/documents/app/views/documents/show.html.erb
@@ -27,26 +27,46 @@ See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
 
-<% html_title h(@document.title) -%>
-<%= toolbar title: @document.title,
-            subtitle: "#{@document.category.name} - #{format_date @document.created_at}" do %>
-  <% if authorize_for(:documents, :edit) %>
-    <li class="toolbar-item">
-      <%= link_to({controller: '/documents', action: 'edit', id: @document}, class: 'button', accesskey: accesskey(:edit)) do %>
-        <%= op_icon('button--icon icon-edit') %>
-        <span class="button--text"><%= t(:button_edit) %></span>
-      <% end %>
-    </li>
-  <% end %>
-  <% if authorize_for(:documents, :destroy) %>
-    <li class="toolbar-item">
-      <%= link_to({controller: '/documents', action: 'destroy', id: @document}, class: 'button', data: { confirm: t(:text_are_you_sure) }, method: :delete) do %>
-        <%= op_icon('button--icon icon-delete') %>
-        <span class="button--text"><%= t(:button_delete) %></span>
-      <% end %>
-    </li>
-  <% end %>
-<% end %>
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { @document.title }
+    header.with_description { "#{@document.category.name} - #{format_date @document.created_at}" }
+    header.with_breadcrumbs( [{ href: project_overview_path(@project.id), text: @project.name },
+                              { href: project_documents_path(@project), text: t(:label_document_plural) },
+                              @document.title
+                             ])
+
+    if authorize_for(:documents, :edit)
+      header.with_action_button(tag: :a,
+                                scheme: :default,
+                                mobile_icon: :pencil,
+                                mobile_label: t(:button_edit),
+                                size: :medium,
+                                href: url_for({controller: '/documents', action: 'edit', id: @document}),
+                                aria: { label: t(:button_edit) },
+                                title: t(:button_edit)) do |button|
+        button.with_leading_visual_icon(icon: :pencil)
+        t(:button_edit)
+      end
+    end
+    if authorize_for(:documents, :destroy)
+      header.with_action_button(tag: :a,
+                                scheme: :danger,
+                                mobile_icon: :trash,
+                                mobile_label: t(:button_delete),
+                                size: :medium,
+                                href: url_for({controller: '/documents', action: 'destroy', id: @document}),
+                                aria: { label: I18n.t(:button_delete) },
+                                data: {
+                                  confirm: I18n.t(:text_are_you_sure),
+                                  method: :delete
+                                },
+                                title: I18n.t(:button_delete)) do |button|
+        button.with_leading_visual_icon(icon: :trash)
+        t(:button_delete)
+      end
+    end
+  end %>
 
 <div class="wiki op-uc-container">
   <%= format_text @document.description, attachments: @document.attachments %>
diff --git a/modules/github_integration/spec/workers/cron/check_deploy_status_job_spec.rb b/modules/github_integration/spec/workers/cron/check_deploy_status_job_spec.rb
index c4d9999186a5..d34e064d6c88 100644
--- a/modules/github_integration/spec/workers/cron/check_deploy_status_job_spec.rb
+++ b/modules/github_integration/spec/workers/cron/check_deploy_status_job_spec.rb
@@ -101,7 +101,7 @@
       {
         "Accept" => "*/*",
         "Accept-Encoding" => "gzip, deflate",
-        "User-Agent" => "httpx.rb/1.3.3"
+        "User-Agent" => "httpx.rb/1.4.0"
       }
     end
 
diff --git a/modules/gitlab_integration/config/locales/crowdin/js-cs.yml b/modules/gitlab_integration/config/locales/crowdin/js-cs.yml
index 8e9d8d23d7f3..b42d7901f955 100644
--- a/modules/gitlab_integration/config/locales/crowdin/js-cs.yml
+++ b/modules/gitlab_integration/config/locales/crowdin/js-cs.yml
@@ -50,4 +50,4 @@ cs:
       updated_on: Aktualizováno
     work_packages:
       tabs:
-        gitlab: "GitLab"
+        gitlab: "Gitlab"
diff --git a/modules/job_status/config/locales/crowdin/cs.yml b/modules/job_status/config/locales/crowdin/cs.yml
index 439e9c17ca67..f9d33b291d19 100644
--- a/modules/job_status/config/locales/crowdin/cs.yml
+++ b/modules/job_status/config/locales/crowdin/cs.yml
@@ -4,18 +4,18 @@ cs:
     name: "Stav úlohy OpenProject"
     description: "Seznam a stav úkolů na pozadí."
   job_status_dialog:
-    download_starts: 'The download should start automatically.'
-    link_to_download: 'Or, %{link} to download.'
+    download_starts: 'Stahování by mělo začít automaticky.'
+    link_to_download: 'Nebo %{link} ke stažení.'
     click_here: 'klikněte zde'
-    title: 'Background job status'
-    redirect: 'You are being redirected.'
-    redirect_link: 'Please click here to continue.'
-    redirect_errors: 'Due to these errors, you will not be redirected automatically.'
-    errors: 'Something went wrong'
+    title: 'Stav úlohy na pozadí'
+    redirect: 'Nyní jste přesměrováváni'
+    redirect_link: 'Pro pokračování klikněte prosím zde.'
+    redirect_errors: 'Kvůli těmto chybám nebudete automaticky přesměrováni.'
+    errors: 'Něco se pokazilo'
     generic_messages:
-      not_found: 'This job could not be found.'
-      in_queue: 'The job has been queued and will be processed shortly.'
-      in_process: 'The job is currently being processed.'
-      error: 'The job has failed to complete.'
-      cancelled: 'The job has been cancelled due to an error.'
-      success: 'The job completed successfully.'
+      not_found: 'Tento úkol se nepodařilo najít.'
+      in_queue: 'Úkol byl zařazen do fronty a brzy bude zpracován.'
+      in_process: 'Úloha se právě zpracovává.'
+      error: 'Úloha se nepodařilo dokončit.'
+      cancelled: 'Úloha byla zrušena z důvodu chyby.'
+      success: 'Úloha byla úspěšně dokončena.'
diff --git a/modules/job_status/config/locales/crowdin/ms.yml b/modules/job_status/config/locales/crowdin/ms.yml
index 8b195c28ff96..15bfa60f6359 100644
--- a/modules/job_status/config/locales/crowdin/ms.yml
+++ b/modules/job_status/config/locales/crowdin/ms.yml
@@ -4,18 +4,18 @@ ms:
     name: "Status Pekerjaan OpenProject"
     description: "Senarai dan status latar belakang pekerjaan."
   job_status_dialog:
-    download_starts: 'The download should start automatically.'
-    link_to_download: 'Or, %{link} to download.'
-    click_here: 'click here'
-    title: 'Background job status'
-    redirect: 'You are being redirected.'
-    redirect_link: 'Please click here to continue.'
-    redirect_errors: 'Due to these errors, you will not be redirected automatically.'
-    errors: 'Something went wrong'
+    download_starts: 'Muat turun harus bermula secara automatik.'
+    link_to_download: 'Atau, %{link} untuk memuat turun.'
+    click_here: 'klik sini'
+    title: 'Status pekerjaan latar belakang'
+    redirect: 'Anda sedang dilencongkan.'
+    redirect_link: 'Sila klik di sini untuk teruskan.'
+    redirect_errors: 'Disebabkan ralat ini, anda tidak akan diubah hala secara automatik.'
+    errors: 'Sesuatu telah berlaku'
     generic_messages:
-      not_found: 'This job could not be found.'
-      in_queue: 'The job has been queued and will be processed shortly.'
-      in_process: 'The job is currently being processed.'
-      error: 'The job has failed to complete.'
-      cancelled: 'The job has been cancelled due to an error.'
-      success: 'The job completed successfully.'
+      not_found: 'Pekerjaan ini tidak ditemui.'
+      in_queue: 'Kerja telah beratur dan akan diproses sebentar lagi.'
+      in_process: 'Kerja sedang diproses.'
+      error: 'Kerja itu gagal diselesaikan.'
+      cancelled: 'Kerja telah dibatalkan kerana ralat.'
+      success: 'Kerja selesai dengan jayanya.'
diff --git a/modules/meeting/app/components/meeting_agenda_items/blank_slate_component.html.erb b/modules/meeting/app/components/meeting_agenda_items/blank_slate_component.html.erb
new file mode 100644
index 000000000000..44f1977e1331
--- /dev/null
+++ b/modules/meeting/app/components/meeting_agenda_items/blank_slate_component.html.erb
@@ -0,0 +1,31 @@
+<%=
+  render(Primer::Beta::Blankslate.new) do |component|
+    component.with_visual_icon(icon: :book)
+    component.with_heading(tag: :h2).with_content(title)
+    component.with_description do
+      flex_layout do |flex|
+        if template?
+          flex.with_row(mb: 2) do
+            render(Primer::Beta::Text.new(color: :subtle)) { t(:"recurring_meeting.template.description") }
+          end
+        else
+          flex.with_row(mb: 2) do
+            render(Primer::Beta::Text.new(color: :subtle)) { t(:text_meeting_empty_description_1) }
+          end
+          flex.with_row do
+            render(Primer::Beta::Text.new(color: :subtle)) { t(:text_meeting_empty_description_2) }
+          end
+        end
+
+        if can_finalize_template?
+          flex.with_row(mt: 2) do
+            render(Primer::Beta::Text.new(font_weight: :bold, color: :subtle)) do
+              t(:"recurring_meeting.template.blankslate_finalize",
+                button_title: t("recurring_meeting.template.button_finalize"))
+            end
+          end
+        end
+      end
+    end
+  end
+%>
diff --git a/modules/meeting/app/components/meeting_agenda_items/blank_slate_component.rb b/modules/meeting/app/components/meeting_agenda_items/blank_slate_component.rb
new file mode 100644
index 000000000000..4ca1a3fd17e5
--- /dev/null
+++ b/modules/meeting/app/components/meeting_agenda_items/blank_slate_component.rb
@@ -0,0 +1,59 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module MeetingAgendaItems
+  class BlankSlateComponent < ApplicationComponent
+    include ApplicationHelper
+    include OpTurbo::Streamable
+    include OpPrimer::ComponentHelpers
+
+    attr_reader :meeting
+
+    def initialize(meeting:)
+      super
+
+      @meeting = meeting
+    end
+
+    delegate :template?, to: :meeting
+
+    def title
+      if template?
+        t(:"recurring_meeting.template.blank_title")
+      else
+        t(:text_meeting_empty_heading)
+      end
+    end
+
+    def can_finalize_template?
+      template? &&
+        User.current.allowed_in_project?(:create_meetings, @meeting.project) &&
+        @meeting.recurring_meeting.scheduled_meetings.none?
+    end
+  end
+end
diff --git a/modules/meeting/app/components/meeting_agenda_items/list_component.html.erb b/modules/meeting/app/components/meeting_agenda_items/list_component.html.erb
index a11caa657beb..174a85ae63be 100644
--- a/modules/meeting/app/components/meeting_agenda_items/list_component.html.erb
+++ b/modules/meeting/app/components/meeting_agenda_items/list_component.html.erb
@@ -1,6 +1,17 @@
 <%=
   component_wrapper(data: wrapper_data_attributes) do
     flex_layout(mb: 3) do |flex|
+      if @meeting.template? && !empty?
+        flex.with_row(mb: 3) do
+          render Primer::Alpha::Banner.new(scheme: :default,
+                                           icon: :info,
+                                           dismiss_scheme: :none) do
+            t("recurring_meeting.template.banner_html",
+                   link: link_to(@meeting.recurring_meeting.title,
+                                 recurring_meeting_path(@meeting.recurring_meeting)))
+          end
+        end
+      end
       flex.with_row(classes: 'dragula-container', id: insert_target_modifier_id, data: { 'allowed-drop-type': 'section' }.merge(drop_target_config) ) do
         first_and_last = [@meeting.sections.first, @meeting.sections.last]
         render(
@@ -10,27 +21,14 @@
           )
         )
       end
-      if @meeting.agenda_items.empty? && @meeting.sections.empty?
+      if empty?
         flex.with_row do
           render(border_box_container) do |border_box|
             if @form_hidden
               border_box.with_body(
                 scheme: :default
               ) do
-                render(Primer::Beta::Blankslate.new) do |component|
-                  component.with_visual_icon(icon: :book)
-                  component.with_heading(tag: :h2).with_content(t("text_meeting_empty_heading"))
-                  component.with_description do
-                    flex_layout do |flex|
-                      flex.with_row(mb: 2) do
-                        render(Primer::Beta::Text.new(color: :subtle)) { t("text_meeting_empty_description_1") }
-                      end
-                      flex.with_row do
-                        render(Primer::Beta::Text.new(color: :subtle)) { t("text_meeting_empty_description_2") }
-                      end
-                    end
-                  end
-                end
+                render(MeetingAgendaItems::BlankSlateComponent.new(meeting: @meeting))
               end
             end
             border_box.with_row(p: 0, border_top: 0) do
diff --git a/modules/meeting/app/components/meeting_agenda_items/list_component.rb b/modules/meeting/app/components/meeting_agenda_items/list_component.rb
index 92cd53f9b065..709fd947170c 100644
--- a/modules/meeting/app/components/meeting_agenda_items/list_component.rb
+++ b/modules/meeting/app/components/meeting_agenda_items/list_component.rb
@@ -40,6 +40,10 @@ def initialize(meeting:, form_hidden: true, form_type: :simple)
       @form_type = form_type
     end
 
+    def empty?
+      @meeting.agenda_items.empty? && @meeting.sections.empty?
+    end
+
     private
 
     def wrapper_data_attributes
diff --git a/modules/meeting/app/components/meetings/combined_filter_component.html.erb b/modules/meeting/app/components/meetings/combined_filter_component.html.erb
new file mode 100644
index 000000000000..8fde66db7c6a
--- /dev/null
+++ b/modules/meeting/app/components/meetings/combined_filter_component.html.erb
@@ -0,0 +1,24 @@
+<%=
+  flex_layout do |flex|
+    flex.with_column do
+      render(Meetings::MeetingFilterButtonComponent.new(query: @query, project: @project))
+    end
+
+    flex.with_column(ml: 1) do
+      render(Primer::Alpha::SegmentedControl.new("aria-label": I18n.t(:label_meeting_date_time))) do |control|
+        control.with_item(tag: :a,
+                          icon: :"arrow-right",
+                          href: dynamic_path,
+                          label: t(:label_upcoming_meetings_short),
+                          title: t(:label_upcoming_meetings),
+                          selected: upcoming_query?)
+        control.with_item(tag: :a,
+                          icon: :history,
+                          href: dynamic_path(upcoming: false),
+                          label: t(:label_past_meetings_short),
+                          title: t(:label_past_meetings),
+                          selected: !upcoming_query?)
+      end
+    end
+  end
+%>
diff --git a/modules/meeting/app/components/meetings/combined_filter_component.rb b/modules/meeting/app/components/meetings/combined_filter_component.rb
new file mode 100644
index 000000000000..786ef0632e1e
--- /dev/null
+++ b/modules/meeting/app/components/meetings/combined_filter_component.rb
@@ -0,0 +1,57 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module Meetings
+  class CombinedFilterComponent < ApplicationComponent
+    include ApplicationHelper
+    include OpTurbo::Streamable
+    include OpPrimer::ComponentHelpers
+    include Redmine::I18n
+
+    def initialize(query:, params:, project: nil)
+      super()
+
+      @query = query
+      @project = project
+      @params = params
+    end
+
+    def dynamic_path(upcoming: true)
+      polymorphic_path([@project, :meetings], current_params.merge(upcoming:))
+    end
+
+    def upcoming_query?
+      filter = @query.filters.find { |f| f.name == :time }
+      filter ? !filter.past? : true
+    end
+
+    def current_params
+      @current_params ||= params.slice(:filters, :page, :per_page).permit!
+    end
+  end
+end
diff --git a/modules/meeting/app/components/meetings/header_component.html.erb b/modules/meeting/app/components/meetings/header_component.html.erb
index a3c97958fa88..ee89a02dd97d 100644
--- a/modules/meeting/app/components/meetings/header_component.html.erb
+++ b/modules/meeting/app/components/meetings/header_component.html.erb
@@ -19,10 +19,32 @@
                                  cancel_path: cancel_edit_meeting_path(@meeting),
                                  label: Meeting.human_attribute_name(:title),
                                  placeholder: Meeting.human_attribute_name(:title),)
-        @meeting.title
+        if @meeting.template?
+          "#{@meeting.title} (#{I18n.t(:label_template)})"
+        elsif @series.present?
+          concat render(Primer::Beta::Text.new) { @meeting.title }
+          concat render(Primer::Beta::Text.new(color: :subtle)) { " (#{format_date(@meeting.start_time)})" }
+        else
+          @meeting.title
+        end
       end
       header.with_breadcrumbs(breadcrumb_items)
       header.with_description { render(Meetings::HeaderInfolineComponent.new(@meeting)) }
+      if finish_setup_enabled?
+        header.with_action_button(
+          tag: :a,
+          scheme: :primary,
+          mobile_label: I18n.t("recurring_meeting.template.button_finalize"),
+          mobile_icon: :check,
+          size: :medium,
+          data: { "turbo-method": :post },
+          href: template_completed_recurring_meeting_path(@meeting.recurring_meeting),
+        ) do |button|
+          button.with_leading_visual_icon(icon: :check)
+          I18n.t("recurring_meeting.template.button_finalize")
+        end
+      end
+
       header.with_action_menu(menu_arguments: {},
                               button_arguments: { icon: "kebab-horizontal",
                                                   "aria-label": t("label_meeting_actions"),
@@ -34,28 +56,31 @@
                          data: { 'turbo-stream': true }
                        }) do |item|
           item.with_leading_visual_icon(icon: :pencil)
-        end if @meeting.editable?
+        end if @meeting.editable? && !@series
 
-        menu.with_item(label: t(:button_copy),
-                       href: copy_meeting_path(@meeting),
-                       content_arguments: {
-                         data: { turbo_stream: true }
-                       }) do |item|
-          item.with_leading_visual_icon(icon: :copy)
-        end
+        unless @meeting.template?
+            menu.with_item(label: copy_label,
+                           href: copy_meeting_path(@meeting),
+                           content_arguments: {
+                             data: { turbo_stream: true }
+                           }) do |item|
+              item.with_leading_visual_icon(icon: :copy)
+            end
 
-        menu.with_item(label: t(:label_icalendar_download),
-                       href: download_ics_meeting_path(@meeting)) do |item|
-          item.with_leading_visual_icon(icon: :download)
-        end
+            menu.with_item(label: t(:label_icalendar_download),
+                           href: download_ics_meeting_path(@meeting)) do |item|
+              item.with_leading_visual_icon(icon: :download)
+            end
 
-        if @meeting.open? && User.current.allowed_in_project?(:send_meeting_agendas_notification, @meeting.project)
-          menu.with_item(label: t('meeting.label_mail_all_participants'),
-                         href: notify_meeting_path(@meeting),
-                         form_arguments: { method: :post, data: { turbo: 'false' } }) do |item|
-            item.with_leading_visual_icon(icon: :mail)
+            if @meeting.open? &&User.current.allowed_in_project?(:send_meeting_agendas_notification, @meeting.project
+            )
+              menu.with_item(label: t('meeting.label_mail_all_participants'),
+                             href: notify_meeting_path(@meeting),
+                             form_arguments: { method: :post, data: { turbo: 'false' } }) do |item|
+                item.with_leading_visual_icon(icon: :mail)
+              end
+            end
           end
-        end
 
         menu.with_item(label: t(:label_history),
                        tag: :a,
@@ -68,7 +93,7 @@
           item.with_leading_visual_icon(icon: :clock) # or :check TBD
         end
 
-        menu.with_item(label: t("label_meeting_delete"),
+        menu.with_item(label: delete_label,
                        scheme: :danger,
                        href: meeting_path(@meeting),
                        form_arguments: {
diff --git a/modules/meeting/app/components/meetings/header_component.rb b/modules/meeting/app/components/meetings/header_component.rb
index 4aba72081558..38c7cf45bc2c 100644
--- a/modules/meeting/app/components/meetings/header_component.rb
+++ b/modules/meeting/app/components/meetings/header_component.rb
@@ -32,14 +32,17 @@ class HeaderComponent < ApplicationComponent
     include OpTurbo::Streamable
     include OpPrimer::ComponentHelpers
     include Primer::FetchOrFallbackHelper
+    include Redmine::I18n
 
     STATE_DEFAULT = :show
     STATE_EDIT = :edit
     STATE_OPTIONS = [STATE_DEFAULT, STATE_EDIT].freeze
+
     def initialize(meeting:, project: nil, state: STATE_DEFAULT)
       super
 
       @meeting = meeting
+      @series = meeting.recurring_meeting
       @project = project
       @state = fetch_or_fallback(STATE_OPTIONS, state)
     end
@@ -52,14 +55,39 @@ def check_for_updates_interval
     private
 
     def delete_enabled?
-      User.current.allowed_in_project?(:delete_meetings, @meeting.project)
+      !@meeting.template? && User.current.allowed_in_project?(:delete_meetings, @meeting.project)
+    end
+
+    def finish_setup_enabled?
+      @meeting.template? &&
+        User.current.allowed_in_project?(:create_meetings, @meeting.project) &&
+        @series.scheduled_meetings.none?
     end
 
     def breadcrumb_items
-      [parent_element,
-       { href: @project.present? ? project_meetings_path(@project.id) : meetings_path,
-         text: I18n.t(:label_meeting_plural) },
-       @meeting.title]
+      [
+        parent_element,
+        { href: @project.present? ? project_meetings_path(@project.id) : meetings_path,
+          text: I18n.t(:label_meeting_plural) },
+        meeting_series_element,
+        meeting_element
+      ].compact
+    end
+
+    def meeting_element
+      if @meeting.templated?
+        I18n.t(:label_template)
+      elsif @series.present?
+        format_date(@meeting.start_time)
+      else
+        @meeting.title
+      end
+    end
+
+    def meeting_series_element
+      if @series.present?
+        { href: recurring_meeting_path(@series), text: @series.title }
+      end
     end
 
     def parent_element
@@ -69,5 +97,21 @@ def parent_element
         { href: home_path, text: helpers.organization_name }
       end
     end
+
+    def delete_label
+      if @series.present?
+        I18n.t("label_recurring_meeting_cancel")
+      else
+        I18n.t("label_meeting_delete")
+      end
+    end
+
+    def copy_label
+      if @series.present?
+        I18n.t("label_recurring_meeting_copy")
+      else
+        I18n.t("button_copy")
+      end
+    end
   end
 end
diff --git a/modules/meeting/app/components/meetings/header_infoline_component.html.erb b/modules/meeting/app/components/meetings/header_infoline_component.html.erb
index d5ac7c726ff7..4c64c92d8123 100644
--- a/modules/meeting/app/components/meetings/header_infoline_component.html.erb
+++ b/modules/meeting/app/components/meetings/header_infoline_component.html.erb
@@ -1,8 +1,12 @@
 <%= render(Primer::BaseComponent.new(tag: :div)) do %>
-  <%= t("label_meeting_created_by") %>
-  <%= render(Primer::Beta::Link.new(href: user_path(@meeting.author),
-                                    underline: false,
-                                    target: "_blank")) { @meeting.author.name } %>.
+  <% if @series && !@meeting.template? %>
+    <%= t("recurring_meeting.occurrence.infoline", title: @series.title) %>
+  <% else %>
+    <%= t(:label_meeting_created_by) %>
+    <%= render(Primer::Beta::Link.new(href: user_path(@meeting.author),
+                                      underline: false,
+                                      target: "_blank")) { @meeting.author.name } %>.
+  <% end %>
   <%= t("label_meeting_last_updated") %>
   <%= render(OpPrimer::RelativeTimeComponent.new(datetime: last_updated_at, prefix: I18n.t(:label_on))) %>.
 <% end %>
diff --git a/modules/meeting/app/components/meetings/header_infoline_component.rb b/modules/meeting/app/components/meetings/header_infoline_component.rb
index 25032fd9ac57..3e152948e790 100644
--- a/modules/meeting/app/components/meetings/header_infoline_component.rb
+++ b/modules/meeting/app/components/meetings/header_infoline_component.rb
@@ -31,6 +31,7 @@ class HeaderInfolineComponent < ApplicationComponent
     def initialize(meeting)
       super
       @meeting = meeting
+      @series = meeting.recurring_meeting
     end
 
     def last_updated_at
diff --git a/modules/meeting/app/components/meetings/index/dialog_component.html.erb b/modules/meeting/app/components/meetings/index/dialog_component.html.erb
index d66c3ab90b5b..7eafcf9ffac2 100644
--- a/modules/meeting/app/components/meetings/index/dialog_component.html.erb
+++ b/modules/meeting/app/components/meetings/index/dialog_component.html.erb
@@ -1,10 +1,39 @@
 <%=
   render(Primer::Alpha::Dialog.new(
-    id: "new-meeting-dialog", title: title,
+    id: "new-meeting-dialog",
+    title:,
     size: :medium_portrait,
     data: { 'keep-open-on-submit': true }
   )) do |dialog|
     dialog.with_header(variant: :large)
-    render(Meetings::Index::FormComponent.new(meeting: @meeting, project: @project, type: @type))
+    dialog.with_body do
+      render(Meetings::Index::FormComponent.new(meeting: @meeting,
+                                                project: @project,
+                                                copy_from: @copy_from))
+    end
+
+    dialog.with_footer do
+      component_collection do |modal_footer|
+        modal_footer.with_component(
+          Primer::ButtonComponent.new(
+            data: { 'close-dialog-id': "new-meeting-dialog" }
+          )) do
+          I18n.t(:button_cancel)
+        end
+
+        modal_footer.with_component(
+          Primer::ButtonComponent.new(
+            scheme: :primary,
+            form: 'meeting-form',
+            type: :submit
+          )) do
+          if @meeting.persisted?
+            I18n.t(:button_save)
+          else
+            I18n.t(:label_meeting_create)
+          end
+        end
+      end
+    end
   end
 %>
diff --git a/modules/meeting/app/components/meetings/index/dialog_component.rb b/modules/meeting/app/components/meetings/index/dialog_component.rb
index ad90c65469d1..011851a817b9 100644
--- a/modules/meeting/app/components/meetings/index/dialog_component.rb
+++ b/modules/meeting/app/components/meetings/index/dialog_component.rb
@@ -33,12 +33,12 @@ class Index::DialogComponent < ApplicationComponent
     include OpTurbo::Streamable
     include OpPrimer::ComponentHelpers
 
-    def initialize(meeting:, project:, type:)
+    def initialize(meeting:, project:, copy_from: nil)
       super
 
       @meeting = meeting
       @project = project
-      @type = type
+      @copy_from = copy_from
     end
 
     private
@@ -52,7 +52,15 @@ def render?
     end
 
     def title
-      @type == :new ? I18n.t("label_meeting_new_dynamic") : "Copy meeting"
+      return I18n.t(:label_meeting_copy) if @copy_from
+      return I18n.t(:label_meeting_edit) if @meeting.persisted?
+
+      case @meeting
+      when RecurringMeeting
+        I18n.t("label_meeting_new_recurring")
+      else
+        I18n.t("label_meeting_new_dynamic")
+      end
     end
   end
 end
diff --git a/modules/meeting/app/components/meetings/index/form_component.html.erb b/modules/meeting/app/components/meetings/index/form_component.html.erb
index c0c6f358811c..e44a22fac400 100644
--- a/modules/meeting/app/components/meetings/index/form_component.html.erb
+++ b/modules/meeting/app/components/meetings/index/form_component.html.erb
@@ -3,77 +3,135 @@
     primer_form_with(
       scope: :meeting,
       model: @meeting,
-      method: :post,
-      data: { turbo: true },
-      html: { :id => 'meeting-form' },
-      url: {:controller => '/meetings', :action => 'create', :project_id => @project}
+      method: form_method,
+      data: {
+        turbo: true,
+        controller: [
+          "show-when-value-selected",
+          @meeting.is_a?(RecurringMeeting) ? "recurring-meetings--form" : nil,
+        ].compact.join(" "),
+        "application-target": "dynamic"
+      },
+      html: {
+        id: 'meeting-form'
+      },
+      url: {
+        controller: form_controller,
+        action: form_action,
+        project_id: @project
+      }
     ) do |f|
-      component_collection do |collection|
-        collection.with_component(Primer::Alpha::Dialog::Body.new) do
-          flex_layout(mb: 3) do |modal_body|
-            if @project.nil?
-              modal_body.with_row(mt: 3) do
-                render(Meeting::ProjectAutocompleter.new(f))
-              end
-            end
-
-            modal_body.with_row(mt: 3) do
-              render(Meeting::Title.new(f))
-            end
-
-            modal_body.with_row(mt: 3) do
-              render(Meeting::StartDate.new(f, initial_value: start_date_initial_value))
-            end
+      flex_layout(mb: 3) do |modal_body|
+        if @meeting.errors[:base].present?
+          modal_body.with_row do
+            render(Primer::Alpha::Banner.new(mb: 3, icon: :stop, scheme: :danger)) { @meeting.errors[:base].join("\n") }
+          end
+        end
 
-            modal_body.with_row(mt: 3) do
-              render(Meeting::StartTime.new(f, initial_value: start_time_initial_value))
-            end
+        if @project.nil?
+          modal_body.with_row(mt: 3) do
+            render(Meeting::ProjectAutocompleter.new(f))
+          end
+        end
 
-            modal_body.with_row(mt: 3) do
-              render(Meeting::Duration.new(f))
-            end
+        modal_body.with_row(mt: 3) do
+          render(Meeting::Title.new(f))
+        end
 
-            modal_body.with_row(mt: 3) do
-              render(Meeting::Location.new(f))
-            end
+        modal_body.with_row(mt: 3) do
+          render(Meeting::Location.new(f, meeting: @meeting))
+        end
 
-            modal_body.with_row do
-              render(Meeting::Type.new(f))
-            end
+        modal_body.with_row(mt: 3) do
+          render(Meeting::TimeGroup.new(f, meeting: @meeting))
+        end
 
-            unless @type == :new
-              modal_body.with_row do
-                render(Meeting::CopiedFrom.new(f, id: @type.id))
+        if @meeting.is_a?(RecurringMeeting)
+          modal_body.with_row(mt: 3) do
+            flex_layout(classes: "FormControl-horizontalGroup") do |frequency_row|
+              frequency_row.with_column(flex: 1) do
+                render(RecurringMeeting::Frequency.new(f))
               end
 
-              modal_body.with_row(mt: 3) do
-                render(Meeting::CopyItems.new(f))
+              frequency_row.with_column(
+                flex: 1,
+                hidden: @meeting.frequency_working_days?,
+                data: {
+                  target_name: "frequency",
+                  not_value: "working_days",
+                  set_visibility: "true",
+                  "show-when-value-selected-target": "effect"
+                }) do
+                render(RecurringMeeting::Interval.new(f))
               end
+            end
+          end
 
-              modal_body.with_row(mt: 3) do
-                render(Meeting::CopyParticipants.new(f))
-              end
+          modal_body.with_row(mt: 1) do
+            render(Primer::Beta::Text.new(
+              id: "recurring-meeting-frequency-schedule",
+              font_size: :small,
+              color: :subtle,
+            )) { @meeting.human_frequency_schedule }
+          end
 
-              modal_body.with_row(mt: 3) do
-                render(Meeting::CopyAttachments.new(f))
+          modal_body.with_row(mt: 3) do
+            flex_layout(classes: "FormControl-horizontalGroup") do |frequency_row|
+              frequency_row.with_column(flex: 1) do
+                render(RecurringMeeting::EndAfter.new(f))
               end
 
-              modal_body.with_row(mt: 3) do
-                render(Meeting::EmailParticipants.new(f))
+              frequency_row.with_column(
+                flex: 1,
+                hidden: @meeting.frequency_working_days?,
+              ) do
+                flex_layout do |end_after|
+                  end_after.with_row(hidden: @meeting.end_after_iterations?,
+                                     data: {
+                                       value: "specific_date",
+                                       target_name: "end_after",
+                                       "show-when-value-selected-target": "effect" }
+                  ) do
+                    render(RecurringMeeting::SpecificDate.new(f, meeting: @meeting))
+                  end
+
+                  end_after.with_row(hidden: @meeting.end_after_specific_date?,
+                                     data: {
+                                       value: "iterations",
+                                       target_name: "end_after",
+                                       "show-when-value-selected-target": "effect"
+                                     }) do
+                    render(RecurringMeeting::Iterations.new(f))
+                  end
+                end
               end
             end
           end
+        else
+          modal_body.with_row do
+            render(Meeting::Type.new(f))
+          end
         end
 
-        collection.with_component(Primer::Alpha::Dialog::Footer.new) do
-          component_collection do |modal_footer|
-            modal_footer.with_component(Primer::ButtonComponent.new(data: { 'close-dialog-id': "new-meeting-dialog" })) do
-              I18n.t("button_cancel")
-            end
+        if @copy_from
+          modal_body.with_row do
+            render(Meeting::CopiedFrom.new(f, id: @copy_from.id))
+          end
 
-            modal_footer.with_component(Primer::ButtonComponent.new(scheme: :primary, type: :submit)) do
-              I18n.t("label_meeting_create")
-            end
+          modal_body.with_row(mt: 3) do
+            render(Meeting::CopyItems.new(f))
+          end
+
+          modal_body.with_row(mt: 3) do
+            render(Meeting::CopyParticipants.new(f))
+          end
+
+          modal_body.with_row(mt: 3) do
+            render(Meeting::CopyAttachments.new(f))
+          end
+
+          modal_body.with_row(mt: 3) do
+            render(Meeting::EmailParticipants.new(f))
           end
         end
       end
diff --git a/modules/meeting/app/components/meetings/index/form_component.rb b/modules/meeting/app/components/meetings/index/form_component.rb
index 8f277a1024f0..aaf81f9b69f9 100644
--- a/modules/meeting/app/components/meetings/index/form_component.rb
+++ b/modules/meeting/app/components/meetings/index/form_component.rb
@@ -32,22 +32,38 @@ class Index::FormComponent < ApplicationComponent
     include OpTurbo::Streamable
     include OpPrimer::ComponentHelpers
 
-    def initialize(meeting:, project:, type:)
+    def initialize(meeting:, project:, copy_from: nil)
       super
 
       @meeting = meeting
       @project = project
-      @type = type
+      @copy_from = copy_from
     end
 
     private
 
-    def start_date_initial_value
-      format_time_as_date(@meeting.start_time, format: "%Y-%m-%d")
+    def form_controller
+      if @meeting.is_a?(RecurringMeeting)
+        "/recurring_meetings"
+      else
+        "/meetings"
+      end
     end
 
-    def start_time_initial_value
-      format_time(@meeting.start_time, include_date: false, format: "%H:%M")
+    def form_method
+      if @meeting.new_record?
+        :post
+      else
+        :put
+      end
+    end
+
+    def form_action
+      if @meeting.new_record?
+        :create
+      else
+        :update
+      end
     end
   end
 end
diff --git a/modules/meeting/app/components/meetings/index_sub_header_component.html.erb b/modules/meeting/app/components/meetings/index_sub_header_component.html.erb
index dc6622c3c428..d4c665de8501 100644
--- a/modules/meeting/app/components/meetings/index_sub_header_component.html.erb
+++ b/modules/meeting/app/components/meetings/index_sub_header_component.html.erb
@@ -4,7 +4,7 @@
   "filter--filters-form-output-format-value": "json",
 })) do |subheader|
   subheader.with_filter_component do
-    render(Meetings::MeetingFilterButtonComponent.new(query: @query, project: @project))
+    render(Meetings::CombinedFilterComponent.new(query: @query, project: @project, params: @params))
   end
 
   if render_create_button?
@@ -23,16 +23,38 @@
           I18n.t(:label_meeting)
         end
 
-        menu.with_item(label: I18n.t("meeting.types.structured"),
-                       tag: :a,
-                       href: new_dialog_meetings_path(project_id: @project&.id),
-                       content_arguments: { data: { controller: "async-dialog" }}
-        )
+        if OpenProject::FeatureDecisions.recurring_meetings_active?
+          menu.with_item(label: I18n.t("meeting.types.one_time"),
+                         tag: :a,
+                         href: new_dialog_meetings_path(project_id: @project&.id, type: :structured),
+                         content_arguments: { data: { controller: "async-dialog" }}
+          ) do |item|
+            item.with_description.with_content(t("meeting.types.structured_text"))
+          end
+
+          menu.with_item(label: I18n.t("meeting.types.recurring"),
+                         tag: :a,
+                         href: new_dialog_meetings_path(project_id: @project&.id, type: :recurring),
+                         content_arguments: { data: { controller: "async-dialog" }}
+          ) do |item|
+            item.with_description.with_content(t("meeting.types.recurring_text"))
+          end
+        else
+          menu.with_item(label: I18n.t("meeting.types.structured"),
+                         tag: :a,
+                         href: new_dialog_meetings_path(project_id: @project&.id, type: :structured),
+                         content_arguments: { data: { controller: "async-dialog" }}
+          ) do |item|
+            item.with_description.with_content(t("meeting.types.structured_text"))
+          end
+        end
 
         menu.with_item(label: I18n.t("meeting.types.classic"),
                        tag: :a,
                        href: dynamic_path
-        )
+        ) do |item|
+          item.with_description.with_content(t("meeting.types.classic_text"))
+        end
       end
     end
   end
diff --git a/modules/meeting/app/components/meetings/index_sub_header_component.rb b/modules/meeting/app/components/meetings/index_sub_header_component.rb
index 1540b148b4ff..1be28c8987c8 100644
--- a/modules/meeting/app/components/meetings/index_sub_header_component.rb
+++ b/modules/meeting/app/components/meetings/index_sub_header_component.rb
@@ -34,10 +34,11 @@ class IndexSubHeaderComponent < ApplicationComponent
     # rubocop:enable OpenProject/AddPreviewForViewComponent
     include ApplicationHelper
 
-    def initialize(query:, project: nil)
+    def initialize(query:, params:, project: nil)
       super
       @query = query
       @project = project
+      @params = params
     end
 
     def render_create_button?
diff --git a/modules/meeting/app/components/meetings/meeting_filter_button_component.rb b/modules/meeting/app/components/meetings/meeting_filter_button_component.rb
index 3e39c65271ae..f4dd1e3ecd19 100644
--- a/modules/meeting/app/components/meetings/meeting_filter_button_component.rb
+++ b/modules/meeting/app/components/meetings/meeting_filter_button_component.rb
@@ -36,6 +36,7 @@ def filters_count
       @filters_count ||= begin
         count = super
         count -= 1 if project.present?
+        count -= 1 if query.filters.find { |f| f.name == :time }
 
         count
       end
diff --git a/modules/meeting/app/components/meetings/meeting_filters_component.rb b/modules/meeting/app/components/meetings/meeting_filters_component.rb
index f40c91d9aaa6..d65bd9861611 100644
--- a/modules/meeting/app/components/meetings/meeting_filters_component.rb
+++ b/modules/meeting/app/components/meetings/meeting_filters_component.rb
@@ -64,7 +64,7 @@ def allowed_filter?(filter)
         Queries::Meetings::Filters::AttendedUserFilter,
         Queries::Meetings::Filters::AuthorFilter,
         Queries::Meetings::Filters::InvitedUserFilter,
-        Queries::Meetings::Filters::TimeFilter
+        Queries::Meetings::Filters::RecurringFilter
       ]
 
       if project.nil?
diff --git a/modules/meeting/app/components/meetings/row_component.rb b/modules/meeting/app/components/meetings/row_component.rb
index 0e5778dfbfe9..88377b0f65ec 100644
--- a/modules/meeting/app/components/meetings/row_component.rb
+++ b/modules/meeting/app/components/meetings/row_component.rb
@@ -35,11 +35,28 @@ def project_name
     end
 
     def title
-      link_to model.title, project_meeting_path(model.project, model)
+      if recurring?
+        link_to model.title, recurring_meeting_path(model)
+      elsif recurring_meeting.present?
+        occurrence_title
+      else
+        link_to model.title, project_meeting_path(model.project, model)
+      end
+    end
+
+    def occurrence_title
+      safe_join(
+        [(link_to model.title, project_meeting_path(model.project, model)),
+         (link_to recurring_label, recurring_meeting_path(recurring_meeting))], "  "
+      )
     end
 
     def start_time
-      safe_join([helpers.format_date(model.start_time), helpers.format_time(model.start_time, include_date: false)], " ")
+      if recurring?
+        helpers.format_time(model.start_time, include_date: false)
+      else
+        safe_join([helpers.format_date(model.start_time), helpers.format_time(model.start_time, include_date: false)], " ")
+      end
     end
 
     def duration
@@ -47,11 +64,17 @@ def duration
     end
 
     def location
-      helpers.auto_link(model.location,
+      helpers.auto_link(recurring? ? model.template.location : model.location,
                         link: :all,
                         html: { target: "_blank" })
     end
 
+    def frequency
+      return unless recurring?
+
+      model.human_frequency
+    end
+
     def button_links
       [
         action_menu
@@ -66,19 +89,30 @@ def action_menu
                               data: {
                                 "test-selector": "more-button"
                               })
-        if copy_allowed?
+
+        if recurring?
+          nil
+        elsif recurring_meeting.present?
+          view_meeting_series(menu)
+        else
           copy_action(menu)
         end
 
-        ical_action(menu)
+        ical_action(menu) unless recurring?
+        delete_action(menu)
+      end
+    end
 
-        if delete_allowed?
-          delete_action(menu)
-        end
+    def view_meeting_series(menu)
+      menu.with_item(label: I18n.t(:label_recurring_meeting_view),
+                     href: recurring_meeting_path(recurring_meeting)) do |item|
+        item.with_leading_visual_icon(icon: :iterations)
       end
     end
 
     def copy_action(menu)
+      return unless copy_allowed?
+
       menu.with_item(label: I18n.t(:label_meeting_copy),
                      href: copy_meeting_path(model),
                      content_arguments: {
@@ -102,16 +136,33 @@ def ical_action(menu)
     end
 
     def delete_action(menu)
-      menu.with_item(label: I18n.t(:label_meeting_delete),
+      return unless delete_allowed?
+
+      menu.with_item(label: recurring_meeting.present? ? I18n.t(:label_recurring_meeting_delete) : I18n.t(:label_meeting_delete),
                      scheme: :danger,
                      href: meeting_path(model),
                      form_arguments: {
-                       method: :delete, data: { confirm: I18n.t("text_are_you_sure"), turbo: false }
+                       method: :delete, data: { confirm: delete_confirm_message, turbo: false }
                      }) do |item|
         item.with_leading_visual_icon(icon: :trash)
       end
     end
 
+    def delete_confirm_message
+      if recurring_meeting.present?
+        I18n.t(:label_recurring_meeting_delete_confirmation, name: recurring_meeting.title)
+      else
+        I18n.t("text_are_you_sure")
+      end
+    end
+
+    def recurring_label
+      render(Primer::BaseComponent.new(tag: :span, color: :muted)) do
+        concat render(Primer::Beta::Octicon.new(icon: :iterations, mr: 1, ml: 1))
+        concat render(Primer::Beta::Text.new(font_weight: :bold, font_size: :small)) { recurring_meeting.human_frequency }
+      end
+    end
+
     def delete_allowed?
       User.current.allowed_in_project?(:delete_meetings, model.project)
     end
@@ -119,5 +170,15 @@ def delete_allowed?
     def copy_allowed?
       User.current.allowed_in_project?(:create_meetings, model.project)
     end
+
+    def recurring?
+      model.is_a?(RecurringMeeting)
+    end
+
+    def recurring_meeting
+      return if recurring?
+
+      model.recurring_meeting
+    end
   end
 end
diff --git a/modules/meeting/app/components/meetings/side_panel/attachments_component.html.erb b/modules/meeting/app/components/meetings/side_panel/attachments_component.html.erb
index f4c2fb18794b..480ae708c87d 100644
--- a/modules/meeting/app/components/meetings/side_panel/attachments_component.html.erb
+++ b/modules/meeting/app/components/meetings/side_panel/attachments_component.html.erb
@@ -2,7 +2,13 @@
   component_wrapper do
     render(Primer::OpenProject::SidePanel::Section.new) do |section|
       section.with_title { t(:label_attachment_plural) }
-      section.with_description { I18n.t('meeting.attachments.text') }
+      section.with_description do
+        if @meeting.templated?
+          I18n.t('meeting.attachments.template')
+        else
+          I18n.t('meeting.attachments.text')
+        end
+      end
       section.with_counter(count: @meeting.attachments.count)
 
       section.with_footer_button(
diff --git a/modules/meeting/app/components/meetings/side_panel/details_component.html.erb b/modules/meeting/app/components/meetings/side_panel/details_component.html.erb
index 1c55629c1ce8..c9d94216d661 100644
--- a/modules/meeting/app/components/meetings/side_panel/details_component.html.erb
+++ b/modules/meeting/app/components/meetings/side_panel/details_component.html.erb
@@ -1,14 +1,25 @@
 <%=
   component_wrapper do
     render(Primer::OpenProject::SidePanel::Section.new) do |section|
-      section.with_title { t(:label_meeting_details) }
+      if @meeting.template?
+        section.with_title { t(:label_meeting_series_details) }
+      else
+        section.with_title { t(:label_meeting_details) }
+      end
 
       if @meeting.editable?
+        href =
+          if @meeting.template?
+            details_dialog_recurring_meeting_path(@meeting.recurring_meeting)
+          else
+            details_dialog_meeting_path(@meeting)
+          end
+
         section.with_action_icon(
           icon: :gear,
           scheme: :invisible,
           tag: :a,
-          href: details_dialog_meeting_path(@meeting),
+          href:,
           classes: "hide-when-print",
           data: { controller: 'async-dialog' },
           'aria-label': t(:label_meeting_details_edit),
@@ -17,10 +28,30 @@
       end
 
       flex_layout do |details|
-        details.with_row do
-          render_meeting_attribute_row(:calendar) do
-            render(Primer::Beta::Text.new) do
-              format_date(@meeting.start_time)
+        if @meeting.template?
+          details.with_row do
+            render_meeting_attribute_row(:"git-commit") do
+              render(Primer::Beta::Text.new) do
+                @meeting.recurring_meeting.base_schedule
+              end
+            end
+          end
+        else
+          if @series.present?
+            details.with_row(mb: 2) do
+              render_meeting_attribute_row(:iterations) do
+                render(Primer::Beta::Link.new(href: recurring_meeting_path(@series))) do
+                  @series.title
+                end
+              end
+            end
+          end
+
+          details.with_row do
+            render_meeting_attribute_row(:calendar) do
+              render(Primer::Beta::Text.new) do
+                format_date(@meeting.start_time)
+              end
             end
           end
         end
@@ -30,7 +61,7 @@
             flex_layout(align_items: :center) do |time|
               time.with_column do
                 render(Primer::Beta::Text.new) do
-                  "#{format_time(@meeting.start_time, include_date: false)} - #{format_time(@meeting.end_time, include_date:false)}"
+                  "#{format_time(@meeting.start_time, include_date: false)} - #{format_time(@meeting.end_time, include_date: false)}"
                 end
               end
 
diff --git a/modules/meeting/app/components/meetings/side_panel/details_component.rb b/modules/meeting/app/components/meetings/side_panel/details_component.rb
index fa4282bee4f3..26527bbca4b8 100644
--- a/modules/meeting/app/components/meetings/side_panel/details_component.rb
+++ b/modules/meeting/app/components/meetings/side_panel/details_component.rb
@@ -36,6 +36,7 @@ def initialize(meeting:)
       super
 
       @meeting = meeting
+      @series = meeting.recurring_meeting
     end
 
     private
diff --git a/modules/meeting/app/components/meetings/side_panel/details_form_component.html.erb b/modules/meeting/app/components/meetings/side_panel/details_form_component.html.erb
index 0454078438f3..cc719ac1358a 100644
--- a/modules/meeting/app/components/meetings/side_panel/details_form_component.html.erb
+++ b/modules/meeting/app/components/meetings/side_panel/details_form_component.html.erb
@@ -14,19 +14,11 @@
             end
 
             modal_body.with_row(mt: 3) do
-              render(Meeting::StartDate.new(f, initial_value: start_date_initial_value))
+              render(Meeting::TimeGroup.new(f, meeting: @meeting))
             end
 
             modal_body.with_row(mt: 3) do
-              render(Meeting::StartTime.new(f, initial_value: start_time_initial_value))
-            end
-
-            modal_body.with_row(mt: 3) do
-              render(Meeting::Duration.new(f))
-            end
-
-            modal_body.with_row(mt: 3) do
-              render(Meeting::Location.new(f))
+              render(Meeting::Location.new(f, meeting: @meeting))
             end
 
             modal_body.with_row do
diff --git a/modules/meeting/app/components/meetings/side_panel/participants_component.html.erb b/modules/meeting/app/components/meetings/side_panel/participants_component.html.erb
index f487a08ec514..89ea9685416b 100644
--- a/modules/meeting/app/components/meetings/side_panel/participants_component.html.erb
+++ b/modules/meeting/app/components/meetings/side_panel/participants_component.html.erb
@@ -4,6 +4,10 @@
       section.with_title { Meeting.human_attribute_name(:participants) }
       section.with_counter(count: @meeting.invited_or_attended_participants.count)
 
+      if @meeting.templated?
+        section.with_description { I18n.t('meeting.participants.template') }
+      end
+
       if @meeting.editable?
         section.with_action_icon(
           icon: :gear,
diff --git a/modules/meeting/app/components/meetings/side_panel/participants_dialog.html.erb b/modules/meeting/app/components/meetings/side_panel/participants_dialog.html.erb
index 8c1fde5e83ac..5fd081e9c14f 100644
--- a/modules/meeting/app/components/meetings/side_panel/participants_dialog.html.erb
+++ b/modules/meeting/app/components/meetings/side_panel/participants_dialog.html.erb
@@ -17,14 +17,17 @@
           class: 'Overlay-form'
         ) do |f|
           flex_layout(mt: 3) do |form_container|
+
             form_container.with_row do
               flex_layout(justify_content: :flex_end) do |header|
                 header.with_column(style: "width: 90px;", text_align: :center) do
                   render(Primer::Beta::Text.new(font_weight: :emphasized)) { t("description_invite").capitalize }
                 end
 
-                header.with_column(style: "width: 90px;", text_align: :center) do
-                  render(Primer::Beta::Text.new(font_weight: :emphasized)) { t("description_attended").capitalize }
+                unless @meeting.template?
+                  header.with_column(style: "width: 90px;", text_align: :center) do
+                    render(Primer::Beta::Text.new(font_weight: :emphasized)) { t("description_attended").capitalize }
+                  end
                 end
               end
             end
@@ -47,7 +50,8 @@
                             existing_participant.with_column(flex: 1, classes: 'ellipsis') do
                               render(Users::AvatarComponent.new(
                                 user: participant.user,
-                                classes: 'op-principal_flex'
+                                classes: 'op-principal_flex',
+                                hover_card: { active: true, target: :custom }
                               ))
                             end
                             existing_participant.with_column(style: "width: 90px;", text_align: :center) do
@@ -69,12 +73,14 @@
                               #          unchecked_value: ""
                               #        ))
                             end
-                            existing_participant.with_column(style: "width: 90px;", text_align: :center) do
-                              styled_check_box_tag "meeting[participants_attributes][][attended]",
-                                                   value = 1,
-                                                   checked = participant.attended?,
-                                                   id: "checkbox_attended_#{participant.user.id}",
-                                                   disabled: !@meeting.editable?
+                            unless @meeting.template?
+                              existing_participant.with_column(style: "width: 90px;", text_align: :center) do
+                                styled_check_box_tag "meeting[participants_attributes][][attended]",
+                                                     value = 1,
+                                                     checked = participant.attended?,
+                                                     id: "checkbox_attended_#{participant.user.id}",
+                                                     disabled: !@meeting.editable?
+                              end
                             end
                           end
                         end
@@ -84,7 +90,8 @@
                         new_participant.with_column(flex: 1, classes: 'ellipsis') do
                           render(Users::AvatarComponent.new(
                             user:,
-                            classes: 'op-principal_flex'
+                            classes: 'op-principal_flex',
+                            hover_card: { active: true, target: :custom }
                           ))
                         end
 
@@ -96,12 +103,14 @@
                                                disabled: !@meeting.editable?
                         end
 
-                        new_participant.with_column(style: "width: 90px;", text_align: :center) do
-                          styled_check_box_tag "meeting[participants_attributes][][attended]",
-                                               value = "1",
-                                               checked = false,
-                                               id: "checkbox_attended_#{user.id}",
-                                               disabled: !@meeting.editable?
+                        unless @meeting.template?
+                          new_participant.with_column(style: "width: 90px;", text_align: :center) do
+                            styled_check_box_tag "meeting[participants_attributes][][attended]",
+                                                 value = "1",
+                                                 checked = false,
+                                                 id: "checkbox_attended_#{user.id}",
+                                                 disabled: !@meeting.editable?
+                          end
                         end
                       end
                     end
@@ -109,6 +118,10 @@
                 end
               end
             end
+
+            form_container.with_row do
+              helpers.angular_component_tag 'opce-custom-modal-overlay'
+            end
           end
         end
       end
diff --git a/modules/meeting/app/components/meetings/side_panel_component.html.erb b/modules/meeting/app/components/meetings/side_panel_component.html.erb
index 9239d6131fa6..11cabc8cbe59 100644
--- a/modules/meeting/app/components/meetings/side_panel_component.html.erb
+++ b/modules/meeting/app/components/meetings/side_panel_component.html.erb
@@ -2,9 +2,12 @@
   component_wrapper do
     render(Primer::OpenProject::SidePanel.new) do |panel|
       panel.with_section(Meetings::SidePanel::DetailsComponent.new(meeting: @meeting))
-      panel.with_section(Meetings::SidePanel::StateComponent.new(meeting: @meeting))
+      unless @meeting.template?
+        panel.with_section(Meetings::SidePanel::StateComponent.new(meeting: @meeting))
+      end
 
       desktop_grid_row_arguments = { display: [:none, nil, :"table_cell"] }
+
       panel.with_section(Meetings::SidePanel::ParticipantsComponent.new(meeting: @meeting),
                          grid_row_arguments: desktop_grid_row_arguments.merge({classes: "meetings-side-panel--participants-section"}))
 
diff --git a/modules/meeting/app/components/meetings/table_component.rb b/modules/meeting/app/components/meetings/table_component.rb
index cd18de9b8913..56a1433c6c7d 100644
--- a/modules/meeting/app/components/meetings/table_component.rb
+++ b/modules/meeting/app/components/meetings/table_component.rb
@@ -32,7 +32,7 @@ module Meetings
   class TableComponent < ::OpPrimer::BorderBoxTableComponent
     options :current_project # used to determine if displaying the projects column
 
-    columns :title, :start_time, :project_name, :duration, :location
+    columns :title, :start_time, :project_name, :duration, :location, :frequency
 
     mobile_columns :title, :start_time, :project_name
 
@@ -41,11 +41,7 @@ class TableComponent < ::OpPrimer::BorderBoxTableComponent
     main_column :title
 
     def sortable?
-      true
-    end
-
-    def initial_sort
-      %i[start_time asc]
+      false
     end
 
     def has_actions?
@@ -59,7 +55,9 @@ def mobile_title
     def headers
       @headers ||= [
         [:title, { caption: Meeting.human_attribute_name(:title) }],
-        [:start_time, { caption: I18n.t(:label_meeting_date_and_time) }],
+        recurring? ? [:frequency, { caption: I18n.t("activerecord.attributes.recurring_meeting.frequency") }] : nil,
+        [:start_time,
+         { caption: recurring? ? I18n.t("activerecord.attributes.meeting.start_time") : I18n.t(:label_meeting_date_and_time) }],
         current_project.blank? ? [:project_name, { caption: Meeting.human_attribute_name(:project) }] : nil,
         [:duration, { caption: Meeting.human_attribute_name(:duration) }],
         [:location, { caption: Meeting.human_attribute_name(:location) }]
@@ -69,5 +67,9 @@ def headers
     def columns
       @columns ||= headers.map(&:first)
     end
+
+    def recurring?
+      model.first.is_a?(RecurringMeeting)
+    end
   end
 end
diff --git a/modules/meeting/app/components/recurring_meetings/footer_component.html.erb b/modules/meeting/app/components/recurring_meetings/footer_component.html.erb
new file mode 100644
index 000000000000..9defd037db85
--- /dev/null
+++ b/modules/meeting/app/components/recurring_meetings/footer_component.html.erb
@@ -0,0 +1,56 @@
+<%#-- copyright
+OpenProject is an open source project management software.
+Copyright (C) the OpenProject GmbH
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License version 3.
+
+OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+Copyright (C) 2006-2013 Jean-Philippe Lang
+Copyright (C) 2010-2013 the ChiliProject Team
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+See COPYRIGHT and LICENSE files for more details.
+
+++#%>
+
+<%=
+  component_wrapper do
+    flex_layout(justify_content: :space_between) do |flex|
+      flex.with_column(classes: "ellipsis") do
+        render(Primer::BaseComponent.new(tag: :span, color: :muted)) do
+          concat render(Primer::Beta::Octicon.new(icon: :iterations, mr: 1, ml: 1))
+          concat render(Primer::Beta::Text.new(font_weight: :bold)) { label }
+        end
+      end
+
+      flex.with_column do
+        render(
+          Primer::Beta::Button.new(
+            scheme: :link,
+            size: :medium,
+            tag: :a,
+            href: polymorphic_path([@project, @meeting], count: @current_count, direction: @direction)
+          )
+        ) do |_c|
+          I18n.t(:label_recurring_meeting_show_more)
+        end
+      end
+    end
+  end
+%>
+
+
diff --git a/modules/meeting/app/components/recurring_meetings/footer_component.rb b/modules/meeting/app/components/recurring_meetings/footer_component.rb
new file mode 100644
index 000000000000..5a68df141e95
--- /dev/null
+++ b/modules/meeting/app/components/recurring_meetings/footer_component.rb
@@ -0,0 +1,56 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module RecurringMeetings
+  class FooterComponent < ApplicationComponent
+    include ApplicationHelper
+    include OpTurbo::Streamable
+    include OpPrimer::ComponentHelpers
+
+    def initialize(meeting:, project:, count:, direction:, max_count:)
+      super
+
+      @meeting = meeting
+      @project = project
+      @current_count = count
+      @direction = direction
+      @max_count = max_count
+    end
+
+    def label
+      count = @max_count - @current_count
+      label_suffix = count == 1 ? "_singular" : ""
+
+      if @direction == "past"
+        I18n.t("label_recurring_meeting_more_past#{label_suffix}", count:)
+      else
+        I18n.t("label_recurring_meeting_more#{label_suffix}", count:, schedule: @meeting.full_schedule_in_words)
+      end
+    end
+  end
+end
diff --git a/modules/meeting/app/components/recurring_meetings/row_component.rb b/modules/meeting/app/components/recurring_meetings/row_component.rb
new file mode 100644
index 000000000000..8a958c871717
--- /dev/null
+++ b/modules/meeting/app/components/recurring_meetings/row_component.rb
@@ -0,0 +1,234 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module RecurringMeetings
+  class RowComponent < ::OpPrimer::BorderBoxRowComponent
+    delegate :meeting, to: :model
+    delegate :cancelled?, to: :model
+    delegate :recurring_meeting, to: :model
+    delegate :project, to: :recurring_meeting
+    delegate :schedule, to: :meeting
+    delegate :current_project, to: :table
+
+    def instantiated?
+      meeting.present?
+    end
+
+    def column_args(column)
+      if column == :title
+        { style: "grid-column: span 2" }
+      else
+        super
+      end
+    end
+
+    def start_time
+      if instantiated?
+        link_to start_time_title, current_project_meeting_path(meeting)
+      else
+        start_time_title
+      end
+    end
+
+    def current_project_meeting_path(meeting)
+      if current_project
+        project_meeting_path(current_project, meeting)
+      else
+        meeting_path(meeting)
+      end
+    end
+
+    def user_time_zone(time)
+      helpers.in_user_zone(time)
+    end
+
+    def formatted_time(time)
+      helpers.format_time(user_time_zone(time), include_date: true)
+    end
+
+    def old_time
+      render(Primer::Beta::Text.new(tag: :s)) { formatted_time(model.start_time) }
+    end
+
+    def start_time_title
+      if start_time_changed?
+        old_time + simple_format("\n#{formatted_time(meeting.start_time)}")
+      else
+        formatted_time(model.start_time)
+      end
+    end
+
+    def relative_time
+      time = start_time_changed? ? meeting.start_time : model.start_time
+
+      render(OpPrimer::RelativeTimeComponent.new(datetime: user_time_zone(time), prefix: I18n.t(:label_on)))
+    end
+
+    def state
+      if model.cancelled?
+        "cancelled"
+      elsif instantiated?
+        meeting.state
+      else
+        "scheduled"
+      end
+    end
+
+    def status
+      scheme = status_scheme(state)
+
+      render(Primer::Beta::Label.new(title:, scheme:)) do
+        render(Primer::Beta::Text.new) { t("label_meeting_state_#{state}") }
+      end
+    end
+
+    def status_scheme(state)
+      case state
+      when "open"
+        :success
+      when "cancelled"
+        :severe
+      else
+        :secondary
+      end
+    end
+
+    def create
+      return unless copy_allowed?
+      return if instantiated? || cancelled?
+
+      render(
+        Primer::Beta::Button.new(
+          scheme: :default,
+          size: :medium,
+          tag: :a,
+          data: { "turbo-method": "post" },
+          href: init_recurring_meeting_path(model.recurring_meeting.id, start_time: model.start_time.iso8601)
+        )
+      ) do |_c|
+        I18n.t(:label_recurring_meeting_create)
+      end
+    end
+
+    def button_links
+      [
+        action_menu
+      ]
+    end
+
+    def action_menu
+      render(Primer::Alpha::ActionMenu.new) do |menu|
+        menu.with_show_button(icon: "kebab-horizontal",
+                              "aria-label": "More",
+                              scheme: :invisible,
+                              data: {
+                                "test-selector": "more-button"
+                              })
+
+        delete_scheduled_action(menu)
+        ical_action(menu)
+        delete_action(menu)
+        restore_action(menu)
+      end
+    end
+
+    def ical_action(menu)
+      return unless instantiated? && !cancelled?
+
+      menu.with_item(label: I18n.t(:label_icalendar_download),
+                     href: download_ics_meeting_path(meeting),
+                     content_arguments: {
+                       data: { turbo: false }
+                     }) do |item|
+        item.with_leading_visual_icon(icon: :download)
+      end
+    end
+
+    def delete_action(menu)
+      return unless delete_allowed? && !cancelled? && instantiated?
+
+      menu.with_item(
+        label: past? ? I18n.t(:label_recurring_meeting_delete) : I18n.t(:label_recurring_meeting_cancel),
+        scheme: :danger,
+        href: current_project_meeting_path(meeting),
+        form_arguments: {
+          method: :delete, data: { confirm: I18n.t(:label_recurring_occurrence_delete_confirmation), turbo: false }
+        }
+      ) do |item|
+        item.with_leading_visual_icon(icon: :trash)
+      end
+    end
+
+    def delete_scheduled_action(menu)
+      return unless delete_allowed? && !cancelled? && !instantiated?
+
+      menu.with_item(
+        label: I18n.t(:label_recurring_meeting_cancel),
+        scheme: :danger,
+        href: delete_scheduled_recurring_meeting_path(model.recurring_meeting.id, start_time: model.start_time.iso8601),
+        form_arguments: {
+          method: :post, data: { confirm: I18n.t("text_are_you_sure"), turbo: false }
+        }
+      ) do |item|
+        item.with_leading_visual_icon(icon: :trash)
+      end
+    end
+
+    def restore_action(menu)
+      return unless cancelled?
+
+      menu.with_item(
+        label: I18n.t(:label_recurring_meeting_restore),
+        href: init_recurring_meeting_path(recurring_meeting, start_time: model.start_time.iso8601),
+        form_arguments: {
+          method: :post
+        }
+      ) do |item|
+        item.with_leading_visual_icon(icon: :history)
+      end
+    end
+
+    def delete_allowed?
+      User.current.allowed_in_project?(:delete_meetings, project)
+    end
+
+    def copy_allowed?
+      User.current.allowed_in_project?(:create_meetings, project)
+    end
+
+    def start_time_changed?
+      meeting && meeting.start_time != model.start_time
+    end
+
+    def past?
+      model.start_time < Time.current
+    end
+  end
+end
diff --git a/modules/meeting/app/components/recurring_meetings/show_component.html.erb b/modules/meeting/app/components/recurring_meetings/show_component.html.erb
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/modules/meeting/app/components/recurring_meetings/show_component.rb b/modules/meeting/app/components/recurring_meetings/show_component.rb
new file mode 100644
index 000000000000..c2ad5dc03188
--- /dev/null
+++ b/modules/meeting/app/components/recurring_meetings/show_component.rb
@@ -0,0 +1,41 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module RecurringMeetings
+  class ShowComponent < ApplicationComponent
+    include ApplicationHelper
+    include OpPrimer::ComponentHelpers
+
+    def initialize(meeting:, project:)
+      super
+
+      @meeting = meeting
+      @project = project
+    end
+  end
+end
diff --git a/modules/meeting/app/components/recurring_meetings/show_page_header_component.html.erb b/modules/meeting/app/components/recurring_meetings/show_page_header_component.html.erb
new file mode 100644
index 000000000000..998c20bc9bc9
--- /dev/null
+++ b/modules/meeting/app/components/recurring_meetings/show_page_header_component.html.erb
@@ -0,0 +1,50 @@
+<%= render(Primer::OpenProject::PageHeader.new) do |header|
+  header.with_title { page_title }
+  header.with_description { page_description }
+  header.with_breadcrumbs(breadcrumb_items)
+
+  header.with_action_button(
+    tag: :a,
+    mobile_label: I18n.t("recurring_meeting.template.label_view_template"),
+    mobile_icon: :eye,
+    size: :medium,
+    href: meeting_path(@meeting.template)
+  ) { I18n.t("recurring_meeting.template.label_view_template") }
+
+  if render_create_button?
+    header.with_action_menu(menu_arguments: { anchor_align: :end },
+                            button_arguments: { icon: "op-kebab-vertical",
+                                                classes: "hide-when-print",
+                                                "aria-label": "Menu",
+                                                data: {
+                                                  "test-selector": "recurring-meeting-action-menu"
+                                                } }) do |menu, _button|
+
+      menu.with_item(
+        label: I18n.t(:label_recurring_meeting_series_edit),
+        icon: :gear,
+        href: details_dialog_recurring_meeting_path(@meeting),
+        tag: :a,
+        content_arguments: {
+          data: { controller: 'async-dialog' },
+        },
+        'aria-label': t(:label_recurring_meeting_series_edit),
+        test_selector: "edit-meeting-details-button",
+      )
+
+      menu.with_item(
+        label: t(:label_icalendar_download),
+        href: download_ics_recurring_meeting_path(@meeting)
+      )
+
+      menu.with_item(
+        label: I18n.t(:label_recurring_meeting_series_delete),
+        href: polymorphic_path([@project, @meeting]),
+        scheme: :danger,
+        form_arguments: {
+          method: :delete, data: { confirm: t("text_are_you_sure"), turbo: 'false' }
+        }
+      )
+    end
+  end
+end %>
diff --git a/modules/meeting/app/components/recurring_meetings/show_page_header_component.rb b/modules/meeting/app/components/recurring_meetings/show_page_header_component.rb
new file mode 100644
index 000000000000..757fe2c6fe99
--- /dev/null
+++ b/modules/meeting/app/components/recurring_meetings/show_page_header_component.rb
@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2010-2024 the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+# ++
+
+module RecurringMeetings
+  class ShowPageHeaderComponent < ApplicationComponent
+    include OpPrimer::ComponentHelpers
+    include ApplicationHelper
+
+    def initialize(project: nil, meeting: nil)
+      super
+
+      @project = project
+      @meeting = meeting
+    end
+
+    def render_create_button?
+      if @project
+        User.current.allowed_in_project?(:create_meetings, @project)
+      else
+        User.current.allowed_in_any_project?(:create_meetings)
+      end
+    end
+
+    def dynamic_path
+      polymorphic_path([:new, @project, :recurring_meeting])
+    end
+
+    def id
+      "add-recurring-meeting-button"
+    end
+
+    def accessibility_label_text
+      I18n.t(:label_recurring_meeting_new)
+    end
+
+    def label_text
+      I18n.t(:label_recurring_meeting)
+    end
+
+    def page_title
+      @meeting.present? ? "#{@meeting.title} (Meeting series)" : I18n.t(:label_recurring_meeting_plural)
+    end
+
+    def page_description
+      @meeting.full_schedule_in_words
+    end
+
+    def breadcrumb_items
+      [parent_element,
+       { href: @project.present? ? project_meetings_path(@project.id) : meetings_path,
+         text: I18n.t(:label_meeting_plural) },
+       page_title]
+    end
+
+    def parent_element
+      if @project.present?
+        { href: project_overview_path(@project.id), text: @project.name }
+      else
+        { href: home_path, text: I18n.t(:label_home) }
+      end
+    end
+  end
+end
diff --git a/modules/meeting/app/components/recurring_meetings/show_page_sub_header_component.html.erb b/modules/meeting/app/components/recurring_meetings/show_page_sub_header_component.html.erb
new file mode 100644
index 000000000000..49d2e2e15419
--- /dev/null
+++ b/modules/meeting/app/components/recurring_meetings/show_page_sub_header_component.html.erb
@@ -0,0 +1,22 @@
+<%= render(Primer::OpenProject::SubHeader.new(data: {
+  controller: "filter--filters-form",
+  "application-target": "dynamic",
+  "filter--filters-form-output-format-value": "json",
+})) do |subheader|
+  subheader.with_filter_component do
+    render(Primer::Alpha::SegmentedControl.new("aria-label": I18n.t(:label_filter_plural))) do |control|
+      control.with_item(tag: :a,
+                        icon: :"arrow-right",
+                        href: recurring_meeting_path(@meeting),
+                        label: t(:label_upcoming_meetings_short),
+                        title: t(:label_upcoming_meetings),
+                        selected: @params[:direction] != "past")
+      control.with_item(tag: :a,
+                        icon: :history,
+                        href: recurring_meeting_path(@meeting, direction: :past),
+                        label: t(:label_past_meetings_short),
+                        title: t(:label_past_meetings),
+                        selected: @params[:direction] == "past")
+    end
+  end
+end %>
diff --git a/modules/meeting/app/components/recurring_meetings/show_page_sub_header_component.rb b/modules/meeting/app/components/recurring_meetings/show_page_sub_header_component.rb
new file mode 100644
index 000000000000..8d7f8c856985
--- /dev/null
+++ b/modules/meeting/app/components/recurring_meetings/show_page_sub_header_component.rb
@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+# ++
+
+module RecurringMeetings
+  # rubocop:disable OpenProject/AddPreviewForViewComponent
+  class ShowPageSubHeaderComponent < ApplicationComponent
+    # rubocop:enable OpenProject/AddPreviewForViewComponent
+    include ApplicationHelper
+
+    def initialize(meeting:, params:, project: nil)
+      super
+
+      @meeting = meeting
+      @project = project
+      @params = params
+    end
+
+    def dynamic_path
+      polymorphic_path([:new, @project, :meeting])
+    end
+
+    def accessibility_label_text
+      I18n.t(:label_meeting_new)
+    end
+
+    def label_text
+      I18n.t(:label_meeting)
+    end
+  end
+end
diff --git a/modules/meeting/app/components/recurring_meetings/table_component.rb b/modules/meeting/app/components/recurring_meetings/table_component.rb
new file mode 100644
index 000000000000..5b92be0e4aec
--- /dev/null
+++ b/modules/meeting/app/components/recurring_meetings/table_component.rb
@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module RecurringMeetings
+  class TableComponent < ::OpPrimer::BorderBoxTableComponent
+    options :current_project, :count, :direction, :max_count
+
+    columns :start_time, :relative_time, :status, :create
+
+    def has_actions?
+      true
+    end
+
+    def has_footer?
+      return false unless recurring_meeting
+
+      options[:max_count] - count > 0
+    end
+
+    def footer
+      render RecurringMeetings::FooterComponent.new(
+        meeting: recurring_meeting,
+        project: options[:current_project],
+        direction: options[:direction],
+        max_count: options[:max_count],
+        count:
+      )
+    end
+
+    def header_args(column)
+      if column == :title
+        { style: "grid-column: span 2" }
+      else
+        super
+      end
+    end
+
+    def mobile_title
+      I18n.t(:label_recurring_meeting_plural)
+    end
+
+    def headers
+      @headers ||= [
+        [:start_time, { caption: I18n.t(:label_meeting_date_and_time) }],
+        [:relative_time, { caption: I18n.t("recurring_meeting.starts") }],
+        [:status, { caption: Meeting.human_attribute_name(:status) }],
+        [:create, { caption: "" }]
+      ].compact
+    end
+
+    def columns
+      @columns ||= headers.map(&:first)
+    end
+
+    def recurring_meeting
+      return if model.blank?
+
+      @recurring_meeting ||= model.first.recurring_meeting
+    end
+
+    def count
+      @count ||= [options[:count], rows.count].max
+    end
+  end
+end
diff --git a/modules/meeting/app/contracts/meeting_agenda_items/create_contract.rb b/modules/meeting/app/contracts/meeting_agenda_items/create_contract.rb
index 1592c764b24b..ff0ecac37477 100644
--- a/modules/meeting/app/contracts/meeting_agenda_items/create_contract.rb
+++ b/modules/meeting/app/contracts/meeting_agenda_items/create_contract.rb
@@ -35,6 +35,8 @@ class CreateContract < BaseContract
     def self.assignable_meetings(user)
       StructuredMeeting
         .open
+        .not_templated
+        .not_cancelled
         .visible(user)
     end
 
diff --git a/modules/meeting/app/contracts/meetings/create_contract.rb b/modules/meeting/app/contracts/meetings/create_contract.rb
index 6591590c8020..23c0b57d12d0 100644
--- a/modules/meeting/app/contracts/meetings/create_contract.rb
+++ b/modules/meeting/app/contracts/meetings/create_contract.rb
@@ -29,8 +29,11 @@
 module Meetings
   class CreateContract < BaseContract
     attribute :type
+    attribute :recurring_meeting_id
+
     validate :user_allowed_to_add
     validate :type_in_allowed
+    validate :recurring_meeting_visible
 
     private
 
@@ -45,5 +48,13 @@ def user_allowed_to_add
         errors.add :base, :error_unauthorized
       end
     end
+
+    def recurring_meeting_visible
+      return if model.recurring_meeting.nil?
+
+      unless user.allowed_in_project?(:view_meetings, model.recurring_meeting.project)
+        errors.add :base, :error_unauthorized
+      end
+    end
   end
 end
diff --git a/modules/meeting/app/contracts/meetings/delete_contract.rb b/modules/meeting/app/contracts/meetings/delete_contract.rb
new file mode 100644
index 000000000000..edf019c5e149
--- /dev/null
+++ b/modules/meeting/app/contracts/meetings/delete_contract.rb
@@ -0,0 +1,33 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module Meetings
+  class DeleteContract < ::DeleteContract
+    delete_permission :delete_meetings
+  end
+end
diff --git a/modules/meeting/app/contracts/meetings/update_contract.rb b/modules/meeting/app/contracts/meetings/update_contract.rb
index 090eb4b0fa61..9bb44d583a08 100644
--- a/modules/meeting/app/contracts/meetings/update_contract.rb
+++ b/modules/meeting/app/contracts/meetings/update_contract.rb
@@ -28,7 +28,10 @@
 
 module Meetings
   class UpdateContract < BaseContract
+    include Redmine::I18n
+
     validate :user_allowed_to_edit
+    validate :not_before_scheduled_time
 
     attribute :lock_version do
       if model.lock_version.nil? || model.lock_version_changed?
@@ -41,5 +44,15 @@ def user_allowed_to_edit
         errors.add :base, :error_unauthorized
       end
     end
+
+    def not_before_scheduled_time
+      return unless model.recurring_meeting_id && model.scheduled_meeting
+      return unless model.changed.intersect?(%w[start_time start_date])
+
+      scheduled_time = model.scheduled_meeting.start_time
+      if model.start_time < scheduled_time
+        errors.add :start_date, :after, date: format_date(scheduled_time)
+      end
+    end
   end
 end
diff --git a/modules/meeting/app/contracts/recurring_meetings/base_contract.rb b/modules/meeting/app/contracts/recurring_meetings/base_contract.rb
new file mode 100644
index 000000000000..56316cc19d61
--- /dev/null
+++ b/modules/meeting/app/contracts/recurring_meetings/base_contract.rb
@@ -0,0 +1,51 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module RecurringMeetings
+  class BaseContract < ::ModelContract
+    def self.model
+      RecurringMeeting
+    end
+
+    attribute :title
+    attribute :author_id
+    attribute :project_id
+    attribute :start_time
+    attribute :start_date
+    attribute :start_time_hour
+    attribute :frequency
+    attribute :end_after
+    attribute :end_date
+    attribute :iterations
+    attribute :interval
+
+    # Virtual attributes for the form
+    attribute :duration
+    attribute :location
+  end
+end
diff --git a/modules/meeting/app/contracts/recurring_meetings/create_contract.rb b/modules/meeting/app/contracts/recurring_meetings/create_contract.rb
new file mode 100644
index 000000000000..5b32613aa598
--- /dev/null
+++ b/modules/meeting/app/contracts/recurring_meetings/create_contract.rb
@@ -0,0 +1,41 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module RecurringMeetings
+  class CreateContract < BaseContract
+    validate :user_allowed_to_add
+
+    private
+
+    def user_allowed_to_add
+      unless user.allowed_in_project?(:create_meetings, model.project)
+        errors.add :base, :error_unauthorized
+      end
+    end
+  end
+end
diff --git a/modules/meeting/app/contracts/recurring_meetings/update_contract.rb b/modules/meeting/app/contracts/recurring_meetings/update_contract.rb
new file mode 100644
index 000000000000..358a4d9b5de6
--- /dev/null
+++ b/modules/meeting/app/contracts/recurring_meetings/update_contract.rb
@@ -0,0 +1,39 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module RecurringMeetings
+  class UpdateContract < BaseContract
+    validate :user_allowed_to_edit
+
+    def user_allowed_to_edit
+      unless user.allowed_in_project?(:edit_meetings, model.project)
+        errors.add :base, :error_unauthorized
+      end
+    end
+  end
+end
diff --git a/modules/meeting/app/controllers/meetings_controller.rb b/modules/meeting/app/controllers/meetings_controller.rb
index 7a1f8801e56f..af3e93508f02 100644
--- a/modules/meeting/app/controllers/meetings_controller.rb
+++ b/modules/meeting/app/controllers/meetings_controller.rb
@@ -39,6 +39,7 @@ class MeetingsController < ApplicationController
   before_action :authorize, except: %i[index new create update_title update_details update_participants change_state new_dialog]
   before_action :authorize_global,
                 only: %i[index new create update_title update_details update_participants change_state new_dialog]
+  before_action :prevent_template_destruction, only: :destroy
 
   helper :watchers
   helper :meeting_contents
@@ -68,12 +69,16 @@ def index
     :meetings
   end
 
-  def show
+  def show # rubocop:disable Metrics/AbcSize
     respond_to do |format|
       format.html do
         html_title "#{t(:label_meeting)}: #{@meeting.title}"
         if @meeting.is_a?(StructuredMeeting)
-          render(Meetings::ShowComponent.new(meeting: @meeting, project: @project), layout: true)
+          if @meeting.state == "cancelled"
+            render_404
+          else
+            render(Meetings::ShowComponent.new(meeting: @meeting, project: @project), layout: true)
+          end
         elsif @meeting.agenda.present? && @meeting.agenda.locked?
           params[:tab] ||= "minutes"
         end
@@ -127,7 +132,7 @@ def create # rubocop:disable Metrics/AbcSize
             component: Meetings::Index::FormComponent.new(
               meeting: @meeting,
               project: @project,
-              type: @copy_from || :new
+              copy_from: @copy_from
             ),
             status: :bad_request
           )
@@ -139,7 +144,10 @@ def create # rubocop:disable Metrics/AbcSize
   end
 
   def new_dialog
-    respond_with_dialog Meetings::Index::DialogComponent.new(meeting: @meeting, project: @project, type: :new)
+    respond_with_dialog Meetings::Index::DialogComponent.new(
+      meeting: @meeting,
+      project: @project
+    )
   end
 
   def new; end
@@ -161,15 +169,31 @@ def copy
       end
 
       format.turbo_stream do
-        respond_with_dialog Meetings::Index::DialogComponent.new(meeting: @meeting, project: @project, type: copy_from)
+        respond_with_dialog Meetings::Index::DialogComponent.new(
+          meeting: @meeting,
+          project: @project,
+          copy_from:
+        )
       end
     end
   end
 
-  def destroy
-    @meeting.destroy
-    flash[:notice] = I18n.t(:notice_successful_delete)
-    redirect_to action: "index", project_id: @project
+  def destroy # rubocop:disable Metrics/AbcSize
+    recurring = @meeting.recurring_meeting
+
+    # rubocop:disable Rails/ActionControllerFlashBeforeRender
+    Meetings::DeleteService
+      .new(model: @meeting, user: User.current)
+      .call
+      .on_success { flash[:notice] = recurring ? I18n.t(:notice_successful_cancel) : I18n.t(:notice_successful_delete) }
+      .on_failure { |call| flash[:error] = call.message }
+    # rubocop:enable Rails/ActionControllerFlashBeforeRender
+
+    if recurring
+      redirect_to polymorphic_path([@project, recurring]), status: :see_other
+    else
+      redirect_to polymorphic_path([@project, :meetings]), status: :see_other
+    end
   end
 
   def edit
@@ -306,19 +330,26 @@ def load_query
       current_user
     ).call(params)
 
-    query = apply_default_filter_if_none_given(query)
-
-    if @project
-      query.where("project_id", "=", @project.id)
-    end
+    apply_default_filter_if_none_given(query)
+    apply_time_filter_and_sort(query)
+    query.where("project_id", "=", @project.id) if @project
 
     query
   end
 
+  def apply_time_filter_and_sort(query)
+    if params[:upcoming] == "false"
+      query.where("time", "=", Queries::Meetings::Filters::TimeFilter::PAST_VALUE)
+      query.order(start_time: :desc)
+    else
+      query.where("time", "=", Queries::Meetings::Filters::TimeFilter::FUTURE_VALUE)
+      query.order(start_time: :asc)
+    end
+  end
+
   def apply_default_filter_if_none_given(query)
-    return query if query.filters.any?
+    return if params.key?(:filters)
 
-    query.where("time", "=", Queries::Meetings::Filters::TimeFilter::FUTURE_VALUE)
     query.where("invited_user_id", "=", [User.current.id.to_s])
   end
 
@@ -329,11 +360,22 @@ def load_meetings(query)
   end
 
   def build_meeting
-    @meeting = Meeting.new
+    @meeting = meeting_class.new
     @meeting.project = @project
     @meeting.author = User.current
   end
 
+  def meeting_class
+    case params[:type]
+    when "recurring"
+      RecurringMeeting
+    when "structured"
+      StructuredMeeting
+    else
+      Meeting
+    end
+  end
+
   def global_upcoming_meetings
     projects = Project.allowed_in_project(User.current, :view_meetings)
 
@@ -349,7 +391,7 @@ def find_meeting
     render_404
   end
 
-  def convert_params
+  def convert_params # rubocop:disable Metrics/AbcSize
     # We do some preprocessing of `meeting_params` that we will store in this
     # instance variable.
     @converted_params = meeting_params.to_h
@@ -365,6 +407,9 @@ def convert_params
     else
       force_defaults
     end
+
+    # Recurring meeting occurrences can only be copied as one-off meetings
+    @converted_params[:recurring_meeting_id] = nil
   end
 
   def meeting_params
@@ -383,15 +428,6 @@ def structured_meeting_params
     end
   end
 
-  def meeting_type(given_type)
-    case given_type
-    when "dynamic"
-      "StructuredMeeting"
-    else
-      "Meeting"
-    end
-  end
-
   def verify_activities_module_activated
     render_403 if @project && !@project.module_enabled?("activity")
   end
@@ -449,4 +485,8 @@ def copy_attributes
       send_notifications: copy_param(:send_notifications)
     }
   end
+
+  def prevent_template_destruction
+    render_400 if @meeting.templated?
+  end
 end
diff --git a/modules/meeting/app/controllers/recurring_meetings/schedule_controller.rb b/modules/meeting/app/controllers/recurring_meetings/schedule_controller.rb
new file mode 100644
index 000000000000..d85ad73a1e64
--- /dev/null
+++ b/modules/meeting/app/controllers/recurring_meetings/schedule_controller.rb
@@ -0,0 +1,37 @@
+module RecurringMeetings
+  class ScheduleController < ApplicationController
+    authorize_with_permission :create_meetings, global: true
+
+    around_action :with_user_time_zone
+    before_action :build_meeting
+
+    def humanize_schedule
+      text = @recurring_meeting.human_frequency_schedule
+      respond_to do |format|
+        format.html { render plain: text }
+        format.turbo_stream do
+          render turbo_stream: turbo_stream.update("recurring-meeting-frequency-schedule",
+                                                   plain: text)
+        end
+      end
+    end
+
+    private
+
+    def with_user_time_zone(&)
+      User.execute_as(User.current, &)
+    end
+
+    def build_meeting
+      @recurring_meeting = RecurringMeeting.new(schedule_params.compact_blank)
+    end
+
+    def schedule_params
+      params
+        .require(:meeting)
+        .permit(:start_date, :start_time_hour, :frequency, :interval)
+    end
+
+    def default_breadcrumb; end
+  end
+end
diff --git a/modules/meeting/app/controllers/recurring_meetings_controller.rb b/modules/meeting/app/controllers/recurring_meetings_controller.rb
new file mode 100644
index 000000000000..5dedc984d3ad
--- /dev/null
+++ b/modules/meeting/app/controllers/recurring_meetings_controller.rb
@@ -0,0 +1,270 @@
+class RecurringMeetingsController < ApplicationController
+  include RecurringMeetingsHelper
+  include Layout
+  include PaginationHelper
+  include OpTurbo::ComponentStream
+  include OpTurbo::FlashStreamHelper
+  include OpTurbo::DialogStreamHelper
+
+  before_action :find_meeting,
+                only: %i[show update details_dialog destroy edit init delete_scheduled template_completed download_ics]
+  before_action :find_optional_project, only: %i[index show new create update details_dialog destroy edit delete_scheduled]
+  before_action :authorize_global, only: %i[index new create]
+  before_action :authorize, except: %i[index new create]
+  before_action :get_scheduled_meeting, only: %i[delete_scheduled]
+
+  before_action :convert_params, only: %i[create update]
+  before_action :check_template_completable, only: %i[template_completed]
+
+  menu_item :meetings
+
+  def index
+    @recurring_meetings =
+      if @project
+        RecurringMeeting.visible.where(project_id: @project.id)
+      else
+        RecurringMeeting.visible
+      end
+
+    respond_to do |format|
+      format.html do
+        render :index, locals: { menu_name: project_or_global_menu }
+      end
+    end
+  end
+
+  def new
+    @recurring_meeting = RecurringMeeting.new(project: @project)
+  end
+
+  def show
+    @direction = params[:direction]
+    @max_count = max_count
+    @count = [(params[:count].to_i + 5), @max_count].min
+
+    @meetings = if @direction == "past"
+                  @recurring_meeting.scheduled_instances(upcoming: false).limit(@count)
+                else
+                  upcoming_meetings(count: @count)
+                end
+
+    respond_to do |format|
+      format.html do
+        render :show, locals: { menu_name: project_or_global_menu }
+      end
+    end
+  end
+
+  def init
+    call = ::RecurringMeetings::InitOccurrenceService
+      .new(user: current_user, recurring_meeting: @recurring_meeting)
+      .call(start_time: DateTime.iso8601(params[:start_time]))
+
+    if call.success?
+      redirect_to project_meeting_path(call.result.project, call.result), status: :see_other
+    else
+      flash[:error] = call.message
+      redirect_to action: :show, id: @recurring_meeting
+    end
+  end
+
+  def details_dialog
+    respond_with_dialog Meetings::Index::DialogComponent.new(
+      meeting: @recurring_meeting,
+      project: @recurring_meeting.project
+    )
+  end
+
+  def create # rubocop:disable Metrics/AbcSize
+    call = ::RecurringMeetings::CreateService
+      .new(user: current_user)
+      .call(@converted_params)
+
+    if call.success?
+      flash[:notice] = I18n.t(:notice_successful_create).html_safe
+      redirect_to polymorphic_path([@project, :meeting], { id: call.result.template.id }),
+                  status: :see_other
+    else
+      respond_to do |format|
+        format.turbo_stream do
+          update_via_turbo_stream(
+            component: Meetings::Index::FormComponent.new(
+              meeting: call.result,
+              project: @project,
+              copy_from: @copy_from
+            ),
+            status: :bad_request
+          )
+
+          respond_with_turbo_streams
+        end
+      end
+    end
+  end
+
+  def edit
+    redirect_to controller: "meetings", action: "show", id: @recurring_meeting.template, status: :see_other
+  end
+
+  def update
+    call = ::RecurringMeetings::UpdateService
+      .new(model: @recurring_meeting, user: current_user)
+      .call(@converted_params)
+
+    if call.success?
+      redirect_back(fallback_location: recurring_meeting_path(call.result), status: :see_other, turbo: false)
+    else
+      respond_to do |format|
+        format.turbo_stream do
+          update_via_turbo_stream(
+            component: Meetings::Index::FormComponent.new(
+              meeting: call.result,
+              project: @project
+            ),
+            status: :bad_request
+          )
+
+          respond_with_turbo_streams
+        end
+      end
+    end
+  end
+
+  def destroy
+    if @recurring_meeting.destroy
+      flash[:notice] = I18n.t(:notice_successful_delete)
+    else
+      flash[:error] = I18n.t(:error_failed_to_delete_entry)
+    end
+
+    respond_to do |format|
+      format.html do
+        redirect_to polymorphic_path([@project, :meetings])
+      end
+    end
+  end
+
+  def template_completed
+    call = ::RecurringMeetings::InitOccurrenceService
+      .new(user: current_user, recurring_meeting: @recurring_meeting)
+      .call(start_time: @first_occurrence.to_time)
+
+    if call.success?
+      flash[:success] = I18n.t("recurring_meeting.occurrence.first_created")
+    else
+      flash[:error] = call.message
+    end
+
+    redirect_to action: :show, id: @recurring_meeting, status: :see_other
+  end
+
+  def delete_scheduled
+    if @scheduled.update(cancelled: true)
+      flash[:notice] = I18n.t(:notice_successful_cancel)
+    else
+      flash[:error] = I18n.t(:error_failed_to_delete_entry)
+    end
+
+    redirect_to polymorphic_path([@project, @recurring_meeting]), status: :see_other
+  end
+
+  def download_ics
+    ::RecurringMeetings::ICalService
+      .new(user: current_user, series: @recurring_meeting)
+      .call
+      .on_failure { |call| render_500(message: call.message) }
+      .on_success do |call|
+      send_data call.result, filename: filename_for_content_disposition("#{@recurring_meeting.title}.ics")
+    end
+  end
+
+  private
+
+  def upcoming_meetings(count:)
+    meetings = @recurring_meeting
+      .scheduled_instances(upcoming: true)
+      .index_by(&:start_time)
+
+    merged = @recurring_meeting
+      .scheduled_occurrences(limit: count)
+      .map do |start_time|
+      meetings.delete(start_time) || scheduled_meeting(start_time)
+    end
+
+    # Ensure we keep any remaining future meetings that exceed the limit
+    merged + meetings.values.sort_by(&:start_time)
+  end
+
+  def scheduled_meeting(start_time)
+    ScheduledMeeting.new(start_time:, recurring_meeting: @recurring_meeting)
+  end
+
+  def get_scheduled_meeting
+    @scheduled = @recurring_meeting.scheduled_meetings.find_or_initialize_by(start_time: params[:start_time])
+
+    render_400 unless @scheduled.meeting_id.nil?
+  end
+
+  def find_optional_project
+    @project = Project.find(params[:project_id]) if params[:project_id].present?
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+
+  def find_meeting
+    @recurring_meeting = RecurringMeeting.visible.find(params[:id])
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+
+  def convert_params
+    # We do some preprocessing of `meeting_params` that we will store in this
+    # instance variable.
+    @converted_params = recurring_meeting_params.to_h
+
+    @converted_params[:project] = @project
+    @converted_params[:duration] = @converted_params[:duration].to_hours if @converted_params[:duration].present?
+  end
+
+  def recurring_meeting_params
+    params
+      .require(:meeting)
+      .permit(:title, :location, :start_time_hour, :duration, :start_date,
+              :interval, :frequency, :end_after, :end_date, :iterations)
+  end
+
+  def find_copy_from_meeting
+    copied_from_meeting_id = params[:copied_from_meeting_id] || params[:meeting][:copied_from_meeting_id]
+    return unless copied_from_meeting_id
+
+    @copy_from = Meeting.visible.find(copied_from_meeting_id)
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+
+  def structured_meeting_params
+    if params[:structured_meeting].present?
+      params
+        .require(:structured_meeting)
+    end
+  end
+
+  def check_template_completable
+    @first_occurrence = @recurring_meeting.next_occurrence&.to_time
+    if @first_occurrence.nil?
+      render_400(message: I18n.t("recurring_meeting.occurrence.error_no_next"))
+      return
+    end
+
+    is_scheduled = @recurring_meeting
+      .scheduled_meetings
+      .where(start_time: @first_occurrence)
+      .where.not(meeting_id: nil)
+      .exists?
+
+    if is_scheduled
+      flash[:info] = I18n.t("recurring_meeting.occurrence.first_already_exists")
+      redirect_to action: :show, status: :see_other
+    end
+  end
+end
diff --git a/modules/meeting/app/controllers/work_package_meetings_tab_controller.rb b/modules/meeting/app/controllers/work_package_meetings_tab_controller.rb
index 7a8e8825928a..2f95ca80ecf8 100644
--- a/modules/meeting/app/controllers/work_package_meetings_tab_controller.rb
+++ b/modules/meeting/app/controllers/work_package_meetings_tab_controller.rb
@@ -130,9 +130,9 @@ def get_grouped_agenda_items(direction)
   def get_agenda_items_of_work_package(direction)
     agenda_items = MeetingAgendaItem
         .includes(:meeting)
-        .where(meeting_id: Meeting.visible(current_user))
+        .where(meeting_id: Meeting.not_templated.visible(current_user))
         .where(work_package_id: @work_package.id)
-        .reorder(sort_clause(direction))
+        .order(sort_clause(direction))
 
     comparison = direction == :past ? "<" : ">="
     agenda_items.where("meetings.start_time + (interval '1 hour' * meetings.duration) #{comparison} ?", Time.zone.now)
diff --git a/modules/meeting/app/forms/meeting/location.rb b/modules/meeting/app/forms/meeting/location.rb
index 40d9f3e882b6..4d5be511d7af 100644
--- a/modules/meeting/app/forms/meeting/location.rb
+++ b/modules/meeting/app/forms/meeting/location.rb
@@ -30,10 +30,21 @@ class Meeting::Location < ApplicationForm
   form do |meeting_form|
     meeting_form.text_field(
       name: :location,
+      value: @value,
       placeholder: Meeting.human_attribute_name(:location),
       label: Meeting.human_attribute_name(:location),
-      visually_hide_label: false,
-      leading_visual: { icon: :location }
+      visually_hide_label: false
     )
   end
+
+  def initialize(meeting:)
+    super()
+
+    @value =
+      if meeting.is_a?(RecurringMeeting) && meeting.template
+        meeting.template.location
+      else
+        meeting.location
+      end
+  end
 end
diff --git a/modules/meeting/app/forms/meeting/time_group.rb b/modules/meeting/app/forms/meeting/time_group.rb
new file mode 100644
index 000000000000..a7c1eccd8083
--- /dev/null
+++ b/modules/meeting/app/forms/meeting/time_group.rb
@@ -0,0 +1,96 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+class Meeting::TimeGroup < ApplicationForm
+  include Redmine::I18n
+
+  form do |meeting_form|
+    meeting_form.group(layout: :horizontal) do |group|
+      group.text_field(
+        name: :start_date,
+        type: "date",
+        value: @initial_date,
+        placeholder: @meeting.class.human_attribute_name(:start_date),
+        label: @meeting.class.human_attribute_name(:start_date),
+        required: true,
+        autofocus: false,
+        data: {
+          action: "input->recurring-meetings--form#updateFrequencyText"
+        }
+      )
+
+      group.text_field(
+        name: :start_time_hour,
+        type: "time",
+        value: @initial_time,
+        placeholder: Meeting.human_attribute_name(:start_time),
+        label: Meeting.human_attribute_name(:start_time),
+        required: true,
+        caption: formatted_time_zone_offset,
+        data: {
+          action: "input->recurring-meetings--form#updateFrequencyText"
+        }
+      )
+      group.text_field(
+        name: :duration,
+        type: :text,
+        value: @duration,
+        placeholder: Meeting.human_attribute_name(:duration),
+        label: Meeting.human_attribute_name(:duration),
+        visually_hide_label: false,
+        required: true,
+        caption: I18n.t("text_in_hours"),
+        data: {
+          controller: "chronic-duration",
+          application_target: "dynamic"
+        }
+      )
+    end
+  end
+
+  def initialize(meeting:)
+    super()
+
+    @meeting = meeting
+    @initial_time = meeting.start_time_hour.presence || format_time(meeting.start_time, include_date: false, format: "%H:%M")
+    @initial_date = meeting.start_date.presence || format_time_as_date(meeting.start_time, format: "%Y-%m-%d")
+
+    duration = duration_value(meeting)
+    @duration = duration.nil? ? "" : ChronicDuration.output(duration * 3600, format: :hours_only)
+  end
+
+  private
+
+  def duration_value(meeting)
+    if meeting.is_a?(RecurringMeeting) && meeting.template
+      meeting.template.duration
+    else
+      meeting.duration
+    end
+  end
+end
diff --git a/modules/meeting/app/forms/meeting/type.rb b/modules/meeting/app/forms/meeting/type.rb
index bc8135b7dd3a..880a0b2ab73a 100644
--- a/modules/meeting/app/forms/meeting/type.rb
+++ b/modules/meeting/app/forms/meeting/type.rb
@@ -28,6 +28,6 @@
 
 class Meeting::Type < ApplicationForm
   form do |meeting_form|
-    meeting_form.hidden(name: :type, value: "StructuredMeeting")
+    meeting_form.hidden(name: :type, value: @builder.object.class.name)
   end
 end
diff --git a/modules/meeting/app/forms/meeting_agenda_item/meeting_form.rb b/modules/meeting/app/forms/meeting_agenda_item/meeting_form.rb
index cd44d1fedb88..1e9778be0623 100644
--- a/modules/meeting/app/forms/meeting_agenda_item/meeting_form.rb
+++ b/modules/meeting/app/forms/meeting_agenda_item/meeting_form.rb
@@ -45,7 +45,7 @@ class MeetingAgendaItem::MeetingForm < ApplicationForm
       MeetingAgendaItems::CreateContract
         .assignable_meetings(User.current)
         .where("meetings.start_time + (interval '1 hour' * meetings.duration) >= ?", Time.zone.now)
-        .reorder("meetings.start_time ASC")
+        .order("meetings.start_time")
         .includes(:project)
         .each do |meeting|
           select.option(
diff --git a/modules/meeting/app/forms/recurring_meeting/end_after.rb b/modules/meeting/app/forms/recurring_meeting/end_after.rb
new file mode 100644
index 000000000000..7b4725341663
--- /dev/null
+++ b/modules/meeting/app/forms/recurring_meeting/end_after.rb
@@ -0,0 +1,43 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+class RecurringMeeting::EndAfter < ApplicationForm
+  form do |meeting_form|
+    meeting_form.select_list(
+      name: "end_after",
+      label: I18n.t("activerecord.attributes.recurring_meeting.end_after"),
+      data: {
+        target_name: "end_after",
+        "show-when-value-selected-target": "cause"
+      }
+    ) do |list|
+      list.option(value: "specific_date", label: I18n.t("recurring_meeting.end_after.specific_date"))
+      list.option(value: "iterations", label: I18n.t("recurring_meeting.end_after.iterations"))
+    end
+  end
+end
diff --git a/modules/meeting/app/forms/recurring_meeting/frequency.rb b/modules/meeting/app/forms/recurring_meeting/frequency.rb
new file mode 100644
index 000000000000..8ed3963ec16a
--- /dev/null
+++ b/modules/meeting/app/forms/recurring_meeting/frequency.rb
@@ -0,0 +1,46 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+class RecurringMeeting::Frequency < ApplicationForm
+  form do |meeting_form|
+    meeting_form.select_list(
+      name: "frequency",
+      label: I18n.t("activerecord.attributes.recurring_meeting.frequency"),
+      data: {
+        target_name: "frequency",
+        "show-when-value-selected-target": "cause",
+        action: "input->recurring-meetings--form#updateFrequencyText"
+      }
+    ) do |list|
+      RecurringMeeting.frequencies.each_key do |value|
+        label = I18n.t(:"recurring_meeting.frequency.#{value}")
+        list.option(label:, value:)
+      end
+    end
+  end
+end
diff --git a/modules/meeting/app/forms/meeting/duration.rb b/modules/meeting/app/forms/recurring_meeting/interval.rb
similarity index 78%
rename from modules/meeting/app/forms/meeting/duration.rb
rename to modules/meeting/app/forms/recurring_meeting/interval.rb
index 41a5d303f4db..e94f080bf69a 100644
--- a/modules/meeting/app/forms/meeting/duration.rb
+++ b/modules/meeting/app/forms/recurring_meeting/interval.rb
@@ -26,20 +26,17 @@
 # See COPYRIGHT and LICENSE files for more details.
 #++
 
-class Meeting::Duration < ApplicationForm
+class RecurringMeeting::Interval < ApplicationForm
   form do |meeting_form|
     meeting_form.text_field(
-      name: :duration,
+      name: :interval,
       type: :number,
-      min: 0,
-      max: 24,
-      step: 0.05,
-      placeholder: Meeting.human_attribute_name(:duration),
-      label: Meeting.human_attribute_name(:duration),
-      visually_hide_label: false,
-      required: true,
-      leading_visual: { icon: :stopwatch },
-      caption: I18n.t("text_in_hours")
+      step: 1,
+      max: RecurringMeeting::MAX_INTERVAL,
+      label: I18n.t("activerecord.attributes.recurring_meeting.interval"),
+      data: {
+        action: "input->recurring-meetings--form#updateFrequencyText"
+      }
     )
   end
 end
diff --git a/modules/meeting/app/forms/recurring_meeting/iterations.rb b/modules/meeting/app/forms/recurring_meeting/iterations.rb
new file mode 100644
index 000000000000..dffe00d35bc2
--- /dev/null
+++ b/modules/meeting/app/forms/recurring_meeting/iterations.rb
@@ -0,0 +1,39 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+class RecurringMeeting::Iterations < ApplicationForm
+  form do |meeting_form|
+    meeting_form.text_field(
+      name: :iterations,
+      type: :number,
+      step: 1,
+      max: RecurringMeeting::MAX_ITERATIONS,
+      label: I18n.t("activerecord.attributes.recurring_meeting.iterations")
+    )
+  end
+end
diff --git a/modules/meeting/app/forms/recurring_meeting/specific_date.rb b/modules/meeting/app/forms/recurring_meeting/specific_date.rb
new file mode 100644
index 000000000000..53af80881348
--- /dev/null
+++ b/modules/meeting/app/forms/recurring_meeting/specific_date.rb
@@ -0,0 +1,48 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+class RecurringMeeting::SpecificDate < ApplicationForm
+  form do |meeting_form|
+    meeting_form.text_field(
+      name: :end_date,
+      type: "date",
+      value: @value,
+      placeholder: Meeting.human_attribute_name(:end_date),
+      label: Meeting.human_attribute_name(:end_date),
+      required: false,
+      autofocus: false
+    )
+  end
+
+  def initialize(meeting:)
+    super()
+
+    end_time = meeting.end_date || 1.year.from_now
+    @value = end_time.strftime("%Y-%m-%d")
+  end
+end
diff --git a/modules/meeting/app/helpers/recurring_meetings_helper.rb b/modules/meeting/app/helpers/recurring_meetings_helper.rb
new file mode 100644
index 000000000000..fb36af0f88d8
--- /dev/null
+++ b/modules/meeting/app/helpers/recurring_meetings_helper.rb
@@ -0,0 +1,37 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module RecurringMeetingsHelper
+  def max_count
+    if @direction == "past"
+      @recurring_meeting.scheduled_instances(upcoming: false).count
+    else
+      @recurring_meeting.remaining_occurrences.count
+    end
+  end
+end
diff --git a/modules/meeting/app/menus/meetings/menu.rb b/modules/meeting/app/menus/meetings/menu.rb
index 9afeca06170d..f4990f3d626e 100644
--- a/modules/meeting/app/menus/meetings/menu.rb
+++ b/modules/meeting/app/menus/meetings/menu.rb
@@ -27,42 +27,73 @@
 # ++
 module Meetings
   class Menu < Submenu
-    attr_reader :view_type, :project
-
-    def initialize(project: nil, params: nil)
-      @project = project
-      @params = params
-
-      super(view_type:, project:, params:)
+    def initialize(params:, project: nil)
+      super(view_type: nil, project:, params:)
     end
 
     def menu_items
       [
         OpenProject::Menu::MenuGroup.new(header: nil, children: top_level_menu_items),
+        meeting_series_menu_group,
         OpenProject::Menu::MenuGroup.new(header: I18n.t(:label_involvement), children: involvement_sidebar_menu_items)
-      ]
+      ].compact
     end
 
     def top_level_menu_items
-      upcoming_filter = [{ time: { operator: "=", values: ["future"] } }].to_json
-      past_filter = [{ time: { operator: "=", values: ["past"] } }].to_json
+      all_filter = [{ invited_user_id: { operator: "*", values: [] } }].to_json
+      my_meetings_href = polymorphic_path([project, :meetings])
 
       [
-        menu_item(title: I18n.t(:label_upcoming_meetings),
-                  query_params: { filters: upcoming_filter, sort: "start_time" }),
-        menu_item(title: I18n.t(:label_past_meetings),
-                  query_params: { filters: past_filter, sort: "start_time:desc" })
-      ]
+        menu_item(title: I18n.t(:label_my_meetings),
+                  selected: params[:current_href] == my_meetings_href && params[:filters].blank?),
+        recurring_menu_item,
+        menu_item(title: I18n.t(:label_all_meetings),
+                  query_params: { filters: all_filter })
+      ].compact
+    end
+
+    def meeting_series_menu_group
+      return unless OpenProject::FeatureDecisions.recurring_meetings_active?
+
+      OpenProject::Menu::MenuGroup.new(header: I18n.t(:label_meeting_series), children: meeting_series_menu_items)
+    end
+
+    def meeting_series_menu_items
+      series = RecurringMeeting
+        .visible
+        .reorder("LOWER(title)")
+
+      if project
+        series = series.where(project_id: project.id)
+      end
+
+      series.pluck(:id, :title)
+            .map do |id, title|
+        href = polymorphic_path([project, :recurring_meeting], { id: })
+        OpenProject::Menu::MenuItem.new(title:,
+                                        selected: params[:current_href] == href,
+                                        href:)
+      end
+    end
+
+    def recurring_menu_item
+      return unless OpenProject::FeatureDecisions.recurring_meetings_active?
+
+      recurring_filter = [{ type: { operator: "=", values: ["t"] } }].to_json
+
+      menu_item(title: I18n.t("label_recurring_meeting_plural"),
+                query_params: { filters: recurring_filter, sort: "start_time" })
     end
 
     def involvement_sidebar_menu_items
+      invitation_filter = [{ invited_user_id: { operator: "=", values: [User.current.id.to_s] } }].to_json
+
       [
-        menu_item(title: I18n.t(:label_upcoming_invitations)),
-        menu_item(title: I18n.t(:label_past_invitations),
-                  query_params: { filters: past_filter, sort: "start_time:desc" }),
-        menu_item(title: I18n.t(:label_attendee),
+        menu_item(title: I18n.t(:label_invitations),
+                  query_params: { filters: invitation_filter, sort: "start_time" }),
+        menu_item(title: I18n.t(:label_attended),
                   query_params: { filters: attendee_filter }),
-        menu_item(title: I18n.t(:label_author),
+        menu_item(title: I18n.t(:label_created_by_me),
                   query_params: { filters: author_filter })
       ]
     end
@@ -89,5 +120,9 @@ def attendee_filter
     def author_filter
       [{ author_id: { operator: "=", values: [User.current.id.to_s] } }].to_json
     end
+
+    def recurring_meeting_type_filter
+      [{ type: { operator: "=", values: [RecurringMeeting.to_s] } }].to_json
+    end
   end
 end
diff --git a/modules/meeting/app/models/meeting.rb b/modules/meeting/app/models/meeting.rb
index 27697a97fc57..8f38e8a6aeaf 100644
--- a/modules/meeting/app/models/meeting.rb
+++ b/modules/meeting/app/models/meeting.rb
@@ -27,13 +27,18 @@
 #++
 
 class Meeting < ApplicationRecord
-  include VirtualAttribute
+  include VirtualStartTime
+  include ChronicDuration
   include OpenProject::Journal::AttachmentHelper
 
   self.table_name = "meetings"
 
   belongs_to :project
   belongs_to :author, class_name: "User"
+
+  belongs_to :recurring_meeting, optional: true
+  has_one :scheduled_meeting, inverse_of: :meeting
+
   has_one :agenda, dependent: :destroy, class_name: "MeetingAgenda"
   has_one :minutes, dependent: :destroy, class_name: "MeetingMinutes"
   has_many :contents, -> { readonly }, class_name: "MeetingContent"
@@ -46,11 +51,21 @@ class Meeting < ApplicationRecord
   has_many :sections, dependent: :destroy, class_name: "MeetingSection"
   has_many :agenda_items, dependent: :destroy, class_name: "MeetingAgendaItem"
 
-  default_scope do
-    order("#{Meeting.table_name}.start_time DESC")
-  end
+  scope :templated, -> { where(template: true) }
+  scope :not_templated, -> { where(template: false) }
+
+  scope :cancelled, -> { where(state: :cancelled) }
+  scope :not_cancelled, -> { where.not(id: cancelled) }
+
+  scope :not_recurring, -> { where(recurring_meeting_id: nil) }
+  scope :recurring, -> { where.not(id: not_recurring) }
+
   scope :from_tomorrow, -> { where(["start_time >= ?", Date.tomorrow.beginning_of_day]) }
   scope :from_today, -> { where(["start_time >= ?", Time.zone.today.beginning_of_day]) }
+
+  scope :upcoming, -> { where("start_time + (interval '1 hour' * duration) >= ?", Time.current) }
+  scope :past, -> { where("start_time + (interval '1 hour' * duration) < ?", Time.current) }
+
   scope :with_users_by_date, -> {
     order("#{Meeting.table_name}.title ASC")
       .includes({ participants: :user }, :author)
@@ -87,26 +102,18 @@ class Meeting < ApplicationRecord
 
   accepts_nested_attributes_for :participants, allow_destroy: true
 
-  validates_presence_of :title, :project_id, :duration
-
-  # We only save start_time as an aggregated value of start_date and hour,
-  # but still need start_date and _hour for validation purposes
-  virtual_attribute :start_date do
-    @start_date
-  end
-  virtual_attribute :start_time_hour do
-    @start_time_hour
-  end
+  validates_presence_of :title, :project_id
 
-  validate :validate_date_and_time
+  validates_numericality_of :duration, greater_than: 0
 
-  before_save :update_start_time!
   before_save :add_new_participants_as_watcher
-  after_initialize :set_initial_values
+
   after_update :send_rescheduling_mail, if: -> { saved_change_to_start_time? || saved_change_to_duration? }
 
   enum state: {
     open: 0, # 0 -> default, leave values for future states between open and closed
+    scheduled: 1,
+    cancelled: 4,
     closed: 5
   }
 
@@ -124,21 +131,6 @@ def changed_hash
     OpenProject::Cache::CacheKey.expand(parts)
   end
 
-  ##
-  # Return the computed start_time when changed
-  def start_time
-    if parse_start_time?
-      parsed_start_time
-    else
-      super
-    end
-  end
-
-  def start_time=(value)
-    super(value&.to_datetime)
-    update_derived_fields
-  end
-
   def start_month
     start_time.month
   end
@@ -159,6 +151,10 @@ def text
     agenda.text if agenda.present?
   end
 
+  def templated?
+    !!template
+  end
+
   def author=(user)
     super
     # Don't add the author as participant if we already have some through nested attributes
@@ -249,82 +245,8 @@ def allowed_participants
       .where(user_id: available_members)
   end
 
-  protected
-
-  def set_initial_values
-    # set defaults
-    # Start date is set to tomorrow at 10 AM (Current users local time)
-    write_attribute(:start_time, User.current.time_zone.now.at_midnight + 34.hours) if start_time.nil?
-    self.duration ||= 1
-    update_derived_fields
-  end
-
-  def update_derived_fields
-    @start_date = format_time_as_date(start_time, format: "%Y-%m-%d")
-    @start_time_hour = format_time(start_time, include_date: false, format: "%H:%M")
-  end
-
   private
 
-  ##
-  # Validate date and time setters.
-  # If start_time has been changed, check that value.
-  # Otherwise start_{date, time_hour} was used, then validate those
-  def validate_date_and_time
-    if parse_start_time?
-      errors.add :start_date, :not_an_iso_date if parsed_start_date.nil?
-      errors.add :start_time_hour, :invalid_time_format if parsed_start_time_hour.nil?
-    elsif start_time.nil?
-      errors.add :start_time, :invalid
-    end
-  end
-
-  ##
-  # Actually sets the aggregated start_time attribute.
-  def update_start_time!
-    write_attribute(:start_time, start_time)
-  end
-
-  ##
-  # Determines whether new raw values were provided.
-  def parse_start_time?
-    changed.intersect?(%w(start_date start_time_hour))
-  end
-
-  ##
-  # Returns the parse result of both start_date and start_time_hour
-  def parsed_start_time
-    date = parsed_start_date
-    time = parsed_start_time_hour
-
-    return if date.nil? || time.nil?
-
-    Time.zone.local(
-      date.year,
-      date.month,
-      date.day,
-      time.hour,
-      time.min
-    )
-  end
-
-  ##
-  # Enforce ISO 8601 date parsing for the given input string
-  # This avoids weird parsing of dates due to malformed input.
-  def parsed_start_date
-    Date.iso8601(@start_date)
-  rescue ArgumentError
-    nil
-  end
-
-  ##
-  # Enforce HH::MM time parsing for the given input string
-  def parsed_start_time_hour
-    Time.strptime(@start_time_hour, "%H:%M")
-  rescue ArgumentError
-    nil
-  end
-
   def add_new_participants_as_watcher
     participants.select(&:new_record?).each do |p|
       add_watcher(p.user)
@@ -332,12 +254,16 @@ def add_new_participants_as_watcher
   end
 
   def send_participant_added_mail(participant)
-    if persisted? && Journal::NotificationConfiguration.active?
+    return if templated? || new_record?
+
+    if Journal::NotificationConfiguration.active?
       MeetingMailer.invited(self, participant.user, User.current).deliver_later
     end
   end
 
   def send_rescheduling_mail
+    return if templated? || new_record?
+
     MeetingNotificationService
       .new(self)
       .call :rescheduled,
diff --git a/modules/meeting/app/models/meeting/chronic_duration.rb b/modules/meeting/app/models/meeting/chronic_duration.rb
new file mode 100644
index 000000000000..b48a2f186cc9
--- /dev/null
+++ b/modules/meeting/app/models/meeting/chronic_duration.rb
@@ -0,0 +1,41 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module Meeting::ChronicDuration
+  def duration=(value)
+    if value.is_a?(String)
+      write_attribute(:duration, value.to_hours)
+    else
+      super
+    end
+  end
+
+  def formatted_duration
+    DurationConverter.output(duration, format: :hours_only)
+  end
+end
diff --git a/modules/meeting/app/models/meeting/virtual_start_time.rb b/modules/meeting/app/models/meeting/virtual_start_time.rb
new file mode 100644
index 000000000000..68bbdf198e8b
--- /dev/null
+++ b/modules/meeting/app/models/meeting/virtual_start_time.rb
@@ -0,0 +1,137 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module Meeting::VirtualStartTime
+  extend ActiveSupport::Concern
+
+  included do
+    include VirtualAttribute
+
+    # We only save start_time as an aggregated value of start_date and hour,
+    # but still need start_date and _hour for validation purposes
+    virtual_attribute :start_date do
+      @start_date
+    end
+    virtual_attribute :start_time_hour do
+      @start_time_hour
+    end
+
+    validate :validate_date_and_time
+    after_initialize :set_initial_values
+    before_save :update_start_time!
+  end
+
+  ##
+  # Actually sets the aggregated start_time attribute.
+  def update_start_time!
+    write_attribute(:start_time, start_time)
+  end
+
+  ##
+  # Validate date and time setters.
+  # If start_time has been changed, check that value.
+  # Otherwise start_{date, time_hour} was used, then validate those
+  def validate_date_and_time
+    if parse_start_time?
+      errors.add :start_date, :not_an_iso_date if parsed_start_date.nil?
+      errors.add :start_time_hour, :invalid_time_format if parsed_start_time_hour.nil?
+    elsif start_time.nil?
+      errors.add :start_time, :invalid
+    end
+  end
+
+  ##
+  # Determines whether new raw values were provided.
+  def parse_start_time?
+    changed.intersect?(%w(start_date start_time_hour))
+  end
+
+  ##
+  # Returns the parse result of both start_date and start_time_hour
+  def parsed_start_time
+    date = parsed_start_date
+    time = parsed_start_time_hour
+
+    return if date.nil? || time.nil?
+
+    Time.zone.local(
+      date.year,
+      date.month,
+      date.day,
+      time.hour,
+      time.min
+    )
+  end
+
+  def set_initial_values
+    # set defaults
+    # Start date is set to tomorrow at 10 AM (Current users local time)
+    write_attribute(:start_time, User.current.time_zone.now.at_midnight + 34.hours) if start_time.nil?
+    self.duration ||= 1
+    update_derived_fields
+  end
+
+  ##
+  # Return the computed start_time when changed
+  def start_time
+    if parse_start_time?
+      parsed_start_time
+    else
+      super
+    end
+  end
+
+  def start_time=(value)
+    super(value&.to_datetime)
+    update_derived_fields
+  end
+
+  def update_derived_fields
+    @start_date = format_time_as_date(start_time, format: "%Y-%m-%d")
+    @start_time_hour = format_time(start_time, include_date: false, format: "%H:%M")
+  end
+
+  ##
+  # Enforce ISO 8601 date parsing for the given input string
+  # This avoids weird parsing of dates due to malformed input.
+  def parsed_start_date
+    return @start_date if @start_date.is_a?(Date)
+
+    Date.iso8601(@start_date)
+  rescue ArgumentError
+    nil
+  end
+
+  ##
+  # Enforce HH::MM time parsing for the given input string
+  def parsed_start_time_hour
+    Time.strptime(@start_time_hour, "%H:%M")
+  rescue ArgumentError
+    nil
+  end
+end
diff --git a/modules/meeting/app/models/queries/meetings.rb b/modules/meeting/app/models/queries/meetings.rb
index 1e73d1c94f52..e70e0704e12b 100644
--- a/modules/meeting/app/models/queries/meetings.rb
+++ b/modules/meeting/app/models/queries/meetings.rb
@@ -34,5 +34,8 @@ module Queries::Meetings
     filter Filters::InvitedUserFilter
     filter Filters::AuthorFilter
     filter Filters::DatesIntervalFilter
+    filter Filters::RecurringFilter
+
+    order Orders::DefaultOrder
   end
 end
diff --git a/modules/meeting/app/models/queries/meetings/filters/attended_user_filter.rb b/modules/meeting/app/models/queries/meetings/filters/attended_user_filter.rb
index 5101106cb599..d004477eb838 100644
--- a/modules/meeting/app/models/queries/meetings/filters/attended_user_filter.rb
+++ b/modules/meeting/app/models/queries/meetings/filters/attended_user_filter.rb
@@ -43,6 +43,10 @@ def where
     "meeting_participants.user_id IN (#{values.join(',')}) AND meeting_participants.attended"
   end
 
+  def human_name
+    I18n.t(:label_attended_user)
+  end
+
   def joins
     :participants
   end
diff --git a/modules/meeting/app/models/queries/meetings/filters/invited_user_filter.rb b/modules/meeting/app/models/queries/meetings/filters/invited_user_filter.rb
index 04caa0b2772f..59d8f333dfbb 100644
--- a/modules/meeting/app/models/queries/meetings/filters/invited_user_filter.rb
+++ b/modules/meeting/app/models/queries/meetings/filters/invited_user_filter.rb
@@ -40,7 +40,14 @@ def type_strategy
   end
 
   def where
-    "meeting_participants.user_id IN (#{values.join(',')}) AND meeting_participants.invited"
+    [
+      operator_strategy.sql_for_field(values, MeetingParticipant.table_name, "user_id"),
+      "#{MeetingParticipant.table_name}.invited"
+    ].join(" AND ")
+  end
+
+  def human_name
+    I18n.t(:label_invited_user)
   end
 
   def joins
@@ -50,8 +57,4 @@ def joins
   def self.key
     :invited_user_id
   end
-
-  def available_operators
-    [::Queries::Operators::Equals]
-  end
 end
diff --git a/modules/meeting/app/models/queries/meetings/filters/recurring_filter.rb b/modules/meeting/app/models/queries/meetings/filters/recurring_filter.rb
new file mode 100644
index 000000000000..01279912b04d
--- /dev/null
+++ b/modules/meeting/app/models/queries/meetings/filters/recurring_filter.rb
@@ -0,0 +1,51 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+class Queries::Meetings::Filters::RecurringFilter < Queries::Meetings::Filters::MeetingFilter
+  include Queries::Filters::Shared::BooleanFilter
+
+  def self.key
+    :type
+  end
+
+  def human_name
+    I18n.t("label_recurring_meeting_part_of")
+  end
+
+  def available?
+    OpenProject::FeatureDecisions.recurring_meetings_active?
+  end
+
+  def apply_to(query_scope)
+    if allowed_values.first.intersect?(values)
+      query_scope.recurring
+    else
+      query_scope.not_recurring
+    end
+  end
+end
diff --git a/modules/meeting/app/models/queries/meetings/filters/time_filter.rb b/modules/meeting/app/models/queries/meetings/filters/time_filter.rb
index d0c3faf168bb..f482aed8c1c6 100644
--- a/modules/meeting/app/models/queries/meetings/filters/time_filter.rb
+++ b/modules/meeting/app/models/queries/meetings/filters/time_filter.rb
@@ -39,15 +39,22 @@ def allowed_values
     ]
   end
 
+  def past?
+    values.first == PAST_VALUE
+  end
+
   def where
-    case values.first
-    when PAST_VALUE
+    if past?
       '"meetings"."start_time" < NOW()'
-    when FUTURE_VALUE
+    else
       '"meetings"."start_time" + "meetings"."duration" * interval \'1 hour\' > NOW()'
     end
   end
 
+  def human_name
+    Meeting.human_attribute_name(:start_time)
+  end
+
   def type
     :list
   end
diff --git a/modules/meeting/app/models/queries/meetings/meeting_query.rb b/modules/meeting/app/models/queries/meetings/meeting_query.rb
index 5715c6c87ede..55b39517f656 100644
--- a/modules/meeting/app/models/queries/meetings/meeting_query.rb
+++ b/modules/meeting/app/models/queries/meetings/meeting_query.rb
@@ -42,8 +42,10 @@ def results
 
     def default_scope
       Meeting
+        .not_templated
+        .not_cancelled
         .visible(user)
-        .unscope(:order)
+        .unscope(:order) # remove default scope order
     end
   end
 end
diff --git a/modules/meeting/app/models/queries/meetings/orders/default_order.rb b/modules/meeting/app/models/queries/meetings/orders/default_order.rb
new file mode 100644
index 000000000000..bc791c63d74e
--- /dev/null
+++ b/modules/meeting/app/models/queries/meetings/orders/default_order.rb
@@ -0,0 +1,35 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+class Queries::Meetings::Orders::DefaultOrder < Queries::Orders::Base
+  self.model = Meetings
+
+  def self.key
+    /\A(id|start_time)\z/
+  end
+end
diff --git a/modules/meeting/app/models/recurring_meeting.rb b/modules/meeting/app/models/recurring_meeting.rb
new file mode 100644
index 000000000000..092ebdc56a6a
--- /dev/null
+++ b/modules/meeting/app/models/recurring_meeting.rb
@@ -0,0 +1,216 @@
+class RecurringMeeting < ApplicationRecord
+  # Magical maximum of iterations
+  MAX_ITERATIONS = 1000
+  # Magical maximum of interval, derived from other calendars
+  MAX_INTERVAL = 100
+  include ::Meeting::VirtualStartTime
+  include Redmine::I18n
+
+  belongs_to :project
+  belongs_to :author, class_name: "User"
+
+  validates_presence_of :start_time, :title, :frequency, :end_after
+  validates_presence_of :end_date, if: -> { end_after_specific_date? }
+  validates_numericality_of :iterations,
+                            only_integer: true,
+                            greater_than_or_equal_to: 1,
+                            less_than_or_equal_to: MAX_ITERATIONS,
+                            if: -> { end_after_iterations? }
+  validates_numericality_of :interval,
+                            only_integer: true,
+                            greater_than_or_equal_to: 1,
+                            less_than_or_equal_to: MAX_INTERVAL,
+                            if: -> { !frequency_working_days? }
+
+  validate :end_date_constraints,
+           if: -> { end_after_specific_date? }
+
+  after_initialize :set_defaults
+  after_save :unset_schedule
+  before_destroy :remove_jobs
+
+  enum frequency: {
+    daily: 0,
+    working_days: 1,
+    weekly: 2
+  }.freeze, _prefix: true, _default: "weekly"
+
+  enum end_after: {
+    specific_date: 0,
+    iterations: 1
+  }.freeze, _prefix: true, _default: "specific_date"
+
+  has_many :meetings,
+           inverse_of: :recurring_meeting,
+           dependent: :destroy
+
+  has_many :scheduled_meetings,
+           inverse_of: :recurring_meeting,
+           dependent: :delete_all
+
+  has_one :template, -> { where(template: true) },
+          class_name: "Meeting"
+
+  scope :visible, ->(*args) {
+    includes(:project)
+      .references(:projects)
+      .merge(Project.allowed_to(args.first || User.current, :view_meetings))
+  }
+
+  # Keep location and duration as a virtual attribute
+  # so it can be passed to the template on save
+  virtual_attribute :location do
+    nil
+  end
+  virtual_attribute :duration do
+    nil
+  end
+
+  def human_frequency
+    I18n.t("recurring_meeting.frequency.#{frequency}")
+  end
+
+  def human_day_of_week
+    I18n.t("recurring_meeting.frequency.every_weekday", day_of_the_week: weekday)
+  end
+
+  def weekday
+    I18n.l(start_time, format: "%A")
+  end
+
+  def date
+    start_time.day.ordinalize
+  end
+
+  def schedule
+    @schedule ||= IceCube::Schedule.new(start_time, end_time: end_date).tap do |s|
+      s.add_recurrence_rule count_rule(frequency_rule)
+      exclude_non_working_days(s) if frequency_working_days?
+    end
+  end
+
+  def base_schedule
+    case frequency
+    when "daily"
+      if interval == 1
+        human_frequency
+      else
+        I18n.t("recurring_meeting.in_words.daily_interval", interval:)
+      end
+    when "working_days"
+      I18n.t("recurring_meeting.in_words.working_days")
+    when "weekly"
+      if interval == 1
+        I18n.t("recurring_meeting.in_words.weekly", weekday:)
+      else
+        I18n.t("recurring_meeting.in_words.weekly_interval", interval:, weekday:)
+      end
+    end
+  end
+
+  def full_schedule_in_words
+    I18n.t("recurring_meeting.in_words.full",
+           base: base_schedule,
+           time: format_time(start_time, include_date: false),
+           end_date: format_date(last_occurrence))
+  end
+
+  def human_frequency_schedule
+    I18n.t("recurring_meeting.in_words.frequency",
+           base: base_schedule,
+           time: format_time(start_time, include_date: false))
+  end
+
+  def scheduled_occurrences(limit:)
+    schedule.next_occurrences(limit, Time.current)
+  end
+
+  def first_occurrence
+    schedule.first
+  end
+
+  def last_occurrence
+    schedule.last
+  end
+
+  def next_occurrence(from_time: Time.current)
+    schedule.next_occurrence(from_time)
+  end
+
+  def remaining_occurrences
+    if end_date.present?
+      schedule.occurrences_between(Time.current, end_date)
+    else
+      schedule.remaining_occurrences(Time.current)
+    end
+  end
+
+  def scheduled_instances(upcoming: true)
+    filter_scope = upcoming ? :upcoming : :past
+    direction = upcoming ? :asc : :desc
+
+    scheduled_meetings
+      .includes(:meeting)
+      .public_send(filter_scope)
+      .then { |o| filter_scope == :past ? o.not_cancelled : o }
+      .order(start_time: direction)
+  end
+
+  private
+
+  def unset_schedule
+    @schedule = nil
+  end
+
+  def end_date_constraints
+    return if end_date.nil?
+
+    if end_date < Date.current
+      errors.add(:end_date, :after_today)
+    end
+
+    if parsed_start_date.present? && end_date < parsed_start_date
+      errors.add(:end_date, :after, date: format_date(parsed_start_date))
+    end
+  end
+
+  def exclude_non_working_days(schedule)
+    NonWorkingDay
+      .where(date: start_date...)
+      .pluck(:date)
+      .each do |date|
+      schedule.add_exception_time(date.to_time(:utc))
+    end
+  end
+
+  def frequency_rule
+    case frequency
+    when "daily"
+      IceCube::Rule.daily(interval)
+    when "working_days"
+      IceCube::Rule
+        .weekly(interval)
+        .day(*Setting.working_day_names)
+    when "weekly"
+      IceCube::Rule.weekly(interval)
+    else
+      raise NotImplementedError
+    end
+  end
+
+  def count_rule(rule)
+    if end_after_iterations?
+      rule.count(iterations)
+    else
+      rule.until(end_date.to_time(:utc))
+    end
+  end
+
+  def set_defaults
+    self.end_date ||= 1.year.from_now
+  end
+
+  def remove_jobs
+    RecurringMeetings::InitNextOccurrenceJob.delete_jobs(self)
+  end
+end
diff --git a/modules/meeting/app/models/scheduled_meeting.rb b/modules/meeting/app/models/scheduled_meeting.rb
new file mode 100644
index 000000000000..39cd83603be5
--- /dev/null
+++ b/modules/meeting/app/models/scheduled_meeting.rb
@@ -0,0 +1,44 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+class ScheduledMeeting < ApplicationRecord
+  belongs_to :meeting
+  belongs_to :recurring_meeting
+
+  scope :upcoming, -> { where(start_time: Time.current..) }
+  scope :past, -> { where(start_time: ...Time.current) }
+
+  scope :instantiated, -> { where.not(meeting_id: nil) }
+  scope :not_instantiated, -> { where(meeting_id: nil) }
+
+  scope :cancelled, -> { where(cancelled: true) }
+  scope :not_cancelled, -> { where(cancelled: false) }
+
+  validates_uniqueness_of :meeting, allow_nil: true
+  validates_presence_of :start_time
+end
diff --git a/modules/meeting/app/models/structured_meeting.rb b/modules/meeting/app/models/structured_meeting.rb
index 22a6b59874eb..50399b621409 100644
--- a/modules/meeting/app/models/structured_meeting.rb
+++ b/modules/meeting/app/models/structured_meeting.rb
@@ -38,7 +38,7 @@ class StructuredMeeting < Meeting
   def calculate_agenda_item_time_slots
     current_time = start_time
     MeetingAgendaItem.transaction do
-      changed_items = agenda_items.includes(:meeting_section).reorder("meeting_sections.position", :position).map do |top|
+      changed_items = agenda_items.includes(:meeting_section).order("meeting_sections.position", :position).map do |top|
         start_time = current_time
         current_time += top.duration_in_minutes&.minutes || 0.minutes
         end_time = current_time
diff --git a/modules/meeting/app/services/meetings/delete_service.rb b/modules/meeting/app/services/meetings/delete_service.rb
new file mode 100644
index 000000000000..55642242f49a
--- /dev/null
+++ b/modules/meeting/app/services/meetings/delete_service.rb
@@ -0,0 +1,40 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module Meetings
+  class DeleteService < ::BaseServices::Delete
+    protected
+
+    def after_validate(_, call)
+      schedule = model.scheduled_meeting
+      schedule.update_column(:cancelled, true) if schedule.present?
+
+      call
+    end
+  end
+end
diff --git a/modules/meeting/app/services/meetings/ical_helpers.rb b/modules/meeting/app/services/meetings/ical_helpers.rb
new file mode 100644
index 000000000000..9812c612a18c
--- /dev/null
+++ b/modules/meeting/app/services/meetings/ical_helpers.rb
@@ -0,0 +1,81 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+require "icalendar"
+require "icalendar/tzinfo"
+
+module Meetings
+  module ICalHelpers
+    def ical_event(start_time, &)
+      calendar = build_icalendar(start_time)
+      calendar.event(&)
+      calendar.publish
+      calendar.to_ical
+    end
+
+    def build_icalendar(start_time)
+      ::Icalendar::Calendar.new.tap do |calendar|
+        calendar.prodid = "-//OpenProject GmbH//#{OpenProject::VERSION}//Meeting//EN"
+        ical_timezone = timezone.tzinfo.ical_timezone start_time
+        calendar.add_timezone ical_timezone
+      end
+    end
+
+    def add_attendees(event, meeting)
+      meeting.participants.includes(:user).find_each do |participant|
+        user = participant.user
+        next unless user
+
+        address = Icalendar::Values::CalAddress.new(
+          "mailto:#{user.mail}",
+          {
+            "CN" => user.name,
+            "EMAIL" => user.mail,
+            "PARTSTAT" => "NEEDS-ACTION",
+            "RSVP" => "TRUE",
+            "CUTYPE" => "INDIVIDUAL",
+            "ROLE" => "REQ-PARTICIPANT"
+          }
+        )
+
+        event.append_attendee(address)
+      end
+    end
+
+    def ical_uid(suffix)
+      "#{Setting.app_title}-#{Setting.host_name}-#{suffix}".dasherize
+    end
+
+    def ical_datetime(time, timezone_id)
+      Icalendar::Values::DateTime.new time.in_time_zone(timezone_id), "tzid" => timezone_id
+    end
+
+    def ical_organizer(meeting)
+      Icalendar::Values::CalAddress.new("mailto:#{meeting.author.mail}", cn: meeting.author.name)
+    end
+  end
+end
diff --git a/modules/meeting/app/services/meetings/ical_service.rb b/modules/meeting/app/services/meetings/ical_service.rb
index 565b00599662..dbdaa99958ec 100644
--- a/modules/meeting/app/services/meetings/ical_service.rb
+++ b/modules/meeting/app/services/meetings/ical_service.rb
@@ -30,6 +30,7 @@
 
 module Meetings
   class ICalService
+    include ICalHelpers
     attr_reader :user, :meeting, :timezone, :url_helpers
 
     def initialize(meeting:, user:)
@@ -52,7 +53,7 @@ def call
 
     # rubocop:disable Metrics/AbcSize
     def generate_ical
-      ical_event do |e|
+      ical_event(meeting.start_time) do |e|
         tzinfo = timezone.tzinfo
         tzid = tzinfo.canonical_identifier
 
@@ -62,57 +63,16 @@ def generate_ical
         e.summary = "[#{meeting.project.name}] #{meeting.title}"
         e.description = ical_subject
         e.uid = "#{meeting.id}@#{meeting.project.identifier}"
-        e.organizer = ical_organizer
+        e.organizer = ical_organizer(meeting)
         e.location = meeting.location.presence
 
-        add_attendees(e)
+        add_attendees(e, meeting)
       end
     end
     # rubocop:enable Metrics/AbcSize
 
-    def ical_event(&)
-      calendar = ::Icalendar::Calendar.new
-
-      ical_timezone = @timezone.tzinfo.ical_timezone meeting.start_time
-      calendar.add_timezone ical_timezone
-
-      calendar.event(&)
-
-      calendar.publish
-
-      calendar.to_ical
-    end
-
-    def add_attendees(event)
-      meeting.participants.includes(:user).find_each do |participant|
-        user = participant.user
-        next unless user
-
-        address = Icalendar::Values::CalAddress.new(
-          "mailto:#{user.mail}",
-          {
-            "CN" => user.name,
-            "PARTSTAT" => "NEEDS-ACTION",
-            "RSVP" => "TRUE",
-            "CUTYPE" => "INDIVIDUAL",
-            "ROLE" => "REQ-PARTICIPANT"
-          }
-        )
-
-        event.append_attendee(address)
-      end
-    end
-
     def ical_subject
       "[#{meeting.project.name}] #{I18n.t(:label_meeting)}: #{meeting.title}"
     end
-
-    def ical_datetime(time, timezone_id)
-      Icalendar::Values::DateTime.new time.in_time_zone(timezone_id), "tzid" => timezone_id
-    end
-
-    def ical_organizer
-      Icalendar::Values::CalAddress.new("mailto:#{meeting.author.mail}", cn: meeting.author.name)
-    end
   end
 end
diff --git a/modules/meeting/app/services/meetings/set_attributes_service.rb b/modules/meeting/app/services/meetings/set_attributes_service.rb
index dd2ca21fe0cb..abe44c0d3a9a 100644
--- a/modules/meeting/app/services/meetings/set_attributes_service.rb
+++ b/modules/meeting/app/services/meetings/set_attributes_service.rb
@@ -33,7 +33,7 @@ def set_attributes(params)
 
       super
 
-      set_participants(participants) if participants
+      set_participants(participants) if participants.present?
     end
 
     def set_default_attributes(_params)
diff --git a/modules/meeting/app/services/recurring_meetings/create_service.rb b/modules/meeting/app/services/recurring_meetings/create_service.rb
new file mode 100644
index 000000000000..a29d6af935a5
--- /dev/null
+++ b/modules/meeting/app/services/recurring_meetings/create_service.rb
@@ -0,0 +1,68 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module RecurringMeetings
+  class CreateService < ::BaseServices::Create
+    include WithTemplate
+
+    protected
+
+    def after_perform(call)
+      return call unless call.success?
+
+      recurring_meeting = call.result
+      call.merge! create_meeting_template(recurring_meeting) if call.success?
+      schedule_init_job(recurring_meeting) if call.success?
+
+      call
+    end
+
+    ##
+    # We want to automatically schedule the next occurrence
+    # AFTER the first occurrence has passed.
+    # We do not create initially as you still need to update the template.
+    def schedule_init_job(recurring_meeting)
+      first_occurrence = recurring_meeting.first_occurrence
+      return if first_occurrence.nil?
+
+      ::RecurringMeetings::InitNextOccurrenceJob
+        .set(wait_until: first_occurrence.to_time)
+        .perform_later(recurring_meeting)
+    end
+
+    def create_meeting_template(recurring_meeting)
+      template = StructuredMeeting.new(@template_params)
+      template.project = recurring_meeting.project
+      template.template = true
+      template.recurring_meeting = recurring_meeting
+      template.author = user
+
+      ServiceResult.new(success: template.save, errors: template.errors)
+    end
+  end
+end
diff --git a/modules/meeting/app/services/recurring_meetings/ical_service.rb b/modules/meeting/app/services/recurring_meetings/ical_service.rb
new file mode 100644
index 000000000000..b68633d16b4e
--- /dev/null
+++ b/modules/meeting/app/services/recurring_meetings/ical_service.rb
@@ -0,0 +1,137 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+require "icalendar"
+require "icalendar/tzinfo"
+
+module RecurringMeetings
+  class ICalService
+    include ::Meetings::ICalHelpers
+    attr_reader :user,
+                :series,
+                :schedule,
+                :timezone,
+                :calendar,
+                :url_helpers
+
+    delegate :template, to: :series
+
+    def initialize(series:, user:)
+      @user = user
+      @series = series
+      @url_helpers = OpenProject::StaticRouting::StaticUrlHelpers.new
+    end
+
+    def call # rubocop:disable Metrics/AbcSize
+      User.execute_as(user) do
+        @timezone = Time.zone || Time.zone_default
+        @calendar = build_icalendar(series.start_time)
+        @schedule = series.schedule
+        ServiceResult.success(result: generate_ical)
+      end
+    rescue StandardError => e
+      Rails.logger.error("Failed to generate ICS for meeting series #{@series.id}: #{e.message}")
+      ServiceResult.failure(message: e.message)
+    end
+
+    private
+
+    def tzinfo
+      timezone.tzinfo
+    end
+
+    def tzid
+      tzinfo.canonical_identifier
+    end
+
+    def generate_ical
+      series_event
+      occurrences_events
+
+      calendar.publish
+      calendar.to_ical
+    end
+
+    def series_event # rubocop:disable Metrics/AbcSize
+      calendar.event do |e|
+        base_series_attributes(e)
+
+        e.dtstart = ical_datetime template.start_time, tzid
+        e.dtend = ical_datetime template.end_time, tzid
+        e.url = url_helpers.project_recurring_meeting_url(series.project, series)
+        e.location = template.location.presence
+
+        add_attendees(e, template)
+        e.exdate = cancelled_schedules
+      end
+    end
+
+    def occurrences_events
+      upcoming_instantiated_schedules.find_each do |schedule|
+        occurrence_event(schedule.start_time, schedule.meeting)
+      end
+    end
+
+    def occurrence_event(schedule_start_time, meeting) # rubocop:disable Metrics/AbcSize
+      calendar.event do |e|
+        base_series_attributes(e)
+
+        e.recurrence_id = ical_datetime schedule_start_time, tzid
+        e.dtstart = ical_datetime meeting.start_time, tzid
+        e.dtend = ical_datetime meeting.end_time, tzid
+        e.url = url_helpers.project_meeting_url(meeting.project, meeting)
+        e.location = meeting.location.presence
+
+        add_attendees(e, meeting)
+      end
+    end
+
+    def upcoming_instantiated_schedules
+      series
+        .scheduled_meetings
+        .not_cancelled
+        .instantiated
+        .includes(:meeting)
+    end
+
+    def base_series_attributes(event) # rubocop:disable Metrics/AbcSize
+      event.uid = ical_uid("meeting-series-#{series.id}")
+      event.rrule = schedule.rrules.first.to_ical # We currently only have one recurrence rule
+      event.summary = "[#{series.project.name}] #{series.title}"
+      event.description = "[#{series.project.name}] #{I18n.t(:label_meeting_series)}: #{series.title}"
+      event.organizer = ical_organizer(series)
+    end
+
+    def cancelled_schedules
+      series
+        .scheduled_meetings
+        .cancelled
+        .pluck(:start_time)
+        .map { |time| Icalendar::Values::DateTime.new time.in_time_zone(tzid), "tzid" => tzid }
+    end
+  end
+end
diff --git a/modules/meeting/app/services/recurring_meetings/init_occurrence_service.rb b/modules/meeting/app/services/recurring_meetings/init_occurrence_service.rb
new file mode 100644
index 000000000000..098533a52948
--- /dev/null
+++ b/modules/meeting/app/services/recurring_meetings/init_occurrence_service.rb
@@ -0,0 +1,81 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module RecurringMeetings
+  class InitOccurrenceService < ::BaseServices::BaseCallable
+    include ::Shared::ServiceContext
+
+    attr_reader :user, :recurring_meeting
+
+    def initialize(user:, recurring_meeting:)
+      super()
+      @user = user
+      @recurring_meeting = recurring_meeting
+    end
+
+    protected
+
+    def perform(start_time:)
+      in_context(recurring_meeting, send_notifications: false) do
+        call = instantiate(start_time)
+        create_schedule(call) if call.success?
+
+        call
+      end
+    end
+
+    def instantiate(start_time)
+      ::Meetings::CopyService
+        .new(user:, model: recurring_meeting.template)
+        .call(attributes: instantiate_params(start_time),
+              copy_agenda: true,
+              copy_attachments: true,
+              send_notifications: false)
+    end
+
+    def instantiate_params(start_time)
+      {
+        start_time:,
+        recurring_meeting:
+      }
+    end
+
+    def create_schedule(call)
+      meeting = call.result
+
+      schedule = ScheduledMeeting.find_or_initialize_by(
+        recurring_meeting: recurring_meeting,
+        start_time: meeting.start_time
+      )
+
+      unless schedule.update(meeting:, cancelled: false)
+        call.merge!(ServiceResult.failure(errors: schedule.errors))
+      end
+    end
+  end
+end
diff --git a/modules/meeting/app/services/recurring_meetings/set_attributes_service.rb b/modules/meeting/app/services/recurring_meetings/set_attributes_service.rb
new file mode 100644
index 000000000000..9f232da2b303
--- /dev/null
+++ b/modules/meeting/app/services/recurring_meetings/set_attributes_service.rb
@@ -0,0 +1,49 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module RecurringMeetings
+  class SetAttributesService < ::BaseServices::SetAttributes
+    private
+
+    def set_attributes(params)
+      super
+
+      model.change_by_system do
+        if model.frequency_working_days?
+          model.interval = 1
+        end
+      end
+    end
+
+    def set_default_attributes(_params)
+      model.change_by_system do
+        model.author = user
+      end
+    end
+  end
+end
diff --git a/modules/meeting/app/services/recurring_meetings/update_service.rb b/modules/meeting/app/services/recurring_meetings/update_service.rb
new file mode 100644
index 000000000000..80fcf24e97de
--- /dev/null
+++ b/modules/meeting/app/services/recurring_meetings/update_service.rb
@@ -0,0 +1,86 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module RecurringMeetings
+  class UpdateService < ::BaseServices::Update
+    include WithTemplate
+
+    protected
+
+    def after_perform(call)
+      return call unless call.success?
+
+      cleanup_cancelled_schedules(call.result)
+      reschedule_init_job(call.result)
+      update_template(call)
+    end
+
+    def update_template(call)
+      recurring_meeting = call.result
+      template = recurring_meeting.template
+
+      unless template.update(@template_params)
+        call.merge! ServiceResult.failure(result: template, errors: template.errors)
+      end
+
+      call
+    end
+
+    def cleanup_cancelled_schedules(recurring_meeting)
+      ScheduledMeeting
+        .where(recurring_meeting:)
+        .cancelled
+        .find_each do |scheduled|
+        occurring = recurring_meeting.schedule.occurs_at?(scheduled.start_time)
+        scheduled.delete unless occurring
+      end
+    end
+
+    def reschedule_init_job(recurring_meeting)
+      return unless should_reschedule?(recurring_meeting)
+
+      concurrency_key = InitNextOccurrenceJob.unique_key(recurring_meeting)
+
+      # Delete all scheduled jobs for this meeting
+      GoodJob::Job.where(finished_at: nil, concurrency_key:).delete_all
+
+      InitNextOccurrenceJob
+        .set(wait_until: recurring_meeting.next_occurrence.to_time)
+        .perform_later(recurring_meeting)
+    end
+
+    def should_reschedule?(recurring_meeting)
+      return false if recurring_meeting.next_occurrence.nil?
+
+      recurring_meeting
+        .previous_changes
+        .keys
+        .intersect?(%w[frequency start_date start_time start_time_hour iterations interval end_after end_date])
+    end
+  end
+end
diff --git a/modules/meeting/app/services/recurring_meetings/with_template.rb b/modules/meeting/app/services/recurring_meetings/with_template.rb
new file mode 100644
index 000000000000..18eccbbf1cde
--- /dev/null
+++ b/modules/meeting/app/services/recurring_meetings/with_template.rb
@@ -0,0 +1,47 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module RecurringMeetings
+  module WithTemplate
+    extend ActiveSupport::Concern
+
+    included do
+      attr_accessor :template_params
+
+      def before_perform(params, _)
+        @template_params = extract_template_params(params)
+
+        super
+      end
+
+      def extract_template_params(params)
+        params.slice(:start_date, :start_time_hour, :title, :location, :duration)
+      end
+    end
+  end
+end
diff --git a/modules/meeting/app/views/meetings/index.html.erb b/modules/meeting/app/views/meetings/index.html.erb
index 0e712130e9e5..25b173cf481c 100644
--- a/modules/meeting/app/views/meetings/index.html.erb
+++ b/modules/meeting/app/views/meetings/index.html.erb
@@ -29,7 +29,7 @@ See COPYRIGHT and LICENSE files for more details.
 <% html_title t(:label_meeting_plural) %>
 
 <%= render(Meetings::IndexPageHeaderComponent.new(project: @project)) %>
-<%= render(Meetings::IndexSubHeaderComponent.new(query: @query, project: @project)) %>
+<%= render(Meetings::IndexSubHeaderComponent.new(query: @query, project: @project, params:)) %>
 
 <% if @meetings.empty? -%>
   <%= no_results_box %>
diff --git a/modules/meeting/app/views/meetings/menus/_menu.html.erb b/modules/meeting/app/views/meetings/menus/_menu.html.erb
index 74bacf441dd4..c1fc8a539731 100644
--- a/modules/meeting/app/views/meetings/menus/_menu.html.erb
+++ b/modules/meeting/app/views/meetings/menus/_menu.html.erb
@@ -1,5 +1,9 @@
-  <%= turbo_frame_tag "meeting_sidemenu",
-                      src: @project.present? ? menu_project_meetings_path(@project, **params.permit(:filters, :sort)) : meetings_menu_path(**params.permit(:filters, :sort)),
+<% request_params = params
+  .permit(:filters, :sort)
+  .merge(current_href: request.path)
+%>
+<%= turbo_frame_tag "meeting_sidemenu",
+                      src: @project.present? ? menu_project_meetings_path(@project, **request_params) : meetings_menu_path(**request_params),
                       target: '_top',
                       data: { turbo: false },
                       loading: :lazy %>
diff --git a/modules/boards/app/views/boards/boards/overview.html.erb b/modules/meeting/app/views/recurring_meetings/index.html.erb
similarity index 79%
rename from modules/boards/app/views/boards/boards/overview.html.erb
rename to modules/meeting/app/views/recurring_meetings/index.html.erb
index 95736aa6903f..8d4f0af4b8d5 100644
--- a/modules/boards/app/views/boards/boards/overview.html.erb
+++ b/modules/meeting/app/views/recurring_meetings/index.html.erb
@@ -1,6 +1,6 @@
 <%#-- copyright
 OpenProject is an open source project management software.
-Copyright (C) the OpenProject GmbH
+Copyright (C) 2012-2024 the OpenProject GmbH
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License version 3.
@@ -26,15 +26,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
+<% html_title t(:label_recurring_meeting_plural) %>
 
-<% html_title(t('boards.label_boards')) -%>
+<%= render(Meetings::IndexPageHeaderComponent.new(project: @project)) %>
 
-<%= toolbar title: t('boards.label_boards') do %>
-  <%= render Boards::AddButtonComponent.new %>
-<% end %>
-
-<% if @board_grids.empty? -%>
+<% if @recurring_meetings.empty? -%>
   <%= no_results_box %>
 <% else -%>
-<%= render Boards::TableComponent.new(rows: @board_grids, current_user: User.current) %>
+  <%= render Meetings::TableComponent.new(rows: @recurring_meetings, current_project: @project) %>
 <% end -%>
diff --git a/modules/meeting/app/views/recurring_meetings/new.html.erb b/modules/meeting/app/views/recurring_meetings/new.html.erb
new file mode 100644
index 000000000000..7b8c3f889fe8
--- /dev/null
+++ b/modules/meeting/app/views/recurring_meetings/new.html.erb
@@ -0,0 +1,51 @@
+<%#-- copyright
+OpenProject is an open source project management software.
+Copyright (C) 2012-2024 the OpenProject GmbH
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License version 3.
+
+OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+Copyright (C) 2006-2013 Jean-Philippe Lang
+Copyright (C) 2010-2013 the ChiliProject Team
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+See COPYRIGHT and LICENSE files for more details.
+
+++#%>
+
+<%=
+  render(Primer::OpenProject::PageHeader.new) do |header|
+    header.with_title { t(:label_recurring_meeting_new) }
+    header.with_breadcrumbs([@project.present? ?
+                               { href: project_overview_path(@project.id), text: @project.name } :
+                               { href: home_path, text: I18n.t(:label_home) },
+                             { href: @project.present? ? project_recurring_meetings_path(@project.id) : recurring_meetings_path,
+                               text: I18n.t(:label_meeting_plural) },
+                             t(:label_recurring_meeting_new)])
+  end
+%>
+
+
+<%= primer_form_with(
+      model: @recurring_meeting,
+      url: { :controller => '/recurring_meetings', :action => 'create', :project_id => @project }) do |f| %>
+  <%= render :partial => 'form', locals: { f: f } %>
+
+  <%= render Primer::Beta::Button.new(type: :submit, scheme: :primary, mt: 3) do %>
+    <%= t(:button_create) %>
+  <% end %>
+<% end %>
diff --git a/modules/meeting/app/views/recurring_meetings/show.html.erb b/modules/meeting/app/views/recurring_meetings/show.html.erb
new file mode 100644
index 000000000000..476c3b1dbdd3
--- /dev/null
+++ b/modules/meeting/app/views/recurring_meetings/show.html.erb
@@ -0,0 +1,39 @@
+<%#-- copyright
+OpenProject is an open source project management software.
+Copyright (C) 2012-2024 the OpenProject GmbH
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License version 3.
+
+OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+Copyright (C) 2006-2013 Jean-Philippe Lang
+Copyright (C) 2010-2013 the ChiliProject Team
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+See COPYRIGHT and LICENSE files for more details.
+
+++#%>
+
+<% html_title t(:label_recurring_meeting_plural) %>
+
+<%= render(RecurringMeetings::ShowPageHeaderComponent.new(project: @project, meeting: @recurring_meeting)) %>
+<%= render(RecurringMeetings::ShowPageSubHeaderComponent.new(project: @project, meeting: @recurring_meeting, params:)) %>
+
+<% if @recurring_meeting.nil? -%>
+  <%= no_results_box %>
+<% else -%>
+  <%= render RecurringMeetings::TableComponent.new(rows: @meetings, current_project: @project, count: @count, direction: @direction, max_count: @max_count) %>
+<% end -%>
diff --git a/modules/meeting/app/workers/recurring_meetings/init_next_occurrence_job.rb b/modules/meeting/app/workers/recurring_meetings/init_next_occurrence_job.rb
new file mode 100644
index 000000000000..670a8f7c4565
--- /dev/null
+++ b/modules/meeting/app/workers/recurring_meetings/init_next_occurrence_job.rb
@@ -0,0 +1,135 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module RecurringMeetings
+  class InitNextOccurrenceJob < ApplicationJob
+    include GoodJob::ActiveJobExtensions::Concurrency
+    discard_on ActiveJob::DeserializationError
+
+    good_job_control_concurrency_with(
+      total_limit: 1,
+      key: -> { self.class.unique_key(arguments.first) }
+    )
+
+    def self.delete_jobs(recurring_meeting)
+      concurrency_key = unique_key(recurring_meeting)
+      GoodJob::Job.where(concurrency_key:).delete_all
+    end
+
+    def self.unique_key(recurring_meeting)
+      "RecurringMeetings::InitNextOccurrenceJob-#{recurring_meeting.id}"
+    end
+
+    attr_accessor :recurring_meeting
+
+    def perform(recurring_meeting)
+      self.recurring_meeting = recurring_meeting
+
+      if next_scheduled_time.nil?
+        Rails.logger.debug { "Meeting series #{recurring_meeting} is ending." }
+        return
+      end
+
+      # Schedule the next job
+      schedule_next_job
+
+      # Schedule the next occurrence, if not instantiated
+      check_next_occurrence
+    rescue StandardError => e
+      Rails.logger.error { "Error while initializing next occurrence for series ##{recurring_meeting}: #{e.message}" }
+    end
+
+    private
+
+    def check_next_occurrence
+      if next_occurrence_instantiated?
+        Rails.logger.debug { "Will not create next occurrence for series #{recurring_meeting} as already instantiated" }
+        return
+      end
+
+      if next_occurrence_cancelled?
+        Rails.logger.debug { "Will not create next occurrence for series #{recurring_meeting} is already cancelled" }
+        return
+      end
+
+      init_meeting
+    end
+
+    def init_meeting
+      call = ::RecurringMeetings::InitOccurrenceService
+        .new(user: User.system, recurring_meeting:)
+        .call(start_time: next_scheduled_time)
+
+      call.on_success do
+        Rails.logger.debug { "Initialized occurrence for series ##{recurring_meeting} at #{next_scheduled_time}" }
+      end
+
+      call.on_failure do
+        Rails.logger.error do
+          "Could not create next occurrence for series ##{recurring_meeting}: #{call.message}"
+        end
+      end
+    end
+
+    ##
+    # Schedule when this job should be run the next time
+    def schedule_next_job
+      # Do not schedule if the series is ending
+      return if next_scheduled_time.nil?
+
+      self
+        .class
+        .set(wait_until: next_scheduled_time)
+        .perform_later(recurring_meeting)
+    end
+
+    ##
+    # Return if there is already an instantiated upcoming meeting
+    def next_occurrence_instantiated?
+      recurring_meeting
+        .scheduled_instances
+        .where.not(meeting_id: nil)
+        .exists?(start_time: next_scheduled_time)
+    end
+
+    ##
+    # Return if the next occurrence is cancelled
+    def next_occurrence_cancelled?
+      recurring_meeting
+        .scheduled_instances
+        .where(cancelled: true)
+        .exists?(start_time: next_scheduled_time)
+    end
+
+    def next_scheduled_time
+      return @next_scheduled_time if defined?(@next_scheduled_time)
+
+      @next_scheduled_time = recurring_meeting.next_occurrence&.to_time
+    end
+  end
+end
diff --git a/modules/meeting/config/locales/crowdin/af.yml b/modules/meeting/config/locales/crowdin/af.yml
index f5751724939d..c3160c00f17c 100644
--- a/modules/meeting/config/locales/crowdin/af.yml
+++ b/modules/meeting/config/locales/crowdin/af.yml
@@ -50,11 +50,18 @@ af:
         presenter: "Presenter"
       meeting_section:
         title: "Titel"
+      recurring_meeting:
+        frequency: "Frequency"
+        interval: "Interval"
+        start_date: "Starts on"
+        end_after: "End series after"
+        iterations: "Occurrences"
     errors:
       messages:
         invalid_time_format: "is not a valid time. Required format: HH:MM"
     models:
-      structured_meeting: "Meeting (dynamic)"
+      recurring_meeting: "Recurring meeting"
+      structured_meeting: "One-time meeting"
       meeting_agenda_item: "Agenda item"
       meeting_agenda: "Agenda"
       meeting_minutes: "Minutes"
@@ -88,7 +95,8 @@ af:
   label_meeting: "Meeting"
   label_meeting_plural: "Meetings"
   label_meeting_new: "New Meeting"
-  label_meeting_new_dynamic: "New dynamic meeting"
+  label_meeting_new_dynamic: "New one-time meeting"
+  label_meeting_new_recurring: "New recurring meeting"
   label_meeting_create: "Create meeting"
   label_meeting_copy: "Copy meeting"
   label_meeting_edit: "Edit Meeting"
@@ -102,23 +110,54 @@ af:
   label_meeting_date_time: "Date/Time"
   label_meeting_date_and_time: "Date and time"
   label_meeting_diff: "Diff"
+  label_recurring_meeting: "Recurring meeting"
+  label_recurring_meeting_part_of: "Part of a meeting series"
+  label_recurring_meeting_new: "New recurring meeting"
+  label_recurring_meeting_plural: "Recurring meetings"
+  label_template: "Template"
+  label_recurring_meeting_view: "View meeting series"
+  label_recurring_meeting_create: "Create from template"
+  label_recurring_meeting_copy: "Copy as one-off"
+  label_recurring_meeting_cancel: "Cancel this occurrence"
+  label_recurring_meeting_delete: "Delete occurrence"
+  label_recurring_meeting_delete_confirmation: >
+    This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue?
+  label_recurring_occurrence_delete_confirmation: >
+    Any meeting information not in the template will be lost. Do you want to continue?
+  label_recurring_meeting_restore: "Restore this occurrence"
+  label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})."
+  label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})."
+  label_recurring_meeting_more_past: "There are %{count} more past meetings."
+  label_recurring_meeting_more_past_singular: "There is %{count} more past meeting."
+  label_recurring_meeting_show_more: "Show more"
+  label_recurring_meeting_series_edit: "Edit meeting series"
+  label_recurring_meeting_series_delete: "Delete meeting series"
+  label_my_meetings: "My meetings"
+  label_all_meetings: "All meetings"
   label_upcoming_meetings: "Upcoming meetings"
   label_past_meetings: "Past meetings"
   label_upcoming_meetings_short: "Upcoming"
   label_past_meetings_short: "Past"
   label_involvement: "Involvement"
-  label_upcoming_invitations: "Upcoming invitations"
+  label_invitations: "Invitations"
+  label_invited_user: "Invited user"
   label_past_invitations: "Past invitations"
-  label_attendee: "Attendee"
-  label_author: "Creator"
+  label_attended: "Attended"
+  label_attended_user: "Attended user"
+  label_created_by_me: "Created by me"
   label_notify: "Send for review"
   label_icalendar: "Send iCalendar"
   label_icalendar_download: "Download iCalendar event"
+  label_view_meeting_series: "View meeting series"
+  label_meeting_series: "Meeting series"
   label_version: "Weergawe"
   label_time_zone: "Tydsone"
   label_start_date: "Begindatum"
   meeting:
+    participants:
+      template: "These participants will be invited automatically to all future meetings as they are created."
     attachments:
+      template: "These attached files will be included in all future meetings in the series."
       text: "Attached files are available to all meeting participants. You can also drag and drop these into agenda item notes."
     copy:
       title: "Copy meeting: %{title}"
@@ -145,9 +184,12 @@ af:
     label_mail_all_participants: "Send email to all participants"
     types:
       classic: "Classic"
-      classic_text: "Organize your meeting in a formattable text agenda and protocol."
-      structured: "Dynamic"
-      structured_text: "Organize your meeting as a list of agenda items, optionally linking them to a work package."
+      classic_text: "Organize your meeting as a single formattable text agenda and protocol."
+      structured: "Structured"
+      one_time: "One-time"
+      recurring: "Recurring"
+      recurring_text: "Create meeting series with dynamic template for each occurrence."
+      structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package."
       structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details"
     copied: "Copied from Meeting #%{id}"
   meeting_section:
@@ -155,6 +197,40 @@ af:
     delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?"
     placeholder_title: "New section"
     empty_text: "Drag items here or create a new one"
+  recurring_meeting:
+    occurrence:
+      infoline: "This meeting is part of a recurring meeting series."
+      error_no_next: "There is no next occurrence for this meeting."
+      first_already_exists: "The first occurrence of this meeting series is already instantiated."
+      first_created: >
+        The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence.
+    template:
+      button_finalize: "Finish template"
+      blank_title: "Your meeting series template is empty"
+      description: >
+        This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template.
+      blankslate_finalize: >
+        When you're done preparing this template, click the '%{button_title}' button above to finish the setup and schedule the first meeting of the series.
+      label_view_template: "View template"
+      label_edit_template: "Edit template"
+      banner_html: >
+        You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already created meetings.
+    frequency:
+      every_weekday: "Every %{day_of_the_week}"
+      daily: "Daily"
+      working_days: "Every working day"
+      weekly: "Weekly"
+    end_after:
+      specific_date: "a specific date"
+      iterations: "a number of occurrences"
+    starts: "Starts"
+    in_words:
+      daily_interval: "Every %{interval} days"
+      working_days: "Every working day"
+      weekly: "Every week on %{weekday}"
+      weekly_interval: "Every %{interval} weeks on %{weekday}"
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
   notice_successful_notification: "Notification sent successfully"
   notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here.
   notice_meeting_updated: "This page has been updated by someone else. Reload to view changes."
@@ -207,12 +283,17 @@ af:
   text_deleted_agenda_item: 'Deleted agenda item'
   label_initial_meeting_details: "Meeting"
   label_meeting_details: "Meeting details"
+  label_meeting_series_details: "Meeting series details"
   label_meeting_details_edit: "Edit meeting details"
   label_meeting_state: "Meeting status"
   label_meeting_state_open: "Oop"
   label_meeting_state_open_html: "<i>Open</i>"
   label_meeting_state_closed: "Gesluit"
   label_meeting_state_closed_html: "<i>Closed</i>"
+  label_meeting_state_agenda_created: "Agenda created"
+  label_meeting_state_scheduled: "Scheduled"
+  label_meeting_state_cancelled: "Cancelled"
+  label_meeting_state_skipped: "Skipped"
   label_meeting_reopen_action: "Reopen meeting"
   label_meeting_close_action: "Close meeting"
   text_meeting_open_description: "This meeting is open. You can add/remove agenda items and edit them as you please. After the meeting is over, close it to lock it."
diff --git a/modules/meeting/config/locales/crowdin/ar.yml b/modules/meeting/config/locales/crowdin/ar.yml
index 5ab9ee39754a..7726a8784c54 100644
--- a/modules/meeting/config/locales/crowdin/ar.yml
+++ b/modules/meeting/config/locales/crowdin/ar.yml
@@ -54,11 +54,18 @@ ar:
         presenter: "Presenter"
       meeting_section:
         title: "العنوان"
+      recurring_meeting:
+        frequency: "Frequency"
+        interval: "Interval"
+        start_date: "Starts on"
+        end_after: "End series after"
+        iterations: "Occurrences"
     errors:
       messages:
         invalid_time_format: "ليس وقتًا صالحًا. التصميم المطلوب: HH:MM"
     models:
-      structured_meeting: "Meeting (dynamic)"
+      recurring_meeting: "Recurring meeting"
+      structured_meeting: "One-time meeting"
       meeting_agenda_item: "Agenda item"
       meeting_agenda: "جدول الأعمال"
       meeting_minutes: "محضر الجلسة"
@@ -92,7 +99,8 @@ ar:
   label_meeting: "الاجتماع"
   label_meeting_plural: "الاجتماعات"
   label_meeting_new: "اجتماع جديد"
-  label_meeting_new_dynamic: "New dynamic meeting"
+  label_meeting_new_dynamic: "New one-time meeting"
+  label_meeting_new_recurring: "New recurring meeting"
   label_meeting_create: "Create meeting"
   label_meeting_copy: "Copy meeting"
   label_meeting_edit: "تحرير الاجتماع"
@@ -106,23 +114,54 @@ ar:
   label_meeting_date_time: "التاريخ/الوقت"
   label_meeting_date_and_time: "Date and time"
   label_meeting_diff: "الاختلاف"
+  label_recurring_meeting: "Recurring meeting"
+  label_recurring_meeting_part_of: "Part of a meeting series"
+  label_recurring_meeting_new: "New recurring meeting"
+  label_recurring_meeting_plural: "Recurring meetings"
+  label_template: "Template"
+  label_recurring_meeting_view: "View meeting series"
+  label_recurring_meeting_create: "Create from template"
+  label_recurring_meeting_copy: "Copy as one-off"
+  label_recurring_meeting_cancel: "Cancel this occurrence"
+  label_recurring_meeting_delete: "Delete occurrence"
+  label_recurring_meeting_delete_confirmation: >
+    This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue?
+  label_recurring_occurrence_delete_confirmation: >
+    Any meeting information not in the template will be lost. Do you want to continue?
+  label_recurring_meeting_restore: "Restore this occurrence"
+  label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})."
+  label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})."
+  label_recurring_meeting_more_past: "There are %{count} more past meetings."
+  label_recurring_meeting_more_past_singular: "There is %{count} more past meeting."
+  label_recurring_meeting_show_more: "Show more"
+  label_recurring_meeting_series_edit: "Edit meeting series"
+  label_recurring_meeting_series_delete: "Delete meeting series"
+  label_my_meetings: "My meetings"
+  label_all_meetings: "All meetings"
   label_upcoming_meetings: "Upcoming meetings"
   label_past_meetings: "Past meetings"
   label_upcoming_meetings_short: "Upcoming"
   label_past_meetings_short: "Past"
   label_involvement: "Involvement"
-  label_upcoming_invitations: "Upcoming invitations"
+  label_invitations: "Invitations"
+  label_invited_user: "Invited user"
   label_past_invitations: "Past invitations"
-  label_attendee: "Attendee"
-  label_author: "Creator"
+  label_attended: "Attended"
+  label_attended_user: "Attended user"
+  label_created_by_me: "Created by me"
   label_notify: "إرسال للمراجعة"
   label_icalendar: "إرسال iCalendar"
   label_icalendar_download: "Download iCalendar event"
+  label_view_meeting_series: "View meeting series"
+  label_meeting_series: "Meeting series"
   label_version: "النسخة"
   label_time_zone: "المنطقة الزمنية"
   label_start_date: "تاريخ البدء"
   meeting:
+    participants:
+      template: "These participants will be invited automatically to all future meetings as they are created."
     attachments:
+      template: "These attached files will be included in all future meetings in the series."
       text: "Attached files are available to all meeting participants. You can also drag and drop these into agenda item notes."
     copy:
       title: "Copy meeting: %{title}"
@@ -149,9 +188,12 @@ ar:
     label_mail_all_participants: "Send email to all participants"
     types:
       classic: "Classic"
-      classic_text: "Organize your meeting in a formattable text agenda and protocol."
-      structured: "Dynamic"
-      structured_text: "Organize your meeting as a list of agenda items, optionally linking them to a work package."
+      classic_text: "Organize your meeting as a single formattable text agenda and protocol."
+      structured: "Structured"
+      one_time: "One-time"
+      recurring: "Recurring"
+      recurring_text: "Create meeting series with dynamic template for each occurrence."
+      structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package."
       structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details"
     copied: "نسخ من الاجتماع #%{id}"
   meeting_section:
@@ -159,6 +201,40 @@ ar:
     delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?"
     placeholder_title: "New section"
     empty_text: "Drag items here or create a new one"
+  recurring_meeting:
+    occurrence:
+      infoline: "This meeting is part of a recurring meeting series."
+      error_no_next: "There is no next occurrence for this meeting."
+      first_already_exists: "The first occurrence of this meeting series is already instantiated."
+      first_created: >
+        The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence.
+    template:
+      button_finalize: "Finish template"
+      blank_title: "Your meeting series template is empty"
+      description: >
+        This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template.
+      blankslate_finalize: >
+        When you're done preparing this template, click the '%{button_title}' button above to finish the setup and schedule the first meeting of the series.
+      label_view_template: "View template"
+      label_edit_template: "Edit template"
+      banner_html: >
+        You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already created meetings.
+    frequency:
+      every_weekday: "Every %{day_of_the_week}"
+      daily: "Daily"
+      working_days: "Every working day"
+      weekly: "Weekly"
+    end_after:
+      specific_date: "a specific date"
+      iterations: "a number of occurrences"
+    starts: "Starts"
+    in_words:
+      daily_interval: "Every %{interval} days"
+      working_days: "Every working day"
+      weekly: "Every week on %{weekday}"
+      weekly_interval: "Every %{interval} weeks on %{weekday}"
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
   notice_successful_notification: "تم إرسال الإشعار بنجاح"
   notice_timezone_missing: لم يتم تعيين المنطقة الزمنية و%{zone} مُفترض. لاختيار منطقتك الزمنية، من فضلك اضغط هنا.
   notice_meeting_updated: "This page has been updated by someone else. Reload to view changes."
@@ -211,12 +287,17 @@ ar:
   text_deleted_agenda_item: 'Deleted agenda item'
   label_initial_meeting_details: "الاجتماع"
   label_meeting_details: "Meeting details"
+  label_meeting_series_details: "Meeting series details"
   label_meeting_details_edit: "Edit meeting details"
   label_meeting_state: "Meeting status"
   label_meeting_state_open: "مفتوح"
   label_meeting_state_open_html: "<i>Open</i>"
   label_meeting_state_closed: "مغلق"
   label_meeting_state_closed_html: "<i>Closed</i>"
+  label_meeting_state_agenda_created: "Agenda created"
+  label_meeting_state_scheduled: "Scheduled"
+  label_meeting_state_cancelled: "Cancelled"
+  label_meeting_state_skipped: "Skipped"
   label_meeting_reopen_action: "Reopen meeting"
   label_meeting_close_action: "Close meeting"
   text_meeting_open_description: "This meeting is open. You can add/remove agenda items and edit them as you please. After the meeting is over, close it to lock it."
diff --git a/modules/meeting/config/locales/crowdin/az.yml b/modules/meeting/config/locales/crowdin/az.yml
index 5c3246c015e5..40b2355ebcbe 100644
--- a/modules/meeting/config/locales/crowdin/az.yml
+++ b/modules/meeting/config/locales/crowdin/az.yml
@@ -50,11 +50,18 @@ az:
         presenter: "Presenter"
       meeting_section:
         title: "Title"
+      recurring_meeting:
+        frequency: "Frequency"
+        interval: "Interval"
+        start_date: "Starts on"
+        end_after: "End series after"
+        iterations: "Occurrences"
     errors:
       messages:
         invalid_time_format: "is not a valid time. Required format: HH:MM"
     models:
-      structured_meeting: "Meeting (dynamic)"
+      recurring_meeting: "Recurring meeting"
+      structured_meeting: "One-time meeting"
       meeting_agenda_item: "Agenda item"
       meeting_agenda: "Agenda"
       meeting_minutes: "Minutes"
@@ -88,7 +95,8 @@ az:
   label_meeting: "Meeting"
   label_meeting_plural: "Meetings"
   label_meeting_new: "New Meeting"
-  label_meeting_new_dynamic: "New dynamic meeting"
+  label_meeting_new_dynamic: "New one-time meeting"
+  label_meeting_new_recurring: "New recurring meeting"
   label_meeting_create: "Create meeting"
   label_meeting_copy: "Copy meeting"
   label_meeting_edit: "Edit Meeting"
@@ -102,23 +110,54 @@ az:
   label_meeting_date_time: "Date/Time"
   label_meeting_date_and_time: "Date and time"
   label_meeting_diff: "Diff"
+  label_recurring_meeting: "Recurring meeting"
+  label_recurring_meeting_part_of: "Part of a meeting series"
+  label_recurring_meeting_new: "New recurring meeting"
+  label_recurring_meeting_plural: "Recurring meetings"
+  label_template: "Template"
+  label_recurring_meeting_view: "View meeting series"
+  label_recurring_meeting_create: "Create from template"
+  label_recurring_meeting_copy: "Copy as one-off"
+  label_recurring_meeting_cancel: "Cancel this occurrence"
+  label_recurring_meeting_delete: "Delete occurrence"
+  label_recurring_meeting_delete_confirmation: >
+    This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue?
+  label_recurring_occurrence_delete_confirmation: >
+    Any meeting information not in the template will be lost. Do you want to continue?
+  label_recurring_meeting_restore: "Restore this occurrence"
+  label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})."
+  label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})."
+  label_recurring_meeting_more_past: "There are %{count} more past meetings."
+  label_recurring_meeting_more_past_singular: "There is %{count} more past meeting."
+  label_recurring_meeting_show_more: "Show more"
+  label_recurring_meeting_series_edit: "Edit meeting series"
+  label_recurring_meeting_series_delete: "Delete meeting series"
+  label_my_meetings: "My meetings"
+  label_all_meetings: "All meetings"
   label_upcoming_meetings: "Upcoming meetings"
   label_past_meetings: "Past meetings"
   label_upcoming_meetings_short: "Upcoming"
   label_past_meetings_short: "Past"
   label_involvement: "Involvement"
-  label_upcoming_invitations: "Upcoming invitations"
+  label_invitations: "Invitations"
+  label_invited_user: "Invited user"
   label_past_invitations: "Past invitations"
-  label_attendee: "Attendee"
-  label_author: "Creator"
+  label_attended: "Attended"
+  label_attended_user: "Attended user"
+  label_created_by_me: "Created by me"
   label_notify: "Send for review"
   label_icalendar: "Send iCalendar"
   label_icalendar_download: "Download iCalendar event"
+  label_view_meeting_series: "View meeting series"
+  label_meeting_series: "Meeting series"
   label_version: "Version"
   label_time_zone: "Time zone"
   label_start_date: "Start date"
   meeting:
+    participants:
+      template: "These participants will be invited automatically to all future meetings as they are created."
     attachments:
+      template: "These attached files will be included in all future meetings in the series."
       text: "Attached files are available to all meeting participants. You can also drag and drop these into agenda item notes."
     copy:
       title: "Copy meeting: %{title}"
@@ -145,9 +184,12 @@ az:
     label_mail_all_participants: "Send email to all participants"
     types:
       classic: "Classic"
-      classic_text: "Organize your meeting in a formattable text agenda and protocol."
-      structured: "Dynamic"
-      structured_text: "Organize your meeting as a list of agenda items, optionally linking them to a work package."
+      classic_text: "Organize your meeting as a single formattable text agenda and protocol."
+      structured: "Structured"
+      one_time: "One-time"
+      recurring: "Recurring"
+      recurring_text: "Create meeting series with dynamic template for each occurrence."
+      structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package."
       structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details"
     copied: "Copied from Meeting #%{id}"
   meeting_section:
@@ -155,6 +197,40 @@ az:
     delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?"
     placeholder_title: "New section"
     empty_text: "Drag items here or create a new one"
+  recurring_meeting:
+    occurrence:
+      infoline: "This meeting is part of a recurring meeting series."
+      error_no_next: "There is no next occurrence for this meeting."
+      first_already_exists: "The first occurrence of this meeting series is already instantiated."
+      first_created: >
+        The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence.
+    template:
+      button_finalize: "Finish template"
+      blank_title: "Your meeting series template is empty"
+      description: >
+        This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template.
+      blankslate_finalize: >
+        When you're done preparing this template, click the '%{button_title}' button above to finish the setup and schedule the first meeting of the series.
+      label_view_template: "View template"
+      label_edit_template: "Edit template"
+      banner_html: >
+        You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already created meetings.
+    frequency:
+      every_weekday: "Every %{day_of_the_week}"
+      daily: "Daily"
+      working_days: "Every working day"
+      weekly: "Weekly"
+    end_after:
+      specific_date: "a specific date"
+      iterations: "a number of occurrences"
+    starts: "Starts"
+    in_words:
+      daily_interval: "Every %{interval} days"
+      working_days: "Every working day"
+      weekly: "Every week on %{weekday}"
+      weekly_interval: "Every %{interval} weeks on %{weekday}"
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
   notice_successful_notification: "Notification sent successfully"
   notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here.
   notice_meeting_updated: "This page has been updated by someone else. Reload to view changes."
@@ -207,12 +283,17 @@ az:
   text_deleted_agenda_item: 'Deleted agenda item'
   label_initial_meeting_details: "Meeting"
   label_meeting_details: "Meeting details"
+  label_meeting_series_details: "Meeting series details"
   label_meeting_details_edit: "Edit meeting details"
   label_meeting_state: "Meeting status"
   label_meeting_state_open: "Open"
   label_meeting_state_open_html: "<i>Open</i>"
   label_meeting_state_closed: "Closed"
   label_meeting_state_closed_html: "<i>Closed</i>"
+  label_meeting_state_agenda_created: "Agenda created"
+  label_meeting_state_scheduled: "Scheduled"
+  label_meeting_state_cancelled: "Cancelled"
+  label_meeting_state_skipped: "Skipped"
   label_meeting_reopen_action: "Reopen meeting"
   label_meeting_close_action: "Close meeting"
   text_meeting_open_description: "This meeting is open. You can add/remove agenda items and edit them as you please. After the meeting is over, close it to lock it."
diff --git a/modules/meeting/config/locales/crowdin/be.yml b/modules/meeting/config/locales/crowdin/be.yml
index 337ee325e0e5..45efdd1617c5 100644
--- a/modules/meeting/config/locales/crowdin/be.yml
+++ b/modules/meeting/config/locales/crowdin/be.yml
@@ -52,11 +52,18 @@ be:
         presenter: "Presenter"
       meeting_section:
         title: "Title"
+      recurring_meeting:
+        frequency: "Frequency"
+        interval: "Interval"
+        start_date: "Starts on"
+        end_after: "End series after"
+        iterations: "Occurrences"
     errors:
       messages:
         invalid_time_format: "is not a valid time. Required format: HH:MM"
     models:
-      structured_meeting: "Meeting (dynamic)"
+      recurring_meeting: "Recurring meeting"
+      structured_meeting: "One-time meeting"
       meeting_agenda_item: "Agenda item"
       meeting_agenda: "Agenda"
       meeting_minutes: "Minutes"
@@ -90,7 +97,8 @@ be:
   label_meeting: "Meeting"
   label_meeting_plural: "Meetings"
   label_meeting_new: "New Meeting"
-  label_meeting_new_dynamic: "New dynamic meeting"
+  label_meeting_new_dynamic: "New one-time meeting"
+  label_meeting_new_recurring: "New recurring meeting"
   label_meeting_create: "Create meeting"
   label_meeting_copy: "Copy meeting"
   label_meeting_edit: "Edit Meeting"
@@ -104,23 +112,54 @@ be:
   label_meeting_date_time: "Date/Time"
   label_meeting_date_and_time: "Date and time"
   label_meeting_diff: "Diff"
+  label_recurring_meeting: "Recurring meeting"
+  label_recurring_meeting_part_of: "Part of a meeting series"
+  label_recurring_meeting_new: "New recurring meeting"
+  label_recurring_meeting_plural: "Recurring meetings"
+  label_template: "Template"
+  label_recurring_meeting_view: "View meeting series"
+  label_recurring_meeting_create: "Create from template"
+  label_recurring_meeting_copy: "Copy as one-off"
+  label_recurring_meeting_cancel: "Cancel this occurrence"
+  label_recurring_meeting_delete: "Delete occurrence"
+  label_recurring_meeting_delete_confirmation: >
+    This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue?
+  label_recurring_occurrence_delete_confirmation: >
+    Any meeting information not in the template will be lost. Do you want to continue?
+  label_recurring_meeting_restore: "Restore this occurrence"
+  label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})."
+  label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})."
+  label_recurring_meeting_more_past: "There are %{count} more past meetings."
+  label_recurring_meeting_more_past_singular: "There is %{count} more past meeting."
+  label_recurring_meeting_show_more: "Show more"
+  label_recurring_meeting_series_edit: "Edit meeting series"
+  label_recurring_meeting_series_delete: "Delete meeting series"
+  label_my_meetings: "My meetings"
+  label_all_meetings: "All meetings"
   label_upcoming_meetings: "Upcoming meetings"
   label_past_meetings: "Past meetings"
   label_upcoming_meetings_short: "Upcoming"
   label_past_meetings_short: "Past"
   label_involvement: "Involvement"
-  label_upcoming_invitations: "Upcoming invitations"
+  label_invitations: "Invitations"
+  label_invited_user: "Invited user"
   label_past_invitations: "Past invitations"
-  label_attendee: "Attendee"
-  label_author: "Стваральнік"
+  label_attended: "Attended"
+  label_attended_user: "Attended user"
+  label_created_by_me: "Created by me"
   label_notify: "Send for review"
   label_icalendar: "Send iCalendar"
   label_icalendar_download: "Download iCalendar event"
+  label_view_meeting_series: "View meeting series"
+  label_meeting_series: "Meeting series"
   label_version: "Version"
   label_time_zone: "Time zone"
   label_start_date: "Start date"
   meeting:
+    participants:
+      template: "These participants will be invited automatically to all future meetings as they are created."
     attachments:
+      template: "These attached files will be included in all future meetings in the series."
       text: "Attached files are available to all meeting participants. You can also drag and drop these into agenda item notes."
     copy:
       title: "Copy meeting: %{title}"
@@ -147,9 +186,12 @@ be:
     label_mail_all_participants: "Send email to all participants"
     types:
       classic: "Classic"
-      classic_text: "Organize your meeting in a formattable text agenda and protocol."
-      structured: "Dynamic"
-      structured_text: "Organize your meeting as a list of agenda items, optionally linking them to a work package."
+      classic_text: "Organize your meeting as a single formattable text agenda and protocol."
+      structured: "Structured"
+      one_time: "One-time"
+      recurring: "Recurring"
+      recurring_text: "Create meeting series with dynamic template for each occurrence."
+      structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package."
       structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details"
     copied: "Copied from Meeting #%{id}"
   meeting_section:
@@ -157,6 +199,40 @@ be:
     delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?"
     placeholder_title: "New section"
     empty_text: "Drag items here or create a new one"
+  recurring_meeting:
+    occurrence:
+      infoline: "This meeting is part of a recurring meeting series."
+      error_no_next: "There is no next occurrence for this meeting."
+      first_already_exists: "The first occurrence of this meeting series is already instantiated."
+      first_created: >
+        The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence.
+    template:
+      button_finalize: "Finish template"
+      blank_title: "Your meeting series template is empty"
+      description: >
+        This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template.
+      blankslate_finalize: >
+        When you're done preparing this template, click the '%{button_title}' button above to finish the setup and schedule the first meeting of the series.
+      label_view_template: "View template"
+      label_edit_template: "Edit template"
+      banner_html: >
+        You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already created meetings.
+    frequency:
+      every_weekday: "Every %{day_of_the_week}"
+      daily: "Daily"
+      working_days: "Every working day"
+      weekly: "Weekly"
+    end_after:
+      specific_date: "a specific date"
+      iterations: "a number of occurrences"
+    starts: "Starts"
+    in_words:
+      daily_interval: "Every %{interval} days"
+      working_days: "Every working day"
+      weekly: "Every week on %{weekday}"
+      weekly_interval: "Every %{interval} weeks on %{weekday}"
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
   notice_successful_notification: "Notification sent successfully"
   notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here.
   notice_meeting_updated: "This page has been updated by someone else. Reload to view changes."
@@ -209,12 +285,17 @@ be:
   text_deleted_agenda_item: 'Deleted agenda item'
   label_initial_meeting_details: "Meeting"
   label_meeting_details: "Meeting details"
+  label_meeting_series_details: "Meeting series details"
   label_meeting_details_edit: "Edit meeting details"
   label_meeting_state: "Meeting status"
   label_meeting_state_open: "Open"
   label_meeting_state_open_html: "<i>Open</i>"
   label_meeting_state_closed: "Closed"
   label_meeting_state_closed_html: "<i>Closed</i>"
+  label_meeting_state_agenda_created: "Agenda created"
+  label_meeting_state_scheduled: "Scheduled"
+  label_meeting_state_cancelled: "Cancelled"
+  label_meeting_state_skipped: "Skipped"
   label_meeting_reopen_action: "Reopen meeting"
   label_meeting_close_action: "Close meeting"
   text_meeting_open_description: "This meeting is open. You can add/remove agenda items and edit them as you please. After the meeting is over, close it to lock it."
diff --git a/modules/meeting/config/locales/crowdin/bg.yml b/modules/meeting/config/locales/crowdin/bg.yml
index b7198519d89b..ef58e70ed1f3 100644
--- a/modules/meeting/config/locales/crowdin/bg.yml
+++ b/modules/meeting/config/locales/crowdin/bg.yml
@@ -50,11 +50,18 @@ bg:
         presenter: "Презентатор"
       meeting_section:
         title: "Заглавие"
+      recurring_meeting:
+        frequency: "Frequency"
+        interval: "Interval"
+        start_date: "Starts on"
+        end_after: "End series after"
+        iterations: "Occurrences"
     errors:
       messages:
         invalid_time_format: "не е валидно време. Задължителен формат: HH:MM"
     models:
-      structured_meeting: "Среща (динамична)"
+      recurring_meeting: "Recurring meeting"
+      structured_meeting: "One-time meeting"
       meeting_agenda_item: "Точка от дневния ред"
       meeting_agenda: "Дневен ред"
       meeting_minutes: "Минути"
@@ -88,7 +95,8 @@ bg:
   label_meeting: "среща"
   label_meeting_plural: "Срещи"
   label_meeting_new: "Нова среща"
-  label_meeting_new_dynamic: "New dynamic meeting"
+  label_meeting_new_dynamic: "New one-time meeting"
+  label_meeting_new_recurring: "New recurring meeting"
   label_meeting_create: "Create meeting"
   label_meeting_copy: "Copy meeting"
   label_meeting_edit: "Редактиране на срещата"
@@ -102,23 +110,54 @@ bg:
   label_meeting_date_time: "Дата/час"
   label_meeting_date_and_time: "Date and time"
   label_meeting_diff: "Разлика"
+  label_recurring_meeting: "Recurring meeting"
+  label_recurring_meeting_part_of: "Part of a meeting series"
+  label_recurring_meeting_new: "New recurring meeting"
+  label_recurring_meeting_plural: "Recurring meetings"
+  label_template: "Template"
+  label_recurring_meeting_view: "View meeting series"
+  label_recurring_meeting_create: "Create from template"
+  label_recurring_meeting_copy: "Copy as one-off"
+  label_recurring_meeting_cancel: "Cancel this occurrence"
+  label_recurring_meeting_delete: "Delete occurrence"
+  label_recurring_meeting_delete_confirmation: >
+    This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue?
+  label_recurring_occurrence_delete_confirmation: >
+    Any meeting information not in the template will be lost. Do you want to continue?
+  label_recurring_meeting_restore: "Restore this occurrence"
+  label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})."
+  label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})."
+  label_recurring_meeting_more_past: "There are %{count} more past meetings."
+  label_recurring_meeting_more_past_singular: "There is %{count} more past meeting."
+  label_recurring_meeting_show_more: "Show more"
+  label_recurring_meeting_series_edit: "Edit meeting series"
+  label_recurring_meeting_series_delete: "Delete meeting series"
+  label_my_meetings: "My meetings"
+  label_all_meetings: "All meetings"
   label_upcoming_meetings: "Предстоящи срещи"
   label_past_meetings: "Предишни срещи"
   label_upcoming_meetings_short: "Предстоящи"
   label_past_meetings_short: "Предишен"
   label_involvement: "Участие"
-  label_upcoming_invitations: "Предстоящи покани"
+  label_invitations: "Invitations"
+  label_invited_user: "Invited user"
   label_past_invitations: "Минали покани"
-  label_attendee: "Присъстващ"
-  label_author: "Създател"
+  label_attended: "Attended"
+  label_attended_user: "Attended user"
+  label_created_by_me: "Created by me"
   label_notify: "Изпращане за преглед"
   label_icalendar: "Изпращане на iCalendar"
   label_icalendar_download: "Изтегляне на събитие от iCalendar"
+  label_view_meeting_series: "View meeting series"
+  label_meeting_series: "Meeting series"
   label_version: "Версия"
   label_time_zone: "Часова зона"
   label_start_date: "Начална дата"
   meeting:
+    participants:
+      template: "These participants will be invited automatically to all future meetings as they are created."
     attachments:
+      template: "These attached files will be included in all future meetings in the series."
       text: "Приложените файлове са на разположение на всички участници в срещата. Можете също така да ги плъзгате и пускате в бележките към точките от дневния ред."
     copy:
       title: "Копиране на среща: %{title}"
@@ -145,9 +184,12 @@ bg:
     label_mail_all_participants: "Изпрати имейл до всички участници"
     types:
       classic: "Класически"
-      classic_text: "Организирайте срещата си в текстова програма и протокол, които могат да се форматират."
-      structured: "Динамичен"
-      structured_text: "Организирайте срещата си като списък с точки от дневния ред, като по желание ги свържете с работен пакет."
+      classic_text: "Organize your meeting as a single formattable text agenda and protocol."
+      structured: "Structured"
+      one_time: "One-time"
+      recurring: "Recurring"
+      recurring_text: "Create meeting series with dynamic template for each occurrence."
+      structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package."
       structured_text_copy: "Копирането на среща понастоящем не копира свързаните с нея точки от дневния ред, а само подробностите."
     copied: "Копирано от среща #%{id}"
   meeting_section:
@@ -155,6 +197,40 @@ bg:
     delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?"
     placeholder_title: "New section"
     empty_text: "Завлечете елементите тук, или създайте нов елемент"
+  recurring_meeting:
+    occurrence:
+      infoline: "This meeting is part of a recurring meeting series."
+      error_no_next: "There is no next occurrence for this meeting."
+      first_already_exists: "The first occurrence of this meeting series is already instantiated."
+      first_created: >
+        The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence.
+    template:
+      button_finalize: "Finish template"
+      blank_title: "Your meeting series template is empty"
+      description: >
+        This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template.
+      blankslate_finalize: >
+        When you're done preparing this template, click the '%{button_title}' button above to finish the setup and schedule the first meeting of the series.
+      label_view_template: "View template"
+      label_edit_template: "Edit template"
+      banner_html: >
+        You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already created meetings.
+    frequency:
+      every_weekday: "Every %{day_of_the_week}"
+      daily: "Daily"
+      working_days: "Every working day"
+      weekly: "Weekly"
+    end_after:
+      specific_date: "a specific date"
+      iterations: "a number of occurrences"
+    starts: "Starts"
+    in_words:
+      daily_interval: "Every %{interval} days"
+      working_days: "Every working day"
+      weekly: "Every week on %{weekday}"
+      weekly_interval: "Every %{interval} weeks on %{weekday}"
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
   notice_successful_notification: "Notification sent successfully"
   notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here.
   notice_meeting_updated: "This page has been updated by someone else. Reload to view changes."
@@ -207,12 +283,17 @@ bg:
   text_deleted_agenda_item: 'Deleted agenda item'
   label_initial_meeting_details: "среща"
   label_meeting_details: "Meeting details"
+  label_meeting_series_details: "Meeting series details"
   label_meeting_details_edit: "Edit meeting details"
   label_meeting_state: "Meeting status"
   label_meeting_state_open: "Open"
   label_meeting_state_open_html: "<i>Open</i>"
   label_meeting_state_closed: "Затворен"
   label_meeting_state_closed_html: "<i>Closed</i>"
+  label_meeting_state_agenda_created: "Agenda created"
+  label_meeting_state_scheduled: "Scheduled"
+  label_meeting_state_cancelled: "Cancelled"
+  label_meeting_state_skipped: "Skipped"
   label_meeting_reopen_action: "Reopen meeting"
   label_meeting_close_action: "Затваряне на срещата"
   text_meeting_open_description: "Тази среща е открита. Можете да добавяте/премахвате точки от дневния ред и да ги редактирате, както желаете. След приключване на срещата я затворете, за да я заключите."
diff --git a/modules/meeting/config/locales/crowdin/ca.yml b/modules/meeting/config/locales/crowdin/ca.yml
index f57353189a01..2ba94ed00b6b 100644
--- a/modules/meeting/config/locales/crowdin/ca.yml
+++ b/modules/meeting/config/locales/crowdin/ca.yml
@@ -50,11 +50,18 @@ ca:
         presenter: "Presentador"
       meeting_section:
         title: "Títol"
+      recurring_meeting:
+        frequency: "Frequency"
+        interval: "Interval"
+        start_date: "Starts on"
+        end_after: "End series after"
+        iterations: "Occurrences"
     errors:
       messages:
         invalid_time_format: "no és una hora vàlida. El format requerit és: HH:MM"
     models:
-      structured_meeting: "Reunió (dinàmica)"
+      recurring_meeting: "Recurring meeting"
+      structured_meeting: "One-time meeting"
       meeting_agenda_item: "Element d'agenda"
       meeting_agenda: "Agenda"
       meeting_minutes: "Acta"
@@ -88,7 +95,8 @@ ca:
   label_meeting: "Reunió"
   label_meeting_plural: "Reunions"
   label_meeting_new: "Nova reunió"
-  label_meeting_new_dynamic: "New dynamic meeting"
+  label_meeting_new_dynamic: "New one-time meeting"
+  label_meeting_new_recurring: "New recurring meeting"
   label_meeting_create: "Create meeting"
   label_meeting_copy: "Copy meeting"
   label_meeting_edit: "Editar reunió"
@@ -102,23 +110,54 @@ ca:
   label_meeting_date_time: "Data/Hora"
   label_meeting_date_and_time: "Date and time"
   label_meeting_diff: "Diferència"
+  label_recurring_meeting: "Recurring meeting"
+  label_recurring_meeting_part_of: "Part of a meeting series"
+  label_recurring_meeting_new: "New recurring meeting"
+  label_recurring_meeting_plural: "Recurring meetings"
+  label_template: "Template"
+  label_recurring_meeting_view: "View meeting series"
+  label_recurring_meeting_create: "Create from template"
+  label_recurring_meeting_copy: "Copy as one-off"
+  label_recurring_meeting_cancel: "Cancel this occurrence"
+  label_recurring_meeting_delete: "Delete occurrence"
+  label_recurring_meeting_delete_confirmation: >
+    This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue?
+  label_recurring_occurrence_delete_confirmation: >
+    Any meeting information not in the template will be lost. Do you want to continue?
+  label_recurring_meeting_restore: "Restore this occurrence"
+  label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})."
+  label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})."
+  label_recurring_meeting_more_past: "There are %{count} more past meetings."
+  label_recurring_meeting_more_past_singular: "There is %{count} more past meeting."
+  label_recurring_meeting_show_more: "Show more"
+  label_recurring_meeting_series_edit: "Edit meeting series"
+  label_recurring_meeting_series_delete: "Delete meeting series"
+  label_my_meetings: "My meetings"
+  label_all_meetings: "All meetings"
   label_upcoming_meetings: "Pròximes reunions"
   label_past_meetings: "Reunions passades"
   label_upcoming_meetings_short: "Pròximes"
   label_past_meetings_short: "Passades"
   label_involvement: "Implicació"
-  label_upcoming_invitations: "Pròximes invitacions"
+  label_invitations: "Invitations"
+  label_invited_user: "Invited user"
   label_past_invitations: "Invitacions passades"
-  label_attendee: "Assistent"
-  label_author: "Creador"
+  label_attended: "Attended"
+  label_attended_user: "Attended user"
+  label_created_by_me: "Created by me"
   label_notify: "Envia per revisar"
   label_icalendar: "Envia iCalendar"
   label_icalendar_download: "Descarregueu esdeveniment d'iCalendar"
+  label_view_meeting_series: "View meeting series"
+  label_meeting_series: "Meeting series"
   label_version: "Versió"
   label_time_zone: "Zona horària"
   label_start_date: "Data d'inici"
   meeting:
+    participants:
+      template: "These participants will be invited automatically to all future meetings as they are created."
     attachments:
+      template: "These attached files will be included in all future meetings in the series."
       text: "Els fitxers adjunts estan disponibles per a tots els participants de la reunió. També podeu arrossegar-los i deixar-los anar a les notes dels punts de l'agenda."
     copy:
       title: "Copia la reunió: %{title}"
@@ -145,9 +184,12 @@ ca:
     label_mail_all_participants: "Envia un correu a tots els participants"
     types:
       classic: "Clàssica"
-      classic_text: "Organitzeu la vostra reunió en una agenda i un protocol de text formatejables."
-      structured: "Dinàmica"
-      structured_text: "Organitza la vostra reunió com una llista d'elements de l'agenda, enllaçant-los opcionalment a un paquet de treball."
+      classic_text: "Organize your meeting as a single formattable text agenda and protocol."
+      structured: "Structured"
+      one_time: "One-time"
+      recurring: "Recurring"
+      recurring_text: "Create meeting series with dynamic template for each occurrence."
+      structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package."
       structured_text_copy: "Actualment en copiar una reunió  no es copiaran els elements associats a l'agenda de la reunió, només els detalls."
     copied: "Copiat de la reunió #%{id}"
   meeting_section:
@@ -155,6 +197,40 @@ ca:
     delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?"
     placeholder_title: "Nova secció"
     empty_text: "Arrossega els elements aquí o crea un de nou"
+  recurring_meeting:
+    occurrence:
+      infoline: "This meeting is part of a recurring meeting series."
+      error_no_next: "There is no next occurrence for this meeting."
+      first_already_exists: "The first occurrence of this meeting series is already instantiated."
+      first_created: >
+        The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence.
+    template:
+      button_finalize: "Finish template"
+      blank_title: "Your meeting series template is empty"
+      description: >
+        This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template.
+      blankslate_finalize: >
+        When you're done preparing this template, click the '%{button_title}' button above to finish the setup and schedule the first meeting of the series.
+      label_view_template: "View template"
+      label_edit_template: "Edit template"
+      banner_html: >
+        You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already created meetings.
+    frequency:
+      every_weekday: "Every %{day_of_the_week}"
+      daily: "Daily"
+      working_days: "Every working day"
+      weekly: "Weekly"
+    end_after:
+      specific_date: "a specific date"
+      iterations: "a number of occurrences"
+    starts: "Starts"
+    in_words:
+      daily_interval: "Every %{interval} days"
+      working_days: "Every working day"
+      weekly: "Every week on %{weekday}"
+      weekly_interval: "Every %{interval} weeks on %{weekday}"
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
   notice_successful_notification: "Notificació enviada correctament"
   notice_timezone_missing: No s'ha configurat la zona horària i la %{zone} és assumida. Per seleccionar la teva zona horària, si us plau, fes clic aquí.
   notice_meeting_updated: "This page has been updated by someone else. Reload to view changes."
@@ -207,12 +283,17 @@ ca:
   text_deleted_agenda_item: 'Punt de l''ordre del dia eliminat'
   label_initial_meeting_details: "Reunió"
   label_meeting_details: "Detalls de la reunió"
+  label_meeting_series_details: "Meeting series details"
   label_meeting_details_edit: "Edita els detalls de la reunió"
   label_meeting_state: "Estat de la reunió"
   label_meeting_state_open: "Oberta"
   label_meeting_state_open_html: "<i>Obre</i>"
   label_meeting_state_closed: "Tancada"
   label_meeting_state_closed_html: "<i>Tancat</i>"
+  label_meeting_state_agenda_created: "Agenda created"
+  label_meeting_state_scheduled: "Scheduled"
+  label_meeting_state_cancelled: "Cancelled"
+  label_meeting_state_skipped: "Skipped"
   label_meeting_reopen_action: "Reobrir reunió"
   label_meeting_close_action: "Tancar reunió"
   text_meeting_open_description: "Aquesta reunió està oberta. Pots afegir o eliminar elements de l'agenda i editar-los lliurement. Al final de la reunió, tanca-la per bloquejar-la."
diff --git a/modules/meeting/config/locales/crowdin/ckb-IR.yml b/modules/meeting/config/locales/crowdin/ckb-IR.yml
index b119a6077922..20c392434a8e 100644
--- a/modules/meeting/config/locales/crowdin/ckb-IR.yml
+++ b/modules/meeting/config/locales/crowdin/ckb-IR.yml
@@ -50,11 +50,18 @@ ckb-IR:
         presenter: "Presenter"
       meeting_section:
         title: "Title"
+      recurring_meeting:
+        frequency: "Frequency"
+        interval: "Interval"
+        start_date: "Starts on"
+        end_after: "End series after"
+        iterations: "Occurrences"
     errors:
       messages:
         invalid_time_format: "is not a valid time. Required format: HH:MM"
     models:
-      structured_meeting: "Meeting (dynamic)"
+      recurring_meeting: "Recurring meeting"
+      structured_meeting: "One-time meeting"
       meeting_agenda_item: "Agenda item"
       meeting_agenda: "Agenda"
       meeting_minutes: "Minutes"
@@ -88,7 +95,8 @@ ckb-IR:
   label_meeting: "Meeting"
   label_meeting_plural: "Meetings"
   label_meeting_new: "New Meeting"
-  label_meeting_new_dynamic: "New dynamic meeting"
+  label_meeting_new_dynamic: "New one-time meeting"
+  label_meeting_new_recurring: "New recurring meeting"
   label_meeting_create: "Create meeting"
   label_meeting_copy: "Copy meeting"
   label_meeting_edit: "Edit Meeting"
@@ -102,23 +110,54 @@ ckb-IR:
   label_meeting_date_time: "Date/Time"
   label_meeting_date_and_time: "Date and time"
   label_meeting_diff: "Diff"
+  label_recurring_meeting: "Recurring meeting"
+  label_recurring_meeting_part_of: "Part of a meeting series"
+  label_recurring_meeting_new: "New recurring meeting"
+  label_recurring_meeting_plural: "Recurring meetings"
+  label_template: "Template"
+  label_recurring_meeting_view: "View meeting series"
+  label_recurring_meeting_create: "Create from template"
+  label_recurring_meeting_copy: "Copy as one-off"
+  label_recurring_meeting_cancel: "Cancel this occurrence"
+  label_recurring_meeting_delete: "Delete occurrence"
+  label_recurring_meeting_delete_confirmation: >
+    This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue?
+  label_recurring_occurrence_delete_confirmation: >
+    Any meeting information not in the template will be lost. Do you want to continue?
+  label_recurring_meeting_restore: "Restore this occurrence"
+  label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})."
+  label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})."
+  label_recurring_meeting_more_past: "There are %{count} more past meetings."
+  label_recurring_meeting_more_past_singular: "There is %{count} more past meeting."
+  label_recurring_meeting_show_more: "Show more"
+  label_recurring_meeting_series_edit: "Edit meeting series"
+  label_recurring_meeting_series_delete: "Delete meeting series"
+  label_my_meetings: "My meetings"
+  label_all_meetings: "All meetings"
   label_upcoming_meetings: "Upcoming meetings"
   label_past_meetings: "Past meetings"
   label_upcoming_meetings_short: "Upcoming"
   label_past_meetings_short: "Past"
   label_involvement: "Involvement"
-  label_upcoming_invitations: "Upcoming invitations"
+  label_invitations: "Invitations"
+  label_invited_user: "Invited user"
   label_past_invitations: "Past invitations"
-  label_attendee: "Attendee"
-  label_author: "Creator"
+  label_attended: "Attended"
+  label_attended_user: "Attended user"
+  label_created_by_me: "Created by me"
   label_notify: "Send for review"
   label_icalendar: "Send iCalendar"
   label_icalendar_download: "Download iCalendar event"
+  label_view_meeting_series: "View meeting series"
+  label_meeting_series: "Meeting series"
   label_version: "Version"
   label_time_zone: "Time zone"
   label_start_date: "Start date"
   meeting:
+    participants:
+      template: "These participants will be invited automatically to all future meetings as they are created."
     attachments:
+      template: "These attached files will be included in all future meetings in the series."
       text: "Attached files are available to all meeting participants. You can also drag and drop these into agenda item notes."
     copy:
       title: "Copy meeting: %{title}"
@@ -145,9 +184,12 @@ ckb-IR:
     label_mail_all_participants: "Send email to all participants"
     types:
       classic: "Classic"
-      classic_text: "Organize your meeting in a formattable text agenda and protocol."
-      structured: "Dynamic"
-      structured_text: "Organize your meeting as a list of agenda items, optionally linking them to a work package."
+      classic_text: "Organize your meeting as a single formattable text agenda and protocol."
+      structured: "Structured"
+      one_time: "One-time"
+      recurring: "Recurring"
+      recurring_text: "Create meeting series with dynamic template for each occurrence."
+      structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package."
       structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details"
     copied: "Copied from Meeting #%{id}"
   meeting_section:
@@ -155,6 +197,40 @@ ckb-IR:
     delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?"
     placeholder_title: "New section"
     empty_text: "Drag items here or create a new one"
+  recurring_meeting:
+    occurrence:
+      infoline: "This meeting is part of a recurring meeting series."
+      error_no_next: "There is no next occurrence for this meeting."
+      first_already_exists: "The first occurrence of this meeting series is already instantiated."
+      first_created: >
+        The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence.
+    template:
+      button_finalize: "Finish template"
+      blank_title: "Your meeting series template is empty"
+      description: >
+        This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template.
+      blankslate_finalize: >
+        When you're done preparing this template, click the '%{button_title}' button above to finish the setup and schedule the first meeting of the series.
+      label_view_template: "View template"
+      label_edit_template: "Edit template"
+      banner_html: >
+        You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already created meetings.
+    frequency:
+      every_weekday: "Every %{day_of_the_week}"
+      daily: "Daily"
+      working_days: "Every working day"
+      weekly: "Weekly"
+    end_after:
+      specific_date: "a specific date"
+      iterations: "a number of occurrences"
+    starts: "Starts"
+    in_words:
+      daily_interval: "Every %{interval} days"
+      working_days: "Every working day"
+      weekly: "Every week on %{weekday}"
+      weekly_interval: "Every %{interval} weeks on %{weekday}"
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
   notice_successful_notification: "Notification sent successfully"
   notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here.
   notice_meeting_updated: "This page has been updated by someone else. Reload to view changes."
@@ -207,12 +283,17 @@ ckb-IR:
   text_deleted_agenda_item: 'Deleted agenda item'
   label_initial_meeting_details: "Meeting"
   label_meeting_details: "Meeting details"
+  label_meeting_series_details: "Meeting series details"
   label_meeting_details_edit: "Edit meeting details"
   label_meeting_state: "Meeting status"
   label_meeting_state_open: "Open"
   label_meeting_state_open_html: "<i>Open</i>"
   label_meeting_state_closed: "Closed"
   label_meeting_state_closed_html: "<i>Closed</i>"
+  label_meeting_state_agenda_created: "Agenda created"
+  label_meeting_state_scheduled: "Scheduled"
+  label_meeting_state_cancelled: "Cancelled"
+  label_meeting_state_skipped: "Skipped"
   label_meeting_reopen_action: "Reopen meeting"
   label_meeting_close_action: "Close meeting"
   text_meeting_open_description: "This meeting is open. You can add/remove agenda items and edit them as you please. After the meeting is over, close it to lock it."
diff --git a/modules/meeting/config/locales/crowdin/cs.yml b/modules/meeting/config/locales/crowdin/cs.yml
index 2a0864071e94..4a37a3516f1e 100644
--- a/modules/meeting/config/locales/crowdin/cs.yml
+++ b/modules/meeting/config/locales/crowdin/cs.yml
@@ -52,11 +52,18 @@ cs:
         presenter: "Přednášející"
       meeting_section:
         title: "Název"
+      recurring_meeting:
+        frequency: "Frekvence"
+        interval: "Interval"
+        start_date: "Začíná v"
+        end_after: "Ukončení výskytu po"
+        iterations: "Výskyty"
     errors:
       messages:
         invalid_time_format: "není platný čas. Požadovaný formát: HH:MM"
     models:
-      structured_meeting: ""
+      recurring_meeting: "Opakovaná schůzka"
+      structured_meeting: "Jednorázová schůzka"
       meeting_agenda_item: "Pořad jednání"
       meeting_agenda: "Agenda"
       meeting_minutes: "Zápis"
@@ -90,7 +97,8 @@ cs:
   label_meeting: "Schůzka"
   label_meeting_plural: "Schůzky"
   label_meeting_new: "Nová schůzka"
-  label_meeting_new_dynamic: "New dynamic meeting"
+  label_meeting_new_dynamic: "Nová jednorázová schůzka"
+  label_meeting_new_recurring: "Nová opakovaná schůzka"
   label_meeting_create: "Vytvořit schůzku"
   label_meeting_copy: "Kopírovat schůzku"
   label_meeting_edit: "Upravit schůzku"
@@ -104,34 +112,65 @@ cs:
   label_meeting_date_time: "Datum/Čas"
   label_meeting_date_and_time: "Datum a čas"
   label_meeting_diff: "Rozdíl"
+  label_recurring_meeting: "Opakující se schůzka"
+  label_recurring_meeting_part_of: "Část série schůzek\n"
+  label_recurring_meeting_new: "Nová opakovaná schůzka"
+  label_recurring_meeting_plural: "Opakující se schůzky"
+  label_template: "Šablona"
+  label_recurring_meeting_view: "Zobrazit sérii schůzek"
+  label_recurring_meeting_create: "Vytvořit ze šablony"
+  label_recurring_meeting_copy: "Kopírovat jako jednorázový"
+  label_recurring_meeting_cancel: "Zrušit toto opakování"
+  label_recurring_meeting_delete: "Odstranit výskyt"
+  label_recurring_meeting_delete_confirmation: >
+    This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue?
+  label_recurring_occurrence_delete_confirmation: >
+    Any meeting information not in the template will be lost. Do you want to continue?
+  label_recurring_meeting_restore: "Obnovit tento výskyt"
+  label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})."
+  label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})."
+  label_recurring_meeting_more_past: "Dalších  %{count}  minulých schůzek "
+  label_recurring_meeting_more_past_singular: "There is %{count} more past meeting."
+  label_recurring_meeting_show_more: "Ukázat více"
+  label_recurring_meeting_series_edit: "Upravit sérii schůzek"
+  label_recurring_meeting_series_delete: "Odstranit sérii schůzek"
+  label_my_meetings: "Moje schůzky"
+  label_all_meetings: "Všechny schůzky"
   label_upcoming_meetings: "Nadcházející schůzky"
   label_past_meetings: "Minulé schůzky"
   label_upcoming_meetings_short: "Nadcházející"
   label_past_meetings_short: "Minulé"
   label_involvement: "Zapojení"
-  label_upcoming_invitations: "Nadcházející pozvánky"
+  label_invitations: "Pozvánky"
+  label_invited_user: "Pozvaný uživatel"
   label_past_invitations: "Minulé pozvánky"
-  label_attendee: "Účastník"
-  label_author: "Autor:"
+  label_attended: "Zúčastnil se"
+  label_attended_user: "Zúčastněný uživatel"
+  label_created_by_me: "Vytvořeno mnou"
   label_notify: "Odeslat k posouzení"
   label_icalendar: "Odeslat iCalendar"
   label_icalendar_download: "Stáhnout událost iCalendar"
+  label_view_meeting_series: "Zobrazit sérii schůzek"
+  label_meeting_series: "Řada schůzek"
   label_version: "Verze"
   label_time_zone: "Časové pásmo"
   label_start_date: "Datum zahájení"
   meeting:
+    participants:
+      template: "These participants will be invited automatically to all future meetings as they are created."
     attachments:
+      template: "These attached files will be included in all future meetings in the series."
       text: "Attached files are available to all meeting participants. You can also drag and drop these into agenda item notes."
     copy:
       title: "Kopírovat schůzku %{title}"
       attachments: "Kopírovat přílohy"
       attachments_text: "Zkopírujte všechny přiložené soubory do nové schůzky"
       agenda: "Kopírovat program"
-      agenda_items: "Copy agenda items"
+      agenda_items: "Kopírovat položky agendy"
       agenda_text: "Zkopírujte program staré schůzky"
-      participants: "Copy list of participants"
+      participants: "Kopírovat seznam účastníků"
     email:
-      send_emails: "Email participants"
+      send_emails: "Účastníci e-mailu"
       send_invitation_emails: >
         Send an email invitation immediately to the participants selected above. You can also do this manually at any time later.
       send_invitation_emails_structured: "Send an email invitation immediately to all participants. You can also do this manually at any time later."
@@ -147,19 +186,56 @@ cs:
     label_mail_all_participants: "Poslat e-mail všem účastníkům"
     types:
       classic: "Klasické"
-      classic_text: "Uspořádat schůzku do formátů textového programu a protokolu."
-      structured: "Dynamický"
-      structured_text: "Uspořádat schůzku jako seznam bodů pořadu jednání, případně je propojit s pracovním balíčkem."
+      classic_text: "Organize your meeting as a single formattable text agenda and protocol."
+      structured: "Strukturované"
+      one_time: "Jednorázový"
+      recurring: "Opakované"
+      recurring_text: "Create meeting series with dynamic template for each occurrence."
+      structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package."
       structured_text_copy: "Kopírování schůzky v současné době nezkopíruje související body pořadu jednání, jen podrobnosti"
     copied: "Zkopírováno ze schůzky #%{id}"
   meeting_section:
     untitled_title: "Sekce bez názvu"
     delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?"
     placeholder_title: "Nová sekce"
-    empty_text: "Drag items here or create a new one"
+    empty_text: "Přetáhněte položky sem nebo vytvořte nové"
+  recurring_meeting:
+    occurrence:
+      infoline: "Tato schůzka je součástí opakované série schůzek."
+      error_no_next: "Na této schůzce není žádný další výskyt."
+      first_already_exists: "The first occurrence of this meeting series is already instantiated."
+      first_created: >
+        The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence.
+    template:
+      button_finalize: "Dokončit šablonu"
+      blank_title: "Vaše šablona série schůzek je prázdná"
+      description: >
+        This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template.
+      blankslate_finalize: >
+        When you're done preparing this template, click the '%{button_title}' button above to finish the setup and schedule the first meeting of the series.
+      label_view_template: "Zobrazit šablonu"
+      label_edit_template: "Upravit šablonu"
+      banner_html: >
+        You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already created meetings.
+    frequency:
+      every_weekday: "Every %{day_of_the_week}"
+      daily: "Denně"
+      working_days: "Každý pracovní den"
+      weekly: "Týdně"
+    end_after:
+      specific_date: "konkrétní datum"
+      iterations: "počet výskytů"
+    starts: "Začíná"
+    in_words:
+      daily_interval: "Každé %{interval} dny"
+      working_days: "Každý pracovní den"
+      weekly: "Každý týden na %{weekday}"
+      weekly_interval: "Every %{interval} weeks on %{weekday}"
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
   notice_successful_notification: "Oznámení bylo úspěšně odesláno"
   notice_timezone_missing: Není nastaveno žádné časové pásmo a předpokládá se %{zone} . Chcete-li vybrat časové pásmo, klikněte prosím zde.
-  notice_meeting_updated: "This page has been updated by someone else. Reload to view changes."
+  notice_meeting_updated: "Tato stránka byla aktualizována někým jiným. Pro zobrazení změn znovu načtena."
   permission_create_meetings: "Vytvořit schůzku\n"
   permission_edit_meetings: "Upravit schůzku"
   permission_delete_meetings: "Odstranit schůzky"
@@ -203,18 +279,23 @@ cs:
   label_agenda_item_move_up: "Přesunout výš"
   label_agenda_item_move_down: "Přesunout níž"
   label_agenda_item_add_notes: "Přidat poznámky"
-  label_agenda_item_work_package: "Agenda item work package"
+  label_agenda_item_work_package: "Pracovní balíček k bodu programu"
   text_agenda_item_title: 'Bod programu "%{title}"'
-  text_agenda_work_package_deleted: 'Agenda item for deleted work package'
+  text_agenda_work_package_deleted: 'Položka agendy pro odstraněný pracovní balíček'
   text_deleted_agenda_item: 'Vymazaný bod programu'
   label_initial_meeting_details: "Schůzka"
   label_meeting_details: "Podrobnosti o schůzce"
+  label_meeting_series_details: "Meeting series details"
   label_meeting_details_edit: "Upravit podrobnosti schůzky"
   label_meeting_state: "Stav schůzky"
   label_meeting_state_open: "Otevřít"
   label_meeting_state_open_html: "<i>Otevřeno</i>"
   label_meeting_state_closed: "Uzavřený"
   label_meeting_state_closed_html: "<i>Uzavřeno</i>"
+  label_meeting_state_agenda_created: "Program byl vytvořen"
+  label_meeting_state_scheduled: "Naplánováno"
+  label_meeting_state_cancelled: "Zrušeno"
+  label_meeting_state_skipped: "Přeskočeno"
   label_meeting_reopen_action: "Znovu otevřít schůzku"
   label_meeting_close_action: "Ukončit schůzku"
   text_meeting_open_description: "Tato schůzka je otevřená. Můžete přidat/odebrat položky programu a upravit je, jak chcete. Po skončení schůzky ji zavřete a uzamkněte ji."
diff --git a/modules/meeting/config/locales/crowdin/da.yml b/modules/meeting/config/locales/crowdin/da.yml
index a2ad61aea25f..d6c6873f63be 100644
--- a/modules/meeting/config/locales/crowdin/da.yml
+++ b/modules/meeting/config/locales/crowdin/da.yml
@@ -50,11 +50,18 @@ da:
         presenter: "Presenter"
       meeting_section:
         title: "Titel"
+      recurring_meeting:
+        frequency: "Frequency"
+        interval: "Interval"
+        start_date: "Starts on"
+        end_after: "End series after"
+        iterations: "Occurrences"
     errors:
       messages:
         invalid_time_format: "is not a valid time. Required format: HH:MM"
     models:
-      structured_meeting: "Meeting (dynamic)"
+      recurring_meeting: "Recurring meeting"
+      structured_meeting: "One-time meeting"
       meeting_agenda_item: "Agenda item"
       meeting_agenda: "Dagsorden"
       meeting_minutes: "Referat"
@@ -88,7 +95,8 @@ da:
   label_meeting: "Møde"
   label_meeting_plural: "Møder"
   label_meeting_new: "Nyt møde"
-  label_meeting_new_dynamic: "New dynamic meeting"
+  label_meeting_new_dynamic: "New one-time meeting"
+  label_meeting_new_recurring: "New recurring meeting"
   label_meeting_create: "Create meeting"
   label_meeting_copy: "Copy meeting"
   label_meeting_edit: "Rediger møde"
@@ -102,23 +110,54 @@ da:
   label_meeting_date_time: "Dato/tidspunkt"
   label_meeting_date_and_time: "Date and time"
   label_meeting_diff: "Uenigheder"
+  label_recurring_meeting: "Recurring meeting"
+  label_recurring_meeting_part_of: "Part of a meeting series"
+  label_recurring_meeting_new: "New recurring meeting"
+  label_recurring_meeting_plural: "Recurring meetings"
+  label_template: "Template"
+  label_recurring_meeting_view: "View meeting series"
+  label_recurring_meeting_create: "Create from template"
+  label_recurring_meeting_copy: "Copy as one-off"
+  label_recurring_meeting_cancel: "Cancel this occurrence"
+  label_recurring_meeting_delete: "Delete occurrence"
+  label_recurring_meeting_delete_confirmation: >
+    This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue?
+  label_recurring_occurrence_delete_confirmation: >
+    Any meeting information not in the template will be lost. Do you want to continue?
+  label_recurring_meeting_restore: "Restore this occurrence"
+  label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})."
+  label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})."
+  label_recurring_meeting_more_past: "There are %{count} more past meetings."
+  label_recurring_meeting_more_past_singular: "There is %{count} more past meeting."
+  label_recurring_meeting_show_more: "Show more"
+  label_recurring_meeting_series_edit: "Edit meeting series"
+  label_recurring_meeting_series_delete: "Delete meeting series"
+  label_my_meetings: "My meetings"
+  label_all_meetings: "All meetings"
   label_upcoming_meetings: "Upcoming meetings"
   label_past_meetings: "Past meetings"
   label_upcoming_meetings_short: "Upcoming"
   label_past_meetings_short: "Past"
   label_involvement: "Involvement"
-  label_upcoming_invitations: "Upcoming invitations"
+  label_invitations: "Invitations"
+  label_invited_user: "Invited user"
   label_past_invitations: "Past invitations"
-  label_attendee: "Attendee"
-  label_author: "Creator"
+  label_attended: "Attended"
+  label_attended_user: "Attended user"
+  label_created_by_me: "Created by me"
   label_notify: "Send til vurdering"
   label_icalendar: "Send iCalendar"
   label_icalendar_download: "Download iCalendar event"
+  label_view_meeting_series: "View meeting series"
+  label_meeting_series: "Meeting series"
   label_version: "Version"
   label_time_zone: "Tidszone"
   label_start_date: "Start dato"
   meeting:
+    participants:
+      template: "These participants will be invited automatically to all future meetings as they are created."
     attachments:
+      template: "These attached files will be included in all future meetings in the series."
       text: "Attached files are available to all meeting participants. You can also drag and drop these into agenda item notes."
     copy:
       title: "Copy meeting: %{title}"
@@ -145,9 +184,12 @@ da:
     label_mail_all_participants: "Send email to all participants"
     types:
       classic: "Classic"
-      classic_text: "Organize your meeting in a formattable text agenda and protocol."
-      structured: "Dynamic"
-      structured_text: "Organize your meeting as a list of agenda items, optionally linking them to a work package."
+      classic_text: "Organize your meeting as a single formattable text agenda and protocol."
+      structured: "Structured"
+      one_time: "One-time"
+      recurring: "Recurring"
+      recurring_text: "Create meeting series with dynamic template for each occurrence."
+      structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package."
       structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details"
     copied: "Copied from Meeting #%{id}"
   meeting_section:
@@ -155,6 +197,40 @@ da:
     delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?"
     placeholder_title: "New section"
     empty_text: "Drag items here or create a new one"
+  recurring_meeting:
+    occurrence:
+      infoline: "This meeting is part of a recurring meeting series."
+      error_no_next: "There is no next occurrence for this meeting."
+      first_already_exists: "The first occurrence of this meeting series is already instantiated."
+      first_created: >
+        The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence.
+    template:
+      button_finalize: "Finish template"
+      blank_title: "Your meeting series template is empty"
+      description: >
+        This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template.
+      blankslate_finalize: >
+        When you're done preparing this template, click the '%{button_title}' button above to finish the setup and schedule the first meeting of the series.
+      label_view_template: "View template"
+      label_edit_template: "Edit template"
+      banner_html: >
+        You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already created meetings.
+    frequency:
+      every_weekday: "Every %{day_of_the_week}"
+      daily: "Daily"
+      working_days: "Every working day"
+      weekly: "Weekly"
+    end_after:
+      specific_date: "a specific date"
+      iterations: "a number of occurrences"
+    starts: "Starts"
+    in_words:
+      daily_interval: "Every %{interval} days"
+      working_days: "Every working day"
+      weekly: "Every week on %{weekday}"
+      weekly_interval: "Every %{interval} weeks on %{weekday}"
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
   notice_successful_notification: "Påmindelse er afsendt"
   notice_timezone_missing: Der er ikke sat en tidszone og systemet har valgt %{zone}. For at vælge din egen tidszone, klik venligst her.
   notice_meeting_updated: "This page has been updated by someone else. Reload to view changes."
@@ -207,12 +283,17 @@ da:
   text_deleted_agenda_item: 'Deleted agenda item'
   label_initial_meeting_details: "Møde"
   label_meeting_details: "Meeting details"
+  label_meeting_series_details: "Meeting series details"
   label_meeting_details_edit: "Edit meeting details"
   label_meeting_state: "Meeting status"
   label_meeting_state_open: "Åbn"
   label_meeting_state_open_html: "<i>Open</i>"
   label_meeting_state_closed: "Lukket"
   label_meeting_state_closed_html: "<i>Closed</i>"
+  label_meeting_state_agenda_created: "Agenda created"
+  label_meeting_state_scheduled: "Scheduled"
+  label_meeting_state_cancelled: "Cancelled"
+  label_meeting_state_skipped: "Skipped"
   label_meeting_reopen_action: "Reopen meeting"
   label_meeting_close_action: "Close meeting"
   text_meeting_open_description: "This meeting is open. You can add/remove agenda items and edit them as you please. After the meeting is over, close it to lock it."
diff --git a/modules/meeting/config/locales/crowdin/de.yml b/modules/meeting/config/locales/crowdin/de.yml
index ed4346a8b702..8e1189021cf9 100644
--- a/modules/meeting/config/locales/crowdin/de.yml
+++ b/modules/meeting/config/locales/crowdin/de.yml
@@ -50,11 +50,18 @@ de:
         presenter: "Referent"
       meeting_section:
         title: "Titel"
+      recurring_meeting:
+        frequency: "Häufigkeit"
+        interval: "Intervall"
+        start_date: "Started am"
+        end_after: "Serie endet nach"
+        iterations: "Ereignisse"
     errors:
       messages:
         invalid_time_format: "ist keine gültige Zeit. Erforderliches Format: HH:MM"
     models:
-      structured_meeting: "Besprechung (dynamisch)"
+      recurring_meeting: "Wiederkehrende Besprechung"
+      structured_meeting: "Einmalige Besprechung"
       meeting_agenda_item: "Tagesordnungspunkt"
       meeting_agenda: "Agenda"
       meeting_minutes: "Protokoll"
@@ -88,7 +95,8 @@ de:
   label_meeting: "Besprechung"
   label_meeting_plural: "Besprechungen"
   label_meeting_new: "Neue Besprechung"
-  label_meeting_new_dynamic: "Neue dynamische Besprechung"
+  label_meeting_new_dynamic: "Neue einmalige Besprechung"
+  label_meeting_new_recurring: "Neue Terminserie"
   label_meeting_create: "Besprechung erstellen"
   label_meeting_copy: "Besprechung kopieren"
   label_meeting_edit: "Besprechung bearbeiten"
@@ -102,23 +110,54 @@ de:
   label_meeting_date_time: "Datum/Uhrzeit"
   label_meeting_date_and_time: "Datum und Zeit"
   label_meeting_diff: "Differenz"
+  label_recurring_meeting: "Wiederkehrende Besprechung"
+  label_recurring_meeting_part_of: "Teil einer Terminserie"
+  label_recurring_meeting_new: "Neue Terminserie"
+  label_recurring_meeting_plural: "Wiederkehrende Besprechungen"
+  label_template: "Vorlage"
+  label_recurring_meeting_view: "Terminserie ansehen"
+  label_recurring_meeting_create: "Aus Vorlage erstellen"
+  label_recurring_meeting_copy: "Als einmalige Besprechung kopieren"
+  label_recurring_meeting_cancel: "Diese Besprechung absagen"
+  label_recurring_meeting_delete: "Besprechung löschen"
+  label_recurring_meeting_delete_confirmation: >
+    Diese Besprechung ist Teil der Terminserie %{name}. Dadurch wird nur dieses bestimmte Ereignis und nicht die gesamte Serie gelöscht. Möchten Sie fortfahren?
+  label_recurring_occurrence_delete_confirmation: >
+    Alle Inhalte der Besprechung, die nicht aus der Vorlage stammen, werden gelöscht werden. Möchten Sie fortfahren?
+  label_recurring_meeting_restore: "Dieses Vorkommen wiederherstellen"
+  label_recurring_meeting_more: "Es gibt %{count} folgende Besprechungen (%{schedule})."
+  label_recurring_meeting_more_singular: "Es gibt %{count} folgende Besprechung (%{schedule})."
+  label_recurring_meeting_more_past: "Es gibt %{count} weitere vergangene Besprechungen."
+  label_recurring_meeting_more_past_singular: "Es gibt %{count} weitere vergangene Besprechung."
+  label_recurring_meeting_show_more: "Mehr anzeigen"
+  label_recurring_meeting_series_edit: "Terminserie bearbeiten"
+  label_recurring_meeting_series_delete: "Terminserie löschen"
+  label_my_meetings: "Meine Besprechungen"
+  label_all_meetings: "Alle Besprechungen"
   label_upcoming_meetings: "Zukünftige Meetings"
   label_past_meetings: "Vergangene Meetings"
   label_upcoming_meetings_short: "Anstehend"
   label_past_meetings_short: "Vergangen"
   label_involvement: "Beteiligt"
-  label_upcoming_invitations: "Zukünftige Einladungen"
+  label_invitations: "Einladungen"
+  label_invited_user: "Eingeladen"
   label_past_invitations: "Vergangene Einladungen"
-  label_attendee: "Teilnehmend"
-  label_author: "Erstellt"
+  label_attended: "Teilgenommen"
+  label_attended_user: "Teilgenommen"
+  label_created_by_me: "Von mir erstellt"
   label_notify: "Zur Einsicht verschicken"
   label_icalendar: "iCalendar senden"
   label_icalendar_download: "iCalendar-Termin herunterladen"
+  label_view_meeting_series: "Terminserie ansehen"
+  label_meeting_series: "Terminserien"
   label_version: "Version"
   label_time_zone: "Zeitzone"
   label_start_date: "Beginn"
   meeting:
+    participants:
+      template: "Diese Teilnehmer werden automatisch zu allen zukünftigen Besprechungen eingeladen, sobald diese erstellt werden."
     attachments:
+      template: "Die angehängten Dateien werden in alle künftigen Besprechungen dieser Terminserie einbezogen."
       text: "Angehängte Dateien sind für alle Teilnehmer der Besprechung verfügbar. Sie können diese auch per Drag-and-drop in die Notizen der Tagesordnungspunkte ziehen."
     copy:
       title: "Besprechung kopieren: %{title}"
@@ -145,8 +184,11 @@ de:
     label_mail_all_participants: "E-Mail an alle Teilnehmer senden"
     types:
       classic: "Klassisch"
-      classic_text: "Organisieren Sie Ihr Meeting in einer formatierbaren textbasierter Agenda und zugehöriges Protokoll."
-      structured: "Dynamisch"
+      classic_text: "Organisieren Sie Ihre Besprechung und zugehöriges Protokoll in einem einzelnen Notizblock."
+      structured: "Strukturiert"
+      one_time: "Einmalig"
+      recurring: "Terminserie"
+      recurring_text: "Erstellen Sie eine Terminserie mit einer dynamischen Vorlage und wiederkehrenden Besprechungen."
       structured_text: "Organisieren Sie Ihr Meeting als strukturierte Liste von Einträgen und verknüpfen Sie diese optional mit einem Arbeitspaket."
       structured_text_copy: "Das Kopieren einer Besprechung kopiert derzeit nicht die zugehörigen Tagesordnungspunkte, sondern nur dessen Details"
     copied: "Kopiert von Meeting #%{id}"
@@ -155,6 +197,40 @@ de:
     delete_confirmation: "Wenn Sie den Abschnitt löschen, werden auch alle zugehörigen Tagesordnungspunkte gelöscht. Möchten Sie fortfahren?"
     placeholder_title: "Neuer Abschnitt"
     empty_text: "Neue Agendapunkte hierhin bewegen oder neu erstellen"
+  recurring_meeting:
+    occurrence:
+      infoline: "Diese Besprechung ist Teil einer Terminserie."
+      error_no_next: "Es gibt keinen nächsten Termin für diese Serie."
+      first_already_exists: "Das erste Vorkommen dieser Terminserie wurde bereits angelegt."
+      first_created: >
+        Die erste Besprechung wurde erfolgreich aus der Vorlage erstellt. Weitere werden automatisch zu dem Zeitpunkt erstellt, wenn die vorhergehende Besprechung startet.
+    template:
+      button_finalize: "Vorlage fertigstellen"
+      blank_title: "Die Vorlage für die wiederkehrenden Besprechungen ist leer"
+      description: >
+        Diese Vorlage wird immer dann verwendet, wenn neue Besprechungen der Terminserie erstellt werden. Sie können zu dieser Vorlage Tagesordnungspunkte, Teilnehmer und Anhänge hinzufügen.
+      blankslate_finalize: >
+        Wenn Sie mit der Vorbereitung dieser Vorlage fertig sind, klicken Sie oben auf die Schaltfläche '%{button_title}', um die Einrichtung abzuschließen und die erste Besprechung der Terminserie anzulegen.
+      label_view_template: "Vorlage ansehen"
+      label_edit_template: "Vorlage bearbeiten"
+      banner_html: >
+        Sie bearbeiten gerade eine Vorlage einer Terminserie: %{link}. Jede neue Besprechung der Serie kopiert diese Vorlage. Änderungen wirken sich nicht auf frühere oder bereits erstellte Besprechungen aus.
+    frequency:
+      every_weekday: "Jeden %{day_of_the_week}"
+      daily: "Täglich"
+      working_days: "An Arbeitstagen"
+      weekly: "Wöchentlich"
+    end_after:
+      specific_date: "einem bestimmten Datum"
+      iterations: "nach Anzahl von Ereignissen"
+    starts: "Beginnt"
+    in_words:
+      daily_interval: "Alle %{interval} Tage"
+      working_days: "Jeden Arbeitstag"
+      weekly: "Jede Woche am %{weekday}"
+      weekly_interval: "Alle %{interval} Wochen am %{weekday}"
+      frequency: "%{base} um %{time}"
+      full: "%{base} um %{time}, endet %{end_date}"
   notice_successful_notification: "Benachrichtigung erfolgreich gesendet"
   notice_timezone_missing: Keine Zeitzone eingestellt und daher %{zone} angenommen. Um Ihre Zeitzone einzustellen, klicken Sie bitte hier.
   notice_meeting_updated: "Diese Seite wurde von einem anderen Benutzer verändert. Laden Sie neu, um die Änderungen zu sehen."
@@ -207,12 +283,17 @@ de:
   text_deleted_agenda_item: 'Gelöschter Tagesordnungspunkt'
   label_initial_meeting_details: "Besprechung"
   label_meeting_details: "Besprechungsdetails"
+  label_meeting_series_details: "Details der Terminserie"
   label_meeting_details_edit: "Besprechungsdetails bearbeiten"
   label_meeting_state: "Besprechungsstatus"
   label_meeting_state_open: "Offen"
   label_meeting_state_open_html: "<i>Offen</i>"
   label_meeting_state_closed: "Geschlossen"
   label_meeting_state_closed_html: "<i>Geschlossen</i>"
+  label_meeting_state_agenda_created: "Tagesordnung erstellt"
+  label_meeting_state_scheduled: "Geplant"
+  label_meeting_state_cancelled: "Abgesagt"
+  label_meeting_state_skipped: "Übersprungen"
   label_meeting_reopen_action: "Besprechung wiedereröffnen"
   label_meeting_close_action: "Besprechung schließen"
   text_meeting_open_description: "Diese Besprechung ist offen. Sie können Tagesordnungspunkte hinzufügen/entfernen und sie nach Belieben bearbeiten. Schließen Sie die Besprechung nach deren Ende, um sie zu sperren."
diff --git a/modules/meeting/config/locales/crowdin/el.yml b/modules/meeting/config/locales/crowdin/el.yml
index 4fa09c0bca59..51d6d211942e 100644
--- a/modules/meeting/config/locales/crowdin/el.yml
+++ b/modules/meeting/config/locales/crowdin/el.yml
@@ -50,11 +50,18 @@ el:
         presenter: "Presenter"
       meeting_section:
         title: "Τίτλος"
+      recurring_meeting:
+        frequency: "Frequency"
+        interval: "Interval"
+        start_date: "Starts on"
+        end_after: "End series after"
+        iterations: "Occurrences"
     errors:
       messages:
         invalid_time_format: "δεν είναι έγκυρη ώρα. Απαιτούμενη μορφοποίηση: ΩΩ:ΛΛ"
     models:
-      structured_meeting: "Meeting (dynamic)"
+      recurring_meeting: "Recurring meeting"
+      structured_meeting: "One-time meeting"
       meeting_agenda_item: "Agenda item"
       meeting_agenda: "Ατζέντα"
       meeting_minutes: "Πρακτικά"
@@ -88,7 +95,8 @@ el:
   label_meeting: "Συνάντηση"
   label_meeting_plural: "Συναντήσεις"
   label_meeting_new: "Νέα Συνάντηση"
-  label_meeting_new_dynamic: "New dynamic meeting"
+  label_meeting_new_dynamic: "New one-time meeting"
+  label_meeting_new_recurring: "New recurring meeting"
   label_meeting_create: "Create meeting"
   label_meeting_copy: "Copy meeting"
   label_meeting_edit: "Επεξεργασία Συνάντησης"
@@ -102,23 +110,54 @@ el:
   label_meeting_date_time: "Ημερομηνία/Ώρα"
   label_meeting_date_and_time: "Date and time"
   label_meeting_diff: "Διαφορά"
+  label_recurring_meeting: "Recurring meeting"
+  label_recurring_meeting_part_of: "Part of a meeting series"
+  label_recurring_meeting_new: "New recurring meeting"
+  label_recurring_meeting_plural: "Recurring meetings"
+  label_template: "Template"
+  label_recurring_meeting_view: "View meeting series"
+  label_recurring_meeting_create: "Create from template"
+  label_recurring_meeting_copy: "Copy as one-off"
+  label_recurring_meeting_cancel: "Cancel this occurrence"
+  label_recurring_meeting_delete: "Delete occurrence"
+  label_recurring_meeting_delete_confirmation: >
+    This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue?
+  label_recurring_occurrence_delete_confirmation: >
+    Any meeting information not in the template will be lost. Do you want to continue?
+  label_recurring_meeting_restore: "Restore this occurrence"
+  label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})."
+  label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})."
+  label_recurring_meeting_more_past: "There are %{count} more past meetings."
+  label_recurring_meeting_more_past_singular: "There is %{count} more past meeting."
+  label_recurring_meeting_show_more: "Show more"
+  label_recurring_meeting_series_edit: "Edit meeting series"
+  label_recurring_meeting_series_delete: "Delete meeting series"
+  label_my_meetings: "My meetings"
+  label_all_meetings: "All meetings"
   label_upcoming_meetings: "Upcoming meetings"
   label_past_meetings: "Past meetings"
   label_upcoming_meetings_short: "Upcoming"
   label_past_meetings_short: "Past"
   label_involvement: "Involvement"
-  label_upcoming_invitations: "Upcoming invitations"
+  label_invitations: "Invitations"
+  label_invited_user: "Invited user"
   label_past_invitations: "Past invitations"
-  label_attendee: "Attendee"
-  label_author: "Δημιουργός"
+  label_attended: "Attended"
+  label_attended_user: "Attended user"
+  label_created_by_me: "Created by me"
   label_notify: "Αποστολή για αναθεώρηση"
   label_icalendar: "Αποστολή στο iCalendar"
   label_icalendar_download: "Download iCalendar event"
+  label_view_meeting_series: "View meeting series"
+  label_meeting_series: "Meeting series"
   label_version: "Έκδοση"
   label_time_zone: "Ζώνη Ώρας"
   label_start_date: "Ημερομηνία έναρξης"
   meeting:
+    participants:
+      template: "These participants will be invited automatically to all future meetings as they are created."
     attachments:
+      template: "These attached files will be included in all future meetings in the series."
       text: "Attached files are available to all meeting participants. You can also drag and drop these into agenda item notes."
     copy:
       title: "Copy meeting: %{title}"
@@ -145,9 +184,12 @@ el:
     label_mail_all_participants: "Send email to all participants"
     types:
       classic: "Classic"
-      classic_text: "Organize your meeting in a formattable text agenda and protocol."
-      structured: "Dynamic"
-      structured_text: "Organize your meeting as a list of agenda items, optionally linking them to a work package."
+      classic_text: "Organize your meeting as a single formattable text agenda and protocol."
+      structured: "Structured"
+      one_time: "One-time"
+      recurring: "Recurring"
+      recurring_text: "Create meeting series with dynamic template for each occurrence."
+      structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package."
       structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details"
     copied: "Αντιγράφηκε από τη Συνάντηση #%{id}"
   meeting_section:
@@ -155,6 +197,40 @@ el:
     delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?"
     placeholder_title: "New section"
     empty_text: "Drag items here or create a new one"
+  recurring_meeting:
+    occurrence:
+      infoline: "This meeting is part of a recurring meeting series."
+      error_no_next: "There is no next occurrence for this meeting."
+      first_already_exists: "The first occurrence of this meeting series is already instantiated."
+      first_created: >
+        The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence.
+    template:
+      button_finalize: "Finish template"
+      blank_title: "Your meeting series template is empty"
+      description: >
+        This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template.
+      blankslate_finalize: >
+        When you're done preparing this template, click the '%{button_title}' button above to finish the setup and schedule the first meeting of the series.
+      label_view_template: "View template"
+      label_edit_template: "Edit template"
+      banner_html: >
+        You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already created meetings.
+    frequency:
+      every_weekday: "Every %{day_of_the_week}"
+      daily: "Daily"
+      working_days: "Every working day"
+      weekly: "Weekly"
+    end_after:
+      specific_date: "a specific date"
+      iterations: "a number of occurrences"
+    starts: "Starts"
+    in_words:
+      daily_interval: "Every %{interval} days"
+      working_days: "Every working day"
+      weekly: "Every week on %{weekday}"
+      weekly_interval: "Every %{interval} weeks on %{weekday}"
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
   notice_successful_notification: "Η ειδοποίηση απεστάλη επιτυχώς"
   notice_timezone_missing: Δεν έχει οριστεί ζώνη ώρας και θεωρήθηκε η %{zone}. Για να επιλέξετε την ζώνη ώρας σας, παρακαλούμε κάντε κλικ εδώ.
   notice_meeting_updated: "This page has been updated by someone else. Reload to view changes."
@@ -207,12 +283,17 @@ el:
   text_deleted_agenda_item: 'Deleted agenda item'
   label_initial_meeting_details: "Συνάντηση"
   label_meeting_details: "Meeting details"
+  label_meeting_series_details: "Meeting series details"
   label_meeting_details_edit: "Edit meeting details"
   label_meeting_state: "Meeting status"
   label_meeting_state_open: "Ανοιχτό"
   label_meeting_state_open_html: "<i>Open</i>"
   label_meeting_state_closed: "Κλειστό"
   label_meeting_state_closed_html: "<i>Closed</i>"
+  label_meeting_state_agenda_created: "Agenda created"
+  label_meeting_state_scheduled: "Scheduled"
+  label_meeting_state_cancelled: "Cancelled"
+  label_meeting_state_skipped: "Skipped"
   label_meeting_reopen_action: "Reopen meeting"
   label_meeting_close_action: "Close meeting"
   text_meeting_open_description: "This meeting is open. You can add/remove agenda items and edit them as you please. After the meeting is over, close it to lock it."
diff --git a/modules/meeting/config/locales/crowdin/eo.yml b/modules/meeting/config/locales/crowdin/eo.yml
index 6ec66eb951d3..5cdc2bca204a 100644
--- a/modules/meeting/config/locales/crowdin/eo.yml
+++ b/modules/meeting/config/locales/crowdin/eo.yml
@@ -50,11 +50,18 @@ eo:
         presenter: "Presenter"
       meeting_section:
         title: "Titolo"
+      recurring_meeting:
+        frequency: "Frequency"
+        interval: "Interval"
+        start_date: "Starts on"
+        end_after: "End series after"
+        iterations: "Occurrences"
     errors:
       messages:
         invalid_time_format: "is not a valid time. Required format: HH:MM"
     models:
-      structured_meeting: "Meeting (dynamic)"
+      recurring_meeting: "Recurring meeting"
+      structured_meeting: "One-time meeting"
       meeting_agenda_item: "Agenda item"
       meeting_agenda: "Agenda"
       meeting_minutes: "Minutes"
@@ -88,7 +95,8 @@ eo:
   label_meeting: "Meeting"
   label_meeting_plural: "Meetings"
   label_meeting_new: "New Meeting"
-  label_meeting_new_dynamic: "New dynamic meeting"
+  label_meeting_new_dynamic: "New one-time meeting"
+  label_meeting_new_recurring: "New recurring meeting"
   label_meeting_create: "Create meeting"
   label_meeting_copy: "Copy meeting"
   label_meeting_edit: "Edit Meeting"
@@ -102,23 +110,54 @@ eo:
   label_meeting_date_time: "Date/Time"
   label_meeting_date_and_time: "Date and time"
   label_meeting_diff: "Diff"
+  label_recurring_meeting: "Recurring meeting"
+  label_recurring_meeting_part_of: "Part of a meeting series"
+  label_recurring_meeting_new: "New recurring meeting"
+  label_recurring_meeting_plural: "Recurring meetings"
+  label_template: "Template"
+  label_recurring_meeting_view: "View meeting series"
+  label_recurring_meeting_create: "Create from template"
+  label_recurring_meeting_copy: "Copy as one-off"
+  label_recurring_meeting_cancel: "Cancel this occurrence"
+  label_recurring_meeting_delete: "Delete occurrence"
+  label_recurring_meeting_delete_confirmation: >
+    This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue?
+  label_recurring_occurrence_delete_confirmation: >
+    Any meeting information not in the template will be lost. Do you want to continue?
+  label_recurring_meeting_restore: "Restore this occurrence"
+  label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})."
+  label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})."
+  label_recurring_meeting_more_past: "There are %{count} more past meetings."
+  label_recurring_meeting_more_past_singular: "There is %{count} more past meeting."
+  label_recurring_meeting_show_more: "Show more"
+  label_recurring_meeting_series_edit: "Edit meeting series"
+  label_recurring_meeting_series_delete: "Delete meeting series"
+  label_my_meetings: "My meetings"
+  label_all_meetings: "All meetings"
   label_upcoming_meetings: "Upcoming meetings"
   label_past_meetings: "Past meetings"
   label_upcoming_meetings_short: "Upcoming"
   label_past_meetings_short: "Past"
   label_involvement: "Involvement"
-  label_upcoming_invitations: "Upcoming invitations"
+  label_invitations: "Invitations"
+  label_invited_user: "Invited user"
   label_past_invitations: "Past invitations"
-  label_attendee: "Attendee"
-  label_author: "Creator"
+  label_attended: "Attended"
+  label_attended_user: "Attended user"
+  label_created_by_me: "Created by me"
   label_notify: "Send for review"
   label_icalendar: "Send iCalendar"
   label_icalendar_download: "Download iCalendar event"
+  label_view_meeting_series: "View meeting series"
+  label_meeting_series: "Meeting series"
   label_version: "Versio"
   label_time_zone: "Horzono"
   label_start_date: "Komencdato"
   meeting:
+    participants:
+      template: "These participants will be invited automatically to all future meetings as they are created."
     attachments:
+      template: "These attached files will be included in all future meetings in the series."
       text: "Attached files are available to all meeting participants. You can also drag and drop these into agenda item notes."
     copy:
       title: "Copy meeting: %{title}"
@@ -145,9 +184,12 @@ eo:
     label_mail_all_participants: "Send email to all participants"
     types:
       classic: "Classic"
-      classic_text: "Organize your meeting in a formattable text agenda and protocol."
-      structured: "Dynamic"
-      structured_text: "Organize your meeting as a list of agenda items, optionally linking them to a work package."
+      classic_text: "Organize your meeting as a single formattable text agenda and protocol."
+      structured: "Structured"
+      one_time: "One-time"
+      recurring: "Recurring"
+      recurring_text: "Create meeting series with dynamic template for each occurrence."
+      structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package."
       structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details"
     copied: "Copied from Meeting #%{id}"
   meeting_section:
@@ -155,6 +197,40 @@ eo:
     delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?"
     placeholder_title: "New section"
     empty_text: "Drag items here or create a new one"
+  recurring_meeting:
+    occurrence:
+      infoline: "This meeting is part of a recurring meeting series."
+      error_no_next: "There is no next occurrence for this meeting."
+      first_already_exists: "The first occurrence of this meeting series is already instantiated."
+      first_created: >
+        The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence.
+    template:
+      button_finalize: "Finish template"
+      blank_title: "Your meeting series template is empty"
+      description: >
+        This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template.
+      blankslate_finalize: >
+        When you're done preparing this template, click the '%{button_title}' button above to finish the setup and schedule the first meeting of the series.
+      label_view_template: "View template"
+      label_edit_template: "Edit template"
+      banner_html: >
+        You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already created meetings.
+    frequency:
+      every_weekday: "Every %{day_of_the_week}"
+      daily: "Daily"
+      working_days: "Every working day"
+      weekly: "Weekly"
+    end_after:
+      specific_date: "a specific date"
+      iterations: "a number of occurrences"
+    starts: "Starts"
+    in_words:
+      daily_interval: "Every %{interval} days"
+      working_days: "Every working day"
+      weekly: "Every week on %{weekday}"
+      weekly_interval: "Every %{interval} weeks on %{weekday}"
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
   notice_successful_notification: "Notification sent successfully"
   notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here.
   notice_meeting_updated: "This page has been updated by someone else. Reload to view changes."
@@ -207,12 +283,17 @@ eo:
   text_deleted_agenda_item: 'Deleted agenda item'
   label_initial_meeting_details: "Meeting"
   label_meeting_details: "Meeting details"
+  label_meeting_series_details: "Meeting series details"
   label_meeting_details_edit: "Edit meeting details"
   label_meeting_state: "Meeting status"
   label_meeting_state_open: "Malfermi"
   label_meeting_state_open_html: "<i>Open</i>"
   label_meeting_state_closed: "Fermita"
   label_meeting_state_closed_html: "<i>Closed</i>"
+  label_meeting_state_agenda_created: "Agenda created"
+  label_meeting_state_scheduled: "Scheduled"
+  label_meeting_state_cancelled: "Cancelled"
+  label_meeting_state_skipped: "Skipped"
   label_meeting_reopen_action: "Reopen meeting"
   label_meeting_close_action: "Close meeting"
   text_meeting_open_description: "This meeting is open. You can add/remove agenda items and edit them as you please. After the meeting is over, close it to lock it."
diff --git a/modules/meeting/config/locales/crowdin/es.yml b/modules/meeting/config/locales/crowdin/es.yml
index c0a14b844ed7..d75a09f5f19e 100644
--- a/modules/meeting/config/locales/crowdin/es.yml
+++ b/modules/meeting/config/locales/crowdin/es.yml
@@ -50,11 +50,18 @@ es:
         presenter: "Responsable"
       meeting_section:
         title: "Título"
+      recurring_meeting:
+        frequency: "Frecuencia"
+        interval: "Intervalo"
+        start_date: "Empieza el"
+        end_after: "Finalizar la serie después de"
+        iterations: "Repeticiones"
     errors:
       messages:
         invalid_time_format: "no es una hora válida. Formato requerido: HH:MM"
     models:
-      structured_meeting: "Reunión (dinámico)"
+      recurring_meeting: "Reunión periódica"
+      structured_meeting: "Reunión única"
       meeting_agenda_item: "Puntos de Agenda"
       meeting_agenda: "Agenda"
       meeting_minutes: "Minutas"
@@ -88,7 +95,8 @@ es:
   label_meeting: "Reunión"
   label_meeting_plural: "Reuniones"
   label_meeting_new: "Nueva reunión"
-  label_meeting_new_dynamic: "Nueva reunión dinámica"
+  label_meeting_new_dynamic: "Nueva reunión única"
+  label_meeting_new_recurring: "Nueva reunión periódica"
   label_meeting_create: "Crear reunión"
   label_meeting_copy: "Copiar reunión"
   label_meeting_edit: "Editar reunión"
@@ -102,23 +110,54 @@ es:
   label_meeting_date_time: "Fecha/hora"
   label_meeting_date_and_time: "Fecha y hora"
   label_meeting_diff: "Diferencia"
+  label_recurring_meeting: "Reunión periódica"
+  label_recurring_meeting_part_of: "Parte de una serie de reuniones"
+  label_recurring_meeting_new: "Nueva reunión periódica"
+  label_recurring_meeting_plural: "Reuniones periódicas"
+  label_template: "Plantilla"
+  label_recurring_meeting_view: "Ver serie de reuniones"
+  label_recurring_meeting_create: "Crear a partir de una plantilla"
+  label_recurring_meeting_copy: "Copiar como única"
+  label_recurring_meeting_cancel: "Cancelar esta repetición"
+  label_recurring_meeting_delete: "Eliminar repetición"
+  label_recurring_meeting_delete_confirmation: >
+    Esta reunión forma parte de una serie llamada %{name}. Esto solo eliminará esta reunión en particular y no toda la serie. ¿Desea continuar?
+  label_recurring_occurrence_delete_confirmation: >
+    Cualquier información sobre la reunión que no figure en la plantilla se perderá. ¿Desea continuar?
+  label_recurring_meeting_restore: "Restaurar esta repetición"
+  label_recurring_meeting_more: "Hay %{count} reuniones más programadas (%{schedule})."
+  label_recurring_meeting_more_singular: "Hay %{count} reuniones más programadas (%{schedule})."
+  label_recurring_meeting_more_past: "Hay %{count} reuniones más pasadas."
+  label_recurring_meeting_more_past_singular: "Hay %{count} reuniones más pasadas."
+  label_recurring_meeting_show_more: "Mostrar más"
+  label_recurring_meeting_series_edit: "Editar serie de reuniones"
+  label_recurring_meeting_series_delete: "Eliminar serie de reuniones"
+  label_my_meetings: "Mis reuniones"
+  label_all_meetings: "Todas las reuniones"
   label_upcoming_meetings: "Próximas reuniones"
   label_past_meetings: "Reuniones anteriores"
   label_upcoming_meetings_short: "Próximamente"
   label_past_meetings_short: "Pasado"
   label_involvement: "Implicación"
-  label_upcoming_invitations: "Próximas invitaciones"
+  label_invitations: "Invitaciones"
+  label_invited_user: "Usuario invitado"
   label_past_invitations: "Invitaciones pasadas"
-  label_attendee: "Asistente"
-  label_author: "Autor"
+  label_attended: "Ha asistido"
+  label_attended_user: "Usuario asistente"
+  label_created_by_me: "Creado por mí"
   label_notify: "Enviar para revisión"
   label_icalendar: "Enviar iCalendar"
   label_icalendar_download: "Descargar evento iCalendar"
+  label_view_meeting_series: "Ver serie de reuniones"
+  label_meeting_series: "Serie de reuniones"
   label_version: "Versión"
   label_time_zone: "Zona horaria"
   label_start_date: "Fecha de inicio"
   meeting:
+    participants:
+      template: "Estos participantes serán invitados automáticamente a todas las reuniones futuras a medida que se vayan creando."
     attachments:
+      template: "Estos archivos adjuntos se incluirán en todas las reuniones futuras de la serie."
       text: "Los archivos adjuntos están a disposición de todos los participantes en la reunión. También puede arrastrarlos y soltarlos en las notas de los puntos del orden del día."
     copy:
       title: "Copiar reunión %{title}"
@@ -145,9 +184,12 @@ es:
     label_mail_all_participants: "Enviar email a todos los participantes"
     types:
       classic: "Clásico"
-      classic_text: "Organice su reunión en un formato de agenda de texto y protocolos."
-      structured: "Dinámico"
-      structured_text: "Organice su reunión como una lista de temas del orden del día, enlazándolos opcionalmente a un paquete de trabajo."
+      classic_text: "Organice su reunión como una única agenda y protocolo de texto formateable."
+      structured: "Estructurada"
+      one_time: "Única"
+      recurring: "Periódico"
+      recurring_text: "Cree series de reuniones con una plantilla dinámica para cada repetición."
+      structured_text: "Organice su reunión como una lista dinámica de temas del orden del día, enlazándolos opcionalmente a un paquete de trabajo."
       structured_text_copy: "Copiar una reunión no copiará actualmente los elementos asociados de la agenda de la reunión, solo los detalles"
     copied: "Copiado de la reunión %{id}"
   meeting_section:
@@ -155,6 +197,40 @@ es:
     delete_confirmation: "Al eliminar esta sección también se eliminarán todos sus puntos de agenda. ¿Seguro que desea hacerlo?"
     placeholder_title: "Nueva sección"
     empty_text: "Arrastre los elementos aquí o cree uno nuevo"
+  recurring_meeting:
+    occurrence:
+      infoline: "Esta reunión forma parte de una serie de reuniones periódicas."
+      error_no_next: "No hay próxima repetición para esta reunión."
+      first_already_exists: "La primera repetición de esta serie de reuniones ya está instanciada."
+      first_created: >
+        La primera reunión se ha creado correctamente a partir de la plantilla. Todas las reuniones futuras se crearán automáticamente al mismo tiempo que la anterior.
+    template:
+      button_finalize: "Finalizar plantilla"
+      blank_title: "La plantilla de la serie de reuniones está vacía"
+      description: >
+        Esta plantilla se usará siempre que se creen nuevas reuniones de la serie. Puede añadir elementos de agenda, participantes y archivos adjuntos a esta plantilla.
+      blankslate_finalize: >
+        Cuando haya terminado de preparar esta plantilla, haga clic en el botón '%{button_title}' de arriba para finalizar la configuración y programar la primera reunión de la serie.
+      label_view_template: "Ver plantilla"
+      label_edit_template: "Editar plantilla"
+      banner_html: >
+        En este momento está editando una plantilla de una serie de reuniones: %{link}. Cada nueva repetición de una reunión en la serie utilizará esta plantilla. Los cambios no afectarán a las reuniones pasadas o ya creadas.
+    frequency:
+      every_weekday: "Cada %{day_of_the_week}"
+      daily: "Diariamente"
+      working_days: "Todos los dias hábiles"
+      weekly: "Semanalmente"
+    end_after:
+      specific_date: "una fecha específica"
+      iterations: "un número de repeticiones"
+    starts: "Empieza"
+    in_words:
+      daily_interval: "Cada %{interval} días"
+      working_days: "Todos los dias hábiles"
+      weekly: "Cada semana en %{weekday}"
+      weekly_interval: "Cada %{interval} semanas el %{weekday}"
+      frequency: "%{base} a las %{time}"
+      full: "%{base} a las %{time}, finaliza el %{end_date}"
   notice_successful_notification: "Notificación enviada correctamente"
   notice_timezone_missing: No se ha establecido zona horaria y se asume %{zone}. Para elegir su zona horaria, por favor, haga clic aquí.
   notice_meeting_updated: "Esta página ha sido actualizada por otra persona. Recárguela para ver los cambios."
@@ -207,12 +283,17 @@ es:
   text_deleted_agenda_item: 'Punto del orden del día eliminado'
   label_initial_meeting_details: "Reunión"
   label_meeting_details: "Detalles de la reunión"
+  label_meeting_series_details: "Detalles de la serie de reuniones"
   label_meeting_details_edit: "Editar detalles de la reunión"
   label_meeting_state: "Estado de la reunión"
   label_meeting_state_open: "Abrir"
   label_meeting_state_open_html: "<i>Abierta</i>"
   label_meeting_state_closed: "Cerrado"
   label_meeting_state_closed_html: "<i>Cerrada</i>"
+  label_meeting_state_agenda_created: "Agenda creada"
+  label_meeting_state_scheduled: "Programada"
+  label_meeting_state_cancelled: "Cancelada"
+  label_meeting_state_skipped: "Omitida"
   label_meeting_reopen_action: "Reabrir reunión"
   label_meeting_close_action: "Cerrar reunión"
   text_meeting_open_description: "Esta reunión está abierta. Puede añadir/eliminar elementos de la agenda y editarlos a su gusto. Una vez terminada la reunión, ciérrela para bloquearla."
diff --git a/modules/meeting/config/locales/crowdin/et.yml b/modules/meeting/config/locales/crowdin/et.yml
index e9e6871d9ed5..b539ec4982f1 100644
--- a/modules/meeting/config/locales/crowdin/et.yml
+++ b/modules/meeting/config/locales/crowdin/et.yml
@@ -50,11 +50,18 @@ et:
         presenter: "Presenter"
       meeting_section:
         title: "Pealkiri"
+      recurring_meeting:
+        frequency: "Frequency"
+        interval: "Interval"
+        start_date: "Starts on"
+        end_after: "End series after"
+        iterations: "Occurrences"
     errors:
       messages:
         invalid_time_format: "is not a valid time. Required format: HH:MM"
     models:
-      structured_meeting: "Meeting (dynamic)"
+      recurring_meeting: "Recurring meeting"
+      structured_meeting: "One-time meeting"
       meeting_agenda_item: "Agenda item"
       meeting_agenda: "Päevakava"
       meeting_minutes: "Minutit"
@@ -88,7 +95,8 @@ et:
   label_meeting: "Koosolek"
   label_meeting_plural: "Koosolekud"
   label_meeting_new: "Uus koosolek"
-  label_meeting_new_dynamic: "New dynamic meeting"
+  label_meeting_new_dynamic: "New one-time meeting"
+  label_meeting_new_recurring: "New recurring meeting"
   label_meeting_create: "Create meeting"
   label_meeting_copy: "Copy meeting"
   label_meeting_edit: "Muuda koosolekut"
@@ -102,23 +110,54 @@ et:
   label_meeting_date_time: "Kuupäev/kellaaeg"
   label_meeting_date_and_time: "Date and time"
   label_meeting_diff: "Erinevus"
+  label_recurring_meeting: "Recurring meeting"
+  label_recurring_meeting_part_of: "Part of a meeting series"
+  label_recurring_meeting_new: "New recurring meeting"
+  label_recurring_meeting_plural: "Recurring meetings"
+  label_template: "Template"
+  label_recurring_meeting_view: "View meeting series"
+  label_recurring_meeting_create: "Create from template"
+  label_recurring_meeting_copy: "Copy as one-off"
+  label_recurring_meeting_cancel: "Cancel this occurrence"
+  label_recurring_meeting_delete: "Delete occurrence"
+  label_recurring_meeting_delete_confirmation: >
+    This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue?
+  label_recurring_occurrence_delete_confirmation: >
+    Any meeting information not in the template will be lost. Do you want to continue?
+  label_recurring_meeting_restore: "Restore this occurrence"
+  label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})."
+  label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})."
+  label_recurring_meeting_more_past: "There are %{count} more past meetings."
+  label_recurring_meeting_more_past_singular: "There is %{count} more past meeting."
+  label_recurring_meeting_show_more: "Show more"
+  label_recurring_meeting_series_edit: "Edit meeting series"
+  label_recurring_meeting_series_delete: "Delete meeting series"
+  label_my_meetings: "My meetings"
+  label_all_meetings: "All meetings"
   label_upcoming_meetings: "Upcoming meetings"
   label_past_meetings: "Past meetings"
   label_upcoming_meetings_short: "Upcoming"
   label_past_meetings_short: "Past"
   label_involvement: "Involvement"
-  label_upcoming_invitations: "Upcoming invitations"
+  label_invitations: "Invitations"
+  label_invited_user: "Invited user"
   label_past_invitations: "Past invitations"
-  label_attendee: "Attendee"
-  label_author: "Creator"
+  label_attended: "Attended"
+  label_attended_user: "Attended user"
+  label_created_by_me: "Created by me"
   label_notify: "Saada ülevaatamisele"
   label_icalendar: "Send iCalendar"
   label_icalendar_download: "Download iCalendar event"
+  label_view_meeting_series: "View meeting series"
+  label_meeting_series: "Meeting series"
   label_version: "Versioon"
   label_time_zone: "Ajavöönd"
   label_start_date: "Alguskuupäev"
   meeting:
+    participants:
+      template: "These participants will be invited automatically to all future meetings as they are created."
     attachments:
+      template: "These attached files will be included in all future meetings in the series."
       text: "Attached files are available to all meeting participants. You can also drag and drop these into agenda item notes."
     copy:
       title: "Copy meeting: %{title}"
@@ -145,9 +184,12 @@ et:
     label_mail_all_participants: "Send email to all participants"
     types:
       classic: "Classic"
-      classic_text: "Organize your meeting in a formattable text agenda and protocol."
-      structured: "Dynamic"
-      structured_text: "Organize your meeting as a list of agenda items, optionally linking them to a work package."
+      classic_text: "Organize your meeting as a single formattable text agenda and protocol."
+      structured: "Structured"
+      one_time: "One-time"
+      recurring: "Recurring"
+      recurring_text: "Create meeting series with dynamic template for each occurrence."
+      structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package."
       structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details"
     copied: "Copied from Meeting #%{id}"
   meeting_section:
@@ -155,6 +197,40 @@ et:
     delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?"
     placeholder_title: "New section"
     empty_text: "Drag items here or create a new one"
+  recurring_meeting:
+    occurrence:
+      infoline: "This meeting is part of a recurring meeting series."
+      error_no_next: "There is no next occurrence for this meeting."
+      first_already_exists: "The first occurrence of this meeting series is already instantiated."
+      first_created: >
+        The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence.
+    template:
+      button_finalize: "Finish template"
+      blank_title: "Your meeting series template is empty"
+      description: >
+        This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template.
+      blankslate_finalize: >
+        When you're done preparing this template, click the '%{button_title}' button above to finish the setup and schedule the first meeting of the series.
+      label_view_template: "View template"
+      label_edit_template: "Edit template"
+      banner_html: >
+        You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already created meetings.
+    frequency:
+      every_weekday: "Every %{day_of_the_week}"
+      daily: "Daily"
+      working_days: "Every working day"
+      weekly: "Weekly"
+    end_after:
+      specific_date: "a specific date"
+      iterations: "a number of occurrences"
+    starts: "Starts"
+    in_words:
+      daily_interval: "Every %{interval} days"
+      working_days: "Every working day"
+      weekly: "Every week on %{weekday}"
+      weekly_interval: "Every %{interval} weeks on %{weekday}"
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
   notice_successful_notification: "Notification sent successfully"
   notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here.
   notice_meeting_updated: "This page has been updated by someone else. Reload to view changes."
@@ -207,12 +283,17 @@ et:
   text_deleted_agenda_item: 'Deleted agenda item'
   label_initial_meeting_details: "Koosolek"
   label_meeting_details: "Meeting details"
+  label_meeting_series_details: "Meeting series details"
   label_meeting_details_edit: "Edit meeting details"
   label_meeting_state: "Meeting status"
   label_meeting_state_open: "Avatud"
   label_meeting_state_open_html: "<i>Open</i>"
   label_meeting_state_closed: "Suletud"
   label_meeting_state_closed_html: "<i>Closed</i>"
+  label_meeting_state_agenda_created: "Agenda created"
+  label_meeting_state_scheduled: "Scheduled"
+  label_meeting_state_cancelled: "Cancelled"
+  label_meeting_state_skipped: "Skipped"
   label_meeting_reopen_action: "Reopen meeting"
   label_meeting_close_action: "Close meeting"
   text_meeting_open_description: "This meeting is open. You can add/remove agenda items and edit them as you please. After the meeting is over, close it to lock it."
diff --git a/modules/meeting/config/locales/crowdin/eu.yml b/modules/meeting/config/locales/crowdin/eu.yml
index eebd6f557c53..72de155c8704 100644
--- a/modules/meeting/config/locales/crowdin/eu.yml
+++ b/modules/meeting/config/locales/crowdin/eu.yml
@@ -50,11 +50,18 @@ eu:
         presenter: "Presenter"
       meeting_section:
         title: "Title"
+      recurring_meeting:
+        frequency: "Frequency"
+        interval: "Interval"
+        start_date: "Starts on"
+        end_after: "End series after"
+        iterations: "Occurrences"
     errors:
       messages:
         invalid_time_format: "ez da baliozko ordua. Eskatzen den formatua: OO:MM"
     models:
-      structured_meeting: "Meeting (dynamic)"
+      recurring_meeting: "Recurring meeting"
+      structured_meeting: "One-time meeting"
       meeting_agenda_item: "Agenda item"
       meeting_agenda: "Agenda"
       meeting_minutes: "Aktak"
@@ -88,7 +95,8 @@ eu:
   label_meeting: "Hitzordua"
   label_meeting_plural: "Hitzorduak"
   label_meeting_new: "Hitzordu berria"
-  label_meeting_new_dynamic: "New dynamic meeting"
+  label_meeting_new_dynamic: "New one-time meeting"
+  label_meeting_new_recurring: "New recurring meeting"
   label_meeting_create: "Create meeting"
   label_meeting_copy: "Copy meeting"
   label_meeting_edit: "Aldatu hitzordua"
@@ -102,23 +110,54 @@ eu:
   label_meeting_date_time: "Data/Ordua"
   label_meeting_date_and_time: "Date and time"
   label_meeting_diff: "Diferentzia"
+  label_recurring_meeting: "Recurring meeting"
+  label_recurring_meeting_part_of: "Part of a meeting series"
+  label_recurring_meeting_new: "New recurring meeting"
+  label_recurring_meeting_plural: "Recurring meetings"
+  label_template: "Template"
+  label_recurring_meeting_view: "View meeting series"
+  label_recurring_meeting_create: "Create from template"
+  label_recurring_meeting_copy: "Copy as one-off"
+  label_recurring_meeting_cancel: "Cancel this occurrence"
+  label_recurring_meeting_delete: "Delete occurrence"
+  label_recurring_meeting_delete_confirmation: >
+    This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue?
+  label_recurring_occurrence_delete_confirmation: >
+    Any meeting information not in the template will be lost. Do you want to continue?
+  label_recurring_meeting_restore: "Restore this occurrence"
+  label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})."
+  label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})."
+  label_recurring_meeting_more_past: "There are %{count} more past meetings."
+  label_recurring_meeting_more_past_singular: "There is %{count} more past meeting."
+  label_recurring_meeting_show_more: "Show more"
+  label_recurring_meeting_series_edit: "Edit meeting series"
+  label_recurring_meeting_series_delete: "Delete meeting series"
+  label_my_meetings: "My meetings"
+  label_all_meetings: "All meetings"
   label_upcoming_meetings: "Upcoming meetings"
   label_past_meetings: "Past meetings"
   label_upcoming_meetings_short: "Upcoming"
   label_past_meetings_short: "Past"
   label_involvement: "Involvement"
-  label_upcoming_invitations: "Upcoming invitations"
+  label_invitations: "Invitations"
+  label_invited_user: "Invited user"
   label_past_invitations: "Past invitations"
-  label_attendee: "Attendee"
-  label_author: "Creator"
+  label_attended: "Attended"
+  label_attended_user: "Attended user"
+  label_created_by_me: "Created by me"
   label_notify: "Berrikustera bidali"
   label_icalendar: "Bidali iEgutegia"
   label_icalendar_download: "Download iCalendar event"
+  label_view_meeting_series: "View meeting series"
+  label_meeting_series: "Meeting series"
   label_version: "Bertsioa"
   label_time_zone: "Ordu-eremua"
   label_start_date: "Hasiera data"
   meeting:
+    participants:
+      template: "These participants will be invited automatically to all future meetings as they are created."
     attachments:
+      template: "These attached files will be included in all future meetings in the series."
       text: "Attached files are available to all meeting participants. You can also drag and drop these into agenda item notes."
     copy:
       title: "Copy meeting: %{title}"
@@ -145,9 +184,12 @@ eu:
     label_mail_all_participants: "Send email to all participants"
     types:
       classic: "Classic"
-      classic_text: "Organize your meeting in a formattable text agenda and protocol."
-      structured: "Dynamic"
-      structured_text: "Organize your meeting as a list of agenda items, optionally linking them to a work package."
+      classic_text: "Organize your meeting as a single formattable text agenda and protocol."
+      structured: "Structured"
+      one_time: "One-time"
+      recurring: "Recurring"
+      recurring_text: "Create meeting series with dynamic template for each occurrence."
+      structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package."
       structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details"
     copied: "#%{id} Hitzordutik kopiatua"
   meeting_section:
@@ -155,6 +197,40 @@ eu:
     delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?"
     placeholder_title: "New section"
     empty_text: "Drag items here or create a new one"
+  recurring_meeting:
+    occurrence:
+      infoline: "This meeting is part of a recurring meeting series."
+      error_no_next: "There is no next occurrence for this meeting."
+      first_already_exists: "The first occurrence of this meeting series is already instantiated."
+      first_created: >
+        The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence.
+    template:
+      button_finalize: "Finish template"
+      blank_title: "Your meeting series template is empty"
+      description: >
+        This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template.
+      blankslate_finalize: >
+        When you're done preparing this template, click the '%{button_title}' button above to finish the setup and schedule the first meeting of the series.
+      label_view_template: "View template"
+      label_edit_template: "Edit template"
+      banner_html: >
+        You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already created meetings.
+    frequency:
+      every_weekday: "Every %{day_of_the_week}"
+      daily: "Daily"
+      working_days: "Every working day"
+      weekly: "Weekly"
+    end_after:
+      specific_date: "a specific date"
+      iterations: "a number of occurrences"
+    starts: "Starts"
+    in_words:
+      daily_interval: "Every %{interval} days"
+      working_days: "Every working day"
+      weekly: "Every week on %{weekday}"
+      weekly_interval: "Every %{interval} weeks on %{weekday}"
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
   notice_successful_notification: "Jakinarazpena ondo bidali da"
   notice_timezone_missing: Ez da ordu-eremurik zehaztu eta %{zone} hartu da ontzat. Ordu-eremua aukeratzeko klikatu hemen, mesedez.
   notice_meeting_updated: "This page has been updated by someone else. Reload to view changes."
@@ -207,12 +283,17 @@ eu:
   text_deleted_agenda_item: 'Deleted agenda item'
   label_initial_meeting_details: "Hitzordua"
   label_meeting_details: "Meeting details"
+  label_meeting_series_details: "Meeting series details"
   label_meeting_details_edit: "Edit meeting details"
   label_meeting_state: "Meeting status"
   label_meeting_state_open: "Ireki"
   label_meeting_state_open_html: "<i>Open</i>"
   label_meeting_state_closed: "Closed"
   label_meeting_state_closed_html: "<i>Closed</i>"
+  label_meeting_state_agenda_created: "Agenda created"
+  label_meeting_state_scheduled: "Scheduled"
+  label_meeting_state_cancelled: "Cancelled"
+  label_meeting_state_skipped: "Skipped"
   label_meeting_reopen_action: "Reopen meeting"
   label_meeting_close_action: "Close meeting"
   text_meeting_open_description: "This meeting is open. You can add/remove agenda items and edit them as you please. After the meeting is over, close it to lock it."
diff --git a/modules/meeting/config/locales/crowdin/fa.yml b/modules/meeting/config/locales/crowdin/fa.yml
index 985d2533cc93..a251f3d8f863 100644
--- a/modules/meeting/config/locales/crowdin/fa.yml
+++ b/modules/meeting/config/locales/crowdin/fa.yml
@@ -50,11 +50,18 @@ fa:
         presenter: "Presenter"
       meeting_section:
         title: "عنوان"
+      recurring_meeting:
+        frequency: "Frequency"
+        interval: "Interval"
+        start_date: "Starts on"
+        end_after: "End series after"
+        iterations: "Occurrences"
     errors:
       messages:
         invalid_time_format: "is not a valid time. Required format: HH:MM"
     models:
-      structured_meeting: "Meeting (dynamic)"
+      recurring_meeting: "Recurring meeting"
+      structured_meeting: "One-time meeting"
       meeting_agenda_item: "Agenda item"
       meeting_agenda: "دستور کار"
       meeting_minutes: "دقیقه ها"
@@ -88,7 +95,8 @@ fa:
   label_meeting: "جلسه"
   label_meeting_plural: "جلسات"
   label_meeting_new: "ایجاد جلسه"
-  label_meeting_new_dynamic: "New dynamic meeting"
+  label_meeting_new_dynamic: "New one-time meeting"
+  label_meeting_new_recurring: "New recurring meeting"
   label_meeting_create: "Create meeting"
   label_meeting_copy: "Copy meeting"
   label_meeting_edit: "ویرایش جلسه"
@@ -102,23 +110,54 @@ fa:
   label_meeting_date_time: "تاریخ/زمان"
   label_meeting_date_and_time: "Date and time"
   label_meeting_diff: "اختلاف"
+  label_recurring_meeting: "Recurring meeting"
+  label_recurring_meeting_part_of: "Part of a meeting series"
+  label_recurring_meeting_new: "New recurring meeting"
+  label_recurring_meeting_plural: "Recurring meetings"
+  label_template: "Template"
+  label_recurring_meeting_view: "View meeting series"
+  label_recurring_meeting_create: "Create from template"
+  label_recurring_meeting_copy: "Copy as one-off"
+  label_recurring_meeting_cancel: "Cancel this occurrence"
+  label_recurring_meeting_delete: "Delete occurrence"
+  label_recurring_meeting_delete_confirmation: >
+    This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue?
+  label_recurring_occurrence_delete_confirmation: >
+    Any meeting information not in the template will be lost. Do you want to continue?
+  label_recurring_meeting_restore: "Restore this occurrence"
+  label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})."
+  label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})."
+  label_recurring_meeting_more_past: "There are %{count} more past meetings."
+  label_recurring_meeting_more_past_singular: "There is %{count} more past meeting."
+  label_recurring_meeting_show_more: "Show more"
+  label_recurring_meeting_series_edit: "Edit meeting series"
+  label_recurring_meeting_series_delete: "Delete meeting series"
+  label_my_meetings: "My meetings"
+  label_all_meetings: "All meetings"
   label_upcoming_meetings: "Upcoming meetings"
   label_past_meetings: "Past meetings"
   label_upcoming_meetings_short: "Upcoming"
   label_past_meetings_short: "Past"
   label_involvement: "Involvement"
-  label_upcoming_invitations: "Upcoming invitations"
+  label_invitations: "Invitations"
+  label_invited_user: "Invited user"
   label_past_invitations: "Past invitations"
-  label_attendee: "Attendee"
-  label_author: "Creator"
+  label_attended: "Attended"
+  label_attended_user: "Attended user"
+  label_created_by_me: "Created by me"
   label_notify: "ارسال برای بازبینی"
   label_icalendar: "Send iCalendar"
   label_icalendar_download: "Download iCalendar event"
+  label_view_meeting_series: "View meeting series"
+  label_meeting_series: "Meeting series"
   label_version: "نسخه"
   label_time_zone: "منطقه زمانی"
   label_start_date: "Start date"
   meeting:
+    participants:
+      template: "These participants will be invited automatically to all future meetings as they are created."
     attachments:
+      template: "These attached files will be included in all future meetings in the series."
       text: "Attached files are available to all meeting participants. You can also drag and drop these into agenda item notes."
     copy:
       title: "Copy meeting: %{title}"
@@ -145,9 +184,12 @@ fa:
     label_mail_all_participants: "Send email to all participants"
     types:
       classic: "کلاسیک"
-      classic_text: "Organize your meeting in a formattable text agenda and protocol."
-      structured: "Dynamic"
-      structured_text: "Organize your meeting as a list of agenda items, optionally linking them to a work package."
+      classic_text: "Organize your meeting as a single formattable text agenda and protocol."
+      structured: "Structured"
+      one_time: "One-time"
+      recurring: "Recurring"
+      recurring_text: "Create meeting series with dynamic template for each occurrence."
+      structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package."
       structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details"
     copied: "Copied from Meeting #%{id}"
   meeting_section:
@@ -155,6 +197,40 @@ fa:
     delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?"
     placeholder_title: "New section"
     empty_text: "Drag items here or create a new one"
+  recurring_meeting:
+    occurrence:
+      infoline: "This meeting is part of a recurring meeting series."
+      error_no_next: "There is no next occurrence for this meeting."
+      first_already_exists: "The first occurrence of this meeting series is already instantiated."
+      first_created: >
+        The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence.
+    template:
+      button_finalize: "Finish template"
+      blank_title: "Your meeting series template is empty"
+      description: >
+        This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template.
+      blankslate_finalize: >
+        When you're done preparing this template, click the '%{button_title}' button above to finish the setup and schedule the first meeting of the series.
+      label_view_template: "View template"
+      label_edit_template: "Edit template"
+      banner_html: >
+        You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already created meetings.
+    frequency:
+      every_weekday: "Every %{day_of_the_week}"
+      daily: "Daily"
+      working_days: "Every working day"
+      weekly: "Weekly"
+    end_after:
+      specific_date: "a specific date"
+      iterations: "a number of occurrences"
+    starts: "Starts"
+    in_words:
+      daily_interval: "Every %{interval} days"
+      working_days: "Every working day"
+      weekly: "Every week on %{weekday}"
+      weekly_interval: "Every %{interval} weeks on %{weekday}"
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
   notice_successful_notification: "Notification sent successfully"
   notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here.
   notice_meeting_updated: "This page has been updated by someone else. Reload to view changes."
@@ -207,12 +283,17 @@ fa:
   text_deleted_agenda_item: 'Deleted agenda item'
   label_initial_meeting_details: "جلسه"
   label_meeting_details: "Meeting details"
+  label_meeting_series_details: "Meeting series details"
   label_meeting_details_edit: "Edit meeting details"
   label_meeting_state: "Meeting status"
   label_meeting_state_open: "باز"
   label_meeting_state_open_html: "<i>Open</i>"
   label_meeting_state_closed: "بسته"
   label_meeting_state_closed_html: "<i>Closed</i>"
+  label_meeting_state_agenda_created: "Agenda created"
+  label_meeting_state_scheduled: "Scheduled"
+  label_meeting_state_cancelled: "Cancelled"
+  label_meeting_state_skipped: "Skipped"
   label_meeting_reopen_action: "Reopen meeting"
   label_meeting_close_action: "Close meeting"
   text_meeting_open_description: "This meeting is open. You can add/remove agenda items and edit them as you please. After the meeting is over, close it to lock it."
diff --git a/modules/meeting/config/locales/crowdin/fi.yml b/modules/meeting/config/locales/crowdin/fi.yml
index 0790680f4fb5..868fb3990e9c 100644
--- a/modules/meeting/config/locales/crowdin/fi.yml
+++ b/modules/meeting/config/locales/crowdin/fi.yml
@@ -50,11 +50,18 @@ fi:
         presenter: "Presenter"
       meeting_section:
         title: "Otsikko"
+      recurring_meeting:
+        frequency: "Frequency"
+        interval: "Interval"
+        start_date: "Starts on"
+        end_after: "End series after"
+        iterations: "Occurrences"
     errors:
       messages:
         invalid_time_format: "ei ole kelvollinen aika. Vaadittava muoto: TT:MM"
     models:
-      structured_meeting: "Meeting (dynamic)"
+      recurring_meeting: "Recurring meeting"
+      structured_meeting: "One-time meeting"
       meeting_agenda_item: "Agenda item"
       meeting_agenda: "Esityslista"
       meeting_minutes: "Pöytäkirja"
@@ -88,7 +95,8 @@ fi:
   label_meeting: "Kokous"
   label_meeting_plural: "Kokoukset"
   label_meeting_new: "Uusi kokous"
-  label_meeting_new_dynamic: "New dynamic meeting"
+  label_meeting_new_dynamic: "New one-time meeting"
+  label_meeting_new_recurring: "New recurring meeting"
   label_meeting_create: "Create meeting"
   label_meeting_copy: "Copy meeting"
   label_meeting_edit: "Muokkaa kokousta"
@@ -102,23 +110,54 @@ fi:
   label_meeting_date_time: "Päivämäärä/aika"
   label_meeting_date_and_time: "Date and time"
   label_meeting_diff: "Erot"
+  label_recurring_meeting: "Recurring meeting"
+  label_recurring_meeting_part_of: "Part of a meeting series"
+  label_recurring_meeting_new: "New recurring meeting"
+  label_recurring_meeting_plural: "Recurring meetings"
+  label_template: "Template"
+  label_recurring_meeting_view: "View meeting series"
+  label_recurring_meeting_create: "Create from template"
+  label_recurring_meeting_copy: "Copy as one-off"
+  label_recurring_meeting_cancel: "Cancel this occurrence"
+  label_recurring_meeting_delete: "Delete occurrence"
+  label_recurring_meeting_delete_confirmation: >
+    This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue?
+  label_recurring_occurrence_delete_confirmation: >
+    Any meeting information not in the template will be lost. Do you want to continue?
+  label_recurring_meeting_restore: "Restore this occurrence"
+  label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})."
+  label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})."
+  label_recurring_meeting_more_past: "There are %{count} more past meetings."
+  label_recurring_meeting_more_past_singular: "There is %{count} more past meeting."
+  label_recurring_meeting_show_more: "Show more"
+  label_recurring_meeting_series_edit: "Edit meeting series"
+  label_recurring_meeting_series_delete: "Delete meeting series"
+  label_my_meetings: "My meetings"
+  label_all_meetings: "All meetings"
   label_upcoming_meetings: "Upcoming meetings"
   label_past_meetings: "Past meetings"
   label_upcoming_meetings_short: "Upcoming"
   label_past_meetings_short: "Past"
   label_involvement: "Involvement"
-  label_upcoming_invitations: "Upcoming invitations"
+  label_invitations: "Invitations"
+  label_invited_user: "Invited user"
   label_past_invitations: "Past invitations"
-  label_attendee: "Attendee"
-  label_author: "Creator"
+  label_attended: "Attended"
+  label_attended_user: "Attended user"
+  label_created_by_me: "Created by me"
   label_notify: "Lähetä tarkistettavaksi"
   label_icalendar: "Lähetä iCalendar"
   label_icalendar_download: "Download iCalendar event"
+  label_view_meeting_series: "View meeting series"
+  label_meeting_series: "Meeting series"
   label_version: "Versio"
   label_time_zone: "Aikavyöhyke"
   label_start_date: "Aloituspäivä"
   meeting:
+    participants:
+      template: "These participants will be invited automatically to all future meetings as they are created."
     attachments:
+      template: "These attached files will be included in all future meetings in the series."
       text: "Attached files are available to all meeting participants. You can also drag and drop these into agenda item notes."
     copy:
       title: "Copy meeting: %{title}"
@@ -145,9 +184,12 @@ fi:
     label_mail_all_participants: "Send email to all participants"
     types:
       classic: "Classic"
-      classic_text: "Organize your meeting in a formattable text agenda and protocol."
-      structured: "Dynamic"
-      structured_text: "Organize your meeting as a list of agenda items, optionally linking them to a work package."
+      classic_text: "Organize your meeting as a single formattable text agenda and protocol."
+      structured: "Structured"
+      one_time: "One-time"
+      recurring: "Recurring"
+      recurring_text: "Create meeting series with dynamic template for each occurrence."
+      structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package."
       structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details"
     copied: "Kopioitu kokouksesta #%{id}"
   meeting_section:
@@ -155,6 +197,40 @@ fi:
     delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?"
     placeholder_title: "New section"
     empty_text: "Drag items here or create a new one"
+  recurring_meeting:
+    occurrence:
+      infoline: "This meeting is part of a recurring meeting series."
+      error_no_next: "There is no next occurrence for this meeting."
+      first_already_exists: "The first occurrence of this meeting series is already instantiated."
+      first_created: >
+        The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence.
+    template:
+      button_finalize: "Finish template"
+      blank_title: "Your meeting series template is empty"
+      description: >
+        This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template.
+      blankslate_finalize: >
+        When you're done preparing this template, click the '%{button_title}' button above to finish the setup and schedule the first meeting of the series.
+      label_view_template: "View template"
+      label_edit_template: "Edit template"
+      banner_html: >
+        You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already created meetings.
+    frequency:
+      every_weekday: "Every %{day_of_the_week}"
+      daily: "Daily"
+      working_days: "Every working day"
+      weekly: "Weekly"
+    end_after:
+      specific_date: "a specific date"
+      iterations: "a number of occurrences"
+    starts: "Starts"
+    in_words:
+      daily_interval: "Every %{interval} days"
+      working_days: "Every working day"
+      weekly: "Every week on %{weekday}"
+      weekly_interval: "Every %{interval} weeks on %{weekday}"
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
   notice_successful_notification: "Ilmoituksen lähettäminen onnistui"
   notice_timezone_missing: Aikavyöhykettä ei ole määritetty, joten oletuksena on %{zone}. Valitaksesi aikavyöhykkeen, klikkaa tästä.
   notice_meeting_updated: "This page has been updated by someone else. Reload to view changes."
@@ -207,12 +283,17 @@ fi:
   text_deleted_agenda_item: 'Deleted agenda item'
   label_initial_meeting_details: "Kokous"
   label_meeting_details: "Meeting details"
+  label_meeting_series_details: "Meeting series details"
   label_meeting_details_edit: "Edit meeting details"
   label_meeting_state: "Meeting status"
   label_meeting_state_open: "Avoin"
   label_meeting_state_open_html: "<i>Open</i>"
   label_meeting_state_closed: "Suljettu"
   label_meeting_state_closed_html: "<i>Closed</i>"
+  label_meeting_state_agenda_created: "Agenda created"
+  label_meeting_state_scheduled: "Scheduled"
+  label_meeting_state_cancelled: "Cancelled"
+  label_meeting_state_skipped: "Skipped"
   label_meeting_reopen_action: "Reopen meeting"
   label_meeting_close_action: "Close meeting"
   text_meeting_open_description: "This meeting is open. You can add/remove agenda items and edit them as you please. After the meeting is over, close it to lock it."
diff --git a/modules/meeting/config/locales/crowdin/fil.yml b/modules/meeting/config/locales/crowdin/fil.yml
index 02489014a133..e5b283a4b0de 100644
--- a/modules/meeting/config/locales/crowdin/fil.yml
+++ b/modules/meeting/config/locales/crowdin/fil.yml
@@ -50,11 +50,18 @@ fil:
         presenter: "Presenter"
       meeting_section:
         title: "Pamagat"
+      recurring_meeting:
+        frequency: "Frequency"
+        interval: "Interval"
+        start_date: "Starts on"
+        end_after: "End series after"
+        iterations: "Occurrences"
     errors:
       messages:
         invalid_time_format: "ay hindi balidong oras. Ang hinihinging format ay: HH:MM"
     models:
-      structured_meeting: "Meeting (dynamic)"
+      recurring_meeting: "Recurring meeting"
+      structured_meeting: "One-time meeting"
       meeting_agenda_item: "Agenda item"
       meeting_agenda: "Agenda"
       meeting_minutes: "Minutes"
@@ -88,7 +95,8 @@ fil:
   label_meeting: "Pagpupulong"
   label_meeting_plural: "Mga Pagpupulong"
   label_meeting_new: "Bagong Pagpupulong"
-  label_meeting_new_dynamic: "New dynamic meeting"
+  label_meeting_new_dynamic: "New one-time meeting"
+  label_meeting_new_recurring: "New recurring meeting"
   label_meeting_create: "Create meeting"
   label_meeting_copy: "Copy meeting"
   label_meeting_edit: "I-edit and Pagpupulong"
@@ -102,23 +110,54 @@ fil:
   label_meeting_date_time: "Petsa/Oras"
   label_meeting_date_and_time: "Date and time"
   label_meeting_diff: "Diff"
+  label_recurring_meeting: "Recurring meeting"
+  label_recurring_meeting_part_of: "Part of a meeting series"
+  label_recurring_meeting_new: "New recurring meeting"
+  label_recurring_meeting_plural: "Recurring meetings"
+  label_template: "Template"
+  label_recurring_meeting_view: "View meeting series"
+  label_recurring_meeting_create: "Create from template"
+  label_recurring_meeting_copy: "Copy as one-off"
+  label_recurring_meeting_cancel: "Cancel this occurrence"
+  label_recurring_meeting_delete: "Delete occurrence"
+  label_recurring_meeting_delete_confirmation: >
+    This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue?
+  label_recurring_occurrence_delete_confirmation: >
+    Any meeting information not in the template will be lost. Do you want to continue?
+  label_recurring_meeting_restore: "Restore this occurrence"
+  label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})."
+  label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})."
+  label_recurring_meeting_more_past: "There are %{count} more past meetings."
+  label_recurring_meeting_more_past_singular: "There is %{count} more past meeting."
+  label_recurring_meeting_show_more: "Show more"
+  label_recurring_meeting_series_edit: "Edit meeting series"
+  label_recurring_meeting_series_delete: "Delete meeting series"
+  label_my_meetings: "My meetings"
+  label_all_meetings: "All meetings"
   label_upcoming_meetings: "Upcoming meetings"
   label_past_meetings: "Past meetings"
   label_upcoming_meetings_short: "Upcoming"
   label_past_meetings_short: "Past"
   label_involvement: "Involvement"
-  label_upcoming_invitations: "Upcoming invitations"
+  label_invitations: "Invitations"
+  label_invited_user: "Invited user"
   label_past_invitations: "Past invitations"
-  label_attendee: "Attendee"
-  label_author: "Creator"
+  label_attended: "Attended"
+  label_attended_user: "Attended user"
+  label_created_by_me: "Created by me"
   label_notify: "Ipadala para sa pagsusuri"
   label_icalendar: "Ipadala ang iCalendar"
   label_icalendar_download: "Download iCalendar event"
+  label_view_meeting_series: "View meeting series"
+  label_meeting_series: "Meeting series"
   label_version: "Bersyon"
   label_time_zone: "Time Zone"
   label_start_date: "Petsa ng Pagsisimula"
   meeting:
+    participants:
+      template: "These participants will be invited automatically to all future meetings as they are created."
     attachments:
+      template: "These attached files will be included in all future meetings in the series."
       text: "Attached files are available to all meeting participants. You can also drag and drop these into agenda item notes."
     copy:
       title: "Copy meeting: %{title}"
@@ -145,9 +184,12 @@ fil:
     label_mail_all_participants: "Send email to all participants"
     types:
       classic: "Classic"
-      classic_text: "Organize your meeting in a formattable text agenda and protocol."
-      structured: "Dynamic"
-      structured_text: "Organize your meeting as a list of agenda items, optionally linking them to a work package."
+      classic_text: "Organize your meeting as a single formattable text agenda and protocol."
+      structured: "Structured"
+      one_time: "One-time"
+      recurring: "Recurring"
+      recurring_text: "Create meeting series with dynamic template for each occurrence."
+      structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package."
       structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details"
     copied: "Copied from Meeting #%{id}"
   meeting_section:
@@ -155,6 +197,40 @@ fil:
     delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?"
     placeholder_title: "New section"
     empty_text: "Drag items here or create a new one"
+  recurring_meeting:
+    occurrence:
+      infoline: "This meeting is part of a recurring meeting series."
+      error_no_next: "There is no next occurrence for this meeting."
+      first_already_exists: "The first occurrence of this meeting series is already instantiated."
+      first_created: >
+        The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence.
+    template:
+      button_finalize: "Finish template"
+      blank_title: "Your meeting series template is empty"
+      description: >
+        This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template.
+      blankslate_finalize: >
+        When you're done preparing this template, click the '%{button_title}' button above to finish the setup and schedule the first meeting of the series.
+      label_view_template: "View template"
+      label_edit_template: "Edit template"
+      banner_html: >
+        You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already created meetings.
+    frequency:
+      every_weekday: "Every %{day_of_the_week}"
+      daily: "Daily"
+      working_days: "Every working day"
+      weekly: "Weekly"
+    end_after:
+      specific_date: "a specific date"
+      iterations: "a number of occurrences"
+    starts: "Starts"
+    in_words:
+      daily_interval: "Every %{interval} days"
+      working_days: "Every working day"
+      weekly: "Every week on %{weekday}"
+      weekly_interval: "Every %{interval} weeks on %{weekday}"
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
   notice_successful_notification: "Ang abiso ay naipadala ng matagumpay"
   notice_timezone_missing: Walang nakatakdang time zone at ang %{zone} ay ipinagpalagay na siyang time zone. Para piliin ang iyong time zone, mangyaring magclick dito.
   notice_meeting_updated: "This page has been updated by someone else. Reload to view changes."
@@ -207,12 +283,17 @@ fil:
   text_deleted_agenda_item: 'Deleted agenda item'
   label_initial_meeting_details: "Pagpupulong"
   label_meeting_details: "Meeting details"
+  label_meeting_series_details: "Meeting series details"
   label_meeting_details_edit: "Edit meeting details"
   label_meeting_state: "Meeting status"
   label_meeting_state_open: "Bukas"
   label_meeting_state_open_html: "<i>Open</i>"
   label_meeting_state_closed: "Isinara"
   label_meeting_state_closed_html: "<i>Closed</i>"
+  label_meeting_state_agenda_created: "Agenda created"
+  label_meeting_state_scheduled: "Scheduled"
+  label_meeting_state_cancelled: "Cancelled"
+  label_meeting_state_skipped: "Skipped"
   label_meeting_reopen_action: "Reopen meeting"
   label_meeting_close_action: "Close meeting"
   text_meeting_open_description: "This meeting is open. You can add/remove agenda items and edit them as you please. After the meeting is over, close it to lock it."
diff --git a/modules/meeting/config/locales/crowdin/fr.yml b/modules/meeting/config/locales/crowdin/fr.yml
index 7124b8c570eb..415bab49f895 100644
--- a/modules/meeting/config/locales/crowdin/fr.yml
+++ b/modules/meeting/config/locales/crowdin/fr.yml
@@ -50,11 +50,18 @@ fr:
         presenter: "Responsable"
       meeting_section:
         title: "Titre"
+      recurring_meeting:
+        frequency: "Fréquence"
+        interval: "Intervalle"
+        start_date: "Commence le"
+        end_after: "Terminer la série après"
+        iterations: "Occurrences"
     errors:
       messages:
         invalid_time_format: "n’est pas une heure valide. Format requis : HH:MM"
     models:
-      structured_meeting: "Réunion (dynamique)"
+      recurring_meeting: "Réunion récurrente"
+      structured_meeting: "Réunion ponctuelle"
       meeting_agenda_item: ""
       meeting_agenda: "Ordre du jour"
       meeting_minutes: "Compte-rendu"
@@ -88,7 +95,8 @@ fr:
   label_meeting: "Réunion"
   label_meeting_plural: "Réunions"
   label_meeting_new: "Nouvelle réunion"
-  label_meeting_new_dynamic: "Nouvelle réunion dynamique"
+  label_meeting_new_dynamic: "Nouvelle réunion ponctuelle"
+  label_meeting_new_recurring: "Nouvelle réunion récurrente"
   label_meeting_create: "Créer une réunion"
   label_meeting_copy: "Copier la réunion"
   label_meeting_edit: "Modifier la réunion"
@@ -102,23 +110,54 @@ fr:
   label_meeting_date_time: "Date/Heure"
   label_meeting_date_and_time: "Date et heure"
   label_meeting_diff: "Différence"
+  label_recurring_meeting: "Réunion récurrente"
+  label_recurring_meeting_part_of: "Partie d'une série de réunions"
+  label_recurring_meeting_new: "Nouvelle réunion récurrente"
+  label_recurring_meeting_plural: "Réunions récurrentes"
+  label_template: "Modèle"
+  label_recurring_meeting_view: "Voir la série de réunions"
+  label_recurring_meeting_create: "Créer à partir d'un modèle"
+  label_recurring_meeting_copy: "Copier en tant que réunion ponctuelle"
+  label_recurring_meeting_cancel: "Annuler cette occurrence"
+  label_recurring_meeting_delete: "Supprimer l'occurrence"
+  label_recurring_meeting_delete_confirmation: >
+    Cette réunion fait partie d'une série appelée %{name}. Cette opération ne supprimera que cette réunion particulière et non l'ensemble de la série. Voulez-vous continuer ?
+  label_recurring_occurrence_delete_confirmation: >
+    Toutes les informations relatives à la réunion qui ne figurent pas dans le modèle seront perdues. Voulez-vous continuer ?
+  label_recurring_meeting_restore: "Restaurer cette occurrence"
+  label_recurring_meeting_more: "Il y a %{count} autres réunions prévues (%{schedule})."
+  label_recurring_meeting_more_singular: "Il y a %{count} autre réunion prévue (%{schedule})."
+  label_recurring_meeting_more_past: "Il y a %{count} autres réunions passées."
+  label_recurring_meeting_more_past_singular: "Il y a %{count} autre réunion passée."
+  label_recurring_meeting_show_more: "Afficher plus"
+  label_recurring_meeting_series_edit: "Modifier la série de réunions"
+  label_recurring_meeting_series_delete: "Supprimer la série de réunions"
+  label_my_meetings: "Mes réunions"
+  label_all_meetings: "Toutes les réunions"
   label_upcoming_meetings: "Réunions à venir"
   label_past_meetings: "Réunions passées"
   label_upcoming_meetings_short: "À venir"
   label_past_meetings_short: "Passé"
   label_involvement: "Participation"
-  label_upcoming_invitations: "Invitations à venir"
+  label_invitations: "Invitations"
+  label_invited_user: "Utilisateur invité"
   label_past_invitations: "Invitations passées"
-  label_attendee: "Participant"
-  label_author: "Créateur"
+  label_attended: "Participations"
+  label_attended_user: "Utilisateur participant"
+  label_created_by_me: "Créées par moi"
   label_notify: "Envoyer pour révision"
   label_icalendar: "Envoyer iCalendar"
   label_icalendar_download: "Télécharger l'événement iCalendar"
+  label_view_meeting_series: "Voir la série de réunions"
+  label_meeting_series: "Série de réunions"
   label_version: "Version"
   label_time_zone: "Fuseau horaire"
   label_start_date: "Date de début"
   meeting:
+    participants:
+      template: "Ces participants seront automatiquement invités à toutes les réunions futures au fur et à mesure qu'elles seront créées."
     attachments:
+      template: "Ces fichiers joints seront inclus dans toutes les réunions futures de la série."
       text: "Les fichiers joints sont accessibles à tous les participants à la réunion. Vous pouvez également les glisser-déposer dans les notes relatives aux points de l'ordre du jour."
     copy:
       title: "Copier la réunion : %{title}"
@@ -145,9 +184,12 @@ fr:
     label_mail_all_participants: "Envoyer un mail à tous les participants"
     types:
       classic: "Classique"
-      classic_text: "Organisez votre réunion sous la forme d'un ordre du jour et d'un protocole en texte formatable."
-      structured: "Dynamique"
-      structured_text: "Organisez votre réunion sous la forme d'une liste de points à l'ordre du jour, en les reliant éventuellement à des lots de travaux."
+      classic_text: "Organisez votre réunion sous la forme d'un ordre du jour et d'un protocole sous forme de texte unique formatable."
+      structured: "Structurée"
+      one_time: "Ponctuelle"
+      recurring: "Récurrente"
+      recurring_text: "Créez une série de réunions avec un modèle dynamique pour chaque occurrence."
+      structured_text: "Organisez votre réunion sous la forme d'une liste dynamique de points à l'ordre du jour, en les reliant éventuellement à un lot de travaux."
       structured_text_copy: "Actuellement, la copie d'une réunion n'entraîne pas la copie des points de l'ordre du jour de la réunion, mais uniquement des détails."
     copied: "Copié depuis la réunion #%{id}"
   meeting_section:
@@ -155,6 +197,40 @@ fr:
     delete_confirmation: "Supprimer la section supprimera également tous les éléments de l'ordre du jour qui s'y rapportent. Voulez-vous vraiment continuer ?"
     placeholder_title: "Nouvelle section"
     empty_text: "Faites glisser des éléments ici ou créez-en un nouveau"
+  recurring_meeting:
+    occurrence:
+      infoline: "Cette réunion fait partie d'une série de réunions récurrentes."
+      error_no_next: "Il n'y a pas de prochaine occurrence pour cette réunion."
+      first_already_exists: "La première occurrence de cette série de réunions est déjà instanciée."
+      first_created: >
+        La première réunion a été créée avec succès à partir du modèle. Toutes les réunions futures seront créées automatiquement au moment de l'occurrence précédente.
+    template:
+      button_finalize: "Terminer le modèle"
+      blank_title: "Votre modèle de série de réunions est vide"
+      description: >
+        Ce modèle sera utilisé chaque fois que de nouvelles réunions seront créées dans la série. Vous pouvez ajouter des points à l'ordre du jour, des participants et des pièces jointes à ce modèle.
+      blankslate_finalize: >
+        Lorsque vous avez terminé de préparer ce modèle, cliquez sur le bouton « %{button_title} » ci-dessus pour terminer la configuration et programmer la première réunion de la série.
+      label_view_template: "Voir le modèle"
+      label_edit_template: "Modifier le modèle"
+      banner_html: >
+        Vous êtes en train d'éditer le modèle d'une série de réunions : %{link}. Chaque nouvelle occurrence d'une réunion dans la série utilisera ce modèle. Les modifications n'affecteront pas les réunions passées ou déjà créées.
+    frequency:
+      every_weekday: "Chaque %{day_of_the_week}"
+      daily: "Quotidienne"
+      working_days: "Chaque jour ouvrable"
+      weekly: "Hebdomadaire"
+    end_after:
+      specific_date: "une date spécifique"
+      iterations: "un nombre d'occurrences"
+    starts: "Début"
+    in_words:
+      daily_interval: "Tous les %{interval} jours"
+      working_days: "Chaque jour ouvrable"
+      weekly: "Chaque semaine le %{weekday}"
+      weekly_interval: "Toutes les %{interval} semaines le %{weekday}"
+      frequency: "%{base} à %{time}"
+      full: "%{base} à %{time}, se termine le %{end_date}"
   notice_successful_notification: "Notification envoyée avec succès"
   notice_timezone_missing: Aucun fuseau horaire n'est défini et %{zone} est supposé. Pour choisir votre fuseau horaire, veuillez cliquer ici.
   notice_meeting_updated: "Cette page a été mise à jour par quelqu'un d'autre. Rechargez pour voir les changements."
@@ -207,12 +283,17 @@ fr:
   text_deleted_agenda_item: 'Point de l''ordre du jour supprimé'
   label_initial_meeting_details: "Réunion"
   label_meeting_details: "Détails de la réunion"
+  label_meeting_series_details: "Détails de la série de réunions"
   label_meeting_details_edit: "Modifier les détails de la réunion"
   label_meeting_state: "Statut de la réunion"
   label_meeting_state_open: "Ouvert"
   label_meeting_state_open_html: "<i>Ouvrir</i>"
   label_meeting_state_closed: "Fermé"
   label_meeting_state_closed_html: "<i>Fermé</i>"
+  label_meeting_state_agenda_created: "Ordre du jour créé"
+  label_meeting_state_scheduled: "Planifiée"
+  label_meeting_state_cancelled: "Annulée"
+  label_meeting_state_skipped: "Ignorée"
   label_meeting_reopen_action: "Réouvrir la réunion"
   label_meeting_close_action: "Fermer la réunion"
   text_meeting_open_description: "Cette réunion est ouverte. Vous pouvez ajouter/supprimer des points de l'ordre du jour et les modifier comme vous le souhaitez. Une fois la réunion terminée, clôturez-la pour la verrouiller."
diff --git a/modules/meeting/config/locales/crowdin/he.yml b/modules/meeting/config/locales/crowdin/he.yml
index 54059bcc68d1..3e1e5e9541a4 100644
--- a/modules/meeting/config/locales/crowdin/he.yml
+++ b/modules/meeting/config/locales/crowdin/he.yml
@@ -52,11 +52,18 @@ he:
         presenter: "Presenter"
       meeting_section:
         title: "כותרת"
+      recurring_meeting:
+        frequency: "Frequency"
+        interval: "Interval"
+        start_date: "Starts on"
+        end_after: "End series after"
+        iterations: "Occurrences"
     errors:
       messages:
         invalid_time_format: "תבנית הזמן אינה תקינה. התבנית הנדרשת היא: HH:MM"
     models:
-      structured_meeting: "Meeting (dynamic)"
+      recurring_meeting: "Recurring meeting"
+      structured_meeting: "One-time meeting"
       meeting_agenda_item: "Agenda item"
       meeting_agenda: "סדר היום"
       meeting_minutes: "דקות"
@@ -90,7 +97,8 @@ he:
   label_meeting: "פגישה"
   label_meeting_plural: "פגישות"
   label_meeting_new: "פגישה חדשה"
-  label_meeting_new_dynamic: "New dynamic meeting"
+  label_meeting_new_dynamic: "New one-time meeting"
+  label_meeting_new_recurring: "New recurring meeting"
   label_meeting_create: "Create meeting"
   label_meeting_copy: "Copy meeting"
   label_meeting_edit: "עריכת פגישה"
@@ -104,23 +112,54 @@ he:
   label_meeting_date_time: "תאריך/שעה"
   label_meeting_date_and_time: "Date and time"
   label_meeting_diff: "הבדלים"
+  label_recurring_meeting: "Recurring meeting"
+  label_recurring_meeting_part_of: "Part of a meeting series"
+  label_recurring_meeting_new: "New recurring meeting"
+  label_recurring_meeting_plural: "Recurring meetings"
+  label_template: "Template"
+  label_recurring_meeting_view: "View meeting series"
+  label_recurring_meeting_create: "Create from template"
+  label_recurring_meeting_copy: "Copy as one-off"
+  label_recurring_meeting_cancel: "Cancel this occurrence"
+  label_recurring_meeting_delete: "Delete occurrence"
+  label_recurring_meeting_delete_confirmation: >
+    This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue?
+  label_recurring_occurrence_delete_confirmation: >
+    Any meeting information not in the template will be lost. Do you want to continue?
+  label_recurring_meeting_restore: "Restore this occurrence"
+  label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})."
+  label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})."
+  label_recurring_meeting_more_past: "There are %{count} more past meetings."
+  label_recurring_meeting_more_past_singular: "There is %{count} more past meeting."
+  label_recurring_meeting_show_more: "Show more"
+  label_recurring_meeting_series_edit: "Edit meeting series"
+  label_recurring_meeting_series_delete: "Delete meeting series"
+  label_my_meetings: "My meetings"
+  label_all_meetings: "All meetings"
   label_upcoming_meetings: "Upcoming meetings"
   label_past_meetings: "Past meetings"
   label_upcoming_meetings_short: "Upcoming"
   label_past_meetings_short: "Past"
   label_involvement: "Involvement"
-  label_upcoming_invitations: "Upcoming invitations"
+  label_invitations: "Invitations"
+  label_invited_user: "Invited user"
   label_past_invitations: "Past invitations"
-  label_attendee: "Attendee"
-  label_author: "Creator"
+  label_attended: "Attended"
+  label_attended_user: "Attended user"
+  label_created_by_me: "Created by me"
   label_notify: "שלח לבדיקה"
   label_icalendar: "שלח iCalendar"
   label_icalendar_download: "Download iCalendar event"
+  label_view_meeting_series: "View meeting series"
+  label_meeting_series: "Meeting series"
   label_version: "גירסה"
   label_time_zone: "איזור זמן"
   label_start_date: "תאריך התחלה"
   meeting:
+    participants:
+      template: "These participants will be invited automatically to all future meetings as they are created."
     attachments:
+      template: "These attached files will be included in all future meetings in the series."
       text: "Attached files are available to all meeting participants. You can also drag and drop these into agenda item notes."
     copy:
       title: "Copy meeting: %{title}"
@@ -147,9 +186,12 @@ he:
     label_mail_all_participants: "Send email to all participants"
     types:
       classic: "Classic"
-      classic_text: "Organize your meeting in a formattable text agenda and protocol."
-      structured: "Dynamic"
-      structured_text: "Organize your meeting as a list of agenda items, optionally linking them to a work package."
+      classic_text: "Organize your meeting as a single formattable text agenda and protocol."
+      structured: "Structured"
+      one_time: "One-time"
+      recurring: "Recurring"
+      recurring_text: "Create meeting series with dynamic template for each occurrence."
+      structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package."
       structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details"
     copied: "Copied from Meeting #%{id}"
   meeting_section:
@@ -157,6 +199,40 @@ he:
     delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?"
     placeholder_title: "New section"
     empty_text: "Drag items here or create a new one"
+  recurring_meeting:
+    occurrence:
+      infoline: "This meeting is part of a recurring meeting series."
+      error_no_next: "There is no next occurrence for this meeting."
+      first_already_exists: "The first occurrence of this meeting series is already instantiated."
+      first_created: >
+        The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence.
+    template:
+      button_finalize: "Finish template"
+      blank_title: "Your meeting series template is empty"
+      description: >
+        This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template.
+      blankslate_finalize: >
+        When you're done preparing this template, click the '%{button_title}' button above to finish the setup and schedule the first meeting of the series.
+      label_view_template: "View template"
+      label_edit_template: "Edit template"
+      banner_html: >
+        You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already created meetings.
+    frequency:
+      every_weekday: "Every %{day_of_the_week}"
+      daily: "Daily"
+      working_days: "Every working day"
+      weekly: "Weekly"
+    end_after:
+      specific_date: "a specific date"
+      iterations: "a number of occurrences"
+    starts: "Starts"
+    in_words:
+      daily_interval: "Every %{interval} days"
+      working_days: "Every working day"
+      weekly: "Every week on %{weekday}"
+      weekly_interval: "Every %{interval} weeks on %{weekday}"
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
   notice_successful_notification: "הודעה נשלחה בהצלחה"
   notice_timezone_missing: אין איזור זמן מוגדר, ההערכה היא %{zone}. כדי לבחור את איזור הזמן שלך, אנא לחץ כאן.
   notice_meeting_updated: "This page has been updated by someone else. Reload to view changes."
@@ -209,12 +285,17 @@ he:
   text_deleted_agenda_item: 'Deleted agenda item'
   label_initial_meeting_details: "פגישה"
   label_meeting_details: "Meeting details"
+  label_meeting_series_details: "Meeting series details"
   label_meeting_details_edit: "Edit meeting details"
   label_meeting_state: "Meeting status"
   label_meeting_state_open: "פתיחה"
   label_meeting_state_open_html: "<i>Open</i>"
   label_meeting_state_closed: "סגור"
   label_meeting_state_closed_html: "<i>Closed</i>"
+  label_meeting_state_agenda_created: "Agenda created"
+  label_meeting_state_scheduled: "Scheduled"
+  label_meeting_state_cancelled: "Cancelled"
+  label_meeting_state_skipped: "Skipped"
   label_meeting_reopen_action: "Reopen meeting"
   label_meeting_close_action: "Close meeting"
   text_meeting_open_description: "This meeting is open. You can add/remove agenda items and edit them as you please. After the meeting is over, close it to lock it."
diff --git a/modules/meeting/config/locales/crowdin/hi.yml b/modules/meeting/config/locales/crowdin/hi.yml
index d3cbba6bf0bf..bf260932a8bf 100644
--- a/modules/meeting/config/locales/crowdin/hi.yml
+++ b/modules/meeting/config/locales/crowdin/hi.yml
@@ -50,11 +50,18 @@ hi:
         presenter: "Presenter"
       meeting_section:
         title: "शीर्षक"
+      recurring_meeting:
+        frequency: "Frequency"
+        interval: "Interval"
+        start_date: "Starts on"
+        end_after: "End series after"
+        iterations: "Occurrences"
     errors:
       messages:
         invalid_time_format: "is not a valid time. Required format: HH:MM"
     models:
-      structured_meeting: "Meeting (dynamic)"
+      recurring_meeting: "Recurring meeting"
+      structured_meeting: "One-time meeting"
       meeting_agenda_item: "Agenda item"
       meeting_agenda: "Agenda"
       meeting_minutes: "Minutes"
@@ -88,7 +95,8 @@ hi:
   label_meeting: "Meeting"
   label_meeting_plural: "Meetings"
   label_meeting_new: "New Meeting"
-  label_meeting_new_dynamic: "New dynamic meeting"
+  label_meeting_new_dynamic: "New one-time meeting"
+  label_meeting_new_recurring: "New recurring meeting"
   label_meeting_create: "Create meeting"
   label_meeting_copy: "Copy meeting"
   label_meeting_edit: "Edit Meeting"
@@ -102,23 +110,54 @@ hi:
   label_meeting_date_time: "Date/Time"
   label_meeting_date_and_time: "Date and time"
   label_meeting_diff: "Diff"
+  label_recurring_meeting: "Recurring meeting"
+  label_recurring_meeting_part_of: "Part of a meeting series"
+  label_recurring_meeting_new: "New recurring meeting"
+  label_recurring_meeting_plural: "Recurring meetings"
+  label_template: "Template"
+  label_recurring_meeting_view: "View meeting series"
+  label_recurring_meeting_create: "Create from template"
+  label_recurring_meeting_copy: "Copy as one-off"
+  label_recurring_meeting_cancel: "Cancel this occurrence"
+  label_recurring_meeting_delete: "Delete occurrence"
+  label_recurring_meeting_delete_confirmation: >
+    This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue?
+  label_recurring_occurrence_delete_confirmation: >
+    Any meeting information not in the template will be lost. Do you want to continue?
+  label_recurring_meeting_restore: "Restore this occurrence"
+  label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})."
+  label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})."
+  label_recurring_meeting_more_past: "There are %{count} more past meetings."
+  label_recurring_meeting_more_past_singular: "There is %{count} more past meeting."
+  label_recurring_meeting_show_more: "Show more"
+  label_recurring_meeting_series_edit: "Edit meeting series"
+  label_recurring_meeting_series_delete: "Delete meeting series"
+  label_my_meetings: "My meetings"
+  label_all_meetings: "All meetings"
   label_upcoming_meetings: "Upcoming meetings"
   label_past_meetings: "Past meetings"
   label_upcoming_meetings_short: "Upcoming"
   label_past_meetings_short: "Past"
   label_involvement: "Involvement"
-  label_upcoming_invitations: "Upcoming invitations"
+  label_invitations: "Invitations"
+  label_invited_user: "Invited user"
   label_past_invitations: "Past invitations"
-  label_attendee: "Attendee"
-  label_author: "Creator"
+  label_attended: "Attended"
+  label_attended_user: "Attended user"
+  label_created_by_me: "Created by me"
   label_notify: "Send for review"
   label_icalendar: "Send iCalendar"
   label_icalendar_download: "Download iCalendar event"
+  label_view_meeting_series: "View meeting series"
+  label_meeting_series: "Meeting series"
   label_version: "संस्करण"
   label_time_zone: "समय क्षेत्र"
   label_start_date: "प्रारंभ दिनांक"
   meeting:
+    participants:
+      template: "These participants will be invited automatically to all future meetings as they are created."
     attachments:
+      template: "These attached files will be included in all future meetings in the series."
       text: "Attached files are available to all meeting participants. You can also drag and drop these into agenda item notes."
     copy:
       title: "Copy meeting: %{title}"
@@ -145,9 +184,12 @@ hi:
     label_mail_all_participants: "Send email to all participants"
     types:
       classic: "Classic"
-      classic_text: "Organize your meeting in a formattable text agenda and protocol."
-      structured: "Dynamic"
-      structured_text: "Organize your meeting as a list of agenda items, optionally linking them to a work package."
+      classic_text: "Organize your meeting as a single formattable text agenda and protocol."
+      structured: "Structured"
+      one_time: "One-time"
+      recurring: "Recurring"
+      recurring_text: "Create meeting series with dynamic template for each occurrence."
+      structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package."
       structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details"
     copied: "Copied from Meeting #%{id}"
   meeting_section:
@@ -155,6 +197,40 @@ hi:
     delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?"
     placeholder_title: "New section"
     empty_text: "Drag items here or create a new one"
+  recurring_meeting:
+    occurrence:
+      infoline: "This meeting is part of a recurring meeting series."
+      error_no_next: "There is no next occurrence for this meeting."
+      first_already_exists: "The first occurrence of this meeting series is already instantiated."
+      first_created: >
+        The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence.
+    template:
+      button_finalize: "Finish template"
+      blank_title: "Your meeting series template is empty"
+      description: >
+        This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template.
+      blankslate_finalize: >
+        When you're done preparing this template, click the '%{button_title}' button above to finish the setup and schedule the first meeting of the series.
+      label_view_template: "View template"
+      label_edit_template: "Edit template"
+      banner_html: >
+        You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already created meetings.
+    frequency:
+      every_weekday: "Every %{day_of_the_week}"
+      daily: "Daily"
+      working_days: "Every working day"
+      weekly: "Weekly"
+    end_after:
+      specific_date: "a specific date"
+      iterations: "a number of occurrences"
+    starts: "Starts"
+    in_words:
+      daily_interval: "Every %{interval} days"
+      working_days: "Every working day"
+      weekly: "Every week on %{weekday}"
+      weekly_interval: "Every %{interval} weeks on %{weekday}"
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
   notice_successful_notification: "Notification sent successfully"
   notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here.
   notice_meeting_updated: "This page has been updated by someone else. Reload to view changes."
@@ -207,12 +283,17 @@ hi:
   text_deleted_agenda_item: 'Deleted agenda item'
   label_initial_meeting_details: "Meeting"
   label_meeting_details: "Meeting details"
+  label_meeting_series_details: "Meeting series details"
   label_meeting_details_edit: "Edit meeting details"
   label_meeting_state: "Meeting status"
   label_meeting_state_open: "Open"
   label_meeting_state_open_html: "<i>Open</i>"
   label_meeting_state_closed: "बंद"
   label_meeting_state_closed_html: "<i>Closed</i>"
+  label_meeting_state_agenda_created: "Agenda created"
+  label_meeting_state_scheduled: "Scheduled"
+  label_meeting_state_cancelled: "Cancelled"
+  label_meeting_state_skipped: "Skipped"
   label_meeting_reopen_action: "Reopen meeting"
   label_meeting_close_action: "Close meeting"
   text_meeting_open_description: "This meeting is open. You can add/remove agenda items and edit them as you please. After the meeting is over, close it to lock it."
diff --git a/modules/meeting/config/locales/crowdin/hr.yml b/modules/meeting/config/locales/crowdin/hr.yml
index 9e0969894827..2c8d8a3e6d07 100644
--- a/modules/meeting/config/locales/crowdin/hr.yml
+++ b/modules/meeting/config/locales/crowdin/hr.yml
@@ -51,11 +51,18 @@ hr:
         presenter: "Presenter"
       meeting_section:
         title: "Naziv"
+      recurring_meeting:
+        frequency: "Frequency"
+        interval: "Interval"
+        start_date: "Starts on"
+        end_after: "End series after"
+        iterations: "Occurrences"
     errors:
       messages:
         invalid_time_format: "is not a valid time. Required format: HH:MM"
     models:
-      structured_meeting: "Meeting (dynamic)"
+      recurring_meeting: "Recurring meeting"
+      structured_meeting: "One-time meeting"
       meeting_agenda_item: "Agenda item"
       meeting_agenda: "Dnevni red"
       meeting_minutes: "Minute"
@@ -89,7 +96,8 @@ hr:
   label_meeting: "Sastanak"
   label_meeting_plural: "Sastanci"
   label_meeting_new: "Novi sastanak"
-  label_meeting_new_dynamic: "New dynamic meeting"
+  label_meeting_new_dynamic: "New one-time meeting"
+  label_meeting_new_recurring: "New recurring meeting"
   label_meeting_create: "Create meeting"
   label_meeting_copy: "Copy meeting"
   label_meeting_edit: "Uredite sastanak"
@@ -103,23 +111,54 @@ hr:
   label_meeting_date_time: "Datum/vrijeme"
   label_meeting_date_and_time: "Date and time"
   label_meeting_diff: "Razl"
+  label_recurring_meeting: "Recurring meeting"
+  label_recurring_meeting_part_of: "Part of a meeting series"
+  label_recurring_meeting_new: "New recurring meeting"
+  label_recurring_meeting_plural: "Recurring meetings"
+  label_template: "Template"
+  label_recurring_meeting_view: "View meeting series"
+  label_recurring_meeting_create: "Create from template"
+  label_recurring_meeting_copy: "Copy as one-off"
+  label_recurring_meeting_cancel: "Cancel this occurrence"
+  label_recurring_meeting_delete: "Delete occurrence"
+  label_recurring_meeting_delete_confirmation: >
+    This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue?
+  label_recurring_occurrence_delete_confirmation: >
+    Any meeting information not in the template will be lost. Do you want to continue?
+  label_recurring_meeting_restore: "Restore this occurrence"
+  label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})."
+  label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})."
+  label_recurring_meeting_more_past: "There are %{count} more past meetings."
+  label_recurring_meeting_more_past_singular: "There is %{count} more past meeting."
+  label_recurring_meeting_show_more: "Show more"
+  label_recurring_meeting_series_edit: "Edit meeting series"
+  label_recurring_meeting_series_delete: "Delete meeting series"
+  label_my_meetings: "My meetings"
+  label_all_meetings: "All meetings"
   label_upcoming_meetings: "Upcoming meetings"
   label_past_meetings: "Past meetings"
   label_upcoming_meetings_short: "Upcoming"
   label_past_meetings_short: "Past"
   label_involvement: "Involvement"
-  label_upcoming_invitations: "Upcoming invitations"
+  label_invitations: "Invitations"
+  label_invited_user: "Invited user"
   label_past_invitations: "Past invitations"
-  label_attendee: "Attendee"
-  label_author: "Creator"
+  label_attended: "Attended"
+  label_attended_user: "Attended user"
+  label_created_by_me: "Created by me"
   label_notify: "Šalji na pregled"
   label_icalendar: "Send iCalendar"
   label_icalendar_download: "Download iCalendar event"
+  label_view_meeting_series: "View meeting series"
+  label_meeting_series: "Meeting series"
   label_version: "Verzija"
   label_time_zone: "Vremenska zona"
   label_start_date: "Datum Početka"
   meeting:
+    participants:
+      template: "These participants will be invited automatically to all future meetings as they are created."
     attachments:
+      template: "These attached files will be included in all future meetings in the series."
       text: "Attached files are available to all meeting participants. You can also drag and drop these into agenda item notes."
     copy:
       title: "Copy meeting: %{title}"
@@ -146,9 +185,12 @@ hr:
     label_mail_all_participants: "Send email to all participants"
     types:
       classic: "Classic"
-      classic_text: "Organize your meeting in a formattable text agenda and protocol."
-      structured: "Dynamic"
-      structured_text: "Organize your meeting as a list of agenda items, optionally linking them to a work package."
+      classic_text: "Organize your meeting as a single formattable text agenda and protocol."
+      structured: "Structured"
+      one_time: "One-time"
+      recurring: "Recurring"
+      recurring_text: "Create meeting series with dynamic template for each occurrence."
+      structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package."
       structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details"
     copied: "Copied from Meeting #%{id}"
   meeting_section:
@@ -156,6 +198,40 @@ hr:
     delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?"
     placeholder_title: "New section"
     empty_text: "Drag items here or create a new one"
+  recurring_meeting:
+    occurrence:
+      infoline: "This meeting is part of a recurring meeting series."
+      error_no_next: "There is no next occurrence for this meeting."
+      first_already_exists: "The first occurrence of this meeting series is already instantiated."
+      first_created: >
+        The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence.
+    template:
+      button_finalize: "Finish template"
+      blank_title: "Your meeting series template is empty"
+      description: >
+        This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template.
+      blankslate_finalize: >
+        When you're done preparing this template, click the '%{button_title}' button above to finish the setup and schedule the first meeting of the series.
+      label_view_template: "View template"
+      label_edit_template: "Edit template"
+      banner_html: >
+        You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already created meetings.
+    frequency:
+      every_weekday: "Every %{day_of_the_week}"
+      daily: "Daily"
+      working_days: "Every working day"
+      weekly: "Weekly"
+    end_after:
+      specific_date: "a specific date"
+      iterations: "a number of occurrences"
+    starts: "Starts"
+    in_words:
+      daily_interval: "Every %{interval} days"
+      working_days: "Every working day"
+      weekly: "Every week on %{weekday}"
+      weekly_interval: "Every %{interval} weeks on %{weekday}"
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
   notice_successful_notification: "Notifikacija uspješno poslana"
   notice_timezone_missing: Vremenska zona nije postavljena na osnovu zamišljene %{zone} zone. Da bi ste odabrali vremensku zonu molim vas kliknite ovdje.
   notice_meeting_updated: "This page has been updated by someone else. Reload to view changes."
@@ -208,12 +284,17 @@ hr:
   text_deleted_agenda_item: 'Deleted agenda item'
   label_initial_meeting_details: "Sastanak"
   label_meeting_details: "Meeting details"
+  label_meeting_series_details: "Meeting series details"
   label_meeting_details_edit: "Edit meeting details"
   label_meeting_state: "Meeting status"
   label_meeting_state_open: "Otvoren"
   label_meeting_state_open_html: "<i>Open</i>"
   label_meeting_state_closed: "Zaključeno"
   label_meeting_state_closed_html: "<i>Closed</i>"
+  label_meeting_state_agenda_created: "Agenda created"
+  label_meeting_state_scheduled: "Scheduled"
+  label_meeting_state_cancelled: "Cancelled"
+  label_meeting_state_skipped: "Skipped"
   label_meeting_reopen_action: "Reopen meeting"
   label_meeting_close_action: "Close meeting"
   text_meeting_open_description: "This meeting is open. You can add/remove agenda items and edit them as you please. After the meeting is over, close it to lock it."
diff --git a/modules/meeting/config/locales/crowdin/hu.yml b/modules/meeting/config/locales/crowdin/hu.yml
index afa961479bf8..3571238b10e7 100644
--- a/modules/meeting/config/locales/crowdin/hu.yml
+++ b/modules/meeting/config/locales/crowdin/hu.yml
@@ -50,11 +50,18 @@ hu:
         presenter: "Bemutató"
       meeting_section:
         title: "Cím"
+      recurring_meeting:
+        frequency: "Gyakoriság"
+        interval: "Időköz"
+        start_date: "Starts on"
+        end_after: "End series after"
+        iterations: "Előfordulások"
     errors:
       messages:
         invalid_time_format: "nem egy érvényes időpont. Előírt formátum: óó:pp"
     models:
-      structured_meeting: "Megbeszélés (dinamikus)"
+      recurring_meeting: "Ismétlődő megbeszélés"
+      structured_meeting: "One-time meeting"
       meeting_agenda_item: "Napirendi pont"
       meeting_agenda: "Napirend"
       meeting_minutes: "Jegyzőkönyv"
@@ -88,7 +95,8 @@ hu:
   label_meeting: "Megbeszélés"
   label_meeting_plural: "Megbeszélések"
   label_meeting_new: "Új megbeszélés"
-  label_meeting_new_dynamic: "New dynamic meeting"
+  label_meeting_new_dynamic: "New one-time meeting"
+  label_meeting_new_recurring: "New recurring meeting"
   label_meeting_create: "Create meeting"
   label_meeting_copy: "Copy meeting"
   label_meeting_edit: "Megbeszélés szerkesztése"
@@ -102,23 +110,54 @@ hu:
   label_meeting_date_time: "Dátum/idő"
   label_meeting_date_and_time: "Date and time"
   label_meeting_diff: "Eltérés"
+  label_recurring_meeting: "Recurring meeting"
+  label_recurring_meeting_part_of: "Part of a meeting series"
+  label_recurring_meeting_new: "New recurring meeting"
+  label_recurring_meeting_plural: "Recurring meetings"
+  label_template: "Sablon"
+  label_recurring_meeting_view: "View meeting series"
+  label_recurring_meeting_create: "Create from template"
+  label_recurring_meeting_copy: "Copy as one-off"
+  label_recurring_meeting_cancel: "Cancel this occurrence"
+  label_recurring_meeting_delete: "Delete occurrence"
+  label_recurring_meeting_delete_confirmation: >
+    This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue?
+  label_recurring_occurrence_delete_confirmation: >
+    Any meeting information not in the template will be lost. Do you want to continue?
+  label_recurring_meeting_restore: "Restore this occurrence"
+  label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})."
+  label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})."
+  label_recurring_meeting_more_past: "There are %{count} more past meetings."
+  label_recurring_meeting_more_past_singular: "There is %{count} more past meeting."
+  label_recurring_meeting_show_more: "Show more"
+  label_recurring_meeting_series_edit: "Edit meeting series"
+  label_recurring_meeting_series_delete: "Delete meeting series"
+  label_my_meetings: "My meetings"
+  label_all_meetings: "All meetings"
   label_upcoming_meetings: "Közelgő megbeszélések"
   label_past_meetings: "Korábbi megbeszélések"
   label_upcoming_meetings_short: "Közelgő"
   label_past_meetings_short: "Korábbi"
   label_involvement: "Bevonás "
-  label_upcoming_invitations: "Közelgő meghívások"
+  label_invitations: "Invitations"
+  label_invited_user: "Invited user"
   label_past_invitations: "Korábbi meghívások"
-  label_attendee: "Résztvevő"
-  label_author: "Készítő"
+  label_attended: "Attended"
+  label_attended_user: "Attended user"
+  label_created_by_me: "Created by me"
   label_notify: "Küldés véleményezésre"
   label_icalendar: "iCalendar küldése"
   label_icalendar_download: "iCalendar esemény letöltése"
+  label_view_meeting_series: "View meeting series"
+  label_meeting_series: "Meeting series"
   label_version: "Verzió"
   label_time_zone: "Időzóna"
   label_start_date: "Kezdési dátum"
   meeting:
+    participants:
+      template: "These participants will be invited automatically to all future meetings as they are created."
     attachments:
+      template: "These attached files will be included in all future meetings in the series."
       text: "A csatolt fájlok az ülés valamennyi résztvevője számára elérhetők. Ezeket a napirendi pontok jegyzeteibe is behúzhatja."
     copy:
       title: "%{title} megbeszélés másolása"
@@ -145,9 +184,12 @@ hu:
     label_mail_all_participants: "Email küldése minden résztvevőnek"
     types:
       classic: "Szokásos"
-      classic_text: "Szervezd meg a találkozódat formázott szöveges napirendben és protokollban."
-      structured: "Dinamikus"
-      structured_text: "Szervezd meg a találkozódat napirendi pontokkal, melyeket opcionálisan munkacsomagokhoz rendelhetsz."
+      classic_text: "Organize your meeting as a single formattable text agenda and protocol."
+      structured: "Structured"
+      one_time: "One-time"
+      recurring: "Recurring"
+      recurring_text: "Create meeting series with dynamic template for each occurrence."
+      structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package."
       structured_text_copy: "A megbeszélés másolásával jelnleg nem fogja átmásolni a hozzákapcsolt napirendi pontokat, csak a megbeszélés részleteit."
     copied: "#%{id} megbeszélésből másolva"
   meeting_section:
@@ -155,6 +197,40 @@ hu:
     delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?"
     placeholder_title: "New section"
     empty_text: "Húzza ide az elemeket, vagy hozzon létre egy újat"
+  recurring_meeting:
+    occurrence:
+      infoline: "This meeting is part of a recurring meeting series."
+      error_no_next: "There is no next occurrence for this meeting."
+      first_already_exists: "The first occurrence of this meeting series is already instantiated."
+      first_created: >
+        The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence.
+    template:
+      button_finalize: "Finish template"
+      blank_title: "Your meeting series template is empty"
+      description: >
+        This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template.
+      blankslate_finalize: >
+        When you're done preparing this template, click the '%{button_title}' button above to finish the setup and schedule the first meeting of the series.
+      label_view_template: "View template"
+      label_edit_template: "Edit template"
+      banner_html: >
+        You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already created meetings.
+    frequency:
+      every_weekday: "Every %{day_of_the_week}"
+      daily: "Daily"
+      working_days: "Every working day"
+      weekly: "Weekly"
+    end_after:
+      specific_date: "a specific date"
+      iterations: "a number of occurrences"
+    starts: "Starts"
+    in_words:
+      daily_interval: "Every %{interval} days"
+      working_days: "Every working day"
+      weekly: "Every week on %{weekday}"
+      weekly_interval: "Every %{interval} weeks on %{weekday}"
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
   notice_successful_notification: "Értesítés sikeresen kiküldve"
   notice_timezone_missing: Nincs időzóna beállítva, %{zone} a feltételezett. Időzóna beállításához kattintson ide.
   notice_meeting_updated: "Ezt az oldalt valaki más frissítette. A változások megtekintéséhez töltse újra."
@@ -207,12 +283,17 @@ hu:
   text_deleted_agenda_item: 'Törölt napirendi pont'
   label_initial_meeting_details: "Megbeszélés"
   label_meeting_details: "A megbeszélés részletei"
+  label_meeting_series_details: "Meeting series details"
   label_meeting_details_edit: "Megbeszélés részleteinek szerkesztése"
   label_meeting_state: "A megbeszélés státusza"
   label_meeting_state_open: "Open"
   label_meeting_state_open_html: "<i>Nyitva</i>"
   label_meeting_state_closed: "Lezárva"
   label_meeting_state_closed_html: "<i>Lezárva</i>"
+  label_meeting_state_agenda_created: "Agenda created"
+  label_meeting_state_scheduled: "Scheduled"
+  label_meeting_state_cancelled: "Cancelled"
+  label_meeting_state_skipped: "Skipped"
   label_meeting_reopen_action: "A megbeszélés újranyitása"
   label_meeting_close_action: "Megbeszélés lezárása"
   text_meeting_open_description: "Ez a megbeszélés nyitott. A napirendi pontokat tetszés szerint hozzáadhatja/eltávolíthatja és szerkesztheti. A megbeszélés végeztével zárja be, hogy archíválja azt."
diff --git a/modules/meeting/config/locales/crowdin/id.yml b/modules/meeting/config/locales/crowdin/id.yml
index f7b4cf82a681..ac99e9ec7323 100644
--- a/modules/meeting/config/locales/crowdin/id.yml
+++ b/modules/meeting/config/locales/crowdin/id.yml
@@ -49,11 +49,18 @@ id:
         presenter: "Pembawa acara"
       meeting_section:
         title: "Judul"
+      recurring_meeting:
+        frequency: "Kekerapan"
+        interval: "Sela Waktu"
+        start_date: "Mulai pada"
+        end_after: "End series after"
+        iterations: "Kejadian"
     errors:
       messages:
         invalid_time_format: "bukanlah waktu yang valid. Format seharusnya; JJ:MM"
     models:
-      structured_meeting: "Rapat (dinamis)"
+      recurring_meeting: "Rapat berulang"
+      structured_meeting: "Rapat satu waktu"
       meeting_agenda_item: "Item agenda"
       meeting_agenda: "Agenda"
       meeting_minutes: "Laporan"
@@ -87,7 +94,8 @@ id:
   label_meeting: "Rapat"
   label_meeting_plural: "Rapat"
   label_meeting_new: "Rapat Baru"
-  label_meeting_new_dynamic: "New dynamic meeting"
+  label_meeting_new_dynamic: "Rapat satu waktu baru"
+  label_meeting_new_recurring: "Rapat berulang baru"
   label_meeting_create: "Buat rapat"
   label_meeting_copy: "Salin rapat"
   label_meeting_edit: "Edit Rapat"
@@ -101,23 +109,54 @@ id:
   label_meeting_date_time: "Tanggal/Waktu"
   label_meeting_date_and_time: "Tanggal dan waktu"
   label_meeting_diff: "Perbedaan"
+  label_recurring_meeting: "Recurring meeting"
+  label_recurring_meeting_part_of: "Bagian dari jajaran rapat"
+  label_recurring_meeting_new: "New recurring meeting"
+  label_recurring_meeting_plural: "Recurring meetings"
+  label_template: "Templat"
+  label_recurring_meeting_view: "Lihat jajaran rapat"
+  label_recurring_meeting_create: "Create from template"
+  label_recurring_meeting_copy: "Copy as one-off"
+  label_recurring_meeting_cancel: "Cancel this occurrence"
+  label_recurring_meeting_delete: "Delete occurrence"
+  label_recurring_meeting_delete_confirmation: >
+    This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue?
+  label_recurring_occurrence_delete_confirmation: >
+    Any meeting information not in the template will be lost. Do you want to continue?
+  label_recurring_meeting_restore: "Restore this occurrence"
+  label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})."
+  label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})."
+  label_recurring_meeting_more_past: "There are %{count} more past meetings."
+  label_recurring_meeting_more_past_singular: "There is %{count} more past meeting."
+  label_recurring_meeting_show_more: "Tampilkan lebih"
+  label_recurring_meeting_series_edit: "Edit meeting series"
+  label_recurring_meeting_series_delete: "Delete meeting series"
+  label_my_meetings: "My meetings"
+  label_all_meetings: "All meetings"
   label_upcoming_meetings: "Rapat mendatang"
   label_past_meetings: "Rapat sebelumnya"
   label_upcoming_meetings_short: "Mendatang"
   label_past_meetings_short: "Lalu"
   label_involvement: "Keterlibatan"
-  label_upcoming_invitations: "Undangan mendatang"
+  label_invitations: "Undangan"
+  label_invited_user: "Invited user"
   label_past_invitations: "Undangan sebelumnya"
-  label_attendee: "Peserta"
-  label_author: "Pembuat"
+  label_attended: "Attended"
+  label_attended_user: "Attended user"
+  label_created_by_me: "Created by me"
   label_notify: "Kirim untuk ulasan"
   label_icalendar: "Kirim iCalendar"
   label_icalendar_download: "Unduh acara iCalendar"
+  label_view_meeting_series: "View meeting series"
+  label_meeting_series: "Meeting series"
   label_version: "Versi"
   label_time_zone: "Zona waktu"
   label_start_date: "Tanggal mulai"
   meeting:
+    participants:
+      template: "These participants will be invited automatically to all future meetings as they are created."
     attachments:
+      template: "These attached files will be included in all future meetings in the series."
       text: "File terlampir tersedia untuk semua peserta rapat. Anda juga dapat menyeret dan meletakkannya ke dalam catatan item agenda."
     copy:
       title: "Salinan rapat: %{title}"
@@ -144,9 +183,12 @@ id:
     label_mail_all_participants: "Kirim email ke semua peserta"
     types:
       classic: "Klasik"
-      classic_text: "Atur rapat Anda dalam agenda dan protokol teks yang dapat diformat."
-      structured: "Dinamis"
-      structured_text: "Organize your meeting as a list of agenda items, optionally linking them to a work package."
+      classic_text: "Organize your meeting as a single formattable text agenda and protocol."
+      structured: "Structured"
+      one_time: "One-time"
+      recurring: "Recurring"
+      recurring_text: "Create meeting series with dynamic template for each occurrence."
+      structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package."
       structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details"
     copied: "Disalin dari Meeting #%{id}"
   meeting_section:
@@ -154,6 +196,40 @@ id:
     delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?"
     placeholder_title: "New section"
     empty_text: "Drag items here or create a new one"
+  recurring_meeting:
+    occurrence:
+      infoline: "This meeting is part of a recurring meeting series."
+      error_no_next: "There is no next occurrence for this meeting."
+      first_already_exists: "The first occurrence of this meeting series is already instantiated."
+      first_created: >
+        The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence.
+    template:
+      button_finalize: "Finish template"
+      blank_title: "Your meeting series template is empty"
+      description: >
+        This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template.
+      blankslate_finalize: >
+        When you're done preparing this template, click the '%{button_title}' button above to finish the setup and schedule the first meeting of the series.
+      label_view_template: "View template"
+      label_edit_template: "Edit template"
+      banner_html: >
+        You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already created meetings.
+    frequency:
+      every_weekday: "Every %{day_of_the_week}"
+      daily: "Daily"
+      working_days: "Every working day"
+      weekly: "Weekly"
+    end_after:
+      specific_date: "a specific date"
+      iterations: "a number of occurrences"
+    starts: "Starts"
+    in_words:
+      daily_interval: "Every %{interval} days"
+      working_days: "Every working day"
+      weekly: "Every week on %{weekday}"
+      weekly_interval: "Every %{interval} weeks on %{weekday}"
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
   notice_successful_notification: "Berhasil mengirim notifikasi"
   notice_timezone_missing: Tidak ada zona waktu yang ditetapkan sehingga diasumsikan %{zone}. Untuk memilih zona waktu, silakan mengeklik di sini.
   notice_meeting_updated: "This page has been updated by someone else. Reload to view changes."
@@ -206,12 +282,17 @@ id:
   text_deleted_agenda_item: 'Deleted agenda item'
   label_initial_meeting_details: "Rapat"
   label_meeting_details: "Meeting details"
+  label_meeting_series_details: "Meeting series details"
   label_meeting_details_edit: "Edit meeting details"
   label_meeting_state: "Meeting status"
   label_meeting_state_open: "Buka"
   label_meeting_state_open_html: "<i>Open</i>"
   label_meeting_state_closed: "Closed"
   label_meeting_state_closed_html: "<i>Closed</i>"
+  label_meeting_state_agenda_created: "Agenda created"
+  label_meeting_state_scheduled: "Scheduled"
+  label_meeting_state_cancelled: "Cancelled"
+  label_meeting_state_skipped: "Skipped"
   label_meeting_reopen_action: "Reopen meeting"
   label_meeting_close_action: "Close meeting"
   text_meeting_open_description: "This meeting is open. You can add/remove agenda items and edit them as you please. After the meeting is over, close it to lock it."
diff --git a/modules/meeting/config/locales/crowdin/it.yml b/modules/meeting/config/locales/crowdin/it.yml
index 52395b3a5ed0..6e05f1613f29 100644
--- a/modules/meeting/config/locales/crowdin/it.yml
+++ b/modules/meeting/config/locales/crowdin/it.yml
@@ -50,11 +50,18 @@ it:
         presenter: "Presentatore"
       meeting_section:
         title: "Titolo"
+      recurring_meeting:
+        frequency: "Frequenza"
+        interval: "Intervallo"
+        start_date: "Inizio il"
+        end_after: "Fine serie dopo"
+        iterations: "Ricorrenze"
     errors:
       messages:
         invalid_time_format: "non è un tempo valido. Formato richiesto: HH: mm"
     models:
-      structured_meeting: "Riunione (dinamica)"
+      recurring_meeting: "Riunione ricorrente"
+      structured_meeting: "Riunione una tantum"
       meeting_agenda_item: "Attività"
       meeting_agenda: "Ordine del giorno"
       meeting_minutes: "Verbali"
@@ -88,7 +95,8 @@ it:
   label_meeting: "Riunione"
   label_meeting_plural: "Riunioni"
   label_meeting_new: "Nuova riunione"
-  label_meeting_new_dynamic: "Nuova riunione dinamica"
+  label_meeting_new_dynamic: "Nuova riunione una tantum"
+  label_meeting_new_recurring: "Nuova riunione ricorrente"
   label_meeting_create: "Crea riunione"
   label_meeting_copy: "Copia riunione"
   label_meeting_edit: "Modifica riunione"
@@ -102,23 +110,54 @@ it:
   label_meeting_date_time: "Data/ora"
   label_meeting_date_and_time: "Data e ora"
   label_meeting_diff: "Differenza"
+  label_recurring_meeting: "Riunione ricorrente"
+  label_recurring_meeting_part_of: "Parte di una serie di riunioni"
+  label_recurring_meeting_new: "Nuova riunione ricorrente"
+  label_recurring_meeting_plural: "Riunioni ricorrenti"
+  label_template: "Modello"
+  label_recurring_meeting_view: "Visualizza la serie di riunioni"
+  label_recurring_meeting_create: "Crea da modello"
+  label_recurring_meeting_copy: "Copia come una tantum"
+  label_recurring_meeting_cancel: "Annulla questa ricorrenza"
+  label_recurring_meeting_delete: "Elimina ricorrenza"
+  label_recurring_meeting_delete_confirmation: >
+    Questa riunione fa parte di una serie chiamata %{name}. L'operazione eliminerà solo questa particolare ricorrenza e non l'intera serie. Vuoi continuare?
+  label_recurring_occurrence_delete_confirmation: >
+    Qualsiasi informazione sulla riunione non contenuta nel modello andrà persa. Vuole continuare?
+  label_recurring_meeting_restore: "Ripristina questa ricorrenza"
+  label_recurring_meeting_more: "Ci sono altre %{count} riunioni programmate (%{schedule})."
+  label_recurring_meeting_more_singular: "C'è %{count} altra riunione programmata (%{schedule})."
+  label_recurring_meeting_more_past: "Ci sono altre %{count} riunioni passate."
+  label_recurring_meeting_more_past_singular: "C'è %{count} altra riunione passata."
+  label_recurring_meeting_show_more: "Mostra di più"
+  label_recurring_meeting_series_edit: "Modifica serie di riunioni"
+  label_recurring_meeting_series_delete: "Elimina serie di riunioni"
+  label_my_meetings: "Le mie riunioni"
+  label_all_meetings: "Tutte le riunioni"
   label_upcoming_meetings: "Prossime riunioni"
   label_past_meetings: "Riunioni precedenti"
   label_upcoming_meetings_short: "In programma"
   label_past_meetings_short: "Passato"
   label_involvement: "Coinvolgimento"
-  label_upcoming_invitations: "Prossimi inviti"
+  label_invitations: "Inviti"
+  label_invited_user: "Utente invitato"
   label_past_invitations: "Inviti passati"
-  label_attendee: "Presenti"
-  label_author: "Autore"
+  label_attended: "Ha partecipato"
+  label_attended_user: "Utente presente"
+  label_created_by_me: "Creato da me"
   label_notify: "Invia per revisione"
   label_icalendar: "Invia iCalendar"
   label_icalendar_download: "Scarica l'evento iCalendar"
+  label_view_meeting_series: "Visualizza la serie di riunioni"
+  label_meeting_series: "Serie di riunioni"
   label_version: "Versione"
   label_time_zone: "Fuso orario"
   label_start_date: "Data di inizio"
   meeting:
+    participants:
+      template: "Questi partecipanti saranno invitati automaticamente a tutte le riunioni future, man mano che vengono create."
     attachments:
+      template: "Questi file allegati saranno inclusi in tutte le prossime riunioni della serie."
       text: "I file allegati sono disponibili per tutti i partecipanti alla riunione. Puoi anche trascinarli nelle note dei punti all'ordine del giorno."
     copy:
       title: "Copia riunione: %{title}"
@@ -145,9 +184,12 @@ it:
     label_mail_all_participants: "Invia e-mail a tutti i partecipanti"
     types:
       classic: "Classica"
-      classic_text: "Organizza la tua riunione in un'agenda e un protocollo di testo formattabile."
-      structured: "Dinamica"
-      structured_text: "Organizza la tua riunione come un elenco di punti all'ordine del giorno, collegandoli facoltativamente a un pacchetto di lavoro."
+      classic_text: "Organizza la tua riunione con un unico ordine del giorno e protocollo di testo formattabile."
+      structured: "Strutturato"
+      one_time: "Una tantum"
+      recurring: "Ricorrente"
+      recurring_text: "Crea una serie di riunioni con modello dinamico per ogni ricorrenza."
+      structured_text: "Organizza la tua riunione come un elenco dinamico di punti all'ordine del giorno, collegandoli facoltativamente a una macro-attività."
       structured_text_copy: "La copia di una riunione al momento non copierà gli elementi dell'ordine del giorno della riunione, ma solo i dettagli"
     copied: "Copiato dalla riunione #%{id}"
   meeting_section:
@@ -155,6 +197,40 @@ it:
     delete_confirmation: "L'eliminazione della sezione eliminerà anche tutti i suoi elementi dell'ordine del giorno. Continuare?"
     placeholder_title: "Nuova sezione"
     empty_text: "Trascina gli elementi qui o creane una nuova"
+  recurring_meeting:
+    occurrence:
+      infoline: "Questa riunione fa parte di una serie di riunioni ricorrenti."
+      error_no_next: "Non ci sono ricorrenze successive per questa riunione."
+      first_already_exists: "La prima occorrenza di questa serie di riunioni è già istanziata."
+      first_created: >
+        La prima riunione è stata creata con successo dal modello. Tutte le riunioni future saranno create automaticamente al momento della ricorrenza precedente.
+    template:
+      button_finalize: "Termina modello"
+      blank_title: "Il modello della tua serie di riunioni è vuoto"
+      description: >
+        Questo modello verrà utilizzato ogni volta che verranno create nuove riunioni della serie. A questo modello può aggiungere punti dell'ordine del giorno, partecipanti e allegati.
+      blankslate_finalize: >
+        Quando hai finito di preparare questo modello, clicca sul pulsante '%{button_title}' in alto per terminare l'impostazione e programmare la prima riunione della serie.
+      label_view_template: "Visualizza modello"
+      label_edit_template: "Modifica modello"
+      banner_html: >
+        Stai attualmente modificando un modello di una serie di riunioni: %{link}. Ogni nuova ricorrenza di una riunione della serie userà questo modello. Le modifiche non influenzeranno le riunioni passate o già create.
+    frequency:
+      every_weekday: "Ogni %{day_of_the_week}"
+      daily: "Ogni giorno"
+      working_days: "Ogni giorno lavorativo"
+      weekly: "Ogni settimana"
+    end_after:
+      specific_date: "una data specifica"
+      iterations: "un numero di occorrenze"
+    starts: "Inizio"
+    in_words:
+      daily_interval: "Ogni %{interval} giorni"
+      working_days: "Ogni giorno lavorativo"
+      weekly: "Ogni settimana di %{weekday}"
+      weekly_interval: "Ogni %{interval} settimane di %{weekday}"
+      frequency: "%{base} alle ore %{time}"
+      full: "%{base} alle ore %{time}, fine alle ore %{end_date}"
   notice_successful_notification: "Notifica inviata con successo"
   notice_timezone_missing: Nessun fuso orario è impostato e la %{zone} è un requisito necessario. Per scegliere il tuo fuso orario, fare clic qui.
   notice_meeting_updated: "Questa pagina è stata aggiornata da qualcun altro. Ricarica per visualizzare le modifiche."
@@ -207,12 +283,17 @@ it:
   text_deleted_agenda_item: 'Punto all''ordine del giorno cancellato'
   label_initial_meeting_details: "Riunione"
   label_meeting_details: "Dettagli della riunione"
+  label_meeting_series_details: "Dettagli della serie di riunioni"
   label_meeting_details_edit: "Modifica dettagli riunione"
   label_meeting_state: "Stato della riunione"
   label_meeting_state_open: "Aperti"
   label_meeting_state_open_html: "<i>Aperta</i>"
   label_meeting_state_closed: "Chiuso"
   label_meeting_state_closed_html: "<i>Chiusa</i>"
+  label_meeting_state_agenda_created: "Ordine del giorno creato"
+  label_meeting_state_scheduled: "Programmato"
+  label_meeting_state_cancelled: "Annullato"
+  label_meeting_state_skipped: "Saltato"
   label_meeting_reopen_action: "Riapri la riunione"
   label_meeting_close_action: "Chiudi riunione"
   text_meeting_open_description: "Questa riunione è aperta. Puoi aggiungere/rimuovere gli elementi dell'ordine del giorno e modificarli come vuoi. Una volta finita la riunione, chiuderla per bloccarla."
diff --git a/modules/meeting/config/locales/crowdin/ja.yml b/modules/meeting/config/locales/crowdin/ja.yml
index c286e689a2c3..8a9e7578bd64 100644
--- a/modules/meeting/config/locales/crowdin/ja.yml
+++ b/modules/meeting/config/locales/crowdin/ja.yml
@@ -49,11 +49,18 @@ ja:
         presenter: "発表者"
       meeting_section:
         title: "タイトル"
+      recurring_meeting:
+        frequency: "Frequency"
+        interval: "Interval"
+        start_date: "Starts on"
+        end_after: "End series after"
+        iterations: "Occurrences"
     errors:
       messages:
         invalid_time_format: "有効な時間ではありません。必要なフォーマット: HH:MM"
     models:
-      structured_meeting: "会議(ダイナミック)"
+      recurring_meeting: "Recurring meeting"
+      structured_meeting: "One-time meeting"
       meeting_agenda_item: "議題項目"
       meeting_agenda: "アジェンダ"
       meeting_minutes: "議事録"
@@ -87,7 +94,8 @@ ja:
   label_meeting: "会議"
   label_meeting_plural: "会議"
   label_meeting_new: "新しい会議"
-  label_meeting_new_dynamic: "新しいダイナミック会議"
+  label_meeting_new_dynamic: "New one-time meeting"
+  label_meeting_new_recurring: "New recurring meeting"
   label_meeting_create: "会議を作成"
   label_meeting_copy: "会議をコピー"
   label_meeting_edit: "会議を編集"
@@ -101,23 +109,54 @@ ja:
   label_meeting_date_time: "日付/時刻"
   label_meeting_date_and_time: "日付と時刻"
   label_meeting_diff: "差分"
+  label_recurring_meeting: "Recurring meeting"
+  label_recurring_meeting_part_of: "Part of a meeting series"
+  label_recurring_meeting_new: "New recurring meeting"
+  label_recurring_meeting_plural: "Recurring meetings"
+  label_template: "Template"
+  label_recurring_meeting_view: "View meeting series"
+  label_recurring_meeting_create: "Create from template"
+  label_recurring_meeting_copy: "Copy as one-off"
+  label_recurring_meeting_cancel: "Cancel this occurrence"
+  label_recurring_meeting_delete: "Delete occurrence"
+  label_recurring_meeting_delete_confirmation: >
+    This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue?
+  label_recurring_occurrence_delete_confirmation: >
+    Any meeting information not in the template will be lost. Do you want to continue?
+  label_recurring_meeting_restore: "Restore this occurrence"
+  label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})."
+  label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})."
+  label_recurring_meeting_more_past: "There are %{count} more past meetings."
+  label_recurring_meeting_more_past_singular: "There is %{count} more past meeting."
+  label_recurring_meeting_show_more: "Show more"
+  label_recurring_meeting_series_edit: "Edit meeting series"
+  label_recurring_meeting_series_delete: "Delete meeting series"
+  label_my_meetings: "My meetings"
+  label_all_meetings: "All meetings"
   label_upcoming_meetings: "今後の会議"
   label_past_meetings: "過去の会議"
   label_upcoming_meetings_short: "今後の予定"
   label_past_meetings_short: "過去"
   label_involvement: "関与"
-  label_upcoming_invitations: "今後の招待状"
+  label_invitations: "Invitations"
+  label_invited_user: "Invited user"
   label_past_invitations: "過去の招待状"
-  label_attendee: "参加者"
-  label_author: "作成者"
+  label_attended: "Attended"
+  label_attended_user: "Attended user"
+  label_created_by_me: "Created by me"
   label_notify: "レビュー用に送信"
   label_icalendar: "iCalendar を送信"
   label_icalendar_download: "iCalendarイベントをダウンロード"
+  label_view_meeting_series: "View meeting series"
+  label_meeting_series: "Meeting series"
   label_version: "バージョン"
   label_time_zone: "タイムゾーン"
   label_start_date: "開始日"
   meeting:
+    participants:
+      template: "These participants will be invited automatically to all future meetings as they are created."
     attachments:
+      template: "These attached files will be included in all future meetings in the series."
       text: "添付ファイルはすべての会議参加者が利用可能です。また、これらのファイルを議題項目のノートにドラッグアンドドロップすることもできます。"
     copy:
       title: "会議をコピー：%{title}"
@@ -144,9 +183,12 @@ ja:
     label_mail_all_participants: "すべての参加者にメールを送信"
     types:
       classic: "クラシック"
-      classic_text: "会議をテキスト形式で議題と議事録として整理します。"
-      structured: "ダイナミック"
-      structured_text: "会議を議題項目のリストとして整理し、オプションでそれらをワークパッケージにリンクさせることができます。"
+      classic_text: "Organize your meeting as a single formattable text agenda and protocol."
+      structured: "Structured"
+      one_time: "One-time"
+      recurring: "Recurring"
+      recurring_text: "Create meeting series with dynamic template for each occurrence."
+      structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package."
       structured_text_copy: "会議をコピーする場合、現在は関連する議題項目はコピーされず、詳細のみがコピーされます。"
     copied: "ミーティング#%{id} からコピーしました"
   meeting_section:
@@ -154,6 +196,40 @@ ja:
     delete_confirmation: "セクションを削除すると、そのすべての議題項目も削除されます。これを実行してもよろしいですか？"
     placeholder_title: "新しいセクション"
     empty_text: "アイテムをここにドラッグするか、新しいアイテムを作成してください"
+  recurring_meeting:
+    occurrence:
+      infoline: "This meeting is part of a recurring meeting series."
+      error_no_next: "There is no next occurrence for this meeting."
+      first_already_exists: "The first occurrence of this meeting series is already instantiated."
+      first_created: >
+        The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence.
+    template:
+      button_finalize: "Finish template"
+      blank_title: "Your meeting series template is empty"
+      description: >
+        This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template.
+      blankslate_finalize: >
+        When you're done preparing this template, click the '%{button_title}' button above to finish the setup and schedule the first meeting of the series.
+      label_view_template: "View template"
+      label_edit_template: "Edit template"
+      banner_html: >
+        You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already created meetings.
+    frequency:
+      every_weekday: "Every %{day_of_the_week}"
+      daily: "Daily"
+      working_days: "Every working day"
+      weekly: "Weekly"
+    end_after:
+      specific_date: "a specific date"
+      iterations: "a number of occurrences"
+    starts: "Starts"
+    in_words:
+      daily_interval: "Every %{interval} days"
+      working_days: "Every working day"
+      weekly: "Every week on %{weekday}"
+      weekly_interval: "Every %{interval} weeks on %{weekday}"
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
   notice_successful_notification: "通知が正常に送信されました"
   notice_timezone_missing: タイムゾーンが設定されていない場合、%{zone} が使用されます。タイムゾーンを選択するには、ここをクリックしてください。
   notice_meeting_updated: "このページは他の誰かによって更新されました。変更を表示するには再読み込みしてください。"
@@ -206,12 +282,17 @@ ja:
   text_deleted_agenda_item: '削除された議題項目'
   label_initial_meeting_details: "会議"
   label_meeting_details: "会議詳細"
+  label_meeting_series_details: "Meeting series details"
   label_meeting_details_edit: "会議詳細を編集"
   label_meeting_state: "会議のステータス"
   label_meeting_state_open: "開く"
   label_meeting_state_open_html: "<i>開く</i>"
   label_meeting_state_closed: "終了"
   label_meeting_state_closed_html: "<i>終了</i>"
+  label_meeting_state_agenda_created: "Agenda created"
+  label_meeting_state_scheduled: "Scheduled"
+  label_meeting_state_cancelled: "Cancelled"
+  label_meeting_state_skipped: "Skipped"
   label_meeting_reopen_action: "会議を再開する"
   label_meeting_close_action: "会議を終了する"
   text_meeting_open_description: "この会議は開かれています。議題項目の追加/削除や編集を自由に行えます。会議が終了したら、閉じてロックしてください。"
diff --git a/modules/meeting/config/locales/crowdin/js-cs.yml b/modules/meeting/config/locales/crowdin/js-cs.yml
index 46345c21e955..c47f81f02c41 100644
--- a/modules/meeting/config/locales/crowdin/js-cs.yml
+++ b/modules/meeting/config/locales/crowdin/js-cs.yml
@@ -24,4 +24,4 @@ cs:
     label_meetings: 'Schůzky'
     work_packages:
       tabs:
-        meetings: 'Meetings'
+        meetings: 'Schůzky'
diff --git a/modules/meeting/config/locales/crowdin/js-ms.yml b/modules/meeting/config/locales/crowdin/js-ms.yml
index 077ce31334f2..a8fdd970afbb 100644
--- a/modules/meeting/config/locales/crowdin/js-ms.yml
+++ b/modules/meeting/config/locales/crowdin/js-ms.yml
@@ -24,4 +24,4 @@ ms:
     label_meetings: 'Mesyuarat'
     work_packages:
       tabs:
-        meetings: 'Meetings'
+        meetings: 'Mesyuarat'
diff --git a/modules/meeting/config/locales/crowdin/ka.yml b/modules/meeting/config/locales/crowdin/ka.yml
index 983a4841713e..d74a857c10ce 100644
--- a/modules/meeting/config/locales/crowdin/ka.yml
+++ b/modules/meeting/config/locales/crowdin/ka.yml
@@ -50,11 +50,18 @@ ka:
         presenter: "Presenter"
       meeting_section:
         title: "სათაური"
+      recurring_meeting:
+        frequency: "Frequency"
+        interval: "Interval"
+        start_date: "Starts on"
+        end_after: "End series after"
+        iterations: "Occurrences"
     errors:
       messages:
         invalid_time_format: "is not a valid time. Required format: HH:MM"
     models:
-      structured_meeting: "Meeting (dynamic)"
+      recurring_meeting: "Recurring meeting"
+      structured_meeting: "One-time meeting"
       meeting_agenda_item: "განრიგის პუნქტი"
       meeting_agenda: "დღის განრიგი"
       meeting_minutes: "წუთი"
@@ -88,7 +95,8 @@ ka:
   label_meeting: "შეხვედრა"
   label_meeting_plural: "შეხვედრები"
   label_meeting_new: "ახალი შეხვედრა"
-  label_meeting_new_dynamic: "New dynamic meeting"
+  label_meeting_new_dynamic: "New one-time meeting"
+  label_meeting_new_recurring: "New recurring meeting"
   label_meeting_create: "Create meeting"
   label_meeting_copy: "Copy meeting"
   label_meeting_edit: "შეხვედრის ჩასწორება"
@@ -102,23 +110,54 @@ ka:
   label_meeting_date_time: "თარიღი / დრო"
   label_meeting_date_and_time: "Date and time"
   label_meeting_diff: "სხვაობა"
+  label_recurring_meeting: "Recurring meeting"
+  label_recurring_meeting_part_of: "Part of a meeting series"
+  label_recurring_meeting_new: "New recurring meeting"
+  label_recurring_meeting_plural: "Recurring meetings"
+  label_template: "Template"
+  label_recurring_meeting_view: "View meeting series"
+  label_recurring_meeting_create: "Create from template"
+  label_recurring_meeting_copy: "Copy as one-off"
+  label_recurring_meeting_cancel: "Cancel this occurrence"
+  label_recurring_meeting_delete: "Delete occurrence"
+  label_recurring_meeting_delete_confirmation: >
+    This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue?
+  label_recurring_occurrence_delete_confirmation: >
+    Any meeting information not in the template will be lost. Do you want to continue?
+  label_recurring_meeting_restore: "Restore this occurrence"
+  label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})."
+  label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})."
+  label_recurring_meeting_more_past: "There are %{count} more past meetings."
+  label_recurring_meeting_more_past_singular: "There is %{count} more past meeting."
+  label_recurring_meeting_show_more: "Show more"
+  label_recurring_meeting_series_edit: "Edit meeting series"
+  label_recurring_meeting_series_delete: "Delete meeting series"
+  label_my_meetings: "My meetings"
+  label_all_meetings: "All meetings"
   label_upcoming_meetings: "Upcoming meetings"
   label_past_meetings: "გასული შეხვედრები"
   label_upcoming_meetings_short: "მომავალი"
   label_past_meetings_short: "წარს"
   label_involvement: "ჩარეულობა"
-  label_upcoming_invitations: "Upcoming invitations"
+  label_invitations: "Invitations"
+  label_invited_user: "Invited user"
   label_past_invitations: "Past invitations"
-  label_attendee: "დამსწრე"
-  label_author: "შემქმნელი"
+  label_attended: "Attended"
+  label_attended_user: "Attended user"
+  label_created_by_me: "Created by me"
   label_notify: "Send for review"
   label_icalendar: "'iCalendar'-ის გაგზავნა"
   label_icalendar_download: "Download iCalendar event"
+  label_view_meeting_series: "View meeting series"
+  label_meeting_series: "Meeting series"
   label_version: "ვერსია"
   label_time_zone: "დროის სარტყელი"
   label_start_date: "დაწყების თარიღი"
   meeting:
+    participants:
+      template: "These participants will be invited automatically to all future meetings as they are created."
     attachments:
+      template: "These attached files will be included in all future meetings in the series."
       text: "Attached files are available to all meeting participants. You can also drag and drop these into agenda item notes."
     copy:
       title: "Copy meeting: %{title}"
@@ -145,9 +184,12 @@ ka:
     label_mail_all_participants: "Send email to all participants"
     types:
       classic: "კლასიკური"
-      classic_text: "Organize your meeting in a formattable text agenda and protocol."
-      structured: "დინამიკური"
-      structured_text: "Organize your meeting as a list of agenda items, optionally linking them to a work package."
+      classic_text: "Organize your meeting as a single formattable text agenda and protocol."
+      structured: "Structured"
+      one_time: "One-time"
+      recurring: "Recurring"
+      recurring_text: "Create meeting series with dynamic template for each occurrence."
+      structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package."
       structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details"
     copied: "Copied from Meeting #%{id}"
   meeting_section:
@@ -155,6 +197,40 @@ ka:
     delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?"
     placeholder_title: "New section"
     empty_text: "Drag items here or create a new one"
+  recurring_meeting:
+    occurrence:
+      infoline: "This meeting is part of a recurring meeting series."
+      error_no_next: "There is no next occurrence for this meeting."
+      first_already_exists: "The first occurrence of this meeting series is already instantiated."
+      first_created: >
+        The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence.
+    template:
+      button_finalize: "Finish template"
+      blank_title: "Your meeting series template is empty"
+      description: >
+        This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template.
+      blankslate_finalize: >
+        When you're done preparing this template, click the '%{button_title}' button above to finish the setup and schedule the first meeting of the series.
+      label_view_template: "View template"
+      label_edit_template: "Edit template"
+      banner_html: >
+        You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already created meetings.
+    frequency:
+      every_weekday: "Every %{day_of_the_week}"
+      daily: "Daily"
+      working_days: "Every working day"
+      weekly: "Weekly"
+    end_after:
+      specific_date: "a specific date"
+      iterations: "a number of occurrences"
+    starts: "Starts"
+    in_words:
+      daily_interval: "Every %{interval} days"
+      working_days: "Every working day"
+      weekly: "Every week on %{weekday}"
+      weekly_interval: "Every %{interval} weeks on %{weekday}"
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
   notice_successful_notification: "Notification sent successfully"
   notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here.
   notice_meeting_updated: "This page has been updated by someone else. Reload to view changes."
@@ -207,12 +283,17 @@ ka:
   text_deleted_agenda_item: 'Deleted agenda item'
   label_initial_meeting_details: "შეხვედრა"
   label_meeting_details: "Meeting details"
+  label_meeting_series_details: "Meeting series details"
   label_meeting_details_edit: "Edit meeting details"
   label_meeting_state: "Meeting status"
   label_meeting_state_open: "გახსნა"
   label_meeting_state_open_html: "<i>Open</i>"
   label_meeting_state_closed: "დახურულია"
   label_meeting_state_closed_html: "<i>Closed</i>"
+  label_meeting_state_agenda_created: "Agenda created"
+  label_meeting_state_scheduled: "Scheduled"
+  label_meeting_state_cancelled: "Cancelled"
+  label_meeting_state_skipped: "Skipped"
   label_meeting_reopen_action: "შეხვედრის თავიდან გახსნა"
   label_meeting_close_action: "შეხვედრის დახურვა"
   text_meeting_open_description: "This meeting is open. You can add/remove agenda items and edit them as you please. After the meeting is over, close it to lock it."
diff --git a/modules/meeting/config/locales/crowdin/kk.yml b/modules/meeting/config/locales/crowdin/kk.yml
index 46369b644ecd..cedb1ece5a99 100644
--- a/modules/meeting/config/locales/crowdin/kk.yml
+++ b/modules/meeting/config/locales/crowdin/kk.yml
@@ -50,11 +50,18 @@ kk:
         presenter: "Presenter"
       meeting_section:
         title: "Title"
+      recurring_meeting:
+        frequency: "Frequency"
+        interval: "Interval"
+        start_date: "Starts on"
+        end_after: "End series after"
+        iterations: "Occurrences"
     errors:
       messages:
         invalid_time_format: "is not a valid time. Required format: HH:MM"
     models:
-      structured_meeting: "Meeting (dynamic)"
+      recurring_meeting: "Recurring meeting"
+      structured_meeting: "One-time meeting"
       meeting_agenda_item: "Agenda item"
       meeting_agenda: "Agenda"
       meeting_minutes: "Minutes"
@@ -88,7 +95,8 @@ kk:
   label_meeting: "Meeting"
   label_meeting_plural: "Meetings"
   label_meeting_new: "New Meeting"
-  label_meeting_new_dynamic: "New dynamic meeting"
+  label_meeting_new_dynamic: "New one-time meeting"
+  label_meeting_new_recurring: "New recurring meeting"
   label_meeting_create: "Create meeting"
   label_meeting_copy: "Copy meeting"
   label_meeting_edit: "Edit Meeting"
@@ -102,23 +110,54 @@ kk:
   label_meeting_date_time: "Date/Time"
   label_meeting_date_and_time: "Date and time"
   label_meeting_diff: "Diff"
+  label_recurring_meeting: "Recurring meeting"
+  label_recurring_meeting_part_of: "Part of a meeting series"
+  label_recurring_meeting_new: "New recurring meeting"
+  label_recurring_meeting_plural: "Recurring meetings"
+  label_template: "Template"
+  label_recurring_meeting_view: "View meeting series"
+  label_recurring_meeting_create: "Create from template"
+  label_recurring_meeting_copy: "Copy as one-off"
+  label_recurring_meeting_cancel: "Cancel this occurrence"
+  label_recurring_meeting_delete: "Delete occurrence"
+  label_recurring_meeting_delete_confirmation: >
+    This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue?
+  label_recurring_occurrence_delete_confirmation: >
+    Any meeting information not in the template will be lost. Do you want to continue?
+  label_recurring_meeting_restore: "Restore this occurrence"
+  label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})."
+  label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})."
+  label_recurring_meeting_more_past: "There are %{count} more past meetings."
+  label_recurring_meeting_more_past_singular: "There is %{count} more past meeting."
+  label_recurring_meeting_show_more: "Show more"
+  label_recurring_meeting_series_edit: "Edit meeting series"
+  label_recurring_meeting_series_delete: "Delete meeting series"
+  label_my_meetings: "My meetings"
+  label_all_meetings: "All meetings"
   label_upcoming_meetings: "Upcoming meetings"
   label_past_meetings: "Past meetings"
   label_upcoming_meetings_short: "Upcoming"
   label_past_meetings_short: "Past"
   label_involvement: "Involvement"
-  label_upcoming_invitations: "Upcoming invitations"
+  label_invitations: "Invitations"
+  label_invited_user: "Invited user"
   label_past_invitations: "Past invitations"
-  label_attendee: "Attendee"
-  label_author: "Creator"
+  label_attended: "Attended"
+  label_attended_user: "Attended user"
+  label_created_by_me: "Created by me"
   label_notify: "Send for review"
   label_icalendar: "Send iCalendar"
   label_icalendar_download: "Download iCalendar event"
+  label_view_meeting_series: "View meeting series"
+  label_meeting_series: "Meeting series"
   label_version: "Version"
   label_time_zone: "Time zone"
   label_start_date: "Start date"
   meeting:
+    participants:
+      template: "These participants will be invited automatically to all future meetings as they are created."
     attachments:
+      template: "These attached files will be included in all future meetings in the series."
       text: "Attached files are available to all meeting participants. You can also drag and drop these into agenda item notes."
     copy:
       title: "Copy meeting: %{title}"
@@ -145,9 +184,12 @@ kk:
     label_mail_all_participants: "Send email to all participants"
     types:
       classic: "Classic"
-      classic_text: "Organize your meeting in a formattable text agenda and protocol."
-      structured: "Dynamic"
-      structured_text: "Organize your meeting as a list of agenda items, optionally linking them to a work package."
+      classic_text: "Organize your meeting as a single formattable text agenda and protocol."
+      structured: "Structured"
+      one_time: "One-time"
+      recurring: "Recurring"
+      recurring_text: "Create meeting series with dynamic template for each occurrence."
+      structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package."
       structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details"
     copied: "Copied from Meeting #%{id}"
   meeting_section:
@@ -155,6 +197,40 @@ kk:
     delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?"
     placeholder_title: "New section"
     empty_text: "Drag items here or create a new one"
+  recurring_meeting:
+    occurrence:
+      infoline: "This meeting is part of a recurring meeting series."
+      error_no_next: "There is no next occurrence for this meeting."
+      first_already_exists: "The first occurrence of this meeting series is already instantiated."
+      first_created: >
+        The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence.
+    template:
+      button_finalize: "Finish template"
+      blank_title: "Your meeting series template is empty"
+      description: >
+        This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template.
+      blankslate_finalize: >
+        When you're done preparing this template, click the '%{button_title}' button above to finish the setup and schedule the first meeting of the series.
+      label_view_template: "View template"
+      label_edit_template: "Edit template"
+      banner_html: >
+        You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already created meetings.
+    frequency:
+      every_weekday: "Every %{day_of_the_week}"
+      daily: "Daily"
+      working_days: "Every working day"
+      weekly: "Weekly"
+    end_after:
+      specific_date: "a specific date"
+      iterations: "a number of occurrences"
+    starts: "Starts"
+    in_words:
+      daily_interval: "Every %{interval} days"
+      working_days: "Every working day"
+      weekly: "Every week on %{weekday}"
+      weekly_interval: "Every %{interval} weeks on %{weekday}"
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
   notice_successful_notification: "Notification sent successfully"
   notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here.
   notice_meeting_updated: "This page has been updated by someone else. Reload to view changes."
@@ -207,12 +283,17 @@ kk:
   text_deleted_agenda_item: 'Deleted agenda item'
   label_initial_meeting_details: "Meeting"
   label_meeting_details: "Meeting details"
+  label_meeting_series_details: "Meeting series details"
   label_meeting_details_edit: "Edit meeting details"
   label_meeting_state: "Meeting status"
   label_meeting_state_open: "Open"
   label_meeting_state_open_html: "<i>Open</i>"
   label_meeting_state_closed: "Closed"
   label_meeting_state_closed_html: "<i>Closed</i>"
+  label_meeting_state_agenda_created: "Agenda created"
+  label_meeting_state_scheduled: "Scheduled"
+  label_meeting_state_cancelled: "Cancelled"
+  label_meeting_state_skipped: "Skipped"
   label_meeting_reopen_action: "Reopen meeting"
   label_meeting_close_action: "Close meeting"
   text_meeting_open_description: "This meeting is open. You can add/remove agenda items and edit them as you please. After the meeting is over, close it to lock it."
diff --git a/modules/meeting/config/locales/crowdin/ko.yml b/modules/meeting/config/locales/crowdin/ko.yml
index c8a1e63fe7ad..dea720c5fd0b 100644
--- a/modules/meeting/config/locales/crowdin/ko.yml
+++ b/modules/meeting/config/locales/crowdin/ko.yml
@@ -49,11 +49,18 @@ ko:
         presenter: "발표자"
       meeting_section:
         title: "제목"
+      recurring_meeting:
+        frequency: "빈도"
+        interval: "간격"
+        start_date: "시작:"
+        end_after: "다음 이후 시리즈 종료:"
+        iterations: "항목"
     errors:
       messages:
         invalid_time_format: "은(는) 유효한 시간이 아닙니다. 필요한 형식: HH:MM"
     models:
-      structured_meeting: "미팅(다이내믹)"
+      recurring_meeting: "반복 미팅"
+      structured_meeting: "일회성 미팅"
       meeting_agenda_item: "의제 항목"
       meeting_agenda: "의제"
       meeting_minutes: "의사록"
@@ -87,7 +94,8 @@ ko:
   label_meeting: "미팅"
   label_meeting_plural: "미팅"
   label_meeting_new: "새 미팅"
-  label_meeting_new_dynamic: "새로운 다이내믹 미팅"
+  label_meeting_new_dynamic: "새로운 일회성 미팅"
+  label_meeting_new_recurring: "새로운 반복 미팅"
   label_meeting_create: "미팅 생성"
   label_meeting_copy: "미팅 복사"
   label_meeting_edit: "미팅 편집"
@@ -101,23 +109,54 @@ ko:
   label_meeting_date_time: "날짜/시간"
   label_meeting_date_and_time: "날짜 및 시간"
   label_meeting_diff: "차이"
+  label_recurring_meeting: "반복 미팅"
+  label_recurring_meeting_part_of: "미팅 시리즈의 일부"
+  label_recurring_meeting_new: "새로운 반복 미팅"
+  label_recurring_meeting_plural: "반복 미팅"
+  label_template: "템플릿"
+  label_recurring_meeting_view: "미팅 시리즈 보기"
+  label_recurring_meeting_create: "템플릿에서 만들기"
+  label_recurring_meeting_copy: "일회성 복사"
+  label_recurring_meeting_cancel: "이 항목 취소"
+  label_recurring_meeting_delete: "항목 삭제"
+  label_recurring_meeting_delete_confirmation: >
+    이 미팅은 %{name}(이)라는 시리즈의 일부입니다. 이렇게 하면 전체 시리즈가 아닌 이 특정 항목만 삭제됩니다. 계속하시겠습니까?
+  label_recurring_occurrence_delete_confirmation: >
+    템플릿에 없는 미팅 정보는 모두 손실됩니다. 계속하시겠습니까?
+  label_recurring_meeting_restore: "이 항목 복원"
+  label_recurring_meeting_more: "예정된 미팅(%{schedule})이 %{count}개 더 있습니다."
+  label_recurring_meeting_more_singular: "예정된 미팅(%{schedule})이 %{count}개 더 있습니다."
+  label_recurring_meeting_more_past: "지난 미팅이 %{count}개 더 있습니다."
+  label_recurring_meeting_more_past_singular: "지난 미팅이 %{count}개 더 있습니다."
+  label_recurring_meeting_show_more: "자세히 표시"
+  label_recurring_meeting_series_edit: "미팅 시리즈 편집"
+  label_recurring_meeting_series_delete: "미팅 시리즈 삭제"
+  label_my_meetings: "내 미팅"
+  label_all_meetings: "모든 미팅"
   label_upcoming_meetings: "다가오는 이벤트"
   label_past_meetings: "지난 미팅"
   label_upcoming_meetings_short: "예정"
   label_past_meetings_short: "과거"
   label_involvement: "참여"
-  label_upcoming_invitations: "다가오는 초대"
+  label_invitations: "초대"
+  label_invited_user: "초대된 사용자"
   label_past_invitations: "과거 초대"
-  label_attendee: "참석자"
-  label_author: "만든이"
+  label_attended: "참석함"
+  label_attended_user: "참석한 사용자"
+  label_created_by_me: "내가 생성함"
   label_notify: "검토를 위해 보내기"
   label_icalendar: "iCalendar 보내기"
   label_icalendar_download: "iCalendar 이벤트 다운로드"
+  label_view_meeting_series: "미팅 시리즈 보기"
+  label_meeting_series: "미팅 시리즈"
   label_version: "버전"
   label_time_zone: "표준 시간대"
   label_start_date: "시작일"
   meeting:
+    participants:
+      template: "이러한 참가자는 향후 생성되는 모든 미팅에 자동으로 초대됩니다."
     attachments:
+      template: "이러한 첨부 파일은 시리즈의 모든 향후 미팅에 포함됩니다."
       text: "첨부된 파일은 모든 미팅 참가자가 사용할 수 있습니다. 이러한 파일을 의제 항목 메모에 끌어다 놓을 수도 있습니다."
     copy:
       title: "미팅 복사: %{title}"
@@ -144,9 +183,12 @@ ko:
     label_mail_all_participants: "모든 참가자에게 이메일 보내기"
     types:
       classic: "클래식"
-      classic_text: "서식 지정 가능한 텍스트 의제 및 프로토콜로 미팅을 구성하세요."
-      structured: "다이내믹"
-      structured_text: "미팅을 의제 항목 목록으로 구성하고, 선택적으로 작업 패키지에 연결합니다."
+      classic_text: "서식 지정 가능한 단일 텍스트 의제 및 프로토콜로 미팅을 구성하세요."
+      structured: "구조화됨"
+      one_time: "일회성"
+      recurring: "반복"
+      recurring_text: "각 항목에 대해 다이내믹 템플릿을 사용하여 미팅 시리즈를 만듭니다."
+      structured_text: "미팅을 의제 항목의 다이내믹 목록으로 구성하고, 선택적으로 작업 패키지에 연결합니다."
       structured_text_copy: "미팅을 복사하면 관련 미팅 의제 항목은 현재 복사되지 않고 세부 정보만 복사됩니다"
     copied: "미팅 #%{id}에서 복사됨"
   meeting_section:
@@ -154,6 +196,40 @@ ko:
     delete_confirmation: "이 섹션을 삭제하면 모든 의제 항목도 삭제됩니다. 계속하시겠습니까?"
     placeholder_title: "새 섹션"
     empty_text: "항목을 여기에 끌어오거나 새로 만들기"
+  recurring_meeting:
+    occurrence:
+      infoline: "이 미팅은 반복 미팅 시리즈의 일부입니다."
+      error_no_next: "이 미팅의 다음 항목이 없습니다."
+      first_already_exists: "이 미팅 시리즈의 첫 번째 항목은 이미 인스턴스화되었습니다."
+      first_created: >
+        첫 번째 미팅이 템플릿에서 성공적으로 생성되었습니다. 향후 모든 미팅은 이전 항목이 발생한 시점에 자동으로 생성됩니다.
+    template:
+      button_finalize: "템플릿 완료"
+      blank_title: "미팅 시리즈 템플릿이 비어 있습니다."
+      description: >
+        이 템플릿은 시리즈의 새로운 미팅이 생성될 때마다 사용됩니다. 이 템플릿에 안건 항목, 참가자 및 첨부 파일을 추가할 수 있습니다.
+      blankslate_finalize: >
+        이 템플릿 준비가 완료되면 위의 '%{button_title}' 버튼을 클릭하여 설정을 완료하고 시리즈의 첫 번째 미팅을 예약합니다.
+      label_view_template: "템플릿 보기"
+      label_edit_template: "템플릿 편집"
+      banner_html: >
+        미팅 시리즈의 템플릿을 현재 편집하는 중입니다: %{link}. 시리즈에서 미팅의 모든 새로운 항목이 이 템플릿을 사용하게 됩니다. 변경 사항은 과거 또는 이미 생성된 미팅에 영향을 미치지 않습니다.
+    frequency:
+      every_weekday: "%{day_of_the_week}마다"
+      daily: "매일"
+      working_days: "근무일마다"
+      weekly: "매주"
+    end_after:
+      specific_date: "특정 날짜"
+      iterations: "항목 수"
+    starts: "시작"
+    in_words:
+      daily_interval: "%{interval}일마다"
+      working_days: "근무일마다"
+      weekly: "매주 %{weekday}"
+      weekly_interval: "%{interval}주마다 %{weekday}"
+      frequency: "%{base}, %{time}"
+      full: "%{base}, %{time}, %{end_date}에 종료"
   notice_successful_notification: "알림이 전송됨"
   notice_timezone_missing: 표준 시간대가 설정되지 않았으며 %{zone}(으)로 간주됩니다. 해당 표준 시간대를 선택하려면 여기를 클릭하세요.
   notice_meeting_updated: "이 페이지는 다른 사람이 업데이트했습니다. 변경 사항을 보려면 다시 로드하세요."
@@ -206,16 +282,21 @@ ko:
   text_deleted_agenda_item: '삭제된 의제 항목'
   label_initial_meeting_details: "미팅"
   label_meeting_details: "미팅 세부 정보"
+  label_meeting_series_details: "미팅 시리즈 세부 정보"
   label_meeting_details_edit: "미팅 세부 정보 편집"
   label_meeting_state: "미팅 상태"
   label_meeting_state_open: "열기"
   label_meeting_state_open_html: "<i>열림</i>"
   label_meeting_state_closed: "닫음"
   label_meeting_state_closed_html: "<i>닫힘</i>"
+  label_meeting_state_agenda_created: "의제 생성됨"
+  label_meeting_state_scheduled: "예약됨"
+  label_meeting_state_cancelled: "취소됨"
+  label_meeting_state_skipped: "건너뜀"
   label_meeting_reopen_action: "미팅 다시 열기"
   label_meeting_close_action: "미팅 닫기"
   text_meeting_open_description: "이 미팅은 오픈 상태입니다. 의제 항목을 추가/제거하고 원하는 대로 편집할 수 있습니다. 미팅이 끝나면 닫아서 잠그세요."
-  text_meeting_closed_description: "이 회의는 종료되었습니다. 더 이상 의제 항목을 추가/제거할 수 없습니다."
+  text_meeting_closed_description: "이 미팅은 종료되었습니다. 더 이상 의제 항목을 추가/제거할 수 없습니다."
   label_meeting_manage_participants: "참가자 관리"
   label_meeting_no_participants: "참가자 없음"
   label_meeting_show_hide_participants: "%{count}개 더 표시/숨기기"
diff --git a/modules/meeting/config/locales/crowdin/lt.yml b/modules/meeting/config/locales/crowdin/lt.yml
index b726114eddbf..212d471d37da 100644
--- a/modules/meeting/config/locales/crowdin/lt.yml
+++ b/modules/meeting/config/locales/crowdin/lt.yml
@@ -52,11 +52,18 @@ lt:
         presenter: "Pateikėjas"
       meeting_section:
         title: "Pavadinimas"
+      recurring_meeting:
+        frequency: "Frequency"
+        interval: "Interval"
+        start_date: "Starts on"
+        end_after: "End series after"
+        iterations: "Occurrences"
     errors:
       messages:
         invalid_time_format: "netinkamas laikas. Reikalingas formatas: HH:MM (pvz.: 10:30)"
     models:
-      structured_meeting: "Susitikimas (dinaminis)"
+      recurring_meeting: "Recurring meeting"
+      structured_meeting: "One-time meeting"
       meeting_agenda_item: "Darbotvarkės punktas"
       meeting_agenda: "Dienotvarkė"
       meeting_minutes: "Minutės"
@@ -90,7 +97,8 @@ lt:
   label_meeting: "Pasitarimas"
   label_meeting_plural: "Pasitarimai"
   label_meeting_new: "Naujas pasitarimas"
-  label_meeting_new_dynamic: "New dynamic meeting"
+  label_meeting_new_dynamic: "New one-time meeting"
+  label_meeting_new_recurring: "New recurring meeting"
   label_meeting_create: "Create meeting"
   label_meeting_copy: "Copy meeting"
   label_meeting_edit: "Redaguoti pasitarimą"
@@ -104,23 +112,54 @@ lt:
   label_meeting_date_time: "Data/Laikas"
   label_meeting_date_and_time: "Date and time"
   label_meeting_diff: "skirt."
+  label_recurring_meeting: "Recurring meeting"
+  label_recurring_meeting_part_of: "Part of a meeting series"
+  label_recurring_meeting_new: "New recurring meeting"
+  label_recurring_meeting_plural: "Recurring meetings"
+  label_template: "Template"
+  label_recurring_meeting_view: "View meeting series"
+  label_recurring_meeting_create: "Create from template"
+  label_recurring_meeting_copy: "Copy as one-off"
+  label_recurring_meeting_cancel: "Cancel this occurrence"
+  label_recurring_meeting_delete: "Delete occurrence"
+  label_recurring_meeting_delete_confirmation: >
+    This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue?
+  label_recurring_occurrence_delete_confirmation: >
+    Any meeting information not in the template will be lost. Do you want to continue?
+  label_recurring_meeting_restore: "Restore this occurrence"
+  label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})."
+  label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})."
+  label_recurring_meeting_more_past: "There are %{count} more past meetings."
+  label_recurring_meeting_more_past_singular: "There is %{count} more past meeting."
+  label_recurring_meeting_show_more: "Show more"
+  label_recurring_meeting_series_edit: "Edit meeting series"
+  label_recurring_meeting_series_delete: "Delete meeting series"
+  label_my_meetings: "My meetings"
+  label_all_meetings: "All meetings"
   label_upcoming_meetings: "Artėjantys susirinkimai"
   label_past_meetings: "Įvykę susirinkimai"
   label_upcoming_meetings_short: "Artėjantys"
   label_past_meetings_short: "Buvę"
   label_involvement: "Įsitraukimas"
-  label_upcoming_invitations: "Artėjantys pakvietimai"
+  label_invitations: "Invitations"
+  label_invited_user: "Invited user"
   label_past_invitations: "Ankstesni pakvietimai"
-  label_attendee: "Dalyvis"
-  label_author: "Kūrėjas"
+  label_attended: "Attended"
+  label_attended_user: "Attended user"
+  label_created_by_me: "Created by me"
   label_notify: "Siųsti peržiūrai"
   label_icalendar: "Siųsti iCalendar formatu"
   label_icalendar_download: "Atsisiųsti iCalendar įvykį"
+  label_view_meeting_series: "View meeting series"
+  label_meeting_series: "Meeting series"
   label_version: "Versija"
   label_time_zone: "Laiko juosta"
   label_start_date: "Pradžios data"
   meeting:
+    participants:
+      template: "These participants will be invited automatically to all future meetings as they are created."
     attachments:
+      template: "These attached files will be included in all future meetings in the series."
       text: "Prisegti failai prieinami visiems susitikimo dalyviams. Taipogi galite nutempti juos į plano elemento pastabas."
     copy:
       title: "Kopijuoti susitikimą: %{title}"
@@ -147,9 +186,12 @@ lt:
     label_mail_all_participants: "Siųsti e-laišką visiems dalyviams"
     types:
       classic: "Klasikinis"
-      classic_text: "Organizuokite jūsų susitikimą su formatuojamo teksto darbotvarke ir protokolu."
-      structured: "Dinaminis"
-      structured_text: "Organizuokite jūsų susitikimą su darbotvarkės elementų sąrašu, pasirinktinai susiejant juos su darbo paketu."
+      classic_text: "Organize your meeting as a single formattable text agenda and protocol."
+      structured: "Structured"
+      one_time: "One-time"
+      recurring: "Recurring"
+      recurring_text: "Create meeting series with dynamic template for each occurrence."
+      structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package."
       structured_text_copy: "Šiuo metu nukopijavus susitikimą, susiję susitikimo elmentai nebus kopijuojami, tik detalės."
     copied: "Nukopijuota iš susitikimo #%{id}"
   meeting_section:
@@ -157,6 +199,40 @@ lt:
     delete_confirmation: "Ištrynus skiltį taipogi bus ištrinti ir visi jos plano elementai. Ar tikrai norite tai padaryti?"
     placeholder_title: "Nauja skiltis"
     empty_text: "Tempkite elementus čia arba sukurtkite naują"
+  recurring_meeting:
+    occurrence:
+      infoline: "This meeting is part of a recurring meeting series."
+      error_no_next: "There is no next occurrence for this meeting."
+      first_already_exists: "The first occurrence of this meeting series is already instantiated."
+      first_created: >
+        The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence.
+    template:
+      button_finalize: "Finish template"
+      blank_title: "Your meeting series template is empty"
+      description: >
+        This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template.
+      blankslate_finalize: >
+        When you're done preparing this template, click the '%{button_title}' button above to finish the setup and schedule the first meeting of the series.
+      label_view_template: "View template"
+      label_edit_template: "Edit template"
+      banner_html: >
+        You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already created meetings.
+    frequency:
+      every_weekday: "Every %{day_of_the_week}"
+      daily: "Daily"
+      working_days: "Every working day"
+      weekly: "Weekly"
+    end_after:
+      specific_date: "a specific date"
+      iterations: "a number of occurrences"
+    starts: "Starts"
+    in_words:
+      daily_interval: "Every %{interval} days"
+      working_days: "Every working day"
+      weekly: "Every week on %{weekday}"
+      weekly_interval: "Every %{interval} weeks on %{weekday}"
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
   notice_successful_notification: "Pranešimas sėkmingai išsiųstas"
   notice_timezone_missing: Laiko zona nenustatyta ir %{zone} zona yra rekomenduojama. Kad pasirinktumėte laiko zoną, paspauskite čia.
   notice_meeting_updated: "This page has been updated by someone else. Reload to view changes."
@@ -209,12 +285,17 @@ lt:
   text_deleted_agenda_item: 'Ištrintas darbotvarkės punktas'
   label_initial_meeting_details: "Susitikimas"
   label_meeting_details: "Susitikimo detalės"
+  label_meeting_series_details: "Meeting series details"
   label_meeting_details_edit: "Keisti susitikimo detales"
   label_meeting_state: "Susitikimo būsena"
   label_meeting_state_open: "Atidarytas"
   label_meeting_state_open_html: "<i>Atviras</i>"
   label_meeting_state_closed: "Uždarytas"
   label_meeting_state_closed_html: "<i>Uždarytas</i>"
+  label_meeting_state_agenda_created: "Agenda created"
+  label_meeting_state_scheduled: "Scheduled"
+  label_meeting_state_cancelled: "Cancelled"
+  label_meeting_state_skipped: "Skipped"
   label_meeting_reopen_action: "Iš naujo atidaryti susitikimą"
   label_meeting_close_action: "Uždaryti susitikimą"
   text_meeting_open_description: "Šis susitikimas yra atviras. Jūs galite pridėti/išimti darbotvarkės elementus bei juos keisti pagal poreikius. Pasibaigus susitikimui, uždarykite jį, kad užrakintumėte."
diff --git a/modules/meeting/config/locales/crowdin/lv.yml b/modules/meeting/config/locales/crowdin/lv.yml
index b3e2a4ac5f46..69829cedf7d6 100644
--- a/modules/meeting/config/locales/crowdin/lv.yml
+++ b/modules/meeting/config/locales/crowdin/lv.yml
@@ -51,11 +51,18 @@ lv:
         presenter: "Presenter"
       meeting_section:
         title: "Virsraksts"
+      recurring_meeting:
+        frequency: "Frequency"
+        interval: "Interval"
+        start_date: "Starts on"
+        end_after: "End series after"
+        iterations: "Occurrences"
     errors:
       messages:
         invalid_time_format: "nav derīgs laiks. Vajadzīgais formāts: HH:MM"
     models:
-      structured_meeting: "Sanāksme (dinamiska)"
+      recurring_meeting: "Recurring meeting"
+      structured_meeting: "One-time meeting"
       meeting_agenda_item: "Darba kārtības punkts"
       meeting_agenda: "Darba kārtība"
       meeting_minutes: "Protokols"
@@ -89,7 +96,8 @@ lv:
   label_meeting: "Sanāksmes"
   label_meeting_plural: "Sanāksmes"
   label_meeting_new: "Jauna sanāksme"
-  label_meeting_new_dynamic: "Jauna dinamiska sanāksme"
+  label_meeting_new_dynamic: "New one-time meeting"
+  label_meeting_new_recurring: "New recurring meeting"
   label_meeting_create: "Izveidot sanāksmi"
   label_meeting_copy: "Kopēt sanāksmi"
   label_meeting_edit: "Rediģēt sanāksmi"
@@ -103,23 +111,54 @@ lv:
   label_meeting_date_time: "Datums/laiks"
   label_meeting_date_and_time: "Datums un laiks"
   label_meeting_diff: "Atšķirība"
+  label_recurring_meeting: "Recurring meeting"
+  label_recurring_meeting_part_of: "Part of a meeting series"
+  label_recurring_meeting_new: "New recurring meeting"
+  label_recurring_meeting_plural: "Recurring meetings"
+  label_template: "Template"
+  label_recurring_meeting_view: "View meeting series"
+  label_recurring_meeting_create: "Create from template"
+  label_recurring_meeting_copy: "Copy as one-off"
+  label_recurring_meeting_cancel: "Cancel this occurrence"
+  label_recurring_meeting_delete: "Delete occurrence"
+  label_recurring_meeting_delete_confirmation: >
+    This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue?
+  label_recurring_occurrence_delete_confirmation: >
+    Any meeting information not in the template will be lost. Do you want to continue?
+  label_recurring_meeting_restore: "Restore this occurrence"
+  label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})."
+  label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})."
+  label_recurring_meeting_more_past: "There are %{count} more past meetings."
+  label_recurring_meeting_more_past_singular: "There is %{count} more past meeting."
+  label_recurring_meeting_show_more: "Show more"
+  label_recurring_meeting_series_edit: "Edit meeting series"
+  label_recurring_meeting_series_delete: "Delete meeting series"
+  label_my_meetings: "My meetings"
+  label_all_meetings: "All meetings"
   label_upcoming_meetings: "Gaidāmās sanāksmes"
   label_past_meetings: "Iepriekšējās sanāksmes"
   label_upcoming_meetings_short: "Gaidāmās"
   label_past_meetings_short: "Iepriekšējās"
   label_involvement: "Involvement"
-  label_upcoming_invitations: "Nākotnes ielūgumi"
+  label_invitations: "Invitations"
+  label_invited_user: "Invited user"
   label_past_invitations: "Iepriekšējie ielūgumi"
-  label_attendee: "Dalībnieks"
-  label_author: "Izveidotājs"
+  label_attended: "Attended"
+  label_attended_user: "Attended user"
+  label_created_by_me: "Created by me"
   label_notify: "Send for review"
   label_icalendar: "Send iCalendar"
   label_icalendar_download: "Download iCalendar event"
+  label_view_meeting_series: "View meeting series"
+  label_meeting_series: "Meeting series"
   label_version: "Versija"
   label_time_zone: "Laika josla"
   label_start_date: "Sākuma datums"
   meeting:
+    participants:
+      template: "These participants will be invited automatically to all future meetings as they are created."
     attachments:
+      template: "These attached files will be included in all future meetings in the series."
       text: "Attached files are available to all meeting participants. You can also drag and drop these into agenda item notes."
     copy:
       title: "Copy meeting: %{title}"
@@ -146,9 +185,12 @@ lv:
     label_mail_all_participants: "Send email to all participants"
     types:
       classic: "Klasisks"
-      classic_text: "Organize your meeting in a formattable text agenda and protocol."
-      structured: "Dynamic"
-      structured_text: "Organize your meeting as a list of agenda items, optionally linking them to a work package."
+      classic_text: "Organize your meeting as a single formattable text agenda and protocol."
+      structured: "Structured"
+      one_time: "One-time"
+      recurring: "Recurring"
+      recurring_text: "Create meeting series with dynamic template for each occurrence."
+      structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package."
       structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details"
     copied: "Copied from Meeting #%{id}"
   meeting_section:
@@ -156,6 +198,40 @@ lv:
     delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?"
     placeholder_title: "New section"
     empty_text: "Drag items here or create a new one"
+  recurring_meeting:
+    occurrence:
+      infoline: "This meeting is part of a recurring meeting series."
+      error_no_next: "There is no next occurrence for this meeting."
+      first_already_exists: "The first occurrence of this meeting series is already instantiated."
+      first_created: >
+        The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence.
+    template:
+      button_finalize: "Finish template"
+      blank_title: "Your meeting series template is empty"
+      description: >
+        This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template.
+      blankslate_finalize: >
+        When you're done preparing this template, click the '%{button_title}' button above to finish the setup and schedule the first meeting of the series.
+      label_view_template: "View template"
+      label_edit_template: "Edit template"
+      banner_html: >
+        You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already created meetings.
+    frequency:
+      every_weekday: "Every %{day_of_the_week}"
+      daily: "Daily"
+      working_days: "Every working day"
+      weekly: "Weekly"
+    end_after:
+      specific_date: "a specific date"
+      iterations: "a number of occurrences"
+    starts: "Starts"
+    in_words:
+      daily_interval: "Every %{interval} days"
+      working_days: "Every working day"
+      weekly: "Every week on %{weekday}"
+      weekly_interval: "Every %{interval} weeks on %{weekday}"
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
   notice_successful_notification: "Paziņojums veiksmīgi nosūtīts"
   notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here.
   notice_meeting_updated: "This page has been updated by someone else. Reload to view changes."
@@ -208,12 +284,17 @@ lv:
   text_deleted_agenda_item: 'Deleted agenda item'
   label_initial_meeting_details: "Sanāksmes"
   label_meeting_details: "Meeting details"
+  label_meeting_series_details: "Meeting series details"
   label_meeting_details_edit: "Edit meeting details"
   label_meeting_state: "Meeting status"
   label_meeting_state_open: "Atvērts"
   label_meeting_state_open_html: "<i>Open</i>"
   label_meeting_state_closed: "Closed"
   label_meeting_state_closed_html: "<i>Closed</i>"
+  label_meeting_state_agenda_created: "Agenda created"
+  label_meeting_state_scheduled: "Scheduled"
+  label_meeting_state_cancelled: "Cancelled"
+  label_meeting_state_skipped: "Skipped"
   label_meeting_reopen_action: "Reopen meeting"
   label_meeting_close_action: "Close meeting"
   text_meeting_open_description: "This meeting is open. You can add/remove agenda items and edit them as you please. After the meeting is over, close it to lock it."
diff --git a/modules/meeting/config/locales/crowdin/mn.yml b/modules/meeting/config/locales/crowdin/mn.yml
index 4f2f1368c44c..99952ef29227 100644
--- a/modules/meeting/config/locales/crowdin/mn.yml
+++ b/modules/meeting/config/locales/crowdin/mn.yml
@@ -50,11 +50,18 @@ mn:
         presenter: "Presenter"
       meeting_section:
         title: "Title"
+      recurring_meeting:
+        frequency: "Frequency"
+        interval: "Interval"
+        start_date: "Starts on"
+        end_after: "End series after"
+        iterations: "Occurrences"
     errors:
       messages:
         invalid_time_format: "is not a valid time. Required format: HH:MM"
     models:
-      structured_meeting: "Meeting (dynamic)"
+      recurring_meeting: "Recurring meeting"
+      structured_meeting: "One-time meeting"
       meeting_agenda_item: "Agenda item"
       meeting_agenda: "Agenda"
       meeting_minutes: "Minutes"
@@ -88,7 +95,8 @@ mn:
   label_meeting: "Meeting"
   label_meeting_plural: "Meetings"
   label_meeting_new: "New Meeting"
-  label_meeting_new_dynamic: "New dynamic meeting"
+  label_meeting_new_dynamic: "New one-time meeting"
+  label_meeting_new_recurring: "New recurring meeting"
   label_meeting_create: "Create meeting"
   label_meeting_copy: "Copy meeting"
   label_meeting_edit: "Edit Meeting"
@@ -102,23 +110,54 @@ mn:
   label_meeting_date_time: "Date/Time"
   label_meeting_date_and_time: "Date and time"
   label_meeting_diff: "Diff"
+  label_recurring_meeting: "Recurring meeting"
+  label_recurring_meeting_part_of: "Part of a meeting series"
+  label_recurring_meeting_new: "New recurring meeting"
+  label_recurring_meeting_plural: "Recurring meetings"
+  label_template: "Template"
+  label_recurring_meeting_view: "View meeting series"
+  label_recurring_meeting_create: "Create from template"
+  label_recurring_meeting_copy: "Copy as one-off"
+  label_recurring_meeting_cancel: "Cancel this occurrence"
+  label_recurring_meeting_delete: "Delete occurrence"
+  label_recurring_meeting_delete_confirmation: >
+    This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue?
+  label_recurring_occurrence_delete_confirmation: >
+    Any meeting information not in the template will be lost. Do you want to continue?
+  label_recurring_meeting_restore: "Restore this occurrence"
+  label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})."
+  label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})."
+  label_recurring_meeting_more_past: "There are %{count} more past meetings."
+  label_recurring_meeting_more_past_singular: "There is %{count} more past meeting."
+  label_recurring_meeting_show_more: "Show more"
+  label_recurring_meeting_series_edit: "Edit meeting series"
+  label_recurring_meeting_series_delete: "Delete meeting series"
+  label_my_meetings: "My meetings"
+  label_all_meetings: "All meetings"
   label_upcoming_meetings: "Upcoming meetings"
   label_past_meetings: "Past meetings"
   label_upcoming_meetings_short: "Upcoming"
   label_past_meetings_short: "Past"
   label_involvement: "Involvement"
-  label_upcoming_invitations: "Upcoming invitations"
+  label_invitations: "Invitations"
+  label_invited_user: "Invited user"
   label_past_invitations: "Past invitations"
-  label_attendee: "Attendee"
-  label_author: "Creator"
+  label_attended: "Attended"
+  label_attended_user: "Attended user"
+  label_created_by_me: "Created by me"
   label_notify: "Send for review"
   label_icalendar: "Send iCalendar"
   label_icalendar_download: "Download iCalendar event"
+  label_view_meeting_series: "View meeting series"
+  label_meeting_series: "Meeting series"
   label_version: "Version"
   label_time_zone: "Time zone"
   label_start_date: "Start date"
   meeting:
+    participants:
+      template: "These participants will be invited automatically to all future meetings as they are created."
     attachments:
+      template: "These attached files will be included in all future meetings in the series."
       text: "Attached files are available to all meeting participants. You can also drag and drop these into agenda item notes."
     copy:
       title: "Copy meeting: %{title}"
@@ -145,9 +184,12 @@ mn:
     label_mail_all_participants: "Send email to all participants"
     types:
       classic: "Classic"
-      classic_text: "Organize your meeting in a formattable text agenda and protocol."
-      structured: "Dynamic"
-      structured_text: "Organize your meeting as a list of agenda items, optionally linking them to a work package."
+      classic_text: "Organize your meeting as a single formattable text agenda and protocol."
+      structured: "Structured"
+      one_time: "One-time"
+      recurring: "Recurring"
+      recurring_text: "Create meeting series with dynamic template for each occurrence."
+      structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package."
       structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details"
     copied: "Copied from Meeting #%{id}"
   meeting_section:
@@ -155,6 +197,40 @@ mn:
     delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?"
     placeholder_title: "New section"
     empty_text: "Drag items here or create a new one"
+  recurring_meeting:
+    occurrence:
+      infoline: "This meeting is part of a recurring meeting series."
+      error_no_next: "There is no next occurrence for this meeting."
+      first_already_exists: "The first occurrence of this meeting series is already instantiated."
+      first_created: >
+        The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence.
+    template:
+      button_finalize: "Finish template"
+      blank_title: "Your meeting series template is empty"
+      description: >
+        This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template.
+      blankslate_finalize: >
+        When you're done preparing this template, click the '%{button_title}' button above to finish the setup and schedule the first meeting of the series.
+      label_view_template: "View template"
+      label_edit_template: "Edit template"
+      banner_html: >
+        You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already created meetings.
+    frequency:
+      every_weekday: "Every %{day_of_the_week}"
+      daily: "Daily"
+      working_days: "Every working day"
+      weekly: "Weekly"
+    end_after:
+      specific_date: "a specific date"
+      iterations: "a number of occurrences"
+    starts: "Starts"
+    in_words:
+      daily_interval: "Every %{interval} days"
+      working_days: "Every working day"
+      weekly: "Every week on %{weekday}"
+      weekly_interval: "Every %{interval} weeks on %{weekday}"
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
   notice_successful_notification: "Notification sent successfully"
   notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here.
   notice_meeting_updated: "This page has been updated by someone else. Reload to view changes."
@@ -207,12 +283,17 @@ mn:
   text_deleted_agenda_item: 'Deleted agenda item'
   label_initial_meeting_details: "Meeting"
   label_meeting_details: "Meeting details"
+  label_meeting_series_details: "Meeting series details"
   label_meeting_details_edit: "Edit meeting details"
   label_meeting_state: "Meeting status"
   label_meeting_state_open: "Open"
   label_meeting_state_open_html: "<i>Open</i>"
   label_meeting_state_closed: "Closed"
   label_meeting_state_closed_html: "<i>Closed</i>"
+  label_meeting_state_agenda_created: "Agenda created"
+  label_meeting_state_scheduled: "Scheduled"
+  label_meeting_state_cancelled: "Cancelled"
+  label_meeting_state_skipped: "Skipped"
   label_meeting_reopen_action: "Reopen meeting"
   label_meeting_close_action: "Close meeting"
   text_meeting_open_description: "This meeting is open. You can add/remove agenda items and edit them as you please. After the meeting is over, close it to lock it."
diff --git a/modules/meeting/config/locales/crowdin/ms.yml b/modules/meeting/config/locales/crowdin/ms.yml
index f51059ec5326..ca838068de73 100644
--- a/modules/meeting/config/locales/crowdin/ms.yml
+++ b/modules/meeting/config/locales/crowdin/ms.yml
@@ -49,11 +49,18 @@ ms:
         presenter: "Penyampai"
       meeting_section:
         title: "Tajuk"
+      recurring_meeting:
+        frequency: "Frekuensi"
+        interval: "Selang waktu"
+        start_date: "Bermula pada"
+        end_after: "Tamat siri selepas"
+        iterations: "Kejadian"
     errors:
       messages:
         invalid_time_format: "bukan masa yang sah. Format yang diperlukan: JJ:MM"
     models:
-      structured_meeting: "Mesyuarat (dinamik)"
+      recurring_meeting: "Mesyuarat berulang"
+      structured_meeting: "Mesyuarat sekali"
       meeting_agenda_item: "Item agenda"
       meeting_agenda: "Agenda"
       meeting_minutes: "Minit mesyuarat"
@@ -87,51 +94,83 @@ ms:
   label_meeting: "Mesyuarat"
   label_meeting_plural: "Mesyuarat-mesyuarat"
   label_meeting_new: "Mesyuarat Baharu"
-  label_meeting_new_dynamic: "New dynamic meeting"
-  label_meeting_create: "Create meeting"
-  label_meeting_copy: "Copy meeting"
+  label_meeting_new_dynamic: "Mesyuarat baru sekali"
+  label_meeting_new_recurring: "Mesyuarat berulang yang baru"
+  label_meeting_create: "Buat mesyuarat"
+  label_meeting_copy: "Salin mesyuarat"
   label_meeting_edit: "Edit Mesyuarat"
   label_meeting_agenda: "Agenda"
   label_meeting_minutes: "Minit Mesyuarat"
   label_meeting_close: "Tutup"
   label_meeting_open: "Buka"
-  label_meeting_index_delete: "Delete"
-  label_meeting_open_this_meeting: "Open this meeting"
+  label_meeting_index_delete: "Padam"
+  label_meeting_open_this_meeting: "Buka mesyuarat ini"
   label_meeting_agenda_close: "Tutup agenda untuk mulakan Minit Mesyuarat"
   label_meeting_date_time: "Tarikh/Masa"
-  label_meeting_date_and_time: "Date and time"
+  label_meeting_date_and_time: "Tarikh dan masa"
   label_meeting_diff: "Beza"
+  label_recurring_meeting: "Mesyuarat berulang"
+  label_recurring_meeting_part_of: "Sebahagian daripada siri mesyuarat"
+  label_recurring_meeting_new: "Mesyuarat berulang yang baru"
+  label_recurring_meeting_plural: "Mesyuarat berulang"
+  label_template: "templat"
+  label_recurring_meeting_view: "Lihat siri mesyuarat"
+  label_recurring_meeting_create: "Buat daripada templat"
+  label_recurring_meeting_copy: "Salin sebagai one-off"
+  label_recurring_meeting_cancel: "Batalkan kejadian ini"
+  label_recurring_meeting_delete: "Padam kejadian"
+  label_recurring_meeting_delete_confirmation: >
+    Mesyuarat ini adalah sebahagian daripada siri yang dipanggil %{name}. Ini hanya akan memadamkan kejadian tertentu ini dan bukan keseluruhan siri. Adakah anda mahu meneruskan?
+  label_recurring_occurrence_delete_confirmation: >
+    Sebarang maklumat mesyuarat yang tiada dalam templat akan hilang. Adakah anda mahu meneruskan?
+  label_recurring_meeting_restore: "Pulihkan kejadian ini"
+  label_recurring_meeting_more: "Terdapat %{count} lagi mesyuarat yang dijadualkan (%{schedule})."
+  label_recurring_meeting_more_singular: "Terdapat %{count} lagi mesyuarat berjadual (%{schedule})."
+  label_recurring_meeting_more_past: "Terdapat %{count} lagi mesyuarat yang lalu."
+  label_recurring_meeting_more_past_singular: "Terdapat %{count} lagi mesyuarat yang lalu."
+  label_recurring_meeting_show_more: "Tunjukkan lagi"
+  label_recurring_meeting_series_edit: "Edit siri mesyuarat"
+  label_recurring_meeting_series_delete: "Padamkan siri mesyuarat"
+  label_my_meetings: "Mesyuarat saya"
+  label_all_meetings: "Semua mesyuarat"
   label_upcoming_meetings: "Mesyuarat akan datang"
   label_past_meetings: "Mesyuarat lalu"
   label_upcoming_meetings_short: "Akan Datang"
   label_past_meetings_short: "Lalu"
   label_involvement: "Penglibatan"
-  label_upcoming_invitations: "Jemputan akan datang"
+  label_invitations: "Jemputan"
+  label_invited_user: "Pengguna yang dijemput"
   label_past_invitations: "Jemputan yang lepas"
-  label_attendee: "Penghadir"
-  label_author: "Pencipta"
+  label_attended: "Dihadiri"
+  label_attended_user: "Pengguna yang menghadiri"
+  label_created_by_me: "Dicipta oleh saya"
   label_notify: "Hantar untuk semakan"
   label_icalendar: "Hantar iCalendar\n"
   label_icalendar_download: "Muat turun peristiwa dalam iCalendar"
+  label_view_meeting_series: "Lihat siri mesyuarat"
+  label_meeting_series: "Siri mesyuarat"
   label_version: "Versi"
   label_time_zone: "Zon waktu"
   label_start_date: "Tarikh mula"
   meeting:
+    participants:
+      template: "Peserta ini akan dijemput secara automatik ke semua mesyuarat akan datang apabila ia dibuat."
     attachments:
+      template: "Fail yang dilampirkan ini akan disertakan dalam semua mesyuarat akan datang dalam siri ini."
       text: "Fail yang dilampirkan tersedia kepada semua peserta mesyuarat. Anda juga boleh menarik dan melepaskannya ke dalam nota item agenda."
     copy:
       title: "Salin mesyuarat: %{title}"
       attachments: "Salin lampiran"
       attachments_text: "Salin semua fail yang dilampirkan ke mesyuarat baharu"
       agenda: "Salin agenda"
-      agenda_items: "Copy agenda items"
+      agenda_items: "Salin item agenda"
       agenda_text: "Salin agenda mesyuarat lama"
-      participants: "Copy list of participants"
+      participants: "Salin senarai peserta"
     email:
-      send_emails: "Email participants"
+      send_emails: "E-mel peserta"
       send_invitation_emails: >
-        Send an email invitation immediately to the participants selected above. You can also do this manually at any time later.
-      send_invitation_emails_structured: "Send an email invitation immediately to all participants. You can also do this manually at any time later."
+        Hantar jemputan e-mel segera kepada peserta yang dipilih di atas. Anda juga boleh melakukan ini secara manual pada bila-bila masa kemudian.
+      send_invitation_emails_structured: "Hantar jemputan e-mel dengan segera kepada semua peserta. Anda juga boleh melakukan ini secara manual pada bila-bila masa kemudian."
       open_meeting_link: "Buka mesyuarat"
       invited:
         summary: "%{actor} telah menghantar anda jemputan ke mesyuarat %{title}"
@@ -144,9 +183,12 @@ ms:
     label_mail_all_participants: "Hantar e-mel kepada semua peserta"
     types:
       classic: "Klasik"
-      classic_text: "Aturkan mesyuarat anda dalam agenda teks yang boleh diformat dan diprotokol."
-      structured: "Dinamik"
-      structured_text: "Aturkan mesyuarat anda sebagai senarai butiran agenda, pautkannya ke pakej kerja secara pilihan."
+      classic_text: "Atur mesyuarat anda sebagai agenda dan protokol teks boleh format tunggal."
+      structured: "Berstruktur"
+      one_time: "Sekali"
+      recurring: "Berulang"
+      recurring_text: "Buat siri mesyuarat dengan templat dinamik untuk setiap kejadian."
+      structured_text: "Atur mesyuarat anda sebagai senarai item agenda yang dinamik, secara pilihan memautkannya ke pakej kerja."
       structured_text_copy: "Menyalin mesyuarat pada masa ini tidak akan menyalin item agenda mesyuarat yang berkaitan, hanya butiran sahaja"
     copied: "Disalin daripada Mesyuarat #%{id}"
   meeting_section:
@@ -154,9 +196,43 @@ ms:
     delete_confirmation: "Memadam bahagian ini akan memadam setiap item agenda juga. Adakah anda pasti anda ingin berbuat demikian?"
     placeholder_title: "Bahagian baharu"
     empty_text: "Tarik item ke sini atau cipta yang baharu"
+  recurring_meeting:
+    occurrence:
+      infoline: "Mesyuarat ini adalah sebahagian daripada siri mesyuarat berulang."
+      error_no_next: "Tiada kejadian seterusnya untuk mesyuarat ini."
+      first_already_exists: "Kejadian pertama siri mesyuarat ini telah pun dibuat seketika."
+      first_created: >
+        Mesyuarat pertama telah berjaya dibuat daripada templat. Semua mesyuarat akan datang akan dibuat secara automatik pada masa kejadian sebelumnya.
+    template:
+      button_finalize: "Selesaikan templat"
+      blank_title: "Templat siri mesyuarat anda kosong"
+      description: >
+        Templat ini akan digunakan apabila mesyuarat baharu dalam siri dibuat. Anda boleh menambah item agenda, peserta dan lampiran pada templat ini.
+      blankslate_finalize: >
+        Apabila anda selesai menyediakan templat ini, klik butang '%{button_title}' di atas untuk menyelesaikan persediaan dan menjadualkan mesyuarat pertama siri ini.
+      label_view_template: "Lihat templat"
+      label_edit_template: "Edit templat"
+      banner_html: >
+        Anda sedang mengedit templat siri mesyuarat: %{link}. Setiap kejadian baharu mesyuarat dalam siri ini akan menggunakan templat ini. Perubahan tidak akan menjejaskan mesyuarat yang lalu atau yang telah dibuat.
+    frequency:
+      every_weekday: "Setiap %{day_of_the_week}"
+      daily: "Harian"
+      working_days: "Setiap hari bekerja"
+      weekly: "Mingguan"
+    end_after:
+      specific_date: "tarikh tertentu"
+      iterations: "beberapa kejadian"
+    starts: "Mula"
+    in_words:
+      daily_interval: "Setiap %{interval} hari"
+      working_days: "Setiap hari bekerja"
+      weekly: "Setiap minggu pada %{weekday}"
+      weekly_interval: "Setiap %{interval} minggu pada %{weekday}"
+      frequency: "%{base} pada %{time}"
+      full: "%{base} pada %{time}, berakhir pada %{end_date}"
   notice_successful_notification: "Pemberitahuan berjaya dihantar"
   notice_timezone_missing: Tiada zon waktu yang ditetapkan dan %{zone} adalah diandaikan. Untuk pilih zon waktu anda, sila klik sini.
-  notice_meeting_updated: "This page has been updated by someone else. Reload to view changes."
+  notice_meeting_updated: "Halaman ini telah dikemas kini oleh orang lain. Muat semula untuk melihat perubahan."
   permission_create_meetings: "Cipta mesyuarat"
   permission_edit_meetings: "Edit mesyuarat"
   permission_delete_meetings: "Padam mesyuarat"
@@ -188,7 +264,7 @@ ms:
   label_meeting_delete: "Padam mesyuarat"
   label_meeting_created_by: "Dicipta oleh"
   label_meeting_last_updated: "Kemas kini terakhir"
-  label_meeting_reload: "Reload"
+  label_meeting_reload: "Muat semula"
   label_agenda_items: "Item-item agenda"
   label_agenda_items_reordered: "disusun semula"
   label_agenda_item_remove: "Keluarkan daripada agenda"
@@ -206,12 +282,17 @@ ms:
   text_deleted_agenda_item: 'Item agenda yang telah dipadam'
   label_initial_meeting_details: "Mesyuarat"
   label_meeting_details: "Butiran mesyuarat"
+  label_meeting_series_details: "Butiran siri mesyuarat"
   label_meeting_details_edit: "Edit butiran mesyuarat"
   label_meeting_state: "Status mesyuarat"
   label_meeting_state_open: "Buka"
   label_meeting_state_open_html: "<i>Buka</i>"
   label_meeting_state_closed: "Ditutup"
   label_meeting_state_closed_html: "<i>Ditutup</i>"
+  label_meeting_state_agenda_created: "Agenda dicipta"
+  label_meeting_state_scheduled: "Dijadualkan"
+  label_meeting_state_cancelled: "Dibatalkan"
+  label_meeting_state_skipped: "Dilangkau"
   label_meeting_reopen_action: "Buka semula mesyuarat"
   label_meeting_close_action: "Tutup mesyuarat"
   text_meeting_open_description: "Mesyuarat ini dibuka. Anda boleh tambah/keluarkan item agenda dan mengeditnya mengikut kesukaan anda. Setelah mesyuarat berakhir, tutup untuk menguncinya."
diff --git a/modules/meeting/config/locales/crowdin/ne.yml b/modules/meeting/config/locales/crowdin/ne.yml
index c8b90e056a1a..7b35eb8097b1 100644
--- a/modules/meeting/config/locales/crowdin/ne.yml
+++ b/modules/meeting/config/locales/crowdin/ne.yml
@@ -50,11 +50,18 @@ ne:
         presenter: "Presenter"
       meeting_section:
         title: "Title"
+      recurring_meeting:
+        frequency: "Frequency"
+        interval: "Interval"
+        start_date: "Starts on"
+        end_after: "End series after"
+        iterations: "Occurrences"
     errors:
       messages:
         invalid_time_format: "is not a valid time. Required format: HH:MM"
     models:
-      structured_meeting: "Meeting (dynamic)"
+      recurring_meeting: "Recurring meeting"
+      structured_meeting: "One-time meeting"
       meeting_agenda_item: "Agenda item"
       meeting_agenda: "Agenda"
       meeting_minutes: "Minutes"
@@ -88,7 +95,8 @@ ne:
   label_meeting: "Meeting"
   label_meeting_plural: "Meetings"
   label_meeting_new: "New Meeting"
-  label_meeting_new_dynamic: "New dynamic meeting"
+  label_meeting_new_dynamic: "New one-time meeting"
+  label_meeting_new_recurring: "New recurring meeting"
   label_meeting_create: "Create meeting"
   label_meeting_copy: "Copy meeting"
   label_meeting_edit: "Edit Meeting"
@@ -102,23 +110,54 @@ ne:
   label_meeting_date_time: "Date/Time"
   label_meeting_date_and_time: "Date and time"
   label_meeting_diff: "Diff"
+  label_recurring_meeting: "Recurring meeting"
+  label_recurring_meeting_part_of: "Part of a meeting series"
+  label_recurring_meeting_new: "New recurring meeting"
+  label_recurring_meeting_plural: "Recurring meetings"
+  label_template: "Template"
+  label_recurring_meeting_view: "View meeting series"
+  label_recurring_meeting_create: "Create from template"
+  label_recurring_meeting_copy: "Copy as one-off"
+  label_recurring_meeting_cancel: "Cancel this occurrence"
+  label_recurring_meeting_delete: "Delete occurrence"
+  label_recurring_meeting_delete_confirmation: >
+    This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue?
+  label_recurring_occurrence_delete_confirmation: >
+    Any meeting information not in the template will be lost. Do you want to continue?
+  label_recurring_meeting_restore: "Restore this occurrence"
+  label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})."
+  label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})."
+  label_recurring_meeting_more_past: "There are %{count} more past meetings."
+  label_recurring_meeting_more_past_singular: "There is %{count} more past meeting."
+  label_recurring_meeting_show_more: "Show more"
+  label_recurring_meeting_series_edit: "Edit meeting series"
+  label_recurring_meeting_series_delete: "Delete meeting series"
+  label_my_meetings: "My meetings"
+  label_all_meetings: "All meetings"
   label_upcoming_meetings: "Upcoming meetings"
   label_past_meetings: "Past meetings"
   label_upcoming_meetings_short: "Upcoming"
   label_past_meetings_short: "Past"
   label_involvement: "Involvement"
-  label_upcoming_invitations: "Upcoming invitations"
+  label_invitations: "Invitations"
+  label_invited_user: "Invited user"
   label_past_invitations: "Past invitations"
-  label_attendee: "Attendee"
-  label_author: "Creator"
+  label_attended: "Attended"
+  label_attended_user: "Attended user"
+  label_created_by_me: "Created by me"
   label_notify: "Send for review"
   label_icalendar: "Send iCalendar"
   label_icalendar_download: "Download iCalendar event"
+  label_view_meeting_series: "View meeting series"
+  label_meeting_series: "Meeting series"
   label_version: "Version"
   label_time_zone: "Time zone"
   label_start_date: "Start date"
   meeting:
+    participants:
+      template: "These participants will be invited automatically to all future meetings as they are created."
     attachments:
+      template: "These attached files will be included in all future meetings in the series."
       text: "Attached files are available to all meeting participants. You can also drag and drop these into agenda item notes."
     copy:
       title: "Copy meeting: %{title}"
@@ -145,9 +184,12 @@ ne:
     label_mail_all_participants: "Send email to all participants"
     types:
       classic: "Classic"
-      classic_text: "Organize your meeting in a formattable text agenda and protocol."
-      structured: "Dynamic"
-      structured_text: "Organize your meeting as a list of agenda items, optionally linking them to a work package."
+      classic_text: "Organize your meeting as a single formattable text agenda and protocol."
+      structured: "Structured"
+      one_time: "One-time"
+      recurring: "Recurring"
+      recurring_text: "Create meeting series with dynamic template for each occurrence."
+      structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package."
       structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details"
     copied: "Copied from Meeting #%{id}"
   meeting_section:
@@ -155,6 +197,40 @@ ne:
     delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?"
     placeholder_title: "New section"
     empty_text: "Drag items here or create a new one"
+  recurring_meeting:
+    occurrence:
+      infoline: "This meeting is part of a recurring meeting series."
+      error_no_next: "There is no next occurrence for this meeting."
+      first_already_exists: "The first occurrence of this meeting series is already instantiated."
+      first_created: >
+        The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence.
+    template:
+      button_finalize: "Finish template"
+      blank_title: "Your meeting series template is empty"
+      description: >
+        This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template.
+      blankslate_finalize: >
+        When you're done preparing this template, click the '%{button_title}' button above to finish the setup and schedule the first meeting of the series.
+      label_view_template: "View template"
+      label_edit_template: "Edit template"
+      banner_html: >
+        You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already created meetings.
+    frequency:
+      every_weekday: "Every %{day_of_the_week}"
+      daily: "Daily"
+      working_days: "Every working day"
+      weekly: "Weekly"
+    end_after:
+      specific_date: "a specific date"
+      iterations: "a number of occurrences"
+    starts: "Starts"
+    in_words:
+      daily_interval: "Every %{interval} days"
+      working_days: "Every working day"
+      weekly: "Every week on %{weekday}"
+      weekly_interval: "Every %{interval} weeks on %{weekday}"
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
   notice_successful_notification: "Notification sent successfully"
   notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here.
   notice_meeting_updated: "This page has been updated by someone else. Reload to view changes."
@@ -207,12 +283,17 @@ ne:
   text_deleted_agenda_item: 'Deleted agenda item'
   label_initial_meeting_details: "Meeting"
   label_meeting_details: "Meeting details"
+  label_meeting_series_details: "Meeting series details"
   label_meeting_details_edit: "Edit meeting details"
   label_meeting_state: "Meeting status"
   label_meeting_state_open: "Open"
   label_meeting_state_open_html: "<i>Open</i>"
   label_meeting_state_closed: "Closed"
   label_meeting_state_closed_html: "<i>Closed</i>"
+  label_meeting_state_agenda_created: "Agenda created"
+  label_meeting_state_scheduled: "Scheduled"
+  label_meeting_state_cancelled: "Cancelled"
+  label_meeting_state_skipped: "Skipped"
   label_meeting_reopen_action: "Reopen meeting"
   label_meeting_close_action: "Close meeting"
   text_meeting_open_description: "This meeting is open. You can add/remove agenda items and edit them as you please. After the meeting is over, close it to lock it."
diff --git a/modules/meeting/config/locales/crowdin/nl.yml b/modules/meeting/config/locales/crowdin/nl.yml
index e26043e0b8ff..63c2ab409429 100644
--- a/modules/meeting/config/locales/crowdin/nl.yml
+++ b/modules/meeting/config/locales/crowdin/nl.yml
@@ -50,11 +50,18 @@ nl:
         presenter: "Presentator"
       meeting_section:
         title: "Titel"
+      recurring_meeting:
+        frequency: "Frequentie"
+        interval: "Interval"
+        start_date: "Begint op"
+        end_after: "Serie beëindigen na"
+        iterations: "Voorvallen"
     errors:
       messages:
         invalid_time_format: "is geen geldige tijd. Vereist formaat: UH:MM"
     models:
-      structured_meeting: "Vergadering (dynamisch)"
+      recurring_meeting: "Terugkerende vergadering"
+      structured_meeting: "Eenmalige vergadering"
       meeting_agenda_item: "Agendapunt"
       meeting_agenda: "Agenda"
       meeting_minutes: "Minuten"
@@ -88,7 +95,8 @@ nl:
   label_meeting: "Vergadering"
   label_meeting_plural: "Vergaderingen"
   label_meeting_new: "Nieuwe vergadering"
-  label_meeting_new_dynamic: "Nieuwe dynamische vergadering"
+  label_meeting_new_dynamic: "Nieuwe eenmalige vergadering"
+  label_meeting_new_recurring: "Nieuwe terugkerende vergadering"
   label_meeting_create: "Creëer vergadering"
   label_meeting_copy: "Kopie vergadering"
   label_meeting_edit: "Vergadering bewerken"
@@ -102,23 +110,54 @@ nl:
   label_meeting_date_time: "Datum/Tijd"
   label_meeting_date_and_time: "Datum en tijd"
   label_meeting_diff: "Diff"
+  label_recurring_meeting: "Terugkerende vergadering"
+  label_recurring_meeting_part_of: "Deel van een vergaderreeks"
+  label_recurring_meeting_new: "Nieuwe terugkerende vergadering"
+  label_recurring_meeting_plural: "Terugkerende vergaderingen"
+  label_template: "Sjabloon"
+  label_recurring_meeting_view: "Bekijk vergaderreeksen"
+  label_recurring_meeting_create: "Op basis van sjabloon maken"
+  label_recurring_meeting_copy: "Eenmalig kopiëren"
+  label_recurring_meeting_cancel: "Deze gebeurtenis annuleren"
+  label_recurring_meeting_delete: "Gebeurtenis verwijderen"
+  label_recurring_meeting_delete_confirmation: >
+    Deze bijeenkomst maakt deel uit van een serie genaamd %{name}. Hiermee wordt alleen deze specifieke gebeurtenis verwijderd en niet de hele serie. Wilt u doorgaan?
+  label_recurring_occurrence_delete_confirmation: >
+    Alle vergaderinformatie die niet in de sjabloon staat, zal verloren gaan. Wilt u doorgaan?
+  label_recurring_meeting_restore: "Herstel deze gebeurtenis"
+  label_recurring_meeting_more: "Er zijn nog %{count} geplande vergaderingen (%{schedule})."
+  label_recurring_meeting_more_singular: "Er zijn nog %{count} geplande vergaderingen (%{schedule})."
+  label_recurring_meeting_more_past: "Er zijn %{count} meer eerdere vergaderingen."
+  label_recurring_meeting_more_past_singular: "Er zijn %{count} meer eerdere vergaderingen."
+  label_recurring_meeting_show_more: "Toon meer"
+  label_recurring_meeting_series_edit: "Vergaderreeks bewerken"
+  label_recurring_meeting_series_delete: "Verwijder serie van vergaderingen"
+  label_my_meetings: "Mijn vergaderingen"
+  label_all_meetings: "Alle vergaderingen"
   label_upcoming_meetings: "Geplande vergaderingen"
   label_past_meetings: "Eerdere vergaderingen"
   label_upcoming_meetings_short: "Aankomende"
   label_past_meetings_short: "Vorige"
   label_involvement: "Betrokkenheid"
-  label_upcoming_invitations: "Aankomende uitnodigingen"
+  label_invitations: "Uitnodigingen"
+  label_invited_user: "Uitgenodigde gebruiker"
   label_past_invitations: "Vorige uitnodigingen"
-  label_attendee: "Deelnemer"
-  label_author: "Maker"
+  label_attended: "Deelgenomen"
+  label_attended_user: "Aanwezige gebruiker"
+  label_created_by_me: "Gemaakt door mij"
   label_notify: "Verzenden voor revisie"
   label_icalendar: "Verstuur iCalendar"
   label_icalendar_download: "Download iCalendar event"
+  label_view_meeting_series: "Bekijk vergaderreeksen"
+  label_meeting_series: "Vergaderreeksen"
   label_version: "Versie"
   label_time_zone: "Tijdzone"
   label_start_date: "Startdatum"
   meeting:
+    participants:
+      template: "Deze deelnemers worden automatisch uitgenodigd voor alle toekomstige vergaderingen wanneer deze worden aangemaakt."
     attachments:
+      template: "Deze bijgevoegde bestanden zullen in alle toekomstige vergaderingen in de serie worden opgenomen."
       text: "Bijgevoegde bestanden zijn beschikbaar voor alle deelnemers aan de vergadering. U kunt deze ook naar agendapunt notities slepen."
     copy:
       title: "Kopieer vergadering: %{title}"
@@ -146,8 +185,11 @@ nl:
     types:
       classic: "Klassiek"
       classic_text: "Organiseer uw vergadering met een opmaakbare tekstagenda en protocol."
-      structured: "Dynamisch"
-      structured_text: "Organiseren van uw vergadering als een lijst met agendapunten, eventueel koppelen aan een werkpakket."
+      structured: "Gestructureerd"
+      one_time: "Eenmalig"
+      recurring: "Terugkerend"
+      recurring_text: "Maak vergaderreeksen met dynamische sjablonen voor elke gebeurtenis."
+      structured_text: "Organiseer uw vergadering als een dynamische lijst met agendapunten, optioneel gekoppeld aan een werkpakket."
       structured_text_copy: "Een vergadering kopiëren zal momenteel niet de bijbehorende agendapunten kopiëren, alleen de details"
     copied: "Gekopieerd van vergadering #%{id}"
   meeting_section:
@@ -155,6 +197,40 @@ nl:
     delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?"
     placeholder_title: "Nieuwe Sectie"
     empty_text: "Sleep items hierheen of maak een nieuwe"
+  recurring_meeting:
+    occurrence:
+      infoline: "Deze vergadering is onderdeel van een herhalende vergaderreeks."
+      error_no_next: "Er is geen volgende gebeurtenis voor deze vergadering."
+      first_already_exists: "De eerste gebeurtenis van deze vergaderreeks is al geïnitieerd."
+      first_created: >
+        De eerste vergadering is succesvol aangemaakt vanuit het sjabloon. Alle toekomstige vergaderingen worden automatisch aangemaakt op het moment van de vorige vergadering.
+    template:
+      button_finalize: "Sjabloon voltooien"
+      blank_title: "Uw vergaderreeks sjabloon is leeg"
+      description: >
+        Dit sjabloon wordt gebruikt wanneer nieuwe vergaderingen in de serie worden aangemaakt. U kunt agendapunten, deelnemers en bijlagen aan het sjabloon toevoegen.
+      blankslate_finalize: >
+        Wanneer u klaar bent met het voorbereiden van het sjabloon, klikt u op de knop '%{button_title}' hierboven om het instellen te voltooien en de eerste vergadering van de serie te plannen.
+      label_view_template: "Sjabloon bekijken"
+      label_edit_template: "Bewerkt sjabloon"
+      banner_html: >
+        U bewerkt momenteel een sjabloon van een vergaderingsreeks: %{link}. Elke nieuwe vergadering in de serie zal dit sjabloon gebruiken. Wijzigingen hebben geen invloed op al gemaakte vergaderingen.
+    frequency:
+      every_weekday: "Elke %{day_of_the_week}"
+      daily: "Dagelijks"
+      working_days: "Elke werkdag"
+      weekly: "Wekelijks"
+    end_after:
+      specific_date: "een specifieke datum"
+      iterations: "een aantal gebeurtenissen"
+    starts: "Begint"
+    in_words:
+      daily_interval: "Elke %{interval} dagen"
+      working_days: "Elke werkdag"
+      weekly: "Elke week op %{weekday}"
+      weekly_interval: "Elke %{interval} weken op %{weekday}"
+      frequency: "%{base} op %{time}"
+      full: "%{base} op %{time}, eindigt op %{end_date}"
   notice_successful_notification: "Notificatie succesvol verzonden"
   notice_timezone_missing: Geen tijdzone is ingesteld en %{zone} is aangenomen. Om uw tijdzone te kiezen, klik dan hier.
   notice_meeting_updated: "Deze pagina is door iemand anders bijgewerkt. Herlaad om wijzigingen te bekijken."
@@ -207,12 +283,17 @@ nl:
   text_deleted_agenda_item: 'Geschrapt agendapunt'
   label_initial_meeting_details: "Vergadering"
   label_meeting_details: "Vergaderdetails"
+  label_meeting_series_details: "Details vergaderreeks"
   label_meeting_details_edit: "Bewerk vergader details"
   label_meeting_state: "Vergaderstatus"
   label_meeting_state_open: "Openen"
   label_meeting_state_open_html: "<i>Open</i>"
   label_meeting_state_closed: "Gesloten"
   label_meeting_state_closed_html: "<i>Gesloten</i>"
+  label_meeting_state_agenda_created: "Agenda aangemaakt"
+  label_meeting_state_scheduled: "Gepland"
+  label_meeting_state_cancelled: "Geannuleerd"
+  label_meeting_state_skipped: "Overgeslagen"
   label_meeting_reopen_action: "Heropen vergadering"
   label_meeting_close_action: "Vergadering sluiten"
   text_meeting_open_description: "Deze vergadering is open. Je kunt agenda-items toevoegen/verwijderen en bewerken naar eigen goeddunken. Na afloop van de vergadering kun je deze sluiten, om te vergrendelen."
diff --git a/modules/meeting/config/locales/crowdin/no.yml b/modules/meeting/config/locales/crowdin/no.yml
index 7f53100247dc..c3d6e3dddd9f 100644
--- a/modules/meeting/config/locales/crowdin/no.yml
+++ b/modules/meeting/config/locales/crowdin/no.yml
@@ -50,11 +50,18 @@
         presenter: "Foredragsholder"
       meeting_section:
         title: "Tittel"
+      recurring_meeting:
+        frequency: "Frequency"
+        interval: "Interval"
+        start_date: "Starts on"
+        end_after: "End series after"
+        iterations: "Occurrences"
     errors:
       messages:
         invalid_time_format: "er ikke et gyldig tidpunkt. Formatet må være HH:MM"
     models:
-      structured_meeting: "Møte (dynamisk)"
+      recurring_meeting: "Recurring meeting"
+      structured_meeting: "One-time meeting"
       meeting_agenda_item: "Dagsorden element"
       meeting_agenda: "Saksliste"
       meeting_minutes: "Referat"
@@ -88,7 +95,8 @@
   label_meeting: "Møte"
   label_meeting_plural: "Møter"
   label_meeting_new: "Nytt møte"
-  label_meeting_new_dynamic: "New dynamic meeting"
+  label_meeting_new_dynamic: "New one-time meeting"
+  label_meeting_new_recurring: "New recurring meeting"
   label_meeting_create: "Create meeting"
   label_meeting_copy: "Copy meeting"
   label_meeting_edit: "Redigere møte"
@@ -102,23 +110,54 @@
   label_meeting_date_time: "Dato/klokkeslett"
   label_meeting_date_and_time: "Date and time"
   label_meeting_diff: "Forskjell"
+  label_recurring_meeting: "Recurring meeting"
+  label_recurring_meeting_part_of: "Part of a meeting series"
+  label_recurring_meeting_new: "New recurring meeting"
+  label_recurring_meeting_plural: "Recurring meetings"
+  label_template: "Template"
+  label_recurring_meeting_view: "View meeting series"
+  label_recurring_meeting_create: "Create from template"
+  label_recurring_meeting_copy: "Copy as one-off"
+  label_recurring_meeting_cancel: "Cancel this occurrence"
+  label_recurring_meeting_delete: "Delete occurrence"
+  label_recurring_meeting_delete_confirmation: >
+    This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue?
+  label_recurring_occurrence_delete_confirmation: >
+    Any meeting information not in the template will be lost. Do you want to continue?
+  label_recurring_meeting_restore: "Restore this occurrence"
+  label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})."
+  label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})."
+  label_recurring_meeting_more_past: "There are %{count} more past meetings."
+  label_recurring_meeting_more_past_singular: "There is %{count} more past meeting."
+  label_recurring_meeting_show_more: "Show more"
+  label_recurring_meeting_series_edit: "Edit meeting series"
+  label_recurring_meeting_series_delete: "Delete meeting series"
+  label_my_meetings: "My meetings"
+  label_all_meetings: "All meetings"
   label_upcoming_meetings: "Kommende møter"
   label_past_meetings: "Tidligere møter"
   label_upcoming_meetings_short: "Kommende"
   label_past_meetings_short: "Tidligere"
   label_involvement: "Involvering"
-  label_upcoming_invitations: "Kommende invitasjoner"
+  label_invitations: "Invitations"
+  label_invited_user: "Invited user"
   label_past_invitations: "Tidligere invitasjoner"
-  label_attendee: "Deltager"
-  label_author: "Skaper"
+  label_attended: "Attended"
+  label_attended_user: "Attended user"
+  label_created_by_me: "Created by me"
   label_notify: "Send till gjennomgang"
   label_icalendar: "Send til iCalendar"
   label_icalendar_download: "Last ned iCalendar-hendelse"
+  label_view_meeting_series: "View meeting series"
+  label_meeting_series: "Meeting series"
   label_version: "Versjon"
   label_time_zone: "Tidssone"
   label_start_date: "Startdato"
   meeting:
+    participants:
+      template: "These participants will be invited automatically to all future meetings as they are created."
     attachments:
+      template: "These attached files will be included in all future meetings in the series."
       text: "Vedlagte filer er tilgjengelige for alle møtedeltakere. Du kan også dra og slippe disse inn i til dagsorden."
     copy:
       title: "Kopier møtet %{title}"
@@ -145,9 +184,12 @@
     label_mail_all_participants: "Send e-post til alle deltagere"
     types:
       classic: "Klassisk"
-      classic_text: "Organiser møtet ditt i en formattabel tekst agenda og protokoll."
-      structured: "Dynamisk"
-      structured_text: "Organiser møtet som en liste over saker, eventuelt knytte dem til en arbeidspakke."
+      classic_text: "Organize your meeting as a single formattable text agenda and protocol."
+      structured: "Structured"
+      one_time: "One-time"
+      recurring: "Recurring"
+      recurring_text: "Create meeting series with dynamic template for each occurrence."
+      structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package."
       structured_text_copy: "Kopiering av et møte vil for tiden ikke kopiere de tilknyttede elementene på dagsordenen, bare detaljene"
     copied: "Kopiert fra møte #%{id}"
   meeting_section:
@@ -155,6 +197,40 @@
     delete_confirmation: "Hvis du sletter denne delen, slettes også dets verdier i alle prosjekter. Er du sikker på at du vil gjøre dette?"
     placeholder_title: "Ny seksjon"
     empty_text: "Dra punkter hit eller opprett et nytt"
+  recurring_meeting:
+    occurrence:
+      infoline: "This meeting is part of a recurring meeting series."
+      error_no_next: "There is no next occurrence for this meeting."
+      first_already_exists: "The first occurrence of this meeting series is already instantiated."
+      first_created: >
+        The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence.
+    template:
+      button_finalize: "Finish template"
+      blank_title: "Your meeting series template is empty"
+      description: >
+        This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template.
+      blankslate_finalize: >
+        When you're done preparing this template, click the '%{button_title}' button above to finish the setup and schedule the first meeting of the series.
+      label_view_template: "View template"
+      label_edit_template: "Edit template"
+      banner_html: >
+        You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already created meetings.
+    frequency:
+      every_weekday: "Every %{day_of_the_week}"
+      daily: "Daily"
+      working_days: "Every working day"
+      weekly: "Weekly"
+    end_after:
+      specific_date: "a specific date"
+      iterations: "a number of occurrences"
+    starts: "Starts"
+    in_words:
+      daily_interval: "Every %{interval} days"
+      working_days: "Every working day"
+      weekly: "Every week on %{weekday}"
+      weekly_interval: "Every %{interval} weeks on %{weekday}"
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
   notice_successful_notification: "Påminning sendt"
   notice_timezone_missing: Ingen tidssone angis og %{zone} antas. Vennligst klikk her for å velge egen tidssone.
   notice_meeting_updated: "Denne siden er oppdatert av noen andre. Last siden på nytt for å se endringer."
@@ -207,12 +283,17 @@
   text_deleted_agenda_item: 'Slettet dagsordenpost'
   label_initial_meeting_details: "Møte"
   label_meeting_details: "Møtedetaljer"
+  label_meeting_series_details: "Meeting series details"
   label_meeting_details_edit: "Rediger møtedetaljer"
   label_meeting_state: "Møtestatus"
   label_meeting_state_open: "Åpen"
   label_meeting_state_open_html: "<i>Åpen</i>"
   label_meeting_state_closed: "Stengt"
   label_meeting_state_closed_html: "<i>Stengt</i>"
+  label_meeting_state_agenda_created: "Agenda created"
+  label_meeting_state_scheduled: "Scheduled"
+  label_meeting_state_cancelled: "Cancelled"
+  label_meeting_state_skipped: "Skipped"
   label_meeting_reopen_action: "Gjenåpne møte"
   label_meeting_close_action: "Lukk møtet"
   text_meeting_open_description: "Dette møtet er åpen. Du kan legge til/fjerne punkter på dagsorden og redigere dem etter hvert som du ønsker. Etter at møtet er over, lukk det for å låse det."
diff --git a/modules/meeting/config/locales/crowdin/pl.yml b/modules/meeting/config/locales/crowdin/pl.yml
index 35d987c87acc..5a27070c977e 100644
--- a/modules/meeting/config/locales/crowdin/pl.yml
+++ b/modules/meeting/config/locales/crowdin/pl.yml
@@ -52,11 +52,18 @@ pl:
         presenter: "Prezenter"
       meeting_section:
         title: "Tytuł"
+      recurring_meeting:
+        frequency: "Częstotliwość"
+        interval: "Interwał"
+        start_date: "Rozpoczyna się"
+        end_after: "Zakończ serię po"
+        iterations: "Wystąpienia"
     errors:
       messages:
         invalid_time_format: "nie jest prawidłowy. Wymagany format to: GG:MM"
     models:
-      structured_meeting: "Spotkanie (dynamiczne)"
+      recurring_meeting: "Spotkanie cykliczne"
+      structured_meeting: "Spotkanie jednorazowe"
       meeting_agenda_item: "Punkt programu"
       meeting_agenda: "Plan spotkania"
       meeting_minutes: "Protokół ze spotkania"
@@ -90,7 +97,8 @@ pl:
   label_meeting: "Spotkanie"
   label_meeting_plural: "Spotkania"
   label_meeting_new: "Nowe spotkanie"
-  label_meeting_new_dynamic: "Nowe spotkanie dynamiczne"
+  label_meeting_new_dynamic: "Nowe spotkanie jednorazowe"
+  label_meeting_new_recurring: "Nowe spotkanie cykliczne"
   label_meeting_create: "Utwórz spotkanie"
   label_meeting_copy: "Skopiuj spotkanie"
   label_meeting_edit: "Edycja spotkania"
@@ -104,23 +112,54 @@ pl:
   label_meeting_date_time: "Data/Czas"
   label_meeting_date_and_time: "Data i godzina"
   label_meeting_diff: "Różnice"
+  label_recurring_meeting: "Spotkanie cykliczne"
+  label_recurring_meeting_part_of: "Część serii spotkań"
+  label_recurring_meeting_new: "Nowe spotkanie cykliczne"
+  label_recurring_meeting_plural: "Spotkania cykliczne"
+  label_template: "Szablon"
+  label_recurring_meeting_view: "Wyświetl serię spotkań"
+  label_recurring_meeting_create: "Utwórz z szablonu"
+  label_recurring_meeting_copy: "Skopiuj jako jednorazowe"
+  label_recurring_meeting_cancel: "Anuluj to wystąpienie"
+  label_recurring_meeting_delete: "Usuń wystąpienie"
+  label_recurring_meeting_delete_confirmation: >
+    To spotkanie jest częścią serii o nazwie %{name}. Spowoduje to usunięcie tylko tego konkretnego wystąpienia, a nie całej serii. Czy chcesz kontynuować?
+  label_recurring_occurrence_delete_confirmation: >
+    Wszelkie informacje o spotkaniu, które nie znajdują się w szablonie, zostaną utracone. Czy chcesz kontynuować?
+  label_recurring_meeting_restore: "Przywróć to wystąpienie"
+  label_recurring_meeting_more: "Jest więcej (%{count}) zaplanowanych spotkań (%{schedule})."
+  label_recurring_meeting_more_singular: "Jest jeszcze %{count} zaplanowane spotkanie (%{schedule})."
+  label_recurring_meeting_more_past: "Jest więcej (%{count}) poprzednich spotkań."
+  label_recurring_meeting_more_past_singular: "Jest jeszcze %{count} poprzednie spotkanie."
+  label_recurring_meeting_show_more: "Pokaż więcej"
+  label_recurring_meeting_series_edit: "Edytuj serię spotkań"
+  label_recurring_meeting_series_delete: "Usuń serię spotkań"
+  label_my_meetings: "Moje spotkania"
+  label_all_meetings: "Wszystkie spotkania"
   label_upcoming_meetings: "Nadchodzące spotkania"
   label_past_meetings: "Przeszłe spotkania"
   label_upcoming_meetings_short: "Nadchodzące"
   label_past_meetings_short: "Poprzednie"
   label_involvement: "Zaangażowanie"
-  label_upcoming_invitations: "Nadchodzące zaproszenia"
+  label_invitations: "Zaproszenia"
+  label_invited_user: "Zaproszony użytkownik"
   label_past_invitations: "Poprzednie zaproszenia"
-  label_attendee: "Uczestnik"
-  label_author: "Twórca"
+  label_attended: "Uczestniczył"
+  label_attended_user: "Uczestniczący użytkownik"
+  label_created_by_me: "Utworzone przeze mnie"
   label_notify: "Wyślij do przeglądu"
   label_icalendar: "Wyślij iCalendar"
   label_icalendar_download: "Pobierz wydarzenie iCalendar"
+  label_view_meeting_series: "Wyświetl serię spotkań"
+  label_meeting_series: "Seria spotkań"
   label_version: "Wersja"
   label_time_zone: "Strefa czasowa"
   label_start_date: "Data rozpoczęcia"
   meeting:
+    participants:
+      template: "Uczestnicy ci będą automatycznie zapraszani na wszystkie przyszłe spotkania w miarę ich tworzenia."
     attachments:
+      template: "Załączone pliki zostaną uwzględnione we wszystkich przyszłych spotkaniach z tej serii."
       text: "Załączone pliki są dostępne dla wszystkich uczestników spotkania. Można je również przeciągać i upuszczać w notatkach do punktów planu spotkania."
     copy:
       title: "Kopiuj spotkanie: %{title}"
@@ -147,9 +186,12 @@ pl:
     label_mail_all_participants: "Wyślij wiadomość e-mail do wszystkich uczestników"
     types:
       classic: "Klasyczny"
-      classic_text: "Zorganizuj spotkanie w formatowanym tekstowym planie spotkania i protokole."
-      structured: "Dynamiczne"
-      structured_text: "Zorganizuj spotkanie jako listę punktów planu spotkania, opcjonalnie powiązując je z pakietem roboczym."
+      classic_text: "Zorganizuj spotkanie w jednym formatowanym tekstowym planie spotkania i protokole."
+      structured: "Zorganizowane"
+      one_time: "Jednorazowe"
+      recurring: "Cykliczne"
+      recurring_text: "Utwórz serię spotkań z dynamicznym szablonem dla każdego wystąpienia."
+      structured_text: "Zorganizuj spotkanie jako dynamiczną listę punktów planu spotkania, opcjonalnie powiązując je z pakietem roboczym."
       structured_text_copy: "Skopiowanie spotkania nie powoduje obecnie skopiowania powiązanych pozycji planu spotkania, a jedynie szczegółów"
     copied: "Skopiowano ze spotkania #%{id}"
   meeting_section:
@@ -157,6 +199,40 @@ pl:
     delete_confirmation: "Usunięcie sekcji spowoduje również usunięcie wszystkich jej elementów punktów planu spotkania. Czy na pewno chcesz to zrobić?"
     placeholder_title: "Nowa sekcja"
     empty_text: "Przeciągnij elementy tutaj lub utwórz nowe"
+  recurring_meeting:
+    occurrence:
+      infoline: "Spotkanie to jest częścią serii spotkań cyklicznych."
+      error_no_next: "Nie ma następnego wystąpienia tego spotkania."
+      first_already_exists: "Pierwsze wystąpienie tej serii spotkań jest już tworzone."
+      first_created: >
+        Pierwsze spotkanie zostało utworzone z szablonu. Wszystkie przyszłe spotkania zostaną utworzone automatycznie o godzinie poprzedniego wystąpienia.
+    template:
+      button_finalize: "Zakończ szablon"
+      blank_title: "Szablon serii spotkań jest pusty"
+      description: >
+        Ten szablon będzie używany za każdym razem, gdy zostaną utworzone nowe spotkania w serii. Do tego szablonu możesz dodać elementy planu spotkania, uczestników i załączniki.
+      blankslate_finalize: >
+        Gdy skończysz przygotowywać ten szablon, kliknij przycisk „%{button_title}” powyżej, aby zakończyć konfigurację i zaplanować pierwsze spotkanie serii.
+      label_view_template: "Wyświetl szablon"
+      label_edit_template: "Edytuj szablon"
+      banner_html: >
+        Aktualnie edytujesz szablon serii spotkań: %{link}. Każde nowe wystąpienie spotkania w serii będzie używać tego szablonu. Zmiany nie będą miały wpływu na wcześniejsze ani już utworzone spotkania.
+    frequency:
+      every_weekday: "Co %{day_of_the_week}"
+      daily: "Codziennie"
+      working_days: "W każdy dzień roboczy"
+      weekly: "Co tydzień"
+    end_after:
+      specific_date: "określona data"
+      iterations: "liczba wystąpień"
+    starts: "Zaczyna się"
+    in_words:
+      daily_interval: "Co %{interval} dni"
+      working_days: "W każdy dzień roboczy"
+      weekly: "Co tydzień w %{weekday}"
+      weekly_interval: "Co %{interval} tyg. w %{weekday}"
+      frequency: "%{base} o %{time}"
+      full: "%{base} o %{time}, kończy się %{end_date}"
   notice_successful_notification: "Powiadomienia wysłane pomyślnie"
   notice_timezone_missing: 'Została ustawiona domyślna strefa czasowa: %{zone}. Aby zmienić strefę czasową, kliknij tutaj.'
   notice_meeting_updated: "Ta strona została zaktualizowana przez kogoś innego. Załaduj ją ponownie, aby wyświetlić zmiany."
@@ -209,12 +285,17 @@ pl:
   text_deleted_agenda_item: 'Usunięty punkt planu spotkania'
   label_initial_meeting_details: "Spotkanie"
   label_meeting_details: "Szczegóły spotkania"
+  label_meeting_series_details: "Szczegóły serii spotkań"
   label_meeting_details_edit: "Edytuj szczegóły spotkania"
   label_meeting_state: "Status spotkania"
   label_meeting_state_open: "Otwórz"
   label_meeting_state_open_html: "<i>Otwarte</i>"
   label_meeting_state_closed: "Zamknięte"
   label_meeting_state_closed_html: "<i>Zamknięte</i>"
+  label_meeting_state_agenda_created: "Utworzono plan spotkania"
+  label_meeting_state_scheduled: "Zaplanowano"
+  label_meeting_state_cancelled: "Anulowano"
+  label_meeting_state_skipped: "Pominięto"
   label_meeting_reopen_action: "Otwórz ponownie spotkanie"
   label_meeting_close_action: "Zamknij spotkanie"
   text_meeting_open_description: "To spotkanie jest otwarte. Możesz dodać/usunąć elementy planu spotkania i edytować je tak, jak chcesz. Po zakończeniu spotkania zamknij je, aby je zablokować."
diff --git a/modules/meeting/config/locales/crowdin/pt-BR.yml b/modules/meeting/config/locales/crowdin/pt-BR.yml
index 2ff08e8659b9..81fb5437cce0 100644
--- a/modules/meeting/config/locales/crowdin/pt-BR.yml
+++ b/modules/meeting/config/locales/crowdin/pt-BR.yml
@@ -50,11 +50,18 @@ pt-BR:
         presenter: "Apresentador"
       meeting_section:
         title: "Título"
+      recurring_meeting:
+        frequency: "Frequência"
+        interval: "Intervalo"
+        start_date: "Começa em"
+        end_after: "Encerrar série após"
+        iterations: "Ocorrências"
     errors:
       messages:
         invalid_time_format: "não é um horário válido. Formato exigido: HH:MM"
     models:
-      structured_meeting: "Reunião (dinâmica)"
+      recurring_meeting: "Reunião recorrente"
+      structured_meeting: "Reunião única"
       meeting_agenda_item: "Item da agenda"
       meeting_agenda: "Agenda"
       meeting_minutes: "Atas"
@@ -88,7 +95,8 @@ pt-BR:
   label_meeting: "Reunião"
   label_meeting_plural: "Reuniões"
   label_meeting_new: "Nova Reunião"
-  label_meeting_new_dynamic: "Nova reunião dinâmica"
+  label_meeting_new_dynamic: "Nova reunião única"
+  label_meeting_new_recurring: "Nova reunião recorrente"
   label_meeting_create: "Criar reunião"
   label_meeting_copy: "Copiar reunião"
   label_meeting_edit: "Editar Reunião"
@@ -102,23 +110,54 @@ pt-BR:
   label_meeting_date_time: "Data/Horário"
   label_meeting_date_and_time: "Data e hora"
   label_meeting_diff: "Diferenças"
+  label_recurring_meeting: "Reunião recorrente"
+  label_recurring_meeting_part_of: "Parte de uma série de reuniões"
+  label_recurring_meeting_new: "Nova reunião recorrente"
+  label_recurring_meeting_plural: "Reuniões recorrentes"
+  label_template: "Modelo"
+  label_recurring_meeting_view: "Visualizar série de reuniões"
+  label_recurring_meeting_create: "Criar a partir de um modelo"
+  label_recurring_meeting_copy: "Copiar como único"
+  label_recurring_meeting_cancel: "Cancelar esta ocorrência"
+  label_recurring_meeting_delete: "Excluir ocorrência"
+  label_recurring_meeting_delete_confirmation: >
+    Esta reunião faz parte da série %{name}. Apenas esta ocorrência será excluída, não a série inteira. Deseja continuar?
+  label_recurring_occurrence_delete_confirmation: >
+    Quaisquer informações da reunião que não estejam no modelo serão descartadas. Deseja continuar?
+  label_recurring_meeting_restore: "Restaurar esta ocorrência"
+  label_recurring_meeting_more: "Há mais %{count} reuniões programadas (%{schedule})."
+  label_recurring_meeting_more_singular: "Há mais %{count} reunião programada (%{schedule})."
+  label_recurring_meeting_more_past: "Há mais %{count} reuniões anteriores."
+  label_recurring_meeting_more_past_singular: "Há mais %{count} reunião anterior."
+  label_recurring_meeting_show_more: "Exibir mais"
+  label_recurring_meeting_series_edit: "Editar série de reuniões"
+  label_recurring_meeting_series_delete: "Excluir série de reuniões"
+  label_my_meetings: "Minhas reuniões"
+  label_all_meetings: "Todas as reuniões"
   label_upcoming_meetings: "Próximas reuniões"
   label_past_meetings: "Reuniões anteriores"
   label_upcoming_meetings_short: "Próximos"
   label_past_meetings_short: "Passado"
   label_involvement: "Envolvimento"
-  label_upcoming_invitations: "Próximos convites"
+  label_invitations: "Convites"
+  label_invited_user: "Usuário convidado"
   label_past_invitations: "Convites anteriores"
-  label_attendee: "Participante"
-  label_author: "Criador"
+  label_attended: "Participou"
+  label_attended_user: "Usuário participante"
+  label_created_by_me: "Criado por mim"
   label_notify: "Enviar para revisão"
   label_icalendar: "Enviar iCalendar"
   label_icalendar_download: "Baixar evento iCalendar"
+  label_view_meeting_series: "Visualizar série de reuniões"
+  label_meeting_series: "Séries da reunião"
   label_version: "Versão"
   label_time_zone: "Fuso horário"
   label_start_date: "Data de início"
   meeting:
+    participants:
+      template: "Esses participantes serão adicionados automaticamente a todas as reuniões futuras à medida que forem agendadas."
     attachments:
+      template: "Esses arquivos anexados serão adicionados a todas as reuniões futuras da série."
       text: "Os arquivos anexados podem ser acessados por todos os participantes da reunião. Além disso, você pode simplesmente arrastá-los e soltá-los nas anotações do item da agenda."
     copy:
       title: "Copiar reunião: %{title}"
@@ -145,9 +184,12 @@ pt-BR:
     label_mail_all_participants: "Enviar e-mail para todos os participantes"
     types:
       classic: "Clássico"
-      classic_text: "Organize sua reunião em uma agenda e protocolo de texto formatáveis."
-      structured: "Dinâmico"
-      structured_text: "Organize sua reunião como uma lista de itens da agenda, opcionalmente vinculando-os a um pacote de trabalho."
+      classic_text: "Organize sua reunião como uma única agenda e protocolo de texto formatáveis."
+      structured: "Estruturada"
+      one_time: "Única"
+      recurring: "Recorrente"
+      recurring_text: "Criar série de reuniões com modelo dinâmico para cada evento."
+      structured_text: "Organize sua reunião como uma lista dinâmica de itens da agenda, opcionalmente vinculando-os a um pacote de trabalho."
       structured_text_copy: "Copiar uma reunião atualmente não copiará os itens associados da agenda da reunião, apenas os detalhes"
     copied: "Copiado para a Reunião #%{id}"
   meeting_section:
@@ -155,6 +197,40 @@ pt-BR:
     delete_confirmation: "Excluir a seção também excluirá todos os itens da pauta. Tem certeza de que deseja fazer isso?"
     placeholder_title: "Nova seção"
     empty_text: "Arraste itens para cá ou crie um novo."
+  recurring_meeting:
+    occurrence:
+      infoline: "Esta reunião faz parte de uma série de reuniões recorrentes."
+      error_no_next: "Não há uma próxima ocorrência desta reunião."
+      first_already_exists: "A primeira ocorrência desta série de reuniões já foi agendada."
+      first_created: >
+        A primeira reunião foi criada com sucesso a partir do modelo. Todas as reuniões subsequentes serão criadas automaticamente no horário da ocorrência anterior.
+    template:
+      button_finalize: "Finalizar modelo"
+      blank_title: "O modelo da sua série de reuniões está vazio"
+      description: >
+        Este modelo será utilizado sempre que novas reuniões na série forem criadas. Você pode adicionar itens da agenda, participantes e anexos a este modelo.
+      blankslate_finalize: >
+        Quando terminar de preparar este modelo, clique no botão "%{button_title}" acima para concluir a configuração e agendar a primeira reunião da série.
+      label_view_template: "Ver modelo"
+      label_edit_template: "Editar modelo"
+      banner_html: >
+        Atualmente, você está editando um modelo de série de reuniões: %{link}. Todas as novas ocorrências de reuniões na série usarão este modelo. Alterações não afetarão reuniões passadas ou já agendadas.
+    frequency:
+      every_weekday: "Todos os %{day_of_the_week}"
+      daily: "Diariamente"
+      working_days: "Todos os dias úteis"
+      weekly: "Semanalmente"
+    end_after:
+      specific_date: "uma data específica"
+      iterations: "um número de ocorrências"
+    starts: "Começa"
+    in_words:
+      daily_interval: "A cada %{interval} dias"
+      working_days: "Todos os dias úteis"
+      weekly: "Todas as semanas na %{weekday}"
+      weekly_interval: "Todas as %{interval} semanas em %{weekday}"
+      frequency: "%{base} em %{time}"
+      full: "%{base} em %{time}, termina em %{end_date}"
   notice_successful_notification: "Notificação enviada com sucesso"
   notice_timezone_missing: Nenhum fuso horário está definido, portanto assumiu-se %{zone}. Para escolher o seu fuso horário, clique aqui.
   notice_meeting_updated: "Esta página foi atualizada por outra pessoa. Recarregue para visualizar as alterações."
@@ -207,12 +283,17 @@ pt-BR:
   text_deleted_agenda_item: 'Item da agenda excluído'
   label_initial_meeting_details: "Reunião"
   label_meeting_details: "Detalhes da reunião"
+  label_meeting_series_details: "Detalhes da série de reuniões"
   label_meeting_details_edit: "Editar detalhes da reunião"
   label_meeting_state: "Estado da reunião"
   label_meeting_state_open: "Aberta"
   label_meeting_state_open_html: "<I>Aberta</i>"
   label_meeting_state_closed: "Fechada"
   label_meeting_state_closed_html: "<I>Fechada</i>"
+  label_meeting_state_agenda_created: "Agenda criada"
+  label_meeting_state_scheduled: "Planejada"
+  label_meeting_state_cancelled: "Cancelada"
+  label_meeting_state_skipped: "Pulada"
   label_meeting_reopen_action: "Reabrir reunião"
   label_meeting_close_action: "Fechar reunião"
   text_meeting_open_description: "Esta reunião está aberta. Você pode adicionar/remover itens da agenda e editá-los como desejar. Depois que a reunião terminar, feche-a para bloqueá-la."
diff --git a/modules/meeting/config/locales/crowdin/pt-PT.yml b/modules/meeting/config/locales/crowdin/pt-PT.yml
index e9d75b137f7f..f654c868220e 100644
--- a/modules/meeting/config/locales/crowdin/pt-PT.yml
+++ b/modules/meeting/config/locales/crowdin/pt-PT.yml
@@ -50,11 +50,18 @@ pt-PT:
         presenter: "Apresentador"
       meeting_section:
         title: "Título"
+      recurring_meeting:
+        frequency: "Frequência"
+        interval: "Intervalo"
+        start_date: "Inicia em"
+        end_after: "Terminar a série após"
+        iterations: "Ocorrências"
     errors:
       messages:
         invalid_time_format: "não é uma hora válida. Formato exigido: HH:MM"
     models:
-      structured_meeting: "Reunião (dinâmica)"
+      recurring_meeting: "Reunião recorrente"
+      structured_meeting: "Reunião única"
       meeting_agenda_item: "Pontos da ordem de trabalhos"
       meeting_agenda: "Agenda"
       meeting_minutes: "Minutos"
@@ -88,7 +95,8 @@ pt-PT:
   label_meeting: "Reunião"
   label_meeting_plural: "Reuniões"
   label_meeting_new: "Nova reunião"
-  label_meeting_new_dynamic: "Nova reunião dinâmica"
+  label_meeting_new_dynamic: "Nova reunião única"
+  label_meeting_new_recurring: "Nova reunião recorrente"
   label_meeting_create: "Criar reunião"
   label_meeting_copy: "Copiar reunião"
   label_meeting_edit: "Editar a reunião"
@@ -102,23 +110,54 @@ pt-PT:
   label_meeting_date_time: "Data/Hora"
   label_meeting_date_and_time: "Data e hora"
   label_meeting_diff: "Diferença"
+  label_recurring_meeting: "Reunião recorrente"
+  label_recurring_meeting_part_of: "Parte de uma série de reuniões"
+  label_recurring_meeting_new: "Nova reunião recorrente"
+  label_recurring_meeting_plural: "Reuniões recorrentes"
+  label_template: "Modelo"
+  label_recurring_meeting_view: "Ver séries de reuniões"
+  label_recurring_meeting_create: "Criar a partir do modelo"
+  label_recurring_meeting_copy: "Copie como uma única"
+  label_recurring_meeting_cancel: "Cancelar esta ocorrência"
+  label_recurring_meeting_delete: "Eliminar ocorrência"
+  label_recurring_meeting_delete_confirmation: >
+    Esta reunião faz parte de uma série chamada %{name}. Esta ação apenas irá eliminar esta ocorrência em particular e não toda a série. Deseja continuar?
+  label_recurring_occurrence_delete_confirmation: >
+    Qualquer informação da reunião que não esteja no modelo será perdida. Pretende continuar?
+  label_recurring_meeting_restore: "Restaurar esta ocorrência"
+  label_recurring_meeting_more: "Existem mais %{count} reuniões agendadas (%{schedule})."
+  label_recurring_meeting_more_singular: "Existe mais %{count} reunião agendada (%{schedule})."
+  label_recurring_meeting_more_past: "Existem mais %{count} reuniões no passado."
+  label_recurring_meeting_more_past_singular: "Existe mais %{count} reunião no passado."
+  label_recurring_meeting_show_more: "Mostrar mais"
+  label_recurring_meeting_series_edit: "Editar série de reuniões"
+  label_recurring_meeting_series_delete: "Eliminar série de reuniões"
+  label_my_meetings: "As minhas reuniões"
+  label_all_meetings: "Todas as reuniões"
   label_upcoming_meetings: "Próximas reuniões"
   label_past_meetings: "Reuniões anteriores"
   label_upcoming_meetings_short: "Próximas"
   label_past_meetings_short: "Passado"
   label_involvement: "Envolvimento"
-  label_upcoming_invitations: "Próximos convites"
+  label_invitations: "Convites"
+  label_invited_user: "Utilizador convidado"
   label_past_invitations: "Convites anteriores"
-  label_attendee: "Participante"
-  label_author: "Criador"
+  label_attended: "Participou"
+  label_attended_user: "Utilizador participante"
+  label_created_by_me: "Criado por mim"
   label_notify: "Enviar para revisão"
   label_icalendar: "Enviar iCalendar"
   label_icalendar_download: "Transferir evento iCalendar"
+  label_view_meeting_series: "Ver séries de reuniões"
+  label_meeting_series: "Séries de reuniões"
   label_version: "Versão"
   label_time_zone: "Fuso horário"
   label_start_date: "Data de início"
   meeting:
+    participants:
+      template: "Estes participantes serão convidados automaticamente para todas as reuniões futuras à medida que forem sendo criadas."
     attachments:
+      template: "Estes ficheiros em anexo serão incluídos em todas as futuras reuniões da série."
       text: "Os ficheiros anexados estão disponíveis para todos os participantes na reunião. Também pode arrastar e soltar estes ficheiros nas notas do item da agenda."
     copy:
       title: "Copiar reunião: %{title}"
@@ -145,9 +184,12 @@ pt-PT:
     label_mail_all_participants: "Enviar e-mail a todos os participantes"
     types:
       classic: "Clássico"
-      classic_text: "Organize a sua reunião numa agenda e protocolo de texto formatáveis."
-      structured: "Dinâmico"
-      structured_text: "Organize a sua reunião como uma lista de itens da agenda, associando-os opcionalmente a um pacote de trabalho."
+      classic_text: "Organize a sua reunião numa única agenda e protocolo de texto formatáveis."
+      structured: "Estruturada"
+      one_time: "Única"
+      recurring: "Recorrente"
+      recurring_text: "Crie séries de reuniões com um modelo dinâmico para cada ocorrência."
+      structured_text: "Organize a sua reunião como uma lista dinâmica de itens da agenda, associando-os opcionalmente a um pacote de trabalho."
       structured_text_copy: "Atualmente, a cópia de uma reunião não copia os itens associados da agenda da reunião, apenas os detalhes"
     copied: "Copiado da reunião #%{id}"
   meeting_section:
@@ -155,6 +197,40 @@ pt-PT:
     delete_confirmation: "A eliminação da secção também irá eliminar os seus pontos da ordem de trabalhos. Tem a certeza de que pretende fazê-lo?"
     placeholder_title: "Nova secção"
     empty_text: "Arraste itens para aqui ou crie um novo"
+  recurring_meeting:
+    occurrence:
+      infoline: "Esta reunião faz parte de uma série de reuniões recorrentes."
+      error_no_next: "Esta reunião não tem data prevista para a sua próxima ocorrência."
+      first_already_exists: "A primeira ocorrência desta série de reuniões já está instanciada."
+      first_created: >
+        A primeira reunião foi criada com êxito a partir do modelo. Todas as reuniões futuras serão criadas automaticamente na altura da ocorrência anterior.
+    template:
+      button_finalize: "Terminar modelo"
+      blank_title: "O seu modelo da série de reuniões está vazio"
+      description: >
+        Este modelo será utilizado sempre que forem criadas novas reuniões na série. Pode adicionar itens da agenda, participantes e anexos a este modelo.
+      blankslate_finalize: >
+        Quando terminar de preparar este modelo, clique no botão "%{button_title}" acima para concluir a configuração e agendar a primeira reunião da série.
+      label_view_template: "Ver modelo"
+      label_edit_template: "Editar modelo"
+      banner_html: >
+        Está a editar um modelo de uma série de reuniões: %{link}. Cada ocorrência nova de uma reunião na série irá utilizar este modelo. As alterações não irão afetar as reuniões anteriores ou já criadas.
+    frequency:
+      every_weekday: "A cada %{day_of_the_week}"
+      daily: "Diário"
+      working_days: "Todos os dias úteis"
+      weekly: "Semanal"
+    end_after:
+      specific_date: "uma data específica"
+      iterations: "um certo número de ocorrências"
+    starts: "Começa"
+    in_words:
+      daily_interval: "A cada %{interval} dias"
+      working_days: "Todos os dias úteis"
+      weekly: "Todas as semanas à/ao %{weekday}"
+      weekly_interval: "A cada %{interval} semanas à/ao %{weekday}"
+      frequency: "%{base} às %{time}"
+      full: "%{base} às %{time}, termina a %{end_date}"
   notice_successful_notification: "Notificação enviada com sucesso"
   notice_timezone_missing: Sem fuso horário definido, presume-se %{zone}. Para escolher o seu fuso horário, por favor clique aqui.
   notice_meeting_updated: "Esta página foi atualizada por outra pessoa. Recarregue para ver as alterações."
@@ -207,12 +283,17 @@ pt-PT:
   text_deleted_agenda_item: 'Ponto da ordem de trabalhos eliminado'
   label_initial_meeting_details: "Reunião"
   label_meeting_details: "Detalhes da Reunião"
+  label_meeting_series_details: "Detalhes das séries de reuniões"
   label_meeting_details_edit: "Editar detalhes da reunião"
   label_meeting_state: "Estado da reunião"
   label_meeting_state_open: "Aberto"
   label_meeting_state_open_html: "<i>Aberta</i>"
   label_meeting_state_closed: "Fechado"
   label_meeting_state_closed_html: "<i>Fechada</i>"
+  label_meeting_state_agenda_created: "Agenda criada"
+  label_meeting_state_scheduled: "Agendada"
+  label_meeting_state_cancelled: "Cancelada"
+  label_meeting_state_skipped: "Ignorada"
   label_meeting_reopen_action: "Reabrir reunião"
   label_meeting_close_action: "Encerrar reunião"
   text_meeting_open_description: "Esta reunião está aberta. Você pode adicionar/remover itens da agenda e editá-los quando necessário. Após a reunião acabar, feche-a para trancá-la."
diff --git a/modules/meeting/config/locales/crowdin/ro.yml b/modules/meeting/config/locales/crowdin/ro.yml
index da438dc964ba..2ad6b9568b2d 100644
--- a/modules/meeting/config/locales/crowdin/ro.yml
+++ b/modules/meeting/config/locales/crowdin/ro.yml
@@ -51,11 +51,18 @@ ro:
         presenter: "Presenter"
       meeting_section:
         title: "Titlu"
+      recurring_meeting:
+        frequency: "Frequency"
+        interval: "Interval"
+        start_date: "Starts on"
+        end_after: "End series after"
+        iterations: "Occurrences"
     errors:
       messages:
         invalid_time_format: "nu este o oră valabilă. Format necesar: HH:MM"
     models:
-      structured_meeting: "Meeting (dynamic)"
+      recurring_meeting: "Recurring meeting"
+      structured_meeting: "One-time meeting"
       meeting_agenda_item: "Agenda item"
       meeting_agenda: "Agendă"
       meeting_minutes: "Minute"
@@ -89,7 +96,8 @@ ro:
   label_meeting: "ID Întâlnire"
   label_meeting_plural: "Întâlniri"
   label_meeting_new: "Noua întâlnire"
-  label_meeting_new_dynamic: "New dynamic meeting"
+  label_meeting_new_dynamic: "New one-time meeting"
+  label_meeting_new_recurring: "New recurring meeting"
   label_meeting_create: "Create meeting"
   label_meeting_copy: "Copy meeting"
   label_meeting_edit: "Editare Întâlnire"
@@ -103,23 +111,54 @@ ro:
   label_meeting_date_time: "Dată/Timp"
   label_meeting_date_and_time: "Date and time"
   label_meeting_diff: "Dif"
+  label_recurring_meeting: "Recurring meeting"
+  label_recurring_meeting_part_of: "Part of a meeting series"
+  label_recurring_meeting_new: "New recurring meeting"
+  label_recurring_meeting_plural: "Recurring meetings"
+  label_template: "Șablon"
+  label_recurring_meeting_view: "View meeting series"
+  label_recurring_meeting_create: "Create from template"
+  label_recurring_meeting_copy: "Copy as one-off"
+  label_recurring_meeting_cancel: "Cancel this occurrence"
+  label_recurring_meeting_delete: "Delete occurrence"
+  label_recurring_meeting_delete_confirmation: >
+    This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue?
+  label_recurring_occurrence_delete_confirmation: >
+    Any meeting information not in the template will be lost. Do you want to continue?
+  label_recurring_meeting_restore: "Restore this occurrence"
+  label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})."
+  label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})."
+  label_recurring_meeting_more_past: "There are %{count} more past meetings."
+  label_recurring_meeting_more_past_singular: "There is %{count} more past meeting."
+  label_recurring_meeting_show_more: "Show more"
+  label_recurring_meeting_series_edit: "Edit meeting series"
+  label_recurring_meeting_series_delete: "Delete meeting series"
+  label_my_meetings: "My meetings"
+  label_all_meetings: "All meetings"
   label_upcoming_meetings: "Upcoming meetings"
   label_past_meetings: "Past meetings"
   label_upcoming_meetings_short: "Upcoming"
   label_past_meetings_short: "Past"
   label_involvement: "Implicare"
-  label_upcoming_invitations: "Upcoming invitations"
+  label_invitations: "Invitations"
+  label_invited_user: "Invited user"
   label_past_invitations: "Past invitations"
-  label_attendee: "Attendee"
-  label_author: "Creator"
+  label_attended: "Attended"
+  label_attended_user: "Attended user"
+  label_created_by_me: "Created by me"
   label_notify: "Trimiteți pentru revizuire"
   label_icalendar: "Trimiteți iCalendar"
   label_icalendar_download: "Download iCalendar event"
+  label_view_meeting_series: "View meeting series"
+  label_meeting_series: "Meeting series"
   label_version: "Versiune"
   label_time_zone: "Fus orar"
   label_start_date: "Dată început"
   meeting:
+    participants:
+      template: "These participants will be invited automatically to all future meetings as they are created."
     attachments:
+      template: "These attached files will be included in all future meetings in the series."
       text: "Attached files are available to all meeting participants. You can also drag and drop these into agenda item notes."
     copy:
       title: "Copiază întâlnirea: %{title}"
@@ -146,9 +185,12 @@ ro:
     label_mail_all_participants: "Send email to all participants"
     types:
       classic: "Classic"
-      classic_text: "Organize your meeting in a formattable text agenda and protocol."
-      structured: "Dynamic"
-      structured_text: "Organize your meeting as a list of agenda items, optionally linking them to a work package."
+      classic_text: "Organize your meeting as a single formattable text agenda and protocol."
+      structured: "Structured"
+      one_time: "One-time"
+      recurring: "Recurring"
+      recurring_text: "Create meeting series with dynamic template for each occurrence."
+      structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package."
       structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details"
     copied: "Copiat de la Întâlnire #%{id}"
   meeting_section:
@@ -156,6 +198,40 @@ ro:
     delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?"
     placeholder_title: "New section"
     empty_text: "Drag items here or create a new one"
+  recurring_meeting:
+    occurrence:
+      infoline: "This meeting is part of a recurring meeting series."
+      error_no_next: "There is no next occurrence for this meeting."
+      first_already_exists: "The first occurrence of this meeting series is already instantiated."
+      first_created: >
+        The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence.
+    template:
+      button_finalize: "Finish template"
+      blank_title: "Your meeting series template is empty"
+      description: >
+        This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template.
+      blankslate_finalize: >
+        When you're done preparing this template, click the '%{button_title}' button above to finish the setup and schedule the first meeting of the series.
+      label_view_template: "View template"
+      label_edit_template: "Edit template"
+      banner_html: >
+        You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already created meetings.
+    frequency:
+      every_weekday: "Every %{day_of_the_week}"
+      daily: "Daily"
+      working_days: "Every working day"
+      weekly: "Weekly"
+    end_after:
+      specific_date: "a specific date"
+      iterations: "a number of occurrences"
+    starts: "Starts"
+    in_words:
+      daily_interval: "Every %{interval} days"
+      working_days: "Every working day"
+      weekly: "Every week on %{weekday}"
+      weekly_interval: "Every %{interval} weeks on %{weekday}"
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
   notice_successful_notification: "Notificare trimisă cu succes"
   notice_timezone_missing: Nu este setat niciun fus orar și se presupune %{zone}. Pentru a vă alege fusul orar, vă rugăm să faceți clic aici.
   notice_meeting_updated: "This page has been updated by someone else. Reload to view changes."
@@ -208,12 +284,17 @@ ro:
   text_deleted_agenda_item: 'Deleted agenda item'
   label_initial_meeting_details: "ID întâlnire"
   label_meeting_details: "Meeting details"
+  label_meeting_series_details: "Meeting series details"
   label_meeting_details_edit: "Edit meeting details"
   label_meeting_state: "Meeting status"
   label_meeting_state_open: "Deschisă"
   label_meeting_state_open_html: "<i>Open</i>"
   label_meeting_state_closed: "Închisă"
   label_meeting_state_closed_html: "<i>Closed</i>"
+  label_meeting_state_agenda_created: "Agenda created"
+  label_meeting_state_scheduled: "Scheduled"
+  label_meeting_state_cancelled: "Cancelled"
+  label_meeting_state_skipped: "Skipped"
   label_meeting_reopen_action: "Reopen meeting"
   label_meeting_close_action: "Close meeting"
   text_meeting_open_description: "This meeting is open. You can add/remove agenda items and edit them as you please. After the meeting is over, close it to lock it."
diff --git a/modules/meeting/config/locales/crowdin/ru.yml b/modules/meeting/config/locales/crowdin/ru.yml
index fc62432c9be8..975e926d817c 100644
--- a/modules/meeting/config/locales/crowdin/ru.yml
+++ b/modules/meeting/config/locales/crowdin/ru.yml
@@ -52,11 +52,18 @@ ru:
         presenter: "Ведущий"
       meeting_section:
         title: "Заголовок"
+      recurring_meeting:
+        frequency: "Периодичность"
+        interval: "Промежуток"
+        start_date: "Начинается"
+        end_after: "Завершение серии после"
+        iterations: "События"
     errors:
       messages:
         invalid_time_format: "недопустимое время. Требуемый формат: ЧЧ:ММ"
     models:
-      structured_meeting: "Встреча (динамическая)"
+      recurring_meeting: "Повторяющееся совещание"
+      structured_meeting: "Однократное совещание"
       meeting_agenda_item: "Пункт повестки"
       meeting_agenda: "Повестка дня"
       meeting_minutes: "Протокол(-ы)"
@@ -90,7 +97,8 @@ ru:
   label_meeting: "Совещание"
   label_meeting_plural: "Совещания"
   label_meeting_new: "Новое совещание"
-  label_meeting_new_dynamic: "Новое активное совещание"
+  label_meeting_new_dynamic: "Новое однократное совещание"
+  label_meeting_new_recurring: "Новое повторяющееся совещание"
   label_meeting_create: "Создать совещание"
   label_meeting_copy: "Копировать совещание"
   label_meeting_edit: "Измененить совещание"
@@ -104,23 +112,54 @@ ru:
   label_meeting_date_time: "Дата/Время"
   label_meeting_date_and_time: "Дата и время"
   label_meeting_diff: "Различия"
+  label_recurring_meeting: "Повторяющееся совещание"
+  label_recurring_meeting_part_of: "Часть серии совещаний"
+  label_recurring_meeting_new: "Новое повторяющееся совещание"
+  label_recurring_meeting_plural: "Повторяющиеся совещания"
+  label_template: "Шаблон"
+  label_recurring_meeting_view: "Посмотреть серию совещаний"
+  label_recurring_meeting_create: "Создать из шаблона"
+  label_recurring_meeting_copy: "Копировать как одноразовое"
+  label_recurring_meeting_cancel: "Отменить это событие"
+  label_recurring_meeting_delete: "Удалить событие"
+  label_recurring_meeting_delete_confirmation: >
+    Это совещание является частью серии под названием %{name}. Это приведет к удалению только этого конкретного совещания, а не всей серии. Вы хотите продолжить?
+  label_recurring_occurrence_delete_confirmation: >
+    Любая информация о совещании, не включенная в шаблон, будет потеряна. Вы хотите продолжить?
+  label_recurring_meeting_restore: "Восстановить это событие"
+  label_recurring_meeting_more: "Есть еще %{count} запланированных совещаний (%{schedule})."
+  label_recurring_meeting_more_singular: "Есть еще %{count} запланированное совещание (%{schedule})."
+  label_recurring_meeting_more_past: "Есть еще %{count} прошедших совещаний."
+  label_recurring_meeting_more_past_singular: "Есть еще %{count} прошедшее совещание."
+  label_recurring_meeting_show_more: "Показать еще"
+  label_recurring_meeting_series_edit: "Изменить серию совещаний"
+  label_recurring_meeting_series_delete: "Удалить серию совещаний"
+  label_my_meetings: "Мои совещания"
+  label_all_meetings: "Все совещания"
   label_upcoming_meetings: "Предстоящие встречи"
   label_past_meetings: "Прошедшие встречи"
   label_upcoming_meetings_short: "Предстоящие"
   label_past_meetings_short: "Прошедшие"
   label_involvement: "Вовлечение"
-  label_upcoming_invitations: "Предстоящие приглашения"
+  label_invitations: "Приглашения"
+  label_invited_user: "Приглашенный пользователь"
   label_past_invitations: "Прошлые приглашения"
-  label_attendee: "Участник"
-  label_author: "Автор"
+  label_attended: "Участвовал"
+  label_attended_user: "Участвовавший пользователь"
+  label_created_by_me: "Создано мной"
   label_notify: "Отправка на рецензию"
   label_icalendar: "Отправить iCalendar"
   label_icalendar_download: "Скачать мероприятие iCalendar"
+  label_view_meeting_series: "Посмотреть серию совещаний"
+  label_meeting_series: "Серия совещаний"
   label_version: "Версия"
   label_time_zone: "Часовой пояс"
   label_start_date: "Дата начала"
   meeting:
+    participants:
+      template: "Эти участники будут автоматически приглашаться на все будущие совещания по мере их создания."
     attachments:
+      template: "Эти прикрепленные файлы будут включены во все последующие совещания этой серии."
       text: "Прикрепленные файлы доступны всем участникам совещания. Вы также можете перенести их в примечания к пунктам повестки дня."
     copy:
       title: "Копировать встречу %{title}"
@@ -147,8 +186,11 @@ ru:
     label_mail_all_participants: "Отправить письмо всем участникам"
     types:
       classic: "Классический"
-      classic_text: "Организуйте своё совещание с помощью форматируемой текстовой повестки и протокола."
-      structured: "Динамический"
+      classic_text: "Организуйте встречу как одну форматируемую повестку и протокол."
+      structured: "Структурированная"
+      one_time: "Однократная"
+      recurring: "Периодичность"
+      recurring_text: "Создать серию встреч с динамическим шаблоном для каждого события."
       structured_text: "Организуйте своё совещание в виде списка пунктов повестки, при необходимости связав их с пакетом работ."
       structured_text_copy: "При копировании совещания в настоящее время не скопируются связанные с ним пункты повестки, будут скопированы только детали"
     copied: "Скопировано со встречи #%{id}"
@@ -157,6 +199,40 @@ ru:
     delete_confirmation: "Удаление раздела также удалит все пункты его повестки дня. Вы уверены, что хотите это сделать?"
     placeholder_title: "Новый раздел"
     empty_text: "Перенесите элементы сюда или создайте новые"
+  recurring_meeting:
+    occurrence:
+      infoline: "Это совещание является частью повторяющейся серии совещаний."
+      error_no_next: "Следующее событие для этого совещания не состоится."
+      first_already_exists: "Первое событие этой серии совещаний уже произошло."
+      first_created: >
+        Первое совещание было успешно создано из шаблона. Все последующие совещания будут создаваться автоматически в момент предыдущего.
+    template:
+      button_finalize: "Завершить шаблон"
+      blank_title: "Ваш шаблон серии совещаний пуст"
+      description: >
+        Этот шаблон будет использоваться каждый раз, когда будут создаваться новые совещания в серии. Вы можете добавить в этот шаблон пункты повестки дня, участников и вложения.
+      blankslate_finalize: >
+        По завершении подготовки шаблона нажмите кнопку '%{button_title}', чтобы завершить установку и запланировать первое совещание этой серии.
+      label_view_template: "Посмотреть шаблон"
+      label_edit_template: "Изменить шаблон"
+      banner_html: >
+        В настоящее время вы редактируете шаблон серии совещаний: %{link}. Каждое новое совещание в этой серии будет использовать этот шаблон. Изменения не повлияют на прошлые или уже созданные совещания.
+    frequency:
+      every_weekday: "Каждый %{day_of_the_week}"
+      daily: "Ежедневно"
+      working_days: "Каждый рабочий день"
+      weekly: "Еженедельно"
+    end_after:
+      specific_date: "конкретная дата"
+      iterations: "количество событий"
+    starts: "Начало"
+    in_words:
+      daily_interval: "Каждые %{interval} дней"
+      working_days: "Каждый рабочий день"
+      weekly: "Каждую неделю в %{weekday}"
+      weekly_interval: "Каждые %{interval} недель в %{weekday}"
+      frequency: "%{base} в %{time}"
+      full: "%{base} в %{time}, заканчивается %{end_date}"
   notice_successful_notification: "Уведомление успешно отправленно"
   notice_timezone_missing: Не установлен часовой пояс и применена %{zone}. Чтобы выбрать часовой пояс, пожалуйста, нажмите сюда.
   notice_meeting_updated: "Эта страница была обновлена кем-то другим. Перезагрузите страницу, чтобы просмотреть изменения."
@@ -209,12 +285,17 @@ ru:
   text_deleted_agenda_item: 'Удаленный пункт повестки'
   label_initial_meeting_details: "Встреча"
   label_meeting_details: "Детали совещания"
+  label_meeting_series_details: "Подробности серии совещаний"
   label_meeting_details_edit: "Изменить сведения о встрече"
   label_meeting_state: "Статус встречи"
   label_meeting_state_open: "Открыть"
   label_meeting_state_open_html: "<i>Открыть</i>"
   label_meeting_state_closed: "Закрыть"
   label_meeting_state_closed_html: "<i>Закрытый</i>"
+  label_meeting_state_agenda_created: "Повестка дня создана"
+  label_meeting_state_scheduled: "Запланировано"
+  label_meeting_state_cancelled: "Отменено"
+  label_meeting_state_skipped: "Пропущено"
   label_meeting_reopen_action: "Открыть совещание заново"
   label_meeting_close_action: "Закрыть совещание"
   text_meeting_open_description: "Эта совещание является открытым. Вы можете добавлять/удалять пункты повестки и редактировать их по своему усмотрению. После завершения совещания закройте его, чтобы заблокировать."
diff --git a/modules/meeting/config/locales/crowdin/rw.yml b/modules/meeting/config/locales/crowdin/rw.yml
index fda34d7e5f25..8e8e96b30ddb 100644
--- a/modules/meeting/config/locales/crowdin/rw.yml
+++ b/modules/meeting/config/locales/crowdin/rw.yml
@@ -50,11 +50,18 @@ rw:
         presenter: "Presenter"
       meeting_section:
         title: "Title"
+      recurring_meeting:
+        frequency: "Frequency"
+        interval: "Interval"
+        start_date: "Starts on"
+        end_after: "End series after"
+        iterations: "Occurrences"
     errors:
       messages:
         invalid_time_format: "is not a valid time. Required format: HH:MM"
     models:
-      structured_meeting: "Meeting (dynamic)"
+      recurring_meeting: "Recurring meeting"
+      structured_meeting: "One-time meeting"
       meeting_agenda_item: "Agenda item"
       meeting_agenda: "Agenda"
       meeting_minutes: "Minutes"
@@ -88,7 +95,8 @@ rw:
   label_meeting: "Meeting"
   label_meeting_plural: "Meetings"
   label_meeting_new: "New Meeting"
-  label_meeting_new_dynamic: "New dynamic meeting"
+  label_meeting_new_dynamic: "New one-time meeting"
+  label_meeting_new_recurring: "New recurring meeting"
   label_meeting_create: "Create meeting"
   label_meeting_copy: "Copy meeting"
   label_meeting_edit: "Edit Meeting"
@@ -102,23 +110,54 @@ rw:
   label_meeting_date_time: "Date/Time"
   label_meeting_date_and_time: "Date and time"
   label_meeting_diff: "Diff"
+  label_recurring_meeting: "Recurring meeting"
+  label_recurring_meeting_part_of: "Part of a meeting series"
+  label_recurring_meeting_new: "New recurring meeting"
+  label_recurring_meeting_plural: "Recurring meetings"
+  label_template: "Template"
+  label_recurring_meeting_view: "View meeting series"
+  label_recurring_meeting_create: "Create from template"
+  label_recurring_meeting_copy: "Copy as one-off"
+  label_recurring_meeting_cancel: "Cancel this occurrence"
+  label_recurring_meeting_delete: "Delete occurrence"
+  label_recurring_meeting_delete_confirmation: >
+    This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue?
+  label_recurring_occurrence_delete_confirmation: >
+    Any meeting information not in the template will be lost. Do you want to continue?
+  label_recurring_meeting_restore: "Restore this occurrence"
+  label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})."
+  label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})."
+  label_recurring_meeting_more_past: "There are %{count} more past meetings."
+  label_recurring_meeting_more_past_singular: "There is %{count} more past meeting."
+  label_recurring_meeting_show_more: "Show more"
+  label_recurring_meeting_series_edit: "Edit meeting series"
+  label_recurring_meeting_series_delete: "Delete meeting series"
+  label_my_meetings: "My meetings"
+  label_all_meetings: "All meetings"
   label_upcoming_meetings: "Upcoming meetings"
   label_past_meetings: "Past meetings"
   label_upcoming_meetings_short: "Upcoming"
   label_past_meetings_short: "Past"
   label_involvement: "Involvement"
-  label_upcoming_invitations: "Upcoming invitations"
+  label_invitations: "Invitations"
+  label_invited_user: "Invited user"
   label_past_invitations: "Past invitations"
-  label_attendee: "Attendee"
-  label_author: "Creator"
+  label_attended: "Attended"
+  label_attended_user: "Attended user"
+  label_created_by_me: "Created by me"
   label_notify: "Send for review"
   label_icalendar: "Send iCalendar"
   label_icalendar_download: "Download iCalendar event"
+  label_view_meeting_series: "View meeting series"
+  label_meeting_series: "Meeting series"
   label_version: "Version"
   label_time_zone: "Time zone"
   label_start_date: "Start date"
   meeting:
+    participants:
+      template: "These participants will be invited automatically to all future meetings as they are created."
     attachments:
+      template: "These attached files will be included in all future meetings in the series."
       text: "Attached files are available to all meeting participants. You can also drag and drop these into agenda item notes."
     copy:
       title: "Copy meeting: %{title}"
@@ -145,9 +184,12 @@ rw:
     label_mail_all_participants: "Send email to all participants"
     types:
       classic: "Classic"
-      classic_text: "Organize your meeting in a formattable text agenda and protocol."
-      structured: "Dynamic"
-      structured_text: "Organize your meeting as a list of agenda items, optionally linking them to a work package."
+      classic_text: "Organize your meeting as a single formattable text agenda and protocol."
+      structured: "Structured"
+      one_time: "One-time"
+      recurring: "Recurring"
+      recurring_text: "Create meeting series with dynamic template for each occurrence."
+      structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package."
       structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details"
     copied: "Copied from Meeting #%{id}"
   meeting_section:
@@ -155,6 +197,40 @@ rw:
     delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?"
     placeholder_title: "New section"
     empty_text: "Drag items here or create a new one"
+  recurring_meeting:
+    occurrence:
+      infoline: "This meeting is part of a recurring meeting series."
+      error_no_next: "There is no next occurrence for this meeting."
+      first_already_exists: "The first occurrence of this meeting series is already instantiated."
+      first_created: >
+        The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence.
+    template:
+      button_finalize: "Finish template"
+      blank_title: "Your meeting series template is empty"
+      description: >
+        This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template.
+      blankslate_finalize: >
+        When you're done preparing this template, click the '%{button_title}' button above to finish the setup and schedule the first meeting of the series.
+      label_view_template: "View template"
+      label_edit_template: "Edit template"
+      banner_html: >
+        You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already created meetings.
+    frequency:
+      every_weekday: "Every %{day_of_the_week}"
+      daily: "Daily"
+      working_days: "Every working day"
+      weekly: "Weekly"
+    end_after:
+      specific_date: "a specific date"
+      iterations: "a number of occurrences"
+    starts: "Starts"
+    in_words:
+      daily_interval: "Every %{interval} days"
+      working_days: "Every working day"
+      weekly: "Every week on %{weekday}"
+      weekly_interval: "Every %{interval} weeks on %{weekday}"
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
   notice_successful_notification: "Notification sent successfully"
   notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here.
   notice_meeting_updated: "This page has been updated by someone else. Reload to view changes."
@@ -207,12 +283,17 @@ rw:
   text_deleted_agenda_item: 'Deleted agenda item'
   label_initial_meeting_details: "Meeting"
   label_meeting_details: "Meeting details"
+  label_meeting_series_details: "Meeting series details"
   label_meeting_details_edit: "Edit meeting details"
   label_meeting_state: "Meeting status"
   label_meeting_state_open: "Open"
   label_meeting_state_open_html: "<i>Open</i>"
   label_meeting_state_closed: "Closed"
   label_meeting_state_closed_html: "<i>Closed</i>"
+  label_meeting_state_agenda_created: "Agenda created"
+  label_meeting_state_scheduled: "Scheduled"
+  label_meeting_state_cancelled: "Cancelled"
+  label_meeting_state_skipped: "Skipped"
   label_meeting_reopen_action: "Reopen meeting"
   label_meeting_close_action: "Close meeting"
   text_meeting_open_description: "This meeting is open. You can add/remove agenda items and edit them as you please. After the meeting is over, close it to lock it."
diff --git a/modules/meeting/config/locales/crowdin/si.yml b/modules/meeting/config/locales/crowdin/si.yml
index 51997928ccd7..02fd65d33bae 100644
--- a/modules/meeting/config/locales/crowdin/si.yml
+++ b/modules/meeting/config/locales/crowdin/si.yml
@@ -50,11 +50,18 @@ si:
         presenter: "Presenter"
       meeting_section:
         title: "මාතෘකාව"
+      recurring_meeting:
+        frequency: "Frequency"
+        interval: "Interval"
+        start_date: "Starts on"
+        end_after: "End series after"
+        iterations: "Occurrences"
     errors:
       messages:
         invalid_time_format: "is not a valid time. Required format: HH:MM"
     models:
-      structured_meeting: "Meeting (dynamic)"
+      recurring_meeting: "Recurring meeting"
+      structured_meeting: "One-time meeting"
       meeting_agenda_item: "Agenda item"
       meeting_agenda: "Agenda"
       meeting_minutes: "Minutes"
@@ -88,7 +95,8 @@ si:
   label_meeting: "Meeting"
   label_meeting_plural: "Meetings"
   label_meeting_new: "New Meeting"
-  label_meeting_new_dynamic: "New dynamic meeting"
+  label_meeting_new_dynamic: "New one-time meeting"
+  label_meeting_new_recurring: "New recurring meeting"
   label_meeting_create: "Create meeting"
   label_meeting_copy: "Copy meeting"
   label_meeting_edit: "Edit Meeting"
@@ -102,23 +110,54 @@ si:
   label_meeting_date_time: "Date/Time"
   label_meeting_date_and_time: "Date and time"
   label_meeting_diff: "Diff"
+  label_recurring_meeting: "Recurring meeting"
+  label_recurring_meeting_part_of: "Part of a meeting series"
+  label_recurring_meeting_new: "New recurring meeting"
+  label_recurring_meeting_plural: "Recurring meetings"
+  label_template: "Template"
+  label_recurring_meeting_view: "View meeting series"
+  label_recurring_meeting_create: "Create from template"
+  label_recurring_meeting_copy: "Copy as one-off"
+  label_recurring_meeting_cancel: "Cancel this occurrence"
+  label_recurring_meeting_delete: "Delete occurrence"
+  label_recurring_meeting_delete_confirmation: >
+    This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue?
+  label_recurring_occurrence_delete_confirmation: >
+    Any meeting information not in the template will be lost. Do you want to continue?
+  label_recurring_meeting_restore: "Restore this occurrence"
+  label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})."
+  label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})."
+  label_recurring_meeting_more_past: "There are %{count} more past meetings."
+  label_recurring_meeting_more_past_singular: "There is %{count} more past meeting."
+  label_recurring_meeting_show_more: "Show more"
+  label_recurring_meeting_series_edit: "Edit meeting series"
+  label_recurring_meeting_series_delete: "Delete meeting series"
+  label_my_meetings: "My meetings"
+  label_all_meetings: "All meetings"
   label_upcoming_meetings: "Upcoming meetings"
   label_past_meetings: "Past meetings"
   label_upcoming_meetings_short: "Upcoming"
   label_past_meetings_short: "Past"
   label_involvement: "Involvement"
-  label_upcoming_invitations: "Upcoming invitations"
+  label_invitations: "Invitations"
+  label_invited_user: "Invited user"
   label_past_invitations: "Past invitations"
-  label_attendee: "Attendee"
-  label_author: "Creator"
+  label_attended: "Attended"
+  label_attended_user: "Attended user"
+  label_created_by_me: "Created by me"
   label_notify: "Send for review"
   label_icalendar: "Send iCalendar"
   label_icalendar_download: "Download iCalendar event"
+  label_view_meeting_series: "View meeting series"
+  label_meeting_series: "Meeting series"
   label_version: "අනුවාදය"
   label_time_zone: "වේලා කලාපය"
   label_start_date: "ආරම්භක දිනය"
   meeting:
+    participants:
+      template: "These participants will be invited automatically to all future meetings as they are created."
     attachments:
+      template: "These attached files will be included in all future meetings in the series."
       text: "Attached files are available to all meeting participants. You can also drag and drop these into agenda item notes."
     copy:
       title: "Copy meeting: %{title}"
@@ -145,9 +184,12 @@ si:
     label_mail_all_participants: "Send email to all participants"
     types:
       classic: "Classic"
-      classic_text: "Organize your meeting in a formattable text agenda and protocol."
-      structured: "Dynamic"
-      structured_text: "Organize your meeting as a list of agenda items, optionally linking them to a work package."
+      classic_text: "Organize your meeting as a single formattable text agenda and protocol."
+      structured: "Structured"
+      one_time: "One-time"
+      recurring: "Recurring"
+      recurring_text: "Create meeting series with dynamic template for each occurrence."
+      structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package."
       structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details"
     copied: "Copied from Meeting #%{id}"
   meeting_section:
@@ -155,6 +197,40 @@ si:
     delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?"
     placeholder_title: "New section"
     empty_text: "Drag items here or create a new one"
+  recurring_meeting:
+    occurrence:
+      infoline: "This meeting is part of a recurring meeting series."
+      error_no_next: "There is no next occurrence for this meeting."
+      first_already_exists: "The first occurrence of this meeting series is already instantiated."
+      first_created: >
+        The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence.
+    template:
+      button_finalize: "Finish template"
+      blank_title: "Your meeting series template is empty"
+      description: >
+        This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template.
+      blankslate_finalize: >
+        When you're done preparing this template, click the '%{button_title}' button above to finish the setup and schedule the first meeting of the series.
+      label_view_template: "View template"
+      label_edit_template: "Edit template"
+      banner_html: >
+        You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already created meetings.
+    frequency:
+      every_weekday: "Every %{day_of_the_week}"
+      daily: "Daily"
+      working_days: "Every working day"
+      weekly: "Weekly"
+    end_after:
+      specific_date: "a specific date"
+      iterations: "a number of occurrences"
+    starts: "Starts"
+    in_words:
+      daily_interval: "Every %{interval} days"
+      working_days: "Every working day"
+      weekly: "Every week on %{weekday}"
+      weekly_interval: "Every %{interval} weeks on %{weekday}"
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
   notice_successful_notification: "Notification sent successfully"
   notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here.
   notice_meeting_updated: "This page has been updated by someone else. Reload to view changes."
@@ -207,12 +283,17 @@ si:
   text_deleted_agenda_item: 'Deleted agenda item'
   label_initial_meeting_details: "Meeting"
   label_meeting_details: "Meeting details"
+  label_meeting_series_details: "Meeting series details"
   label_meeting_details_edit: "Edit meeting details"
   label_meeting_state: "Meeting status"
   label_meeting_state_open: "විවෘත"
   label_meeting_state_open_html: "<i>Open</i>"
   label_meeting_state_closed: "වසා"
   label_meeting_state_closed_html: "<i>Closed</i>"
+  label_meeting_state_agenda_created: "Agenda created"
+  label_meeting_state_scheduled: "Scheduled"
+  label_meeting_state_cancelled: "Cancelled"
+  label_meeting_state_skipped: "Skipped"
   label_meeting_reopen_action: "Reopen meeting"
   label_meeting_close_action: "Close meeting"
   text_meeting_open_description: "This meeting is open. You can add/remove agenda items and edit them as you please. After the meeting is over, close it to lock it."
diff --git a/modules/meeting/config/locales/crowdin/sk.yml b/modules/meeting/config/locales/crowdin/sk.yml
index 3ecc01614173..37bfeebcffb4 100644
--- a/modules/meeting/config/locales/crowdin/sk.yml
+++ b/modules/meeting/config/locales/crowdin/sk.yml
@@ -52,11 +52,18 @@ sk:
         presenter: "Presenter"
       meeting_section:
         title: "Nadpis"
+      recurring_meeting:
+        frequency: "Frequency"
+        interval: "Interval"
+        start_date: "Starts on"
+        end_after: "End series after"
+        iterations: "Occurrences"
     errors:
       messages:
         invalid_time_format: "nie je platný čas. Požadovaný formát: HH:MM"
     models:
-      structured_meeting: "Meeting (dynamic)"
+      recurring_meeting: "Recurring meeting"
+      structured_meeting: "One-time meeting"
       meeting_agenda_item: "Agenda item"
       meeting_agenda: "Agenda"
       meeting_minutes: "Zápisnica"
@@ -90,7 +97,8 @@ sk:
   label_meeting: "Stretnutie"
   label_meeting_plural: "Stretnutia"
   label_meeting_new: "Nové stretnutie"
-  label_meeting_new_dynamic: "New dynamic meeting"
+  label_meeting_new_dynamic: "New one-time meeting"
+  label_meeting_new_recurring: "New recurring meeting"
   label_meeting_create: "Create meeting"
   label_meeting_copy: "Copy meeting"
   label_meeting_edit: "Upraviť stretnutie"
@@ -104,23 +112,54 @@ sk:
   label_meeting_date_time: "Dátum/čas"
   label_meeting_date_and_time: "Date and time"
   label_meeting_diff: "Rozdieľ"
+  label_recurring_meeting: "Recurring meeting"
+  label_recurring_meeting_part_of: "Part of a meeting series"
+  label_recurring_meeting_new: "New recurring meeting"
+  label_recurring_meeting_plural: "Recurring meetings"
+  label_template: "Template"
+  label_recurring_meeting_view: "View meeting series"
+  label_recurring_meeting_create: "Create from template"
+  label_recurring_meeting_copy: "Copy as one-off"
+  label_recurring_meeting_cancel: "Cancel this occurrence"
+  label_recurring_meeting_delete: "Delete occurrence"
+  label_recurring_meeting_delete_confirmation: >
+    This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue?
+  label_recurring_occurrence_delete_confirmation: >
+    Any meeting information not in the template will be lost. Do you want to continue?
+  label_recurring_meeting_restore: "Restore this occurrence"
+  label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})."
+  label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})."
+  label_recurring_meeting_more_past: "There are %{count} more past meetings."
+  label_recurring_meeting_more_past_singular: "There is %{count} more past meeting."
+  label_recurring_meeting_show_more: "Show more"
+  label_recurring_meeting_series_edit: "Edit meeting series"
+  label_recurring_meeting_series_delete: "Delete meeting series"
+  label_my_meetings: "My meetings"
+  label_all_meetings: "All meetings"
   label_upcoming_meetings: "Upcoming meetings"
   label_past_meetings: "Past meetings"
   label_upcoming_meetings_short: "Upcoming"
   label_past_meetings_short: "Past"
   label_involvement: "Involvement"
-  label_upcoming_invitations: "Upcoming invitations"
+  label_invitations: "Invitations"
+  label_invited_user: "Invited user"
   label_past_invitations: "Past invitations"
-  label_attendee: "Attendee"
-  label_author: "Creator"
+  label_attended: "Attended"
+  label_attended_user: "Attended user"
+  label_created_by_me: "Created by me"
   label_notify: "Odoslať na revíziu"
   label_icalendar: "Zaslať iKalendár"
   label_icalendar_download: "Download iCalendar event"
+  label_view_meeting_series: "View meeting series"
+  label_meeting_series: "Meeting series"
   label_version: "Verzia"
   label_time_zone: "Časové pásmo"
   label_start_date: "Dátum začiatku"
   meeting:
+    participants:
+      template: "These participants will be invited automatically to all future meetings as they are created."
     attachments:
+      template: "These attached files will be included in all future meetings in the series."
       text: "Attached files are available to all meeting participants. You can also drag and drop these into agenda item notes."
     copy:
       title: "Copy meeting: %{title}"
@@ -147,9 +186,12 @@ sk:
     label_mail_all_participants: "Send email to all participants"
     types:
       classic: "Classic"
-      classic_text: "Organize your meeting in a formattable text agenda and protocol."
-      structured: "Dynamic"
-      structured_text: "Organize your meeting as a list of agenda items, optionally linking them to a work package."
+      classic_text: "Organize your meeting as a single formattable text agenda and protocol."
+      structured: "Structured"
+      one_time: "One-time"
+      recurring: "Recurring"
+      recurring_text: "Create meeting series with dynamic template for each occurrence."
+      structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package."
       structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details"
     copied: "Copied from Meeting #%{id}"
   meeting_section:
@@ -157,6 +199,40 @@ sk:
     delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?"
     placeholder_title: "New section"
     empty_text: "Drag items here or create a new one"
+  recurring_meeting:
+    occurrence:
+      infoline: "This meeting is part of a recurring meeting series."
+      error_no_next: "There is no next occurrence for this meeting."
+      first_already_exists: "The first occurrence of this meeting series is already instantiated."
+      first_created: >
+        The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence.
+    template:
+      button_finalize: "Finish template"
+      blank_title: "Your meeting series template is empty"
+      description: >
+        This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template.
+      blankslate_finalize: >
+        When you're done preparing this template, click the '%{button_title}' button above to finish the setup and schedule the first meeting of the series.
+      label_view_template: "View template"
+      label_edit_template: "Edit template"
+      banner_html: >
+        You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already created meetings.
+    frequency:
+      every_weekday: "Every %{day_of_the_week}"
+      daily: "Daily"
+      working_days: "Every working day"
+      weekly: "Weekly"
+    end_after:
+      specific_date: "a specific date"
+      iterations: "a number of occurrences"
+    starts: "Starts"
+    in_words:
+      daily_interval: "Every %{interval} days"
+      working_days: "Every working day"
+      weekly: "Every week on %{weekday}"
+      weekly_interval: "Every %{interval} weeks on %{weekday}"
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
   notice_successful_notification: "Notifikácia úspešne odoslaná"
   notice_timezone_missing: Časové pásmo nebolo špecificky nastavené, použilo sa teda %{zone}. Ak chcete vybrať iné časové pásmo, kliknite prosím tu.
   notice_meeting_updated: "This page has been updated by someone else. Reload to view changes."
@@ -209,12 +285,17 @@ sk:
   text_deleted_agenda_item: 'Deleted agenda item'
   label_initial_meeting_details: "Stretnutie"
   label_meeting_details: "Meeting details"
+  label_meeting_series_details: "Meeting series details"
   label_meeting_details_edit: "Edit meeting details"
   label_meeting_state: "Meeting status"
   label_meeting_state_open: "Otvorené"
   label_meeting_state_open_html: "<i>Open</i>"
   label_meeting_state_closed: "Zatvorený"
   label_meeting_state_closed_html: "<i>Closed</i>"
+  label_meeting_state_agenda_created: "Agenda created"
+  label_meeting_state_scheduled: "Scheduled"
+  label_meeting_state_cancelled: "Cancelled"
+  label_meeting_state_skipped: "Skipped"
   label_meeting_reopen_action: "Reopen meeting"
   label_meeting_close_action: "Close meeting"
   text_meeting_open_description: "This meeting is open. You can add/remove agenda items and edit them as you please. After the meeting is over, close it to lock it."
diff --git a/modules/meeting/config/locales/crowdin/sl.yml b/modules/meeting/config/locales/crowdin/sl.yml
index a15b7cb22ac0..afb2eceb1cdf 100644
--- a/modules/meeting/config/locales/crowdin/sl.yml
+++ b/modules/meeting/config/locales/crowdin/sl.yml
@@ -52,11 +52,18 @@ sl:
         presenter: "Presenter"
       meeting_section:
         title: "Naslov"
+      recurring_meeting:
+        frequency: "Frequency"
+        interval: "Interval"
+        start_date: "Starts on"
+        end_after: "End series after"
+        iterations: "Occurrences"
     errors:
       messages:
         invalid_time_format: "ni veljaven čas. Potreben format: HH:MM"
     models:
-      structured_meeting: "Meeting (dynamic)"
+      recurring_meeting: "Recurring meeting"
+      structured_meeting: "One-time meeting"
       meeting_agenda_item: "Agenda item"
       meeting_agenda: "Dnevni red"
       meeting_minutes: "Zapisnik"
@@ -90,7 +97,8 @@ sl:
   label_meeting: "Sestanek"
   label_meeting_plural: "Sestanki"
   label_meeting_new: "Nov sestanek"
-  label_meeting_new_dynamic: "New dynamic meeting"
+  label_meeting_new_dynamic: "New one-time meeting"
+  label_meeting_new_recurring: "New recurring meeting"
   label_meeting_create: "Create meeting"
   label_meeting_copy: "Copy meeting"
   label_meeting_edit: "Uredi sestanek"
@@ -104,23 +112,54 @@ sl:
   label_meeting_date_time: "Datum/čas"
   label_meeting_date_and_time: "Date and time"
   label_meeting_diff: "Razlikovanje"
+  label_recurring_meeting: "Recurring meeting"
+  label_recurring_meeting_part_of: "Part of a meeting series"
+  label_recurring_meeting_new: "New recurring meeting"
+  label_recurring_meeting_plural: "Recurring meetings"
+  label_template: "Template"
+  label_recurring_meeting_view: "View meeting series"
+  label_recurring_meeting_create: "Create from template"
+  label_recurring_meeting_copy: "Copy as one-off"
+  label_recurring_meeting_cancel: "Cancel this occurrence"
+  label_recurring_meeting_delete: "Delete occurrence"
+  label_recurring_meeting_delete_confirmation: >
+    This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue?
+  label_recurring_occurrence_delete_confirmation: >
+    Any meeting information not in the template will be lost. Do you want to continue?
+  label_recurring_meeting_restore: "Restore this occurrence"
+  label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})."
+  label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})."
+  label_recurring_meeting_more_past: "There are %{count} more past meetings."
+  label_recurring_meeting_more_past_singular: "There is %{count} more past meeting."
+  label_recurring_meeting_show_more: "Show more"
+  label_recurring_meeting_series_edit: "Edit meeting series"
+  label_recurring_meeting_series_delete: "Delete meeting series"
+  label_my_meetings: "My meetings"
+  label_all_meetings: "All meetings"
   label_upcoming_meetings: "Upcoming meetings"
   label_past_meetings: "Past meetings"
   label_upcoming_meetings_short: "Upcoming"
   label_past_meetings_short: "Past"
   label_involvement: "Involvement"
-  label_upcoming_invitations: "Upcoming invitations"
+  label_invitations: "Invitations"
+  label_invited_user: "Invited user"
   label_past_invitations: "Past invitations"
-  label_attendee: "Attendee"
-  label_author: "Creator"
+  label_attended: "Attended"
+  label_attended_user: "Attended user"
+  label_created_by_me: "Created by me"
   label_notify: "Pošljite v pregled"
   label_icalendar: "Pošljite iCalendar"
   label_icalendar_download: "Download iCalendar event"
+  label_view_meeting_series: "View meeting series"
+  label_meeting_series: "Meeting series"
   label_version: "Različica"
   label_time_zone: "Časovni pas"
   label_start_date: "Datum začetka"
   meeting:
+    participants:
+      template: "These participants will be invited automatically to all future meetings as they are created."
     attachments:
+      template: "These attached files will be included in all future meetings in the series."
       text: "Attached files are available to all meeting participants. You can also drag and drop these into agenda item notes."
     copy:
       title: "Copy meeting: %{title}"
@@ -147,9 +186,12 @@ sl:
     label_mail_all_participants: "Send email to all participants"
     types:
       classic: "Classic"
-      classic_text: "Organize your meeting in a formattable text agenda and protocol."
-      structured: "Dynamic"
-      structured_text: "Organize your meeting as a list of agenda items, optionally linking them to a work package."
+      classic_text: "Organize your meeting as a single formattable text agenda and protocol."
+      structured: "Structured"
+      one_time: "One-time"
+      recurring: "Recurring"
+      recurring_text: "Create meeting series with dynamic template for each occurrence."
+      structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package."
       structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details"
     copied: "Kopirano iz sestanka #%{id}"
   meeting_section:
@@ -157,6 +199,40 @@ sl:
     delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?"
     placeholder_title: "New section"
     empty_text: "Drag items here or create a new one"
+  recurring_meeting:
+    occurrence:
+      infoline: "This meeting is part of a recurring meeting series."
+      error_no_next: "There is no next occurrence for this meeting."
+      first_already_exists: "The first occurrence of this meeting series is already instantiated."
+      first_created: >
+        The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence.
+    template:
+      button_finalize: "Finish template"
+      blank_title: "Your meeting series template is empty"
+      description: >
+        This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template.
+      blankslate_finalize: >
+        When you're done preparing this template, click the '%{button_title}' button above to finish the setup and schedule the first meeting of the series.
+      label_view_template: "View template"
+      label_edit_template: "Edit template"
+      banner_html: >
+        You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already created meetings.
+    frequency:
+      every_weekday: "Every %{day_of_the_week}"
+      daily: "Daily"
+      working_days: "Every working day"
+      weekly: "Weekly"
+    end_after:
+      specific_date: "a specific date"
+      iterations: "a number of occurrences"
+    starts: "Starts"
+    in_words:
+      daily_interval: "Every %{interval} days"
+      working_days: "Every working day"
+      weekly: "Every week on %{weekday}"
+      weekly_interval: "Every %{interval} weeks on %{weekday}"
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
   notice_successful_notification: "Obvestila uspešno poslana"
   notice_timezone_missing: Časovni pas ni določen, %{zone} je izbran avtomatsko. Za določitev časovnega pasu kliknite tukaj.
   notice_meeting_updated: "This page has been updated by someone else. Reload to view changes."
@@ -209,12 +285,17 @@ sl:
   text_deleted_agenda_item: 'Deleted agenda item'
   label_initial_meeting_details: "Sestanek"
   label_meeting_details: "Meeting details"
+  label_meeting_series_details: "Meeting series details"
   label_meeting_details_edit: "Edit meeting details"
   label_meeting_state: "Meeting status"
   label_meeting_state_open: "Odpri"
   label_meeting_state_open_html: "<i>Open</i>"
   label_meeting_state_closed: "Zaprto"
   label_meeting_state_closed_html: "<i>Closed</i>"
+  label_meeting_state_agenda_created: "Agenda created"
+  label_meeting_state_scheduled: "Scheduled"
+  label_meeting_state_cancelled: "Cancelled"
+  label_meeting_state_skipped: "Skipped"
   label_meeting_reopen_action: "Reopen meeting"
   label_meeting_close_action: "Close meeting"
   text_meeting_open_description: "This meeting is open. You can add/remove agenda items and edit them as you please. After the meeting is over, close it to lock it."
diff --git a/modules/meeting/config/locales/crowdin/sr.yml b/modules/meeting/config/locales/crowdin/sr.yml
index e1490563df45..a762a2585550 100644
--- a/modules/meeting/config/locales/crowdin/sr.yml
+++ b/modules/meeting/config/locales/crowdin/sr.yml
@@ -51,11 +51,18 @@ sr:
         presenter: "Presenter"
       meeting_section:
         title: "Title"
+      recurring_meeting:
+        frequency: "Frequency"
+        interval: "Interval"
+        start_date: "Starts on"
+        end_after: "End series after"
+        iterations: "Occurrences"
     errors:
       messages:
         invalid_time_format: "is not a valid time. Required format: HH:MM"
     models:
-      structured_meeting: "Meeting (dynamic)"
+      recurring_meeting: "Recurring meeting"
+      structured_meeting: "One-time meeting"
       meeting_agenda_item: "Agenda item"
       meeting_agenda: "Agenda"
       meeting_minutes: "Minutes"
@@ -89,7 +96,8 @@ sr:
   label_meeting: "Meeting"
   label_meeting_plural: "Meetings"
   label_meeting_new: "New Meeting"
-  label_meeting_new_dynamic: "New dynamic meeting"
+  label_meeting_new_dynamic: "New one-time meeting"
+  label_meeting_new_recurring: "New recurring meeting"
   label_meeting_create: "Create meeting"
   label_meeting_copy: "Copy meeting"
   label_meeting_edit: "Edit Meeting"
@@ -103,23 +111,54 @@ sr:
   label_meeting_date_time: "Date/Time"
   label_meeting_date_and_time: "Date and time"
   label_meeting_diff: "Diff"
+  label_recurring_meeting: "Recurring meeting"
+  label_recurring_meeting_part_of: "Part of a meeting series"
+  label_recurring_meeting_new: "New recurring meeting"
+  label_recurring_meeting_plural: "Recurring meetings"
+  label_template: "Template"
+  label_recurring_meeting_view: "View meeting series"
+  label_recurring_meeting_create: "Create from template"
+  label_recurring_meeting_copy: "Copy as one-off"
+  label_recurring_meeting_cancel: "Cancel this occurrence"
+  label_recurring_meeting_delete: "Delete occurrence"
+  label_recurring_meeting_delete_confirmation: >
+    This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue?
+  label_recurring_occurrence_delete_confirmation: >
+    Any meeting information not in the template will be lost. Do you want to continue?
+  label_recurring_meeting_restore: "Restore this occurrence"
+  label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})."
+  label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})."
+  label_recurring_meeting_more_past: "There are %{count} more past meetings."
+  label_recurring_meeting_more_past_singular: "There is %{count} more past meeting."
+  label_recurring_meeting_show_more: "Show more"
+  label_recurring_meeting_series_edit: "Edit meeting series"
+  label_recurring_meeting_series_delete: "Delete meeting series"
+  label_my_meetings: "My meetings"
+  label_all_meetings: "All meetings"
   label_upcoming_meetings: "Upcoming meetings"
   label_past_meetings: "Past meetings"
   label_upcoming_meetings_short: "Upcoming"
   label_past_meetings_short: "Past"
   label_involvement: "Involvement"
-  label_upcoming_invitations: "Upcoming invitations"
+  label_invitations: "Invitations"
+  label_invited_user: "Invited user"
   label_past_invitations: "Past invitations"
-  label_attendee: "Attendee"
-  label_author: "Creator"
+  label_attended: "Attended"
+  label_attended_user: "Attended user"
+  label_created_by_me: "Created by me"
   label_notify: "Send for review"
   label_icalendar: "Send iCalendar"
   label_icalendar_download: "Download iCalendar event"
+  label_view_meeting_series: "View meeting series"
+  label_meeting_series: "Meeting series"
   label_version: "Verzija"
   label_time_zone: "Time zone"
   label_start_date: "Start date"
   meeting:
+    participants:
+      template: "These participants will be invited automatically to all future meetings as they are created."
     attachments:
+      template: "These attached files will be included in all future meetings in the series."
       text: "Attached files are available to all meeting participants. You can also drag and drop these into agenda item notes."
     copy:
       title: "Copy meeting: %{title}"
@@ -146,9 +185,12 @@ sr:
     label_mail_all_participants: "Send email to all participants"
     types:
       classic: "Classic"
-      classic_text: "Organize your meeting in a formattable text agenda and protocol."
-      structured: "Dynamic"
-      structured_text: "Organize your meeting as a list of agenda items, optionally linking them to a work package."
+      classic_text: "Organize your meeting as a single formattable text agenda and protocol."
+      structured: "Structured"
+      one_time: "One-time"
+      recurring: "Recurring"
+      recurring_text: "Create meeting series with dynamic template for each occurrence."
+      structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package."
       structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details"
     copied: "Copied from Meeting #%{id}"
   meeting_section:
@@ -156,6 +198,40 @@ sr:
     delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?"
     placeholder_title: "New section"
     empty_text: "Drag items here or create a new one"
+  recurring_meeting:
+    occurrence:
+      infoline: "This meeting is part of a recurring meeting series."
+      error_no_next: "There is no next occurrence for this meeting."
+      first_already_exists: "The first occurrence of this meeting series is already instantiated."
+      first_created: >
+        The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence.
+    template:
+      button_finalize: "Finish template"
+      blank_title: "Your meeting series template is empty"
+      description: >
+        This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template.
+      blankslate_finalize: >
+        When you're done preparing this template, click the '%{button_title}' button above to finish the setup and schedule the first meeting of the series.
+      label_view_template: "View template"
+      label_edit_template: "Edit template"
+      banner_html: >
+        You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already created meetings.
+    frequency:
+      every_weekday: "Every %{day_of_the_week}"
+      daily: "Daily"
+      working_days: "Every working day"
+      weekly: "Weekly"
+    end_after:
+      specific_date: "a specific date"
+      iterations: "a number of occurrences"
+    starts: "Starts"
+    in_words:
+      daily_interval: "Every %{interval} days"
+      working_days: "Every working day"
+      weekly: "Every week on %{weekday}"
+      weekly_interval: "Every %{interval} weeks on %{weekday}"
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
   notice_successful_notification: "Notification sent successfully"
   notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here.
   notice_meeting_updated: "This page has been updated by someone else. Reload to view changes."
@@ -208,12 +284,17 @@ sr:
   text_deleted_agenda_item: 'Deleted agenda item'
   label_initial_meeting_details: "Meeting"
   label_meeting_details: "Meeting details"
+  label_meeting_series_details: "Meeting series details"
   label_meeting_details_edit: "Edit meeting details"
   label_meeting_state: "Meeting status"
   label_meeting_state_open: "Open"
   label_meeting_state_open_html: "<i>Open</i>"
   label_meeting_state_closed: "Zatvoreno"
   label_meeting_state_closed_html: "<i>Closed</i>"
+  label_meeting_state_agenda_created: "Agenda created"
+  label_meeting_state_scheduled: "Scheduled"
+  label_meeting_state_cancelled: "Cancelled"
+  label_meeting_state_skipped: "Skipped"
   label_meeting_reopen_action: "Reopen meeting"
   label_meeting_close_action: "Close meeting"
   text_meeting_open_description: "This meeting is open. You can add/remove agenda items and edit them as you please. After the meeting is over, close it to lock it."
diff --git a/modules/meeting/config/locales/crowdin/sv.yml b/modules/meeting/config/locales/crowdin/sv.yml
index 65397b5b65ca..796945aac755 100644
--- a/modules/meeting/config/locales/crowdin/sv.yml
+++ b/modules/meeting/config/locales/crowdin/sv.yml
@@ -50,11 +50,18 @@ sv:
         presenter: "Presenter"
       meeting_section:
         title: "Titel"
+      recurring_meeting:
+        frequency: "Frequency"
+        interval: "Interval"
+        start_date: "Starts on"
+        end_after: "End series after"
+        iterations: "Occurrences"
     errors:
       messages:
         invalid_time_format: "är inte en giltig tid. Använd formatet HH:MM"
     models:
-      structured_meeting: "Meeting (dynamic)"
+      recurring_meeting: "Recurring meeting"
+      structured_meeting: "One-time meeting"
       meeting_agenda_item: "Agenda item"
       meeting_agenda: "Agenda"
       meeting_minutes: "Protokoll"
@@ -88,7 +95,8 @@ sv:
   label_meeting: "Möte"
   label_meeting_plural: "Möten"
   label_meeting_new: "Nytt möte"
-  label_meeting_new_dynamic: "New dynamic meeting"
+  label_meeting_new_dynamic: "New one-time meeting"
+  label_meeting_new_recurring: "New recurring meeting"
   label_meeting_create: "Create meeting"
   label_meeting_copy: "Copy meeting"
   label_meeting_edit: "Redigera möte"
@@ -102,23 +110,54 @@ sv:
   label_meeting_date_time: "Datum/tid"
   label_meeting_date_and_time: "Datum och tid"
   label_meeting_diff: "Skillnad"
+  label_recurring_meeting: "Recurring meeting"
+  label_recurring_meeting_part_of: "Part of a meeting series"
+  label_recurring_meeting_new: "New recurring meeting"
+  label_recurring_meeting_plural: "Recurring meetings"
+  label_template: "Template"
+  label_recurring_meeting_view: "View meeting series"
+  label_recurring_meeting_create: "Create from template"
+  label_recurring_meeting_copy: "Copy as one-off"
+  label_recurring_meeting_cancel: "Cancel this occurrence"
+  label_recurring_meeting_delete: "Delete occurrence"
+  label_recurring_meeting_delete_confirmation: >
+    This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue?
+  label_recurring_occurrence_delete_confirmation: >
+    Any meeting information not in the template will be lost. Do you want to continue?
+  label_recurring_meeting_restore: "Restore this occurrence"
+  label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})."
+  label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})."
+  label_recurring_meeting_more_past: "There are %{count} more past meetings."
+  label_recurring_meeting_more_past_singular: "There is %{count} more past meeting."
+  label_recurring_meeting_show_more: "Show more"
+  label_recurring_meeting_series_edit: "Edit meeting series"
+  label_recurring_meeting_series_delete: "Delete meeting series"
+  label_my_meetings: "My meetings"
+  label_all_meetings: "All meetings"
   label_upcoming_meetings: "Kommande möten"
   label_past_meetings: "Tidigare möten"
   label_upcoming_meetings_short: "Upcoming"
   label_past_meetings_short: "Past"
   label_involvement: "Involvering"
-  label_upcoming_invitations: "Uppkommande inbjudningar"
+  label_invitations: "Invitations"
+  label_invited_user: "Invited user"
   label_past_invitations: "Tidigare inbjudningar"
-  label_attendee: "Attendee"
-  label_author: "Creator"
+  label_attended: "Attended"
+  label_attended_user: "Attended user"
+  label_created_by_me: "Created by me"
   label_notify: "Skicka för granskning"
   label_icalendar: "Skicka iCalendar"
   label_icalendar_download: "Download iCalendar event"
+  label_view_meeting_series: "View meeting series"
+  label_meeting_series: "Meeting series"
   label_version: "Version"
   label_time_zone: "Tidszon"
   label_start_date: "Startdatum"
   meeting:
+    participants:
+      template: "These participants will be invited automatically to all future meetings as they are created."
     attachments:
+      template: "These attached files will be included in all future meetings in the series."
       text: "Attached files are available to all meeting participants. You can also drag and drop these into agenda item notes."
     copy:
       title: "Copy meeting: %{title}"
@@ -145,9 +184,12 @@ sv:
     label_mail_all_participants: "Send email to all participants"
     types:
       classic: "Classic"
-      classic_text: "Organize your meeting in a formattable text agenda and protocol."
-      structured: "Dynamic"
-      structured_text: "Organize your meeting as a list of agenda items, optionally linking them to a work package."
+      classic_text: "Organize your meeting as a single formattable text agenda and protocol."
+      structured: "Structured"
+      one_time: "One-time"
+      recurring: "Recurring"
+      recurring_text: "Create meeting series with dynamic template for each occurrence."
+      structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package."
       structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details"
     copied: "Kopierat från möte #%{id}"
   meeting_section:
@@ -155,6 +197,40 @@ sv:
     delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?"
     placeholder_title: "New section"
     empty_text: "Drag items here or create a new one"
+  recurring_meeting:
+    occurrence:
+      infoline: "This meeting is part of a recurring meeting series."
+      error_no_next: "There is no next occurrence for this meeting."
+      first_already_exists: "The first occurrence of this meeting series is already instantiated."
+      first_created: >
+        The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence.
+    template:
+      button_finalize: "Finish template"
+      blank_title: "Your meeting series template is empty"
+      description: >
+        This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template.
+      blankslate_finalize: >
+        When you're done preparing this template, click the '%{button_title}' button above to finish the setup and schedule the first meeting of the series.
+      label_view_template: "View template"
+      label_edit_template: "Edit template"
+      banner_html: >
+        You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already created meetings.
+    frequency:
+      every_weekday: "Every %{day_of_the_week}"
+      daily: "Daily"
+      working_days: "Every working day"
+      weekly: "Weekly"
+    end_after:
+      specific_date: "a specific date"
+      iterations: "a number of occurrences"
+    starts: "Starts"
+    in_words:
+      daily_interval: "Every %{interval} days"
+      working_days: "Every working day"
+      weekly: "Every week on %{weekday}"
+      weekly_interval: "Every %{interval} weeks on %{weekday}"
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
   notice_successful_notification: "Underrättelse skickades"
   notice_timezone_missing: Ingen tidszon angiven och %{zone} antas. För att välja din tidszon, vänligen klicka här.
   notice_meeting_updated: "This page has been updated by someone else. Reload to view changes."
@@ -207,12 +283,17 @@ sv:
   text_deleted_agenda_item: 'Deleted agenda item'
   label_initial_meeting_details: "Möte"
   label_meeting_details: "Meeting details"
+  label_meeting_series_details: "Meeting series details"
   label_meeting_details_edit: "Edit meeting details"
   label_meeting_state: "Meeting status"
   label_meeting_state_open: "Öppna"
   label_meeting_state_open_html: "<i>Open</i>"
   label_meeting_state_closed: "Stängt"
   label_meeting_state_closed_html: "<i>Closed</i>"
+  label_meeting_state_agenda_created: "Agenda created"
+  label_meeting_state_scheduled: "Scheduled"
+  label_meeting_state_cancelled: "Cancelled"
+  label_meeting_state_skipped: "Skipped"
   label_meeting_reopen_action: "Reopen meeting"
   label_meeting_close_action: "Close meeting"
   text_meeting_open_description: "This meeting is open. You can add/remove agenda items and edit them as you please. After the meeting is over, close it to lock it."
diff --git a/modules/meeting/config/locales/crowdin/th.yml b/modules/meeting/config/locales/crowdin/th.yml
index 506f4b94491f..1aab4c8b87a4 100644
--- a/modules/meeting/config/locales/crowdin/th.yml
+++ b/modules/meeting/config/locales/crowdin/th.yml
@@ -49,11 +49,18 @@ th:
         presenter: "Presenter"
       meeting_section:
         title: "ชื่อเรื่อง"
+      recurring_meeting:
+        frequency: "Frequency"
+        interval: "Interval"
+        start_date: "Starts on"
+        end_after: "End series after"
+        iterations: "Occurrences"
     errors:
       messages:
         invalid_time_format: "is not a valid time. Required format: HH:MM"
     models:
-      structured_meeting: "Meeting (dynamic)"
+      recurring_meeting: "Recurring meeting"
+      structured_meeting: "One-time meeting"
       meeting_agenda_item: "Agenda item"
       meeting_agenda: "Agenda"
       meeting_minutes: "Minutes"
@@ -87,7 +94,8 @@ th:
   label_meeting: "ประชุม"
   label_meeting_plural: "ประชุม"
   label_meeting_new: "New Meeting"
-  label_meeting_new_dynamic: "New dynamic meeting"
+  label_meeting_new_dynamic: "New one-time meeting"
+  label_meeting_new_recurring: "New recurring meeting"
   label_meeting_create: "Create meeting"
   label_meeting_copy: "Copy meeting"
   label_meeting_edit: "Edit Meeting"
@@ -101,23 +109,54 @@ th:
   label_meeting_date_time: "Date/Time"
   label_meeting_date_and_time: "Date and time"
   label_meeting_diff: "Diff"
+  label_recurring_meeting: "Recurring meeting"
+  label_recurring_meeting_part_of: "Part of a meeting series"
+  label_recurring_meeting_new: "New recurring meeting"
+  label_recurring_meeting_plural: "Recurring meetings"
+  label_template: "Template"
+  label_recurring_meeting_view: "View meeting series"
+  label_recurring_meeting_create: "Create from template"
+  label_recurring_meeting_copy: "Copy as one-off"
+  label_recurring_meeting_cancel: "Cancel this occurrence"
+  label_recurring_meeting_delete: "Delete occurrence"
+  label_recurring_meeting_delete_confirmation: >
+    This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue?
+  label_recurring_occurrence_delete_confirmation: >
+    Any meeting information not in the template will be lost. Do you want to continue?
+  label_recurring_meeting_restore: "Restore this occurrence"
+  label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})."
+  label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})."
+  label_recurring_meeting_more_past: "There are %{count} more past meetings."
+  label_recurring_meeting_more_past_singular: "There is %{count} more past meeting."
+  label_recurring_meeting_show_more: "Show more"
+  label_recurring_meeting_series_edit: "Edit meeting series"
+  label_recurring_meeting_series_delete: "Delete meeting series"
+  label_my_meetings: "My meetings"
+  label_all_meetings: "All meetings"
   label_upcoming_meetings: "Upcoming meetings"
   label_past_meetings: "Past meetings"
   label_upcoming_meetings_short: "Upcoming"
   label_past_meetings_short: "Past"
   label_involvement: "Involvement"
-  label_upcoming_invitations: "Upcoming invitations"
+  label_invitations: "Invitations"
+  label_invited_user: "Invited user"
   label_past_invitations: "Past invitations"
-  label_attendee: "Attendee"
-  label_author: "Creator"
+  label_attended: "Attended"
+  label_attended_user: "Attended user"
+  label_created_by_me: "Created by me"
   label_notify: "Send for review"
   label_icalendar: "Send iCalendar"
   label_icalendar_download: "Download iCalendar event"
+  label_view_meeting_series: "View meeting series"
+  label_meeting_series: "Meeting series"
   label_version: "เวอร์ชัน"
   label_time_zone: "โซนเวลา"
   label_start_date: "วันเริ่มต้น"
   meeting:
+    participants:
+      template: "These participants will be invited automatically to all future meetings as they are created."
     attachments:
+      template: "These attached files will be included in all future meetings in the series."
       text: "Attached files are available to all meeting participants. You can also drag and drop these into agenda item notes."
     copy:
       title: "Copy meeting: %{title}"
@@ -144,9 +183,12 @@ th:
     label_mail_all_participants: "Send email to all participants"
     types:
       classic: "Classic"
-      classic_text: "Organize your meeting in a formattable text agenda and protocol."
-      structured: "Dynamic"
-      structured_text: "Organize your meeting as a list of agenda items, optionally linking them to a work package."
+      classic_text: "Organize your meeting as a single formattable text agenda and protocol."
+      structured: "Structured"
+      one_time: "One-time"
+      recurring: "Recurring"
+      recurring_text: "Create meeting series with dynamic template for each occurrence."
+      structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package."
       structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details"
     copied: "Copied from Meeting #%{id}"
   meeting_section:
@@ -154,6 +196,40 @@ th:
     delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?"
     placeholder_title: "New section"
     empty_text: "Drag items here or create a new one"
+  recurring_meeting:
+    occurrence:
+      infoline: "This meeting is part of a recurring meeting series."
+      error_no_next: "There is no next occurrence for this meeting."
+      first_already_exists: "The first occurrence of this meeting series is already instantiated."
+      first_created: >
+        The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence.
+    template:
+      button_finalize: "Finish template"
+      blank_title: "Your meeting series template is empty"
+      description: >
+        This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template.
+      blankslate_finalize: >
+        When you're done preparing this template, click the '%{button_title}' button above to finish the setup and schedule the first meeting of the series.
+      label_view_template: "View template"
+      label_edit_template: "Edit template"
+      banner_html: >
+        You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already created meetings.
+    frequency:
+      every_weekday: "Every %{day_of_the_week}"
+      daily: "Daily"
+      working_days: "Every working day"
+      weekly: "Weekly"
+    end_after:
+      specific_date: "a specific date"
+      iterations: "a number of occurrences"
+    starts: "Starts"
+    in_words:
+      daily_interval: "Every %{interval} days"
+      working_days: "Every working day"
+      weekly: "Every week on %{weekday}"
+      weekly_interval: "Every %{interval} weeks on %{weekday}"
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
   notice_successful_notification: "Notification sent successfully"
   notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here.
   notice_meeting_updated: "This page has been updated by someone else. Reload to view changes."
@@ -206,12 +282,17 @@ th:
   text_deleted_agenda_item: 'Deleted agenda item'
   label_initial_meeting_details: "ประชุม"
   label_meeting_details: "Meeting details"
+  label_meeting_series_details: "Meeting series details"
   label_meeting_details_edit: "Edit meeting details"
   label_meeting_state: "Meeting status"
   label_meeting_state_open: "Open"
   label_meeting_state_open_html: "<i>Open</i>"
   label_meeting_state_closed: "ปิดไปแล้ว"
   label_meeting_state_closed_html: "<i>Closed</i>"
+  label_meeting_state_agenda_created: "Agenda created"
+  label_meeting_state_scheduled: "Scheduled"
+  label_meeting_state_cancelled: "Cancelled"
+  label_meeting_state_skipped: "Skipped"
   label_meeting_reopen_action: "Reopen meeting"
   label_meeting_close_action: "Close meeting"
   text_meeting_open_description: "This meeting is open. You can add/remove agenda items and edit them as you please. After the meeting is over, close it to lock it."
diff --git a/modules/meeting/config/locales/crowdin/tr.yml b/modules/meeting/config/locales/crowdin/tr.yml
index 0531186cc0e1..b1be7b379955 100644
--- a/modules/meeting/config/locales/crowdin/tr.yml
+++ b/modules/meeting/config/locales/crowdin/tr.yml
@@ -50,11 +50,18 @@ tr:
         presenter: "Sunucu "
       meeting_section:
         title: "Başlık"
+      recurring_meeting:
+        frequency: "Frequency"
+        interval: "Interval"
+        start_date: "Starts on"
+        end_after: "End series after"
+        iterations: "Occurrences"
     errors:
       messages:
         invalid_time_format: "geçerli bir zaman değil. Gerekli format: SS:DD"
     models:
-      structured_meeting: "Toplantı (dinamik)"
+      recurring_meeting: "Recurring meeting"
+      structured_meeting: "One-time meeting"
       meeting_agenda_item: "Ajanda öğesi"
       meeting_agenda: "Ajanda"
       meeting_minutes: "Dakika"
@@ -88,7 +95,8 @@ tr:
   label_meeting: "Toplantı"
   label_meeting_plural: "Toplantılar"
   label_meeting_new: "Yeni Toplantı"
-  label_meeting_new_dynamic: "New dynamic meeting"
+  label_meeting_new_dynamic: "New one-time meeting"
+  label_meeting_new_recurring: "New recurring meeting"
   label_meeting_create: "Toplantı oluştur"
   label_meeting_copy: "Toplantıyı kopyala"
   label_meeting_edit: "Toplantıyı Düzenle"
@@ -102,23 +110,54 @@ tr:
   label_meeting_date_time: "Tarih/Saat"
   label_meeting_date_and_time: "Tarih ve zaman"
   label_meeting_diff: "Fark"
+  label_recurring_meeting: "Recurring meeting"
+  label_recurring_meeting_part_of: "Part of a meeting series"
+  label_recurring_meeting_new: "New recurring meeting"
+  label_recurring_meeting_plural: "Recurring meetings"
+  label_template: "Template"
+  label_recurring_meeting_view: "View meeting series"
+  label_recurring_meeting_create: "Create from template"
+  label_recurring_meeting_copy: "Copy as one-off"
+  label_recurring_meeting_cancel: "Cancel this occurrence"
+  label_recurring_meeting_delete: "Delete occurrence"
+  label_recurring_meeting_delete_confirmation: >
+    This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue?
+  label_recurring_occurrence_delete_confirmation: >
+    Any meeting information not in the template will be lost. Do you want to continue?
+  label_recurring_meeting_restore: "Restore this occurrence"
+  label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})."
+  label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})."
+  label_recurring_meeting_more_past: "There are %{count} more past meetings."
+  label_recurring_meeting_more_past_singular: "There is %{count} more past meeting."
+  label_recurring_meeting_show_more: "Show more"
+  label_recurring_meeting_series_edit: "Edit meeting series"
+  label_recurring_meeting_series_delete: "Delete meeting series"
+  label_my_meetings: "My meetings"
+  label_all_meetings: "All meetings"
   label_upcoming_meetings: "Yaklaşan toplantılar"
   label_past_meetings: "Geçmiş toplantılar"
   label_upcoming_meetings_short: "Yaklaşan"
   label_past_meetings_short: "Geçmiş"
   label_involvement: "Katılım"
-  label_upcoming_invitations: "Yaklaşan davetiyeler"
+  label_invitations: "Invitations"
+  label_invited_user: "Invited user"
   label_past_invitations: "Geçmiş davetiyeler"
-  label_attendee: "Katılımcı "
-  label_author: "Oluşturan"
+  label_attended: "Attended"
+  label_attended_user: "Attended user"
+  label_created_by_me: "Created by me"
   label_notify: "Gözden geçirilmek üzere gönder"
   label_icalendar: "Takvime gönder"
   label_icalendar_download: "iCalender etkinliğini indir "
+  label_view_meeting_series: "View meeting series"
+  label_meeting_series: "Meeting series"
   label_version: "Sürüm"
   label_time_zone: "Saat dilim"
   label_start_date: "Başlama tarihi"
   meeting:
+    participants:
+      template: "These participants will be invited automatically to all future meetings as they are created."
     attachments:
+      template: "These attached files will be included in all future meetings in the series."
       text: "Eklenen dosyalar tüm katılımcıların paylaşımına açıktır. Bu dosyaları ajandanıza sürükleyip bırakabilirsiniz."
     copy:
       title: "Toplantıyı kopyala: %{title}"
@@ -145,9 +184,12 @@ tr:
     label_mail_all_participants: "Tüm katılımcılara e-posta gönderin"
     types:
       classic: "Klasik"
-      classic_text: "Toplantınızı biçimlendirilebilir bir metin gündemi ve protokolüyle düzenleyin."
-      structured: "Dinamik"
-      structured_text: "Toplantınızı, isteğe bağlı olarak bunları bir çalışma paketine bağlayarak, gündem maddelerinin bir listesi halinde düzenleyin."
+      classic_text: "Organize your meeting as a single formattable text agenda and protocol."
+      structured: "Structured"
+      one_time: "One-time"
+      recurring: "Recurring"
+      recurring_text: "Create meeting series with dynamic template for each occurrence."
+      structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package."
       structured_text_copy: "Toplantıyı kopyalamak toplantıyla ilgili ajanda maddelerini kopyalamayacaktır, sadece detaylar kopyalanacak"
     copied: "#%{id} numaralı toplantıdan kopyalandı"
   meeting_section:
@@ -155,6 +197,40 @@ tr:
     delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?"
     placeholder_title: "New section"
     empty_text: "Maddeleri buraya sürükleyin ya da yeni bir tane oluşturun"
+  recurring_meeting:
+    occurrence:
+      infoline: "This meeting is part of a recurring meeting series."
+      error_no_next: "There is no next occurrence for this meeting."
+      first_already_exists: "The first occurrence of this meeting series is already instantiated."
+      first_created: >
+        The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence.
+    template:
+      button_finalize: "Finish template"
+      blank_title: "Your meeting series template is empty"
+      description: >
+        This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template.
+      blankslate_finalize: >
+        When you're done preparing this template, click the '%{button_title}' button above to finish the setup and schedule the first meeting of the series.
+      label_view_template: "View template"
+      label_edit_template: "Edit template"
+      banner_html: >
+        You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already created meetings.
+    frequency:
+      every_weekday: "Every %{day_of_the_week}"
+      daily: "Daily"
+      working_days: "Every working day"
+      weekly: "Weekly"
+    end_after:
+      specific_date: "a specific date"
+      iterations: "a number of occurrences"
+    starts: "Starts"
+    in_words:
+      daily_interval: "Every %{interval} days"
+      working_days: "Every working day"
+      weekly: "Every week on %{weekday}"
+      weekly_interval: "Every %{interval} weeks on %{weekday}"
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
   notice_successful_notification: "Bildirim başarıyla gönderildi"
   notice_timezone_missing: Saat dilimi ayarlanmadı ve %{zone} kabul edildi. Saat dilimini seçmek için lütfen buraya tıklayın.
   notice_meeting_updated: "Bu sayfa başka biri tarafından güncellendi. Değişiklikleri görmek için yeniden yükleyin."
@@ -207,12 +283,17 @@ tr:
   text_deleted_agenda_item: 'Silinen ajanda maddesi'
   label_initial_meeting_details: "Toplantı"
   label_meeting_details: "Toplantı detayları"
+  label_meeting_series_details: "Meeting series details"
   label_meeting_details_edit: "Toplantı detaylarını düzenle"
   label_meeting_state: "Toplantı durumu"
   label_meeting_state_open: "Aç"
   label_meeting_state_open_html: "<i>Açık</i>"
   label_meeting_state_closed: "Kapalı"
   label_meeting_state_closed_html: "<i>Kapalı</i>"
+  label_meeting_state_agenda_created: "Agenda created"
+  label_meeting_state_scheduled: "Scheduled"
+  label_meeting_state_cancelled: "Cancelled"
+  label_meeting_state_skipped: "Skipped"
   label_meeting_reopen_action: "Toplantıyı tekrar aç"
   label_meeting_close_action: "Toplantıyı kapat"
   text_meeting_open_description: "Bu toplantı açık. Gündem maddesi ekleyip çıkartabilir ve bu maddeleri düzenleyebilirsiniz. Toplantı bittikten sonra kilitlemek için toplantıyı kapatın."
diff --git a/modules/meeting/config/locales/crowdin/uk.yml b/modules/meeting/config/locales/crowdin/uk.yml
index 5c5a4ce14414..f43294493c8b 100644
--- a/modules/meeting/config/locales/crowdin/uk.yml
+++ b/modules/meeting/config/locales/crowdin/uk.yml
@@ -52,11 +52,18 @@ uk:
         presenter: "Доповідач"
       meeting_section:
         title: "Назва "
+      recurring_meeting:
+        frequency: "Частота"
+        interval: "Інтервал"
+        start_date: "Починається"
+        end_after: "Завершення серії після"
+        iterations: "Повторення"
     errors:
       messages:
         invalid_time_format: "не є допустимим часом. Необхідний формат: HH:MM"
     models:
-      structured_meeting: "Нарада (динамічна)"
+      recurring_meeting: "Повторювана нарада"
+      structured_meeting: "Одноразова нарада"
       meeting_agenda_item: "Порядок денний"
       meeting_agenda: "Порядок денний"
       meeting_minutes: "Хвилини"
@@ -90,7 +97,8 @@ uk:
   label_meeting: "Зустріч"
   label_meeting_plural: "Зустрічі"
   label_meeting_new: "Нова зустріч"
-  label_meeting_new_dynamic: "Нова динамічна нарада"
+  label_meeting_new_dynamic: "Нова одноразова нарада"
+  label_meeting_new_recurring: "Нова повторювана нарада"
   label_meeting_create: "Створити нараду"
   label_meeting_copy: "Копіювати нараду"
   label_meeting_edit: "Редагувати збори"
@@ -104,23 +112,54 @@ uk:
   label_meeting_date_time: "Дата, час"
   label_meeting_date_and_time: "Дата й час"
   label_meeting_diff: "Відмінність"
+  label_recurring_meeting: "Повторювана нарада"
+  label_recurring_meeting_part_of: "Частина серії нарад"
+  label_recurring_meeting_new: "Нова повторювана нарада"
+  label_recurring_meeting_plural: "Повторювані наради"
+  label_template: "Шаблон"
+  label_recurring_meeting_view: "Переглянути серію нарад"
+  label_recurring_meeting_create: "Створити на основі шаблона"
+  label_recurring_meeting_copy: "Копіювати як одноразову"
+  label_recurring_meeting_cancel: "Скасувати це повторення"
+  label_recurring_meeting_delete: "Видалити повторення"
+  label_recurring_meeting_delete_confirmation: >
+    Ця нарада належить до серії з назвою %{name}. Буде видалено лише це повторення, а не всю серію. Продовжити?
+  label_recurring_occurrence_delete_confirmation: >
+    Будь-яку інформацію про нараду, відсутню в шаблоні, буде втрачено. Продовжити?
+  label_recurring_meeting_restore: "Відновити це повторення"
+  label_recurring_meeting_more: "Є інші (%{count}) заплановані наради (%{schedule})."
+  label_recurring_meeting_more_singular: "Є ще %{count} запланована нарада (%{schedule})."
+  label_recurring_meeting_more_past: "Є інші (%{count}) завершені наради."
+  label_recurring_meeting_more_past_singular: "Є ще %{count} завершена нарада."
+  label_recurring_meeting_show_more: "Показати більше"
+  label_recurring_meeting_series_edit: "Редагувати серію нарад"
+  label_recurring_meeting_series_delete: "Видалити серію нарад"
+  label_my_meetings: "Мої наради"
+  label_all_meetings: "Усі наради"
   label_upcoming_meetings: "Майбутні заходи"
   label_past_meetings: "Минулі заходи"
   label_upcoming_meetings_short: "Майбутні"
   label_past_meetings_short: "Минулі"
   label_involvement: "Участь"
-  label_upcoming_invitations: "Майбутні запрошення"
+  label_invitations: "Запрошення"
+  label_invited_user: "Запрошений користувач"
   label_past_invitations: "Минулі запрошення"
-  label_attendee: "Учасник"
-  label_author: "Автор"
+  label_attended: "Відвідано"
+  label_attended_user: "Користувач-учасник"
+  label_created_by_me: "Створено мною"
   label_notify: "Надіслати на розгляд"
   label_icalendar: "Надіслати iCalendar"
   label_icalendar_download: "Завантажити подію iCalendar"
+  label_view_meeting_series: "Переглянути серію нарад"
+  label_meeting_series: "Серія нарад"
   label_version: "Версія"
   label_time_zone: "Часовий пояс"
   label_start_date: "Дата початку"
   meeting:
+    participants:
+      template: "Ці учасники автоматично отримуватимуть запрошення на всі майбутні наради, які ви створюватимете."
     attachments:
+      template: "Ці прикріплені файли додаватимуться до всіх майбутніх нарад серії."
       text: "Прикріплені файли доступні всім учасникам наради. Ви також можете перетягнути їх у примітки до пунктів порядку денного."
     copy:
       title: "Копіювати нараду: %{title}"
@@ -147,9 +186,12 @@ uk:
     label_mail_all_participants: "Надіслати лист усім учасникам"
     types:
       classic: "Класична"
-      classic_text: "Організуйте нараду у вигляді порядку денного й протоколу в текстовому форматі з підтримкою редагування."
-      structured: "Динамічна"
-      structured_text: "Організуйте нараду у вигляді переліку пунктів порядку денного, за бажанням пов’язавши їх із пакетом робіт."
+      classic_text: "Упорядкуйте нараду у вигляді порядку денного й протоколу в текстовому форматі з підтримкою редагування."
+      structured: "Структурована"
+      one_time: "Одноразова"
+      recurring: "Повторювана"
+      recurring_text: "Створюйте серії нарад на основі динамічного шаблона для кожної події."
+      structured_text: "Упорядкуйте нараду у вигляді динамічного переліку пунктів порядку денного, за бажанням пов’язавши їх із пакетом робіт."
       structured_text_copy: "Зараз копіювання наради стосується лише докладних даних про неї, але не пов’язаних пунктів її порядку денного"
     copied: "Скопійовано з наради #%{id} "
   meeting_section:
@@ -157,6 +199,40 @@ uk:
     delete_confirmation: "Видалення цього розділу також призведе до видалення його елементів порядку денного. Ви впевнені?"
     placeholder_title: "Новий розділ"
     empty_text: "Перетягніть елементи сюди або створіть новий"
+  recurring_meeting:
+    occurrence:
+      infoline: "Ця нарада належить до серії повторюваних нарад."
+      error_no_next: "Це одноразова нарада."
+      first_already_exists: "Перша нарада із цієї серії вже відбулася."
+      first_created: >
+        Першу нараду створено на основі шаблона. Усі наступні наради створюватимуться автоматично в момент початку попередніх.
+    template:
+      button_finalize: "Завершити шаблон"
+      blank_title: "Ваш шаблон серії нарад порожній"
+      description: >
+        Цей шаблон використовуватиметься щоразу, коли створюватимуться нові наради в серії. Ви можете додавати до нього пункти порядку денного, учасників і вкладення.
+      blankslate_finalize: >
+        Коли завершите підготовку цього шаблона, натисніть кнопку "%{button_title}" вище, щоб завершити налаштування й запланувати першу нараду серії.
+      label_view_template: "Переглянути шаблон"
+      label_edit_template: "Редагувати шаблон"
+      banner_html: >
+        Ви редагуєте шаблон серії нарад: %{link}. Кожна нова нарада в серії буде створюватиметься на основі цього шаблона. Зміни не вплинуть на завершені або вже створені наради.
+    frequency:
+      every_weekday: "Кожний(-на) %{day_of_the_week}"
+      daily: "Щодня"
+      working_days: "Кожен робочий день"
+      weekly: "Щотижня"
+    end_after:
+      specific_date: "конкретна дата"
+      iterations: "кількість повторень"
+    starts: "Починається"
+    in_words:
+      daily_interval: "Через %{interval} дн."
+      working_days: "Кожен робочий день"
+      weekly: "Щотижня в %{weekday}"
+      weekly_interval: "Через %{interval} тижн. у %{weekday}"
+      frequency: "%{base} о %{time}"
+      full: "%{base} о %{time}, закінчується %{end_date}"
   notice_successful_notification: "Повідомлення успішно надіслано"
   notice_timezone_missing: Часовий пояс не встановлено і %{zone} передбачається. Щоб вибрати часовий пояс, натисніть тут.
   notice_meeting_updated: "Цю сторінку оновив інший користувач. Перезавантажте її, щоб побачити зміни."
@@ -209,12 +285,17 @@ uk:
   text_deleted_agenda_item: 'Видалений пункт порядку денного'
   label_initial_meeting_details: "Нарада"
   label_meeting_details: "Інформація про зустріч"
+  label_meeting_series_details: "Деталі серії нарад"
   label_meeting_details_edit: "Редагувати інформацію про зустріч"
   label_meeting_state: "Статус наради"
   label_meeting_state_open: "Відкрити"
   label_meeting_state_open_html: "<i>Відкрита</i>"
   label_meeting_state_closed: "Закрито"
   label_meeting_state_closed_html: "<i>Закрита</i>"
+  label_meeting_state_agenda_created: "Порядок денний створено"
+  label_meeting_state_scheduled: "Заплановано"
+  label_meeting_state_cancelled: "Скасовано"
+  label_meeting_state_skipped: "Пропущено"
   label_meeting_reopen_action: "Відкрити зустріч знову"
   label_meeting_close_action: "Закрити зустріч"
   text_meeting_open_description: "Це відкрита нарада. Ви можете додавати або вилучати пункти порядку денного й редагувати їх. Коли нарада завершиться, закрийте її, щоб заблокувати."
diff --git a/modules/meeting/config/locales/crowdin/uz.yml b/modules/meeting/config/locales/crowdin/uz.yml
index d6b7109a8875..69b52a3c49e0 100644
--- a/modules/meeting/config/locales/crowdin/uz.yml
+++ b/modules/meeting/config/locales/crowdin/uz.yml
@@ -50,11 +50,18 @@ uz:
         presenter: "Presenter"
       meeting_section:
         title: "Title"
+      recurring_meeting:
+        frequency: "Frequency"
+        interval: "Interval"
+        start_date: "Starts on"
+        end_after: "End series after"
+        iterations: "Occurrences"
     errors:
       messages:
         invalid_time_format: "is not a valid time. Required format: HH:MM"
     models:
-      structured_meeting: "Meeting (dynamic)"
+      recurring_meeting: "Recurring meeting"
+      structured_meeting: "One-time meeting"
       meeting_agenda_item: "Agenda item"
       meeting_agenda: "Agenda"
       meeting_minutes: "Minutes"
@@ -88,7 +95,8 @@ uz:
   label_meeting: "Meeting"
   label_meeting_plural: "Meetings"
   label_meeting_new: "New Meeting"
-  label_meeting_new_dynamic: "New dynamic meeting"
+  label_meeting_new_dynamic: "New one-time meeting"
+  label_meeting_new_recurring: "New recurring meeting"
   label_meeting_create: "Create meeting"
   label_meeting_copy: "Copy meeting"
   label_meeting_edit: "Edit Meeting"
@@ -102,23 +110,54 @@ uz:
   label_meeting_date_time: "Date/Time"
   label_meeting_date_and_time: "Date and time"
   label_meeting_diff: "Diff"
+  label_recurring_meeting: "Recurring meeting"
+  label_recurring_meeting_part_of: "Part of a meeting series"
+  label_recurring_meeting_new: "New recurring meeting"
+  label_recurring_meeting_plural: "Recurring meetings"
+  label_template: "Template"
+  label_recurring_meeting_view: "View meeting series"
+  label_recurring_meeting_create: "Create from template"
+  label_recurring_meeting_copy: "Copy as one-off"
+  label_recurring_meeting_cancel: "Cancel this occurrence"
+  label_recurring_meeting_delete: "Delete occurrence"
+  label_recurring_meeting_delete_confirmation: >
+    This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue?
+  label_recurring_occurrence_delete_confirmation: >
+    Any meeting information not in the template will be lost. Do you want to continue?
+  label_recurring_meeting_restore: "Restore this occurrence"
+  label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})."
+  label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})."
+  label_recurring_meeting_more_past: "There are %{count} more past meetings."
+  label_recurring_meeting_more_past_singular: "There is %{count} more past meeting."
+  label_recurring_meeting_show_more: "Show more"
+  label_recurring_meeting_series_edit: "Edit meeting series"
+  label_recurring_meeting_series_delete: "Delete meeting series"
+  label_my_meetings: "My meetings"
+  label_all_meetings: "All meetings"
   label_upcoming_meetings: "Upcoming meetings"
   label_past_meetings: "Past meetings"
   label_upcoming_meetings_short: "Upcoming"
   label_past_meetings_short: "Past"
   label_involvement: "Involvement"
-  label_upcoming_invitations: "Upcoming invitations"
+  label_invitations: "Invitations"
+  label_invited_user: "Invited user"
   label_past_invitations: "Past invitations"
-  label_attendee: "Attendee"
-  label_author: "Creator"
+  label_attended: "Attended"
+  label_attended_user: "Attended user"
+  label_created_by_me: "Created by me"
   label_notify: "Send for review"
   label_icalendar: "Send iCalendar"
   label_icalendar_download: "Download iCalendar event"
+  label_view_meeting_series: "View meeting series"
+  label_meeting_series: "Meeting series"
   label_version: "Version"
   label_time_zone: "Time zone"
   label_start_date: "Start date"
   meeting:
+    participants:
+      template: "These participants will be invited automatically to all future meetings as they are created."
     attachments:
+      template: "These attached files will be included in all future meetings in the series."
       text: "Attached files are available to all meeting participants. You can also drag and drop these into agenda item notes."
     copy:
       title: "Copy meeting: %{title}"
@@ -145,9 +184,12 @@ uz:
     label_mail_all_participants: "Send email to all participants"
     types:
       classic: "Classic"
-      classic_text: "Organize your meeting in a formattable text agenda and protocol."
-      structured: "Dynamic"
-      structured_text: "Organize your meeting as a list of agenda items, optionally linking them to a work package."
+      classic_text: "Organize your meeting as a single formattable text agenda and protocol."
+      structured: "Structured"
+      one_time: "One-time"
+      recurring: "Recurring"
+      recurring_text: "Create meeting series with dynamic template for each occurrence."
+      structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package."
       structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details"
     copied: "Copied from Meeting #%{id}"
   meeting_section:
@@ -155,6 +197,40 @@ uz:
     delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?"
     placeholder_title: "New section"
     empty_text: "Drag items here or create a new one"
+  recurring_meeting:
+    occurrence:
+      infoline: "This meeting is part of a recurring meeting series."
+      error_no_next: "There is no next occurrence for this meeting."
+      first_already_exists: "The first occurrence of this meeting series is already instantiated."
+      first_created: >
+        The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence.
+    template:
+      button_finalize: "Finish template"
+      blank_title: "Your meeting series template is empty"
+      description: >
+        This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template.
+      blankslate_finalize: >
+        When you're done preparing this template, click the '%{button_title}' button above to finish the setup and schedule the first meeting of the series.
+      label_view_template: "View template"
+      label_edit_template: "Edit template"
+      banner_html: >
+        You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already created meetings.
+    frequency:
+      every_weekday: "Every %{day_of_the_week}"
+      daily: "Daily"
+      working_days: "Every working day"
+      weekly: "Weekly"
+    end_after:
+      specific_date: "a specific date"
+      iterations: "a number of occurrences"
+    starts: "Starts"
+    in_words:
+      daily_interval: "Every %{interval} days"
+      working_days: "Every working day"
+      weekly: "Every week on %{weekday}"
+      weekly_interval: "Every %{interval} weeks on %{weekday}"
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
   notice_successful_notification: "Notification sent successfully"
   notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here.
   notice_meeting_updated: "This page has been updated by someone else. Reload to view changes."
@@ -207,12 +283,17 @@ uz:
   text_deleted_agenda_item: 'Deleted agenda item'
   label_initial_meeting_details: "Meeting"
   label_meeting_details: "Meeting details"
+  label_meeting_series_details: "Meeting series details"
   label_meeting_details_edit: "Edit meeting details"
   label_meeting_state: "Meeting status"
   label_meeting_state_open: "Open"
   label_meeting_state_open_html: "<i>Open</i>"
   label_meeting_state_closed: "Closed"
   label_meeting_state_closed_html: "<i>Closed</i>"
+  label_meeting_state_agenda_created: "Agenda created"
+  label_meeting_state_scheduled: "Scheduled"
+  label_meeting_state_cancelled: "Cancelled"
+  label_meeting_state_skipped: "Skipped"
   label_meeting_reopen_action: "Reopen meeting"
   label_meeting_close_action: "Close meeting"
   text_meeting_open_description: "This meeting is open. You can add/remove agenda items and edit them as you please. After the meeting is over, close it to lock it."
diff --git a/modules/meeting/config/locales/crowdin/vi.yml b/modules/meeting/config/locales/crowdin/vi.yml
index 83b64e576237..b6248219aa3b 100644
--- a/modules/meeting/config/locales/crowdin/vi.yml
+++ b/modules/meeting/config/locales/crowdin/vi.yml
@@ -49,11 +49,18 @@ vi:
         presenter: "Người trình bày"
       meeting_section:
         title: "Tiêu đề"
+      recurring_meeting:
+        frequency: "Frequency"
+        interval: "Interval"
+        start_date: "Starts on"
+        end_after: "End series after"
+        iterations: "Occurrences"
     errors:
       messages:
         invalid_time_format: "không phải giờ hợp lệ. Yêu cầu định dạng: HH:MM"
     models:
-      structured_meeting: "Cuộc họp (dạng động)"
+      recurring_meeting: "Recurring meeting"
+      structured_meeting: "One-time meeting"
       meeting_agenda_item: "Mục chương trình nghị sự"
       meeting_agenda: "Các ý chính"
       meeting_minutes: "Phút"
@@ -87,7 +94,8 @@ vi:
   label_meeting: "Cuộc họp"
   label_meeting_plural: "Những cuộc họp"
   label_meeting_new: "Cuộc họp mới"
-  label_meeting_new_dynamic: "New dynamic meeting"
+  label_meeting_new_dynamic: "New one-time meeting"
+  label_meeting_new_recurring: "New recurring meeting"
   label_meeting_create: "Tạo cuộc họp"
   label_meeting_copy: "Copy meeting"
   label_meeting_edit: "Chỉnh sửa cuộc họp"
@@ -101,23 +109,54 @@ vi:
   label_meeting_date_time: "Ngày/Giờ"
   label_meeting_date_and_time: "Date and time"
   label_meeting_diff: "Sự khác biệt"
+  label_recurring_meeting: "Recurring meeting"
+  label_recurring_meeting_part_of: "Part of a meeting series"
+  label_recurring_meeting_new: "New recurring meeting"
+  label_recurring_meeting_plural: "Recurring meetings"
+  label_template: "Template"
+  label_recurring_meeting_view: "View meeting series"
+  label_recurring_meeting_create: "Create from template"
+  label_recurring_meeting_copy: "Copy as one-off"
+  label_recurring_meeting_cancel: "Cancel this occurrence"
+  label_recurring_meeting_delete: "Delete occurrence"
+  label_recurring_meeting_delete_confirmation: >
+    This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue?
+  label_recurring_occurrence_delete_confirmation: >
+    Any meeting information not in the template will be lost. Do you want to continue?
+  label_recurring_meeting_restore: "Restore this occurrence"
+  label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})."
+  label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})."
+  label_recurring_meeting_more_past: "There are %{count} more past meetings."
+  label_recurring_meeting_more_past_singular: "There is %{count} more past meeting."
+  label_recurring_meeting_show_more: "Show more"
+  label_recurring_meeting_series_edit: "Edit meeting series"
+  label_recurring_meeting_series_delete: "Delete meeting series"
+  label_my_meetings: "My meetings"
+  label_all_meetings: "All meetings"
   label_upcoming_meetings: "Các cuộc họp sắp tới"
   label_past_meetings: "Các cuộc họp đã qua"
   label_upcoming_meetings_short: "Sắp tới"
   label_past_meetings_short: "Đã qua"
   label_involvement: "Tham gia"
-  label_upcoming_invitations: "Lời mời sắp tới"
+  label_invitations: "Invitations"
+  label_invited_user: "Invited user"
   label_past_invitations: "Lời mời đã qua"
-  label_attendee: "Người tham dự"
-  label_author: "Người tạo"
+  label_attended: "Attended"
+  label_attended_user: "Attended user"
+  label_created_by_me: "Created by me"
   label_notify: "Gửi để xem xét"
   label_icalendar: "Gửi iCalendar"
   label_icalendar_download: "Tải xuống sự kiện iCalendar"
+  label_view_meeting_series: "View meeting series"
+  label_meeting_series: "Meeting series"
   label_version: "0886055830 "
   label_time_zone: "Múi giờ"
   label_start_date: "Ngày bắt đầu"
   meeting:
+    participants:
+      template: "These participants will be invited automatically to all future meetings as they are created."
     attachments:
+      template: "These attached files will be included in all future meetings in the series."
       text: "Các tệp đính kèm có sẵn cho tất cả người tham gia cuộc họp. Bạn cũng có thể kéo và thả các tệp này vào ghi chú mục chương trình nghị sự."
     copy:
       title: "Sao chép cuộc họp: %{title}"
@@ -144,9 +183,12 @@ vi:
     label_mail_all_participants: "Gửi email đến tất cả người tham gia"
     types:
       classic: "Cổ điển"
-      classic_text: "Tổ chức cuộc họp của bạn bằng một chương trình nghị sự và biên bản định dạng văn bản."
-      structured: "Dạng động"
-      structured_text: "Tổ chức cuộc họp của bạn dưới dạng danh sách các mục chương trình nghị sự, có thể liên kết chúng với một gói công việc."
+      classic_text: "Organize your meeting as a single formattable text agenda and protocol."
+      structured: "Structured"
+      one_time: "One-time"
+      recurring: "Recurring"
+      recurring_text: "Create meeting series with dynamic template for each occurrence."
+      structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package."
       structured_text_copy: "Sao chép một cuộc họp hiện tại sẽ không sao chép các mục chương trình nghị sự liên quan, chỉ sao chép các chi tiết"
     copied: "Sao chép từ Cuộc họp #%{id}"
   meeting_section:
@@ -154,6 +196,40 @@ vi:
     delete_confirmation: "Xóa phần này cũng sẽ xóa tất cả các mục chương trình nghị sự của nó. Bạn có chắc chắn muốn làm điều này không?"
     placeholder_title: "Phần mới"
     empty_text: "Kéo các mục vào đây hoặc tạo một cái mới"
+  recurring_meeting:
+    occurrence:
+      infoline: "This meeting is part of a recurring meeting series."
+      error_no_next: "There is no next occurrence for this meeting."
+      first_already_exists: "The first occurrence of this meeting series is already instantiated."
+      first_created: >
+        The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence.
+    template:
+      button_finalize: "Finish template"
+      blank_title: "Your meeting series template is empty"
+      description: >
+        This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template.
+      blankslate_finalize: >
+        When you're done preparing this template, click the '%{button_title}' button above to finish the setup and schedule the first meeting of the series.
+      label_view_template: "View template"
+      label_edit_template: "Edit template"
+      banner_html: >
+        You are currently editing a template of a meeting series: %{link}. Every new occurrence of a meeting in the series will use this template. Changes will not affect past or already created meetings.
+    frequency:
+      every_weekday: "Every %{day_of_the_week}"
+      daily: "Daily"
+      working_days: "Every working day"
+      weekly: "Weekly"
+    end_after:
+      specific_date: "a specific date"
+      iterations: "a number of occurrences"
+    starts: "Starts"
+    in_words:
+      daily_interval: "Every %{interval} days"
+      working_days: "Every working day"
+      weekly: "Every week on %{weekday}"
+      weekly_interval: "Every %{interval} weeks on %{weekday}"
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
   notice_successful_notification: "Đã gửi thông báo thành công"
   notice_timezone_missing: Chưa đặt múi giờ và %{zone} đã được chọn. Để chọn múi giowf của bạn, nhấn vào đây.
   notice_meeting_updated: "Trang này đã được người khác cập nhật. Tải lại để xem thay đổi."
@@ -206,12 +282,17 @@ vi:
   text_deleted_agenda_item: 'Mục chương trình nghị sự đã bị xóa'
   label_initial_meeting_details: "Cuộc họp"
   label_meeting_details: "Chi tiết cuộc họp"
+  label_meeting_series_details: "Meeting series details"
   label_meeting_details_edit: "Chỉnh sửa chi tiết cuộc họp"
   label_meeting_state: "Trạng thái cuộc họp"
   label_meeting_state_open: "Mở"
   label_meeting_state_open_html: "<i>Mở</i>"
   label_meeting_state_closed: "Đã đóng"
   label_meeting_state_closed_html: "<i>Đã đóng</i>"
+  label_meeting_state_agenda_created: "Agenda created"
+  label_meeting_state_scheduled: "Scheduled"
+  label_meeting_state_cancelled: "Cancelled"
+  label_meeting_state_skipped: "Skipped"
   label_meeting_reopen_action: "Mở lại cuộc họp"
   label_meeting_close_action: "Đóng cuộc họp"
   text_meeting_open_description: "Cuộc họp này đang mở. Bạn có thể thêm/xóa các mục chương trình nghị sự và chỉnh sửa chúng theo ý muốn. Sau khi cuộc họp kết thúc, hãy đóng nó để khóa lại."
diff --git a/modules/meeting/config/locales/crowdin/zh-CN.yml b/modules/meeting/config/locales/crowdin/zh-CN.yml
index 51aba6c89e0a..f55885f0d972 100644
--- a/modules/meeting/config/locales/crowdin/zh-CN.yml
+++ b/modules/meeting/config/locales/crowdin/zh-CN.yml
@@ -49,11 +49,18 @@ zh-CN:
         presenter: "演讲者"
       meeting_section:
         title: "标题"
+      recurring_meeting:
+        frequency: "频率"
+        interval: "周期"
+        start_date: "开始日期："
+        end_after: "结束定期会议于"
+        iterations: "事件"
     errors:
       messages:
         invalid_time_format: "不是有效时间。所需格式：HH:MM"
     models:
-      structured_meeting: "会议(动态)"
+      recurring_meeting: "定期会议"
+      structured_meeting: "动态会议"
       meeting_agenda_item: "议程项目"
       meeting_agenda: "议程"
       meeting_minutes: "会议记录"
@@ -87,7 +94,8 @@ zh-CN:
   label_meeting: "会议"
   label_meeting_plural: "会议"
   label_meeting_new: "新增会议"
-  label_meeting_new_dynamic: "新动态会议"
+  label_meeting_new_dynamic: "新的动态会议"
+  label_meeting_new_recurring: "新的定期会议"
   label_meeting_create: "创建会议"
   label_meeting_copy: "复制会议"
   label_meeting_edit: "编辑会议"
@@ -101,23 +109,54 @@ zh-CN:
   label_meeting_date_time: "日期/时间"
   label_meeting_date_and_time: "日期和时间"
   label_meeting_diff: "比较"
+  label_recurring_meeting: "定期会议"
+  label_recurring_meeting_part_of: "会议系列的一部分"
+  label_recurring_meeting_new: "新的定期会议"
+  label_recurring_meeting_plural: "定期会议"
+  label_template: "模板"
+  label_recurring_meeting_view: "查看会议系列"
+  label_recurring_meeting_create: "使用模板创建"
+  label_recurring_meeting_copy: "一次性复制"
+  label_recurring_meeting_cancel: "取消此事件"
+  label_recurring_meeting_delete: "删除事件"
+  label_recurring_meeting_delete_confirmation: >
+    本次会议是名为 %{name} 的会议系列的一部分。只会删除本次会议，而不会删除整个系列。要继续吗？
+  label_recurring_occurrence_delete_confirmation: >
+    任何不在模板中的会议信息都将丢失。要继续吗？
+  label_recurring_meeting_restore: "恢复此事件"
+  label_recurring_meeting_more: "还有至少 %{count} 个预定会议 (%{schedule})。"
+  label_recurring_meeting_more_singular: "还有至少 %{count} 个预定会议 (%{schedule})。"
+  label_recurring_meeting_more_past: "有至少 %{count} 个过往会议。"
+  label_recurring_meeting_more_past_singular: "有至少 %{count} 个过往会议。"
+  label_recurring_meeting_show_more: "显示更多"
+  label_recurring_meeting_series_edit: "编辑会议系列"
+  label_recurring_meeting_series_delete: "删除会议系列"
+  label_my_meetings: "我的会议"
+  label_all_meetings: "所有会议"
   label_upcoming_meetings: "即将进行的会议"
   label_past_meetings: "过去的会议"
   label_upcoming_meetings_short: "即将到来"
   label_past_meetings_short: "过往"
   label_involvement: "参与"
-  label_upcoming_invitations: "即将发出的邀请"
+  label_invitations: "邀请函"
+  label_invited_user: "受邀用户"
   label_past_invitations: "过去的邀请"
-  label_attendee: "与会者"
-  label_author: "创建者"
+  label_attended: "已出席"
+  label_attended_user: "出席用户"
+  label_created_by_me: "我创建的"
   label_notify: "发送待审阅"
   label_icalendar: "发送 iCalendar"
   label_icalendar_download: "下载 iCalendar 事件"
+  label_view_meeting_series: "查看会议系列"
+  label_meeting_series: "会议系列"
   label_version: "版本"
   label_time_zone: "时区"
   label_start_date: "开始日期"
   meeting:
+    participants:
+      template: "这些与会者将被自动邀请参加之后创建的所有会议。"
     attachments:
+      template: "这些文件将被自动添加到之后创建的所有系列会议中。"
       text: "所有与会者都可以查看附件。您还可以将这些文件拖放到议程项目注释中。"
     copy:
       title: "复制会议： %{title}"
@@ -144,9 +183,12 @@ zh-CN:
     label_mail_all_participants: "发送电子邮件给所有参与者"
     types:
       classic: "经典"
-      classic_text: "将您的会议以可格式化的文本议程和会议纪要的形式进行组织。"
-      structured: "动态"
-      structured_text: "将您的会议组织为议程项目列表，并可选地将其与工作包链接。"
+      classic_text: "将您的会议组织成一个单一格式的文本议程和协议。"
+      structured: "结构化"
+      one_time: "动态"
+      recurring: "定期"
+      recurring_text: "为每次事件创建带有动态模板的会议系列。"
+      structured_text: "将您的会议组织成一个动态的议程项目列表，并可选地将它们链接到一个工作包。"
       structured_text_copy: "目前复制会议不会复制相关会议的议程项目，只会复制会议的详细信息。"
     copied: "从会议 #%{id} 复制"
   meeting_section:
@@ -154,6 +196,40 @@ zh-CN:
     delete_confirmation: "删除该属性也会删除其在所有项目中的值。您确定要这样做吗？"
     placeholder_title: "新建章节"
     empty_text: "拖动项目到此处或创建一个新项目"
+  recurring_meeting:
+    occurrence:
+      infoline: "本次会议是定期会议系列的一部分。"
+      error_no_next: "此会议没有下一个发生时间。"
+      first_already_exists: "此会议系列的第一次发生已经被实例化。"
+      first_created: >
+        第一次会议已成功从模板创建。所有未来的会议将会在上一次发生的时间自动创建。
+    template:
+      button_finalize: "完成模板"
+      blank_title: "您的会议系列模板为空"
+      description: >
+        此模板将在系列中创建新会议时使用。您可以在此模板中添加议程项目、参与者和附件。
+      blankslate_finalize: >
+        准备好模板后，单击上方的 "%{button_title}"按钮完成设置并安排系列会议的第一次会议。
+      label_view_template: "查看模板"
+      label_edit_template: "编辑模板"
+      banner_html: >
+        您正在编辑会议系列的模板： %{link}。系列会议中的每个新会议都将使用此模板。更改不会影响过往或已创建的会议。
+    frequency:
+      every_weekday: "每个 %{day_of_the_week}"
+      daily: "每日"
+      working_days: "每个工作日"
+      weekly: "每周"
+    end_after:
+      specific_date: "具体日期"
+      iterations: "具体事件"
+    starts: "开始"
+    in_words:
+      daily_interval: "每 %{interval} 天"
+      working_days: "每个工作日"
+      weekly: "每 %{weekday}"
+      weekly_interval: "每 %{interval} 周在 %{weekday}"
+      frequency: "%{base} 在 %{time}"
+      full: "%{base} 在 %{time}，在 %{end_date} 结束"
   notice_successful_notification: "通知发送成功"
   notice_timezone_missing: 没有设定时区，预设时区为 %{zone}。要选择您的时区，请单击此处。
   notice_meeting_updated: "此页面已被其他人更新。重新加载以查看更改。"
@@ -206,12 +282,17 @@ zh-CN:
   text_deleted_agenda_item: '删除的议程项目'
   label_initial_meeting_details: "会议"
   label_meeting_details: "会议详情"
+  label_meeting_series_details: "会议系列详情"
   label_meeting_details_edit: "编辑会议详情"
   label_meeting_state: "会议状态"
   label_meeting_state_open: "开放"
   label_meeting_state_open_html: "<i>开放</i>"
   label_meeting_state_closed: "已关闭"
   label_meeting_state_closed_html: "<i>关闭</i>"
+  label_meeting_state_agenda_created: "议程已创建"
+  label_meeting_state_scheduled: "已加入日程"
+  label_meeting_state_cancelled: "已取消"
+  label_meeting_state_skipped: "已跳过"
   label_meeting_reopen_action: "重新开放会议"
   label_meeting_close_action: "关闭会议"
   text_meeting_open_description: "本次会议已开放。您可以添加/移除议程项目并随时编辑它们。会议结束后，关闭它以锁定它。"
diff --git a/modules/meeting/config/locales/crowdin/zh-TW.yml b/modules/meeting/config/locales/crowdin/zh-TW.yml
index f05454b4b57a..5895a381e11f 100644
--- a/modules/meeting/config/locales/crowdin/zh-TW.yml
+++ b/modules/meeting/config/locales/crowdin/zh-TW.yml
@@ -49,11 +49,18 @@ zh-TW:
         presenter: "簡報者"
       meeting_section:
         title: "標題"
+      recurring_meeting:
+        frequency: "頻率"
+        interval: "間隔"
+        start_date: "開始於"
+        end_after: "系列結束後"
+        iterations: "出現次數"
     errors:
       messages:
         invalid_time_format: "不是有效時間。所需格式: HH:MM"
     models:
-      structured_meeting: "會議(動態)"
+      recurring_meeting: "重複性會議"
+      structured_meeting: "一次性會議"
       meeting_agenda_item: "議程項目"
       meeting_agenda: "會議大綱"
       meeting_minutes: "會議記錄"
@@ -87,7 +94,8 @@ zh-TW:
   label_meeting: "會議"
   label_meeting_plural: "會議"
   label_meeting_new: "新增會議"
-  label_meeting_new_dynamic: "新的動態會議"
+  label_meeting_new_dynamic: "建立一次性會議"
+  label_meeting_new_recurring: "新的重複性會議"
   label_meeting_create: "新增會議"
   label_meeting_copy: "複製會議"
   label_meeting_edit: "編輯會議"
@@ -101,23 +109,54 @@ zh-TW:
   label_meeting_date_time: "日期 / 時間"
   label_meeting_date_and_time: "日期和時間"
   label_meeting_diff: "比較"
+  label_recurring_meeting: "重複性會議"
+  label_recurring_meeting_part_of: "系列會議的一部分"
+  label_recurring_meeting_new: "新的重複性會議"
+  label_recurring_meeting_plural: "重複性會議"
+  label_template: "模板"
+  label_recurring_meeting_view: "檢視會議系列"
+  label_recurring_meeting_create: "從模板建立"
+  label_recurring_meeting_copy: "複製為一次性"
+  label_recurring_meeting_cancel: "取消此事件"
+  label_recurring_meeting_delete: "刪除此事件"
+  label_recurring_meeting_delete_confirmation: >
+    此會議是 %{name}系列的一部分。這只會刪除此特定事件，而不會刪除整個系列。您要繼續嗎？
+  label_recurring_occurrence_delete_confirmation: >
+    任何不在範本中的會議資訊將會遺失。要繼續嗎？
+  label_recurring_meeting_restore: "恢復此事件"
+  label_recurring_meeting_more: "還有 %{count} 預定會議 (%{schedule})。"
+  label_recurring_meeting_more_singular: "還有 %{count} 預定會議 (%{schedule})。"
+  label_recurring_meeting_more_past: "還有 %{count} 更多過去的會議。"
+  label_recurring_meeting_more_past_singular: "還有 %{count} 更多過去的會議。"
+  label_recurring_meeting_show_more: "顯示更多"
+  label_recurring_meeting_series_edit: "編輯系列會議"
+  label_recurring_meeting_series_delete: "刪除系列會議"
+  label_my_meetings: "我的會議"
+  label_all_meetings: "所有會議"
   label_upcoming_meetings: "即將到來的會議"
   label_past_meetings: "過去的會議"
   label_upcoming_meetings_short: "即將開會"
   label_past_meetings_short: "過往會議"
   label_involvement: "參與\n"
-  label_upcoming_invitations: "即將到來的會議邀請"
+  label_invitations: "邀请"
+  label_invited_user: "受邀用户"
   label_past_invitations: "先前的會議邀請"
-  label_attendee: "與會者"
-  label_author: "建立者"
+  label_attended: "出席"
+  label_attended_user: "出席使用者"
+  label_created_by_me: "由我建立"
   label_notify: "送出審閱"
   label_icalendar: "發送 iCalendar"
   label_icalendar_download: "下載 iCalendar "
+  label_view_meeting_series: "檢視會議"
+  label_meeting_series: "會議"
   label_version: "版本"
   label_time_zone: "時區"
   label_start_date: "開始日期"
   meeting:
+    participants:
+      template: "這些參與者將自動被邀請參加未來所有建立的會議。"
     attachments:
+      template: "這些隨附的檔案將納入所有未來的系列會議中。"
       text: "所有會議參與者都可以使用附件， 您也可以將它們拖放到議程項目註釋中。"
     copy:
       title: "複製會議 %{title}"
@@ -144,9 +183,12 @@ zh-TW:
     label_mail_all_participants: "發送電子郵件給所有參與者"
     types:
       classic: "經典"
-      classic_text: "以調整好的文字議程和程序來整理您的會議紀錄。"
-      structured: "動態"
-      structured_text: "將您的會議整理成一個議程項目列表，並可選擇地將它們與一個工作項目連接起來。"
+      classic_text: "將會議組織為單一可格式化的文字議程和規程。"
+      structured: "結構化"
+      one_time: "一次性"
+      recurring: "重覆"
+      recurring_text: "為每次發生的事件建立具有動態範本的會議系列。"
+      structured_text: "將會議組織為動態的議程項目清單，可選擇將其連結到工作項目。"
       structured_text_copy: "目前複製會議不會複製相關會議的議程項目，只會複製會議的詳細信息。"
     copied: "從會議紀錄 #%{id} 中複製"
   meeting_section:
@@ -154,6 +196,40 @@ zh-TW:
     delete_confirmation: "刪除該章節也會刪除其所有的議程項目。您確定要這麼做？"
     placeholder_title: "新增章節"
     empty_text: "將項目拖曳至此處或建立新項目"
+  recurring_meeting:
+    occurrence:
+      infoline: "此會議為定期舉行的系列會議之一。"
+      error_no_next: "本次會議無下次會議。"
+      first_already_exists: "此會議系列的第一次出現已經實體化。"
+      first_created: >
+        第一次會議已從範本成功建立。以後所有的會議都會在前一次發生時自動建立。
+    template:
+      button_finalize: "完成範本"
+      blank_title: "您的會議範本是空的"
+      description: >
+        每當在系列中建立新會議時，都會使用此範本。您可以在此範本中加入議程項目、與會者和附件。
+      blankslate_finalize: >
+        準備完此範本後，按一下上方的 '%{button_title}' 按鈕，即可完成設定並排定系列會議的第一次會議。
+      label_view_template: "查看範本"
+      label_edit_template: "編輯範本"
+      banner_html: >
+        您目前正在編輯會議系列的範本： %{link}。系列會議中的每次新會議都會使用此範本。變更不會影響過去或已建立的會議。
+    frequency:
+      every_weekday: "每個 %{day_of_the_week}"
+      daily: "每日"
+      working_days: "每個工作天"
+      weekly: "每週"
+    end_after:
+      specific_date: "特定日期"
+      iterations: "出現數"
+    starts: "開始"
+    in_words:
+      daily_interval: "每 %{interval} 天"
+      working_days: "每個工作天"
+      weekly: "每週 %{weekday}"
+      weekly_interval: "每 %{interval} 週 %{weekday}"
+      frequency: "%{base} 在 %{time}"
+      full: "%{base} 於 %{time}, 結束於 %{end_date}"
   notice_successful_notification: "通知傳送成功"
   notice_timezone_missing: 沒有設定時區，預設時區為 %{zone} 。請按這裡選擇您的時區。
   notice_meeting_updated: "本頁已由他人更新。重新載入以查看變更。"
@@ -206,12 +282,17 @@ zh-TW:
   text_deleted_agenda_item: '已刪除的議程項目'
   label_initial_meeting_details: "會議"
   label_meeting_details: "會議詳情"
+  label_meeting_series_details: "會議詳細資訊"
   label_meeting_details_edit: "編輯會議詳情"
   label_meeting_state: "會議狀態"
   label_meeting_state_open: "開啟"
   label_meeting_state_open_html: "<i>開啟</i>"
   label_meeting_state_closed: "關閉"
   label_meeting_state_closed_html: "<i>關閉</i>"
+  label_meeting_state_agenda_created: "議程已建立"
+  label_meeting_state_scheduled: "已排程"
+  label_meeting_state_cancelled: "已取消"
+  label_meeting_state_skipped: "已略過"
   label_meeting_reopen_action: "重新開啟會議"
   label_meeting_close_action: "關閉會議"
   text_meeting_open_description: "本次會議已開放。您可以新增/移除議程項目並隨時編輯它們。會議結束後，關閉後鎖定起來。"
diff --git a/modules/meeting/config/locales/en.yml b/modules/meeting/config/locales/en.yml
index c5c7f6beee96..70a70868a327 100644
--- a/modules/meeting/config/locales/en.yml
+++ b/modules/meeting/config/locales/en.yml
@@ -61,11 +61,18 @@ en:
         presenter: "Presenter"
       meeting_section:
         title: "Title"
+      recurring_meeting:
+        frequency: "Frequency"
+        interval: "Interval"
+        start_date: "Starts on"
+        end_after: "End series after"
+        iterations: "Occurrences"
     errors:
       messages:
         invalid_time_format: "is not a valid time. Required format: HH:MM"
     models:
-      structured_meeting: "Meeting (dynamic)"
+      recurring_meeting: "Recurring meeting"
+      structured_meeting: "One-time meeting"
       meeting_agenda_item: "Agenda item"
       meeting_agenda: "Agenda"
       meeting_minutes: "Minutes"
@@ -104,7 +111,8 @@ en:
   label_meeting: "Meeting"
   label_meeting_plural: "Meetings"
   label_meeting_new: "New Meeting"
-  label_meeting_new_dynamic: "New dynamic meeting"
+  label_meeting_new_dynamic: "New one-time meeting"
+  label_meeting_new_recurring: "New recurring meeting"
   label_meeting_create: "Create meeting"
   label_meeting_copy: "Copy meeting"
   label_meeting_edit: "Edit Meeting"
@@ -118,25 +126,59 @@ en:
   label_meeting_date_time: "Date/Time"
   label_meeting_date_and_time: "Date and time"
   label_meeting_diff: "Diff"
+  label_recurring_meeting: "Recurring meeting"
+  label_recurring_meeting_part_of: "Part of a meeting series"
+  label_recurring_meeting_new: "New recurring meeting"
+  label_recurring_meeting_plural: "Recurring meetings"
+  label_template: "Template"
+  label_recurring_meeting_view: "View meeting series"
+  label_recurring_meeting_create: "Create from template"
+  label_recurring_meeting_copy: "Copy as one-off"
+  label_recurring_meeting_cancel: "Cancel this occurrence"
+  label_recurring_meeting_delete: "Delete occurrence"
+  label_recurring_meeting_delete_confirmation: >
+    This meeting is part of a series called %{name}.
+    This will only delete this particular occurrence and not the entire series.
+    Do you want to continue?
+  label_recurring_occurrence_delete_confirmation: >
+    Any meeting information not in the template will be lost.
+    Do you want to continue?
+  label_recurring_meeting_restore: "Restore this occurrence"
+  label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})."
+  label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})."
+  label_recurring_meeting_more_past: "There are %{count} more past meetings."
+  label_recurring_meeting_more_past_singular: "There is %{count} more past meeting."
+  label_recurring_meeting_show_more: "Show more"
+  label_recurring_meeting_series_edit: "Edit meeting series"
+  label_recurring_meeting_series_delete: "Delete meeting series"
+  label_my_meetings: "My meetings"
+  label_all_meetings: "All meetings"
   label_upcoming_meetings: "Upcoming meetings"
   label_past_meetings: "Past meetings"
   label_upcoming_meetings_short: "Upcoming"
   label_past_meetings_short: "Past"
   label_involvement: "Involvement"
-  label_upcoming_invitations: "Upcoming invitations"
+  label_invitations: "Invitations"
+  label_invited_user: "Invited user"
   label_past_invitations: "Past invitations"
-  label_attendee: "Attendee"
-  label_author: "Creator"
+  label_attended: "Attended"
+  label_attended_user: "Attended user"
+  label_created_by_me: "Created by me"
   label_notify: "Send for review"
   label_icalendar: "Send iCalendar"
   label_icalendar_download: "Download iCalendar event"
+  label_view_meeting_series: "View meeting series"
+  label_meeting_series: "Meeting series"
   label_version: "Version"
   label_time_zone: "Time zone"
   label_start_date: "Start date"
 
 
   meeting:
+    participants:
+      template: "These participants will be invited automatically to all future meetings as they are created."
     attachments:
+      template: "These attached files will be included in all future meetings in the series."
       text: "Attached files are available to all meeting participants. You can also drag and drop these into agenda item notes."
     copy:
       title: "Copy meeting: %{title}"
@@ -163,9 +205,12 @@ en:
     label_mail_all_participants: "Send email to all participants"
     types:
       classic: "Classic"
-      classic_text: "Organize your meeting in a formattable text agenda and protocol."
-      structured: "Dynamic"
-      structured_text: "Organize your meeting as a list of agenda items, optionally linking them to a work package."
+      classic_text: "Organize your meeting as a single formattable text agenda and protocol."
+      structured: "Structured"
+      one_time: "One-time"
+      recurring: "Recurring"
+      recurring_text: "Create meeting series with dynamic template for each occurrence."
+      structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package."
       structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details"
     copied: "Copied from Meeting #%{id}"
 
@@ -175,6 +220,46 @@ en:
     placeholder_title: "New section"
     empty_text: "Drag items here or create a new one"
 
+  recurring_meeting:
+    occurrence:
+      infoline: "This meeting is part of a recurring meeting series."
+      error_no_next: "There is no next occurrence for this meeting."
+      first_already_exists: "The first occurrence of this meeting series is already instantiated."
+      first_created: > 
+        The first meeting has been successfuly created from template.
+        All future meetings will be created automatically at the time of the previous occurrence.
+    template:
+      button_finalize: "Finish template"
+      blank_title: "Your meeting series template is empty"
+      description: >
+        This template will be used whenever new meetings in the series get created.
+        You can add agenda items, participants, and attachments to this template.
+      blankslate_finalize: >
+        When you're done preparing this template, 
+        click the '%{button_title}' button above to finish the setup and schedule the first meeting of the series.
+      label_view_template: "View template"
+      label_edit_template: "Edit template"
+      banner_html: >
+        You are currently editing a template of a meeting series: %{link}.
+        Every new occurrence of a meeting in the series will use this template.
+        Changes will not affect past or already created meetings.
+    frequency:
+      every_weekday: "Every %{day_of_the_week}"
+      daily: "Daily"
+      working_days: "Every working day"
+      weekly: "Weekly"
+    end_after:
+      specific_date: "a specific date"
+      iterations: "a number of occurrences"
+    starts: "Starts"
+    in_words:
+      daily_interval: "Every %{interval} days"
+      working_days: "Every working day"
+      weekly: "Every week on %{weekday}"
+      weekly_interval: "Every %{interval} weeks on %{weekday}"
+      frequency: "%{base} at %{time}"
+      full: "%{base} at %{time}, ends on %{end_date}"
+
   notice_successful_notification: "Notification sent successfully"
   notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here.
   notice_meeting_updated: "This page has been updated by someone else. Reload to view changes."
@@ -236,6 +321,7 @@ en:
 
   label_initial_meeting_details: "Meeting"
   label_meeting_details: "Meeting details"
+  label_meeting_series_details: "Meeting series details"
   label_meeting_details_edit: "Edit meeting details"
 
   label_meeting_state: "Meeting status"
@@ -243,6 +329,10 @@ en:
   label_meeting_state_open_html: "<i>Open</i>"
   label_meeting_state_closed: "Closed"
   label_meeting_state_closed_html: "<i>Closed</i>"
+  label_meeting_state_agenda_created: "Agenda created"
+  label_meeting_state_scheduled: "Scheduled"
+  label_meeting_state_cancelled: "Cancelled"
+  label_meeting_state_skipped: "Skipped"
   label_meeting_reopen_action: "Reopen meeting"
   label_meeting_close_action: "Close meeting"
   text_meeting_open_description: "This meeting is open. You can add/remove agenda items and edit them as you please. After the meeting is over, close it to lock it."
diff --git a/modules/meeting/config/routes.rb b/modules/meeting/config/routes.rb
index a22ef0828d5d..4d6b4b845704 100644
--- a/modules/meeting/config/routes.rb
+++ b/modules/meeting/config/routes.rb
@@ -33,6 +33,7 @@
         get "menu" => "meetings/menus#show"
       end
     end
+    resources :recurring_meetings, only: %i[index new create show destroy]
   end
 
   resources :work_packages, only: %i[] do
@@ -55,6 +56,19 @@
     resource :menu, only: %[show]
   end
 
+  resources :recurring_meetings do
+    member do
+      get :details_dialog
+      get :download_ics
+      post :init
+      post :delete_scheduled
+      post :template_completed
+    end
+    collection do
+      get :humanize_schedule, controller: "recurring_meetings/schedule", action: :humanize_schedule
+    end
+  end
+
   resources :meetings do
     get :new_dialog, on: :collection
     member do
diff --git a/modules/meeting/db/migrate/20240426073948_create_recurring_meetings.rb b/modules/meeting/db/migrate/20240426073948_create_recurring_meetings.rb
new file mode 100644
index 000000000000..6cbe26431257
--- /dev/null
+++ b/modules/meeting/db/migrate/20240426073948_create_recurring_meetings.rb
@@ -0,0 +1,19 @@
+class CreateRecurringMeetings < ActiveRecord::Migration[7.1]
+  def change
+    create_table :recurring_meetings do |t|
+      t.datetime :start_time
+      t.date :end_date, null: true
+      t.text :title
+      t.integer :frequency, default: 0, null: false
+      t.integer :end_after, default: 0, null: false
+      t.integer :iterations, null: true
+      t.belongs_to :project, foreign_key: true, index: true
+      t.belongs_to :author, foreign_key: { to_table: :users }
+
+      t.timestamps
+    end
+
+    add_reference :meetings, :recurring_meeting, index: true
+    add_column :meetings, :template, :boolean, default: false, null: false
+  end
+end
diff --git a/modules/meeting/db/migrate/20241122143600_add_interval_to_recurring_meeting.rb b/modules/meeting/db/migrate/20241122143600_add_interval_to_recurring_meeting.rb
new file mode 100644
index 000000000000..678abd8040c3
--- /dev/null
+++ b/modules/meeting/db/migrate/20241122143600_add_interval_to_recurring_meeting.rb
@@ -0,0 +1,6 @@
+class AddIntervalToRecurringMeeting < ActiveRecord::Migration[7.1]
+  def change
+    add_column :recurring_meetings, :interval, :integer,
+               default: 1, null: false
+  end
+end
diff --git a/modules/meeting/db/migrate/20241128190428_create_scheduled_meetings.rb b/modules/meeting/db/migrate/20241128190428_create_scheduled_meetings.rb
new file mode 100644
index 000000000000..b9e9368521ca
--- /dev/null
+++ b/modules/meeting/db/migrate/20241128190428_create_scheduled_meetings.rb
@@ -0,0 +1,22 @@
+class CreateScheduledMeetings < ActiveRecord::Migration[7.1]
+  def change
+    create_table :scheduled_meetings do |t|
+      t.belongs_to :recurring_meeting,
+                   null: false,
+                   foreign_key: { index: true, on_delete: :cascade }
+
+      t.belongs_to :meeting,
+                   null: true,
+                   foreign_key: { index: true, unique: true, on_delete: :nullify }
+
+      t.datetime :start_time, null: false
+      t.boolean :cancelled, default: false, null: false
+
+      t.timestamps
+    end
+
+    add_index :scheduled_meetings,
+              %i[recurring_meeting_id start_time],
+              unique: true
+  end
+end
diff --git a/modules/meeting/lib/open_project/meeting/engine.rb b/modules/meeting/lib/open_project/meeting/engine.rb
index 4c60ed2fedef..4668c82dc4cf 100644
--- a/modules/meeting/lib/open_project/meeting/engine.rb
+++ b/modules/meeting/lib/open_project/meeting/engine.rb
@@ -40,27 +40,38 @@ class Engine < ::Rails::Engine
              bundled: true do
       project_module :meetings do
         permission :view_meetings,
-                   { meetings: %i[index show check_for_updates download_ics participants_dialog history],
+                   {
+                     meetings: %i[index show check_for_updates download_ics participants_dialog history],
                      meeting_agendas: %i[history show diff],
                      meeting_minutes: %i[history show diff],
                      "meetings/menus": %i[show],
-                     work_package_meetings_tab: %i[index count] },
+                     work_package_meetings_tab: %i[index count],
+                     recurring_meetings: %i[index show new create download_ics]
+                   },
                    permissible_on: :project
         permission :create_meetings,
-                   { meetings: %i[new create copy new_dialog],
-                     "meetings/menus": %i[show] },
+                   {
+                     meetings: %i[new create copy new_dialog],
+                     recurring_meetings: %i[new create copy init template_completed],
+                     "recurring_meetings/schedule": %i[update_text],
+                     "meetings/menus": %i[show]
+                   },
                    permissible_on: :project,
                    require: :member,
                    contract_actions: { meetings: %i[create] }
         permission :edit_meetings,
                    {
                      meetings: %i[edit cancel_edit update update_title details_dialog update_details update_participants],
+                     recurring_meetings: %i[edit cancel_edit update update_title details_dialog update_details],
                      work_package_meetings_tab: %i[add_work_package_to_meeting_dialog add_work_package_to_meeting]
                    },
                    permissible_on: :project,
                    require: :member
         permission :delete_meetings,
-                   { meetings: [:destroy] },
+                   {
+                     meetings: [:destroy],
+                     recurring_meetings: %i[destroy delete_scheduled]
+                   },
                    permissible_on: :project,
                    require: :member
         permission :meetings_send_invite,
diff --git a/modules/meeting/spec/components/meetings/side_panel/details_component_spec.rb b/modules/meeting/spec/components/meetings/side_panel/details_component_spec.rb
new file mode 100644
index 000000000000..709db948fd1d
--- /dev/null
+++ b/modules/meeting/spec/components/meetings/side_panel/details_component_spec.rb
@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "rails_helper"
+
+RSpec.describe Meetings::SidePanel::DetailsComponent, type: :component do
+  let(:user) { build_stubbed(:user) }
+
+  subject do
+    render_inline(described_class.new(meeting:))
+    page
+  end
+
+  before do
+    login_as(user)
+  end
+
+  context "with templated meeting and working_days frequency" do
+    let(:series) do
+      build_stubbed(:recurring_meeting,
+                    start_time: DateTime.parse("2024-12-04T10:00:00Z"),
+                    frequency: "working_days")
+    end
+    let(:meeting) do
+      build_stubbed(:structured_meeting_template,
+                    recurring_meeting: series)
+    end
+
+    it "doesn't show the weekday" do
+      expect(subject).to have_no_text("Wednesday")
+    end
+  end
+
+  context "with templated meeting and weekly frequency" do
+    let(:series) do
+      build_stubbed(:recurring_meeting,
+                    start_time: DateTime.parse("2024-12-04T10:00:00Z"),
+                    frequency: "weekly")
+    end
+    let(:meeting) do
+      build_stubbed(:structured_meeting_template,
+                    recurring_meeting: series)
+    end
+
+    it "shows the weekday" do
+      expect(subject).to have_text("Wednesday")
+    end
+  end
+end
diff --git a/modules/meeting/spec/contracts/meetings/delete_contract_spec.rb b/modules/meeting/spec/contracts/meetings/delete_contract_spec.rb
new file mode 100644
index 000000000000..794cabd4b632
--- /dev/null
+++ b/modules/meeting/spec/contracts/meetings/delete_contract_spec.rb
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+require "contracts/shared/model_contract_shared_context"
+
+RSpec.describe Meetings::DeleteContract do
+  include_context "ModelContract shared context"
+
+  shared_let(:project) { create(:project) }
+  shared_let(:meeting) { create(:meeting, project:) }
+  let(:contract) { described_class.new(meeting, user) }
+
+  context "with permission" do
+    let(:user) do
+      create(:user, member_with_permissions: { project => [:delete_meetings] })
+    end
+
+    it_behaves_like "contract is valid"
+  end
+
+  context "without permission" do
+    let(:user) { build_stubbed(:user) }
+
+    it_behaves_like "contract is invalid", base: :error_unauthorized
+  end
+
+  include_examples "contract reuses the model errors" do
+    let(:user) { build_stubbed(:user) }
+  end
+end
diff --git a/modules/meeting/spec/contracts/recurring_meetings/create_contract_spec.rb b/modules/meeting/spec/contracts/recurring_meetings/create_contract_spec.rb
new file mode 100644
index 000000000000..432e637d9d1d
--- /dev/null
+++ b/modules/meeting/spec/contracts/recurring_meetings/create_contract_spec.rb
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+require "contracts/shared/model_contract_shared_context"
+
+RSpec.describe RecurringMeetings::CreateContract do
+  include_context "ModelContract shared context"
+
+  shared_let(:project) { create(:project) }
+  let(:meeting) { build(:recurring_meeting, project:) }
+  let(:contract) { described_class.new(meeting, user) }
+
+  context "with permission" do
+    let(:user) do
+      create(:user, member_with_permissions: { project => %i[view_meetings create_meetings] })
+    end
+
+    it_behaves_like "contract is valid"
+  end
+
+  context "without permission" do
+    let(:user) { build_stubbed(:user) }
+
+    it_behaves_like "contract is invalid", base: :error_unauthorized
+  end
+
+  include_examples "contract reuses the model errors" do
+    let(:user) { build_stubbed(:user) }
+  end
+end
diff --git a/modules/meeting/spec/contracts/recurring_meetings/update_contract_spec.rb b/modules/meeting/spec/contracts/recurring_meetings/update_contract_spec.rb
new file mode 100644
index 000000000000..683ee89dd5b1
--- /dev/null
+++ b/modules/meeting/spec/contracts/recurring_meetings/update_contract_spec.rb
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+require "contracts/shared/model_contract_shared_context"
+
+RSpec.describe RecurringMeetings::UpdateContract do
+  include_context "ModelContract shared context"
+
+  shared_let(:project) { create(:project) }
+  shared_let(:meeting) { create(:recurring_meeting, project:) }
+  let(:contract) { described_class.new(meeting, user) }
+
+  context "with permission" do
+    let(:user) do
+      create(:user, member_with_permissions: { project => [:edit_meetings] })
+    end
+
+    it_behaves_like "contract is valid"
+  end
+
+  context "without permission" do
+    let(:user) { build_stubbed(:user) }
+
+    it_behaves_like "contract is invalid", base: :error_unauthorized
+  end
+
+  include_examples "contract reuses the model errors" do
+    let(:user) { build_stubbed(:user) }
+  end
+end
diff --git a/modules/meeting/spec/factories/meeting_factory.rb b/modules/meeting/spec/factories/meeting_factory.rb
index 415af6bccb2d..3ec2041df7d2 100644
--- a/modules/meeting/spec/factories/meeting_factory.rb
+++ b/modules/meeting/spec/factories/meeting_factory.rb
@@ -39,8 +39,20 @@
       meeting.project = evaluator.project if evaluator.project
     end
 
-    factory :structured_meeting, class: "StructuredMeeting" do |m|
-      m.sequence(:title) { |n| "Structured meeting #{n}" }
+    factory :structured_meeting, class: "StructuredMeeting" do |structured_meeting|
+      structured_meeting.sequence(:title) { |n| "Structured meeting #{n}" }
+    end
+
+    factory :structured_meeting_template, class: "StructuredMeeting" do |structured_meeting|
+      structured_meeting.sequence(:title) { |n| "Structured meeting template #{n}" }
+      template { true }
+      recurring_meeting
+
+      after(:build) do |template, evaluator|
+        %w[author project start_time].each do |attr|
+          template.send(:"#{attr}=", evaluator.recurring_meeting.send(attr))
+        end
+      end
     end
   end
 end
diff --git a/modules/meeting/spec/factories/recurring_meeting_factory.rb b/modules/meeting/spec/factories/recurring_meeting_factory.rb
new file mode 100644
index 000000000000..225fa3841890
--- /dev/null
+++ b/modules/meeting/spec/factories/recurring_meeting_factory.rb
@@ -0,0 +1,58 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+FactoryBot.define do
+  factory :recurring_meeting, class: "RecurringMeeting" do |m|
+    author factory: :user
+    project
+    start_time { Date.tomorrow + 10.hours }
+    end_date { 1.year.from_now }
+    duration { 1.0 }
+    frequency { "weekly" }
+    interval { 1 }
+    iterations { 10 }
+    end_after { "specific_date" }
+
+    location { "https://some-url.com" }
+    m.sequence(:title) { |n| "Meeting series #{n}" }
+
+    after(:create) do |recurring_meeting, evaluator|
+      project = evaluator.project
+      recurring_meeting.project = project
+
+      # create template
+      template = create(:structured_meeting_template,
+                        author: recurring_meeting.author,
+                        recurring_meeting:,
+                        project:)
+
+      # create agenda item
+      create(:meeting_agenda_item, meeting: template, title: "My template item")
+    end
+  end
+end
diff --git a/modules/meeting/spec/factories/scheduled_meeting_factory.rb b/modules/meeting/spec/factories/scheduled_meeting_factory.rb
new file mode 100644
index 000000000000..d5c20b0be9df
--- /dev/null
+++ b/modules/meeting/spec/factories/scheduled_meeting_factory.rb
@@ -0,0 +1,55 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+FactoryBot.define do
+  factory :scheduled_meeting, class: "ScheduledMeeting" do
+    recurring_meeting
+    cancelled { false }
+    meeting { nil }
+    start_time { Date.tomorrow + 10.hours }
+
+    trait :scheduled
+
+    trait :cancelled do
+      cancelled { true }
+    end
+
+    trait :persisted do
+      transient do
+        meeting_start_time { nil }
+      end
+
+      after(:build) do |schedule, evaluator|
+        schedule.meeting = build(:meeting,
+                                 recurring_meeting: schedule.recurring_meeting,
+                                 start_time: evaluator.meeting_start_time || schedule.start_time,
+                                 project: schedule.recurring_meeting.project)
+      end
+    end
+  end
+end
diff --git a/modules/meeting/spec/features/meetings_close_spec.rb b/modules/meeting/spec/features/meetings_close_spec.rb
index 049571bead0e..46b1351e5e7c 100644
--- a/modules/meeting/spec/features/meetings_close_spec.rb
+++ b/modules/meeting/spec/features/meetings_close_spec.rb
@@ -58,6 +58,7 @@
 
       # Go to minutes, expect uneditable
       find(".op-tab-row--link", text: "MINUTES").click
+      wait_for_network_idle
       expect(page).to have_css(".button", text: "Close the agenda to begin the Minutes")
 
       # Close the meeting
diff --git a/modules/meeting/spec/features/meetings_global_menu_item_spec.rb b/modules/meeting/spec/features/meetings_global_menu_item_spec.rb
index f77ab30f3cbd..85af3945cc1e 100644
--- a/modules/meeting/spec/features/meetings_global_menu_item_spec.rb
+++ b/modules/meeting/spec/features/meetings_global_menu_item_spec.rb
@@ -57,9 +57,9 @@
       expect(page).to have_current_path("/meetings")
     end
 
-    specify '"Upcoming invitations" is the default filter set' do
+    specify '"My meetings" is the default filter set' do
       within "#main-menu" do
-        expect(page).to have_css(".selected", text: I18n.t(:label_upcoming_invitations))
+        expect(page).to have_css(".selected", text: "My meetings")
       end
     end
   end
diff --git a/modules/meeting/spec/features/meetings_index_spec.rb b/modules/meeting/spec/features/meetings_index_spec.rb
index 8b41961492d5..c585368a9d5c 100644
--- a/modules/meeting/spec/features/meetings_index_spec.rb
+++ b/modules/meeting/spec/features/meetings_index_spec.rb
@@ -49,13 +49,13 @@
     end
   end
 
-  let(:meeting) do
+  shared_let(:meeting) do
     create(:meeting,
            project:,
            title: "Awesome meeting today!",
            start_time: Time.current)
   end
-  let(:tomorrows_meeting) do
+  shared_let(:tomorrows_meeting) do
     create(:meeting,
            project:,
            title: "Awesome meeting tomorrow!",
@@ -63,25 +63,25 @@
            duration: 2.0,
            location: "no-protocol.com")
   end
-  let(:meeting_with_no_location) do
+  shared_let(:meeting_with_no_location) do
     create(:meeting,
            project:,
            title: "Boring meeting without a location!",
            start_time: 1.day.from_now,
            location: "")
   end
-  let(:meeting_with_malicious_location) do
+  shared_let(:meeting_with_malicious_location) do
     create(:meeting,
            project:,
            title: "Sneaky meeting!",
            start_time: 1.day.from_now,
            location: "<script>alert('Description');</script>")
   end
-  let(:yesterdays_meeting) do
+  shared_let(:yesterdays_meeting) do
     create(:meeting, project:, title: "Awesome meeting yesterday!", start_time: 1.day.ago)
   end
 
-  let(:other_project_meeting) do
+  shared_let(:other_project_meeting) do
     create(:meeting,
            project: other_project,
            title: "Awesome other project meeting!",
@@ -89,7 +89,7 @@
            duration: 2.0,
            location: "not-a-url")
   end
-  let(:ongoing_meeting) do
+  shared_let(:ongoing_meeting) do
     create(:meeting, project:, title: "Awesome ongoing meeting!", start_time: 30.minutes.ago)
   end
 
@@ -109,73 +109,83 @@ def invite_to_meeting(meeting)
   end
 
   shared_examples "sidebar filtering" do |context:|
-    context "when filtering with the sidebar" do
+    context "when showing all meetings without invitations" do
+      it "does not show under My meetings, but in All meetings" do
+        meetings_page.visit!
+        expect(page).to have_content "There is currently nothing to display."
+
+        meetings_page.set_sidebar_filter "All meetings"
+
+        # It now includes the ongoing meeting I'm not invited to
+        if context == :global
+          [ongoing_meeting, meeting, tomorrows_meeting, other_project_meeting]
+        else
+          [ongoing_meeting, meeting, tomorrows_meeting]
+        end
+      end
+    end
+
+    context "when showing all meetings with the sidebar" do
       before do
         ongoing_meeting
         other_project_meeting
         setup_meeting_involvement
         meetings_page.visit!
+        meetings_page.set_sidebar_filter "All meetings"
       end
 
-      context 'with the "Upcoming meetings" filter' do
+      context 'with the "Upcoming meetings" quick filter' do
         before do
-          meetings_page.set_sidebar_filter "Upcoming meetings"
+          meetings_page.set_quick_filter upcoming: true
         end
 
         it "shows all upcoming and ongoing meetings", :aggregate_failures do
-          expected_upcoming_meetings = if context == :global
-                                         [ongoing_meeting, meeting, tomorrows_meeting, other_project_meeting]
-                                       else
-                                         [ongoing_meeting, meeting, tomorrows_meeting]
-                                       end
+          expected_upcoming_meetings =
+            if context == :global
+              [ongoing_meeting, meeting, tomorrows_meeting, meeting_with_no_location,
+               meeting_with_malicious_location, other_project_meeting]
+            else
+              [ongoing_meeting, meeting, tomorrows_meeting, meeting_with_no_location, meeting_with_malicious_location]
+            end
 
           meetings_page.expect_meetings_listed_in_order(*expected_upcoming_meetings)
           meetings_page.expect_meetings_not_listed(yesterdays_meeting)
         end
       end
 
-      context 'with the "Past meetings" filter' do
+      context 'with the "Past meetings" quick filter' do
         before do
-          meetings_page.set_sidebar_filter "Past meetings"
+          meetings_page.set_quick_filter upcoming: false
         end
 
-        it "show all past and ongoing meetings" do
-          meetings_page.expect_meetings_listed_in_order(ongoing_meeting,
-                                                        yesterdays_meeting)
-          meetings_page.expect_meetings_not_listed(meeting,
-                                                   tomorrows_meeting)
+        it "show all past meetings" do
+          meetings_page.expect_meetings_listed(yesterdays_meeting)
+          meetings_page.expect_meetings_not_listed(meeting, tomorrows_meeting)
         end
       end
 
-      context 'with the "Upcoming invitations" filter' do
+      context 'with the "Invitations" filter' do
         before do
-          meetings_page.set_sidebar_filter "Upcoming invitations"
+          meetings_page.set_sidebar_filter "Invitations"
         end
 
-        it "shows all upcoming meetings I've been marked as invited to" do
+        it "shows all meetings I've been marked as invited to with a quick filter" do
           meetings_page.expect_meetings_listed(tomorrows_meeting)
           meetings_page.expect_meetings_not_listed(yesterdays_meeting,
                                                    meeting,
                                                    ongoing_meeting)
-        end
-      end
 
-      context 'with the "Past invitations" filter' do
-        before do
-          meetings_page.set_sidebar_filter "Past invitations"
-        end
+          meetings_page.set_quick_filter upcoming: false
 
-        it "shows all past meetings I've been marked as invited to" do
           meetings_page.expect_meetings_listed(yesterdays_meeting)
-          meetings_page.expect_meetings_not_listed(ongoing_meeting,
-                                                   meeting,
-                                                   tomorrows_meeting)
+
+          meetings_page.expect_meetings_not_listed(meeting, tomorrows_meeting)
         end
       end
 
       context 'with the "Attendee" filter' do
         before do
-          meetings_page.set_sidebar_filter "Attendee"
+          meetings_page.set_sidebar_filter "Attended"
         end
 
         it "shows all meetings I've been marked as attending to" do
@@ -188,7 +198,7 @@ def invite_to_meeting(meeting)
 
       context 'with the "Creator" filter' do
         before do
-          meetings_page.set_sidebar_filter "Creator"
+          meetings_page.set_sidebar_filter "Created by me"
         end
 
         it "shows all meetings I'm the author of" do
@@ -270,7 +280,7 @@ def invite_to_meeting(meeting)
         meetings_page.expect_create_new_button
       end
 
-      it "allows creation of both types of meetings" do
+      it "allows creation of both types of meetings", with_flag: { recurring_meetings: true } do
         meetings_page.visit!
 
         meetings_page.expect_create_new_types
diff --git a/modules/meeting/spec/features/recurring_meetings/recurring_meeting_create_spec.rb b/modules/meeting/spec/features/recurring_meetings/recurring_meeting_create_spec.rb
new file mode 100644
index 000000000000..72629e50242c
--- /dev/null
+++ b/modules/meeting/spec/features/recurring_meetings/recurring_meeting_create_spec.rb
@@ -0,0 +1,127 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+
+require_relative "../../support/pages/meetings/new"
+require_relative "../../support/pages/structured_meeting/show"
+require_relative "../../support/pages/recurring_meeting/show"
+require_relative "../../support/pages/meetings/index"
+
+RSpec.describe "Recurring meetings creation",
+               :js,
+               :with_cuprite,
+               with_flag: { recurring_meetings: true } do
+  include Components::Autocompleter::NgSelectAutocompleteHelpers
+
+  shared_let(:project) { create(:project, enabled_module_names: %w[meetings]) }
+  shared_let(:user) do
+    create(:user,
+           lastname: "First",
+           member_with_permissions: { project => %i[view_meetings create_meetings edit_meetings delete_meetings] }).tap do |u|
+      u.pref[:time_zone] = "Etc/UTC"
+
+      u.save!
+    end
+  end
+  shared_let(:other_user) do
+    create(:user,
+           lastname: "Second",
+           member_with_permissions: { project => %i[view_meetings] })
+  end
+  shared_let(:no_member_user) do
+    create(:user,
+           lastname: "Third")
+  end
+
+  let(:current_user) { user }
+  let(:meeting) { RecurringMeeting.last }
+  let(:show_page) { Pages::RecurringMeeting::Show.new(meeting) }
+  let(:meetings_page) { Pages::Meetings::Index.new(project:) }
+
+  before do
+    travel_to(Date.new(2024, 12, 1))
+  end
+
+  context "with a user with permissions" do
+    it "can create a recurring meeting" do
+      login_as current_user
+      meetings_page.visit!
+      expect(page).to have_current_path(meetings_page.path)
+      meetings_page.click_on "add-meeting-button"
+
+      page.within("action-list") do
+        meetings_page.click_on "Recurring"
+      end
+
+      wait_for_network_idle
+
+      meetings_page.set_title "Some title"
+
+      meetings_page.set_starts_on "2024-12-31"
+      meetings_page.set_start_time "13:30"
+      meetings_page.set_duration "1.5"
+      meetings_page.set_end_date "2025-01-15"
+
+      expect(page).to have_text "Every week on Tuesday at 01:30 PM"
+
+      click_on "Create meeting"
+      wait_for_network_idle
+      expect_and_dismiss_flash(type: :success, message: "Successful creation.")
+
+      # Use is redirected to the template
+      expect(page).to have_current_path(project_meeting_path(project, meeting.template))
+      expect(page).to have_content(I18n.t("recurring_meeting.template.description"))
+      expect(page).to have_link("Finish template")
+
+      click_link_or_button "Finish template"
+
+      # Does not send invitation mails by default
+      perform_enqueued_jobs
+      expect(ActionMailer::Base.deliveries.size).to eq 0
+
+      show_page.visit!
+      expect(page).to have_css(".start_time", count: 3)
+
+      show_page.expect_open_meeting date: "12/31/2024 01:30 PM"
+      show_page.expect_scheduled_meeting date: "01/07/2025 01:30 PM"
+      show_page.expect_scheduled_meeting date: "01/14/2025 01:30 PM"
+    end
+  end
+
+  context "as a user with viewing permissions only" do
+    let(:current_user) { other_user }
+
+    it "does not offer that option" do
+      login_as current_user
+      meetings_page.visit!
+      expect(page).to have_current_path(meetings_page.path)
+      expect(page).not_to have_test_selector("add-meeting-button")
+    end
+  end
+end
diff --git a/modules/meeting/spec/features/recurring_meetings/recurring_meeting_crud_spec.rb b/modules/meeting/spec/features/recurring_meetings/recurring_meeting_crud_spec.rb
new file mode 100644
index 000000000000..2be981d3ef9e
--- /dev/null
+++ b/modules/meeting/spec/features/recurring_meetings/recurring_meeting_crud_spec.rb
@@ -0,0 +1,192 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+
+require_relative "../../support/pages/meetings/new"
+require_relative "../../support/pages/structured_meeting/show"
+require_relative "../../support/pages/recurring_meeting/show"
+require_relative "../../support/pages/meetings/index"
+
+RSpec.describe "Recurring meetings CRUD",
+               :js,
+               :with_cuprite,
+               with_flag: { recurring_meetings: true } do
+  include Components::Autocompleter::NgSelectAutocompleteHelpers
+
+  before_all do
+    travel_to(Date.new(2024, 12, 1))
+  end
+
+  after(:all) do # rubocop:disable RSpec/BeforeAfterAll
+    travel_back
+  end
+
+  shared_let(:project) { create(:project, enabled_module_names: %w[meetings]) }
+  shared_let(:user) do
+    create :user,
+           lastname: "First",
+           preferences: { time_zone: "Etc/UTC" },
+           member_with_permissions: { project => %i[view_meetings create_meetings edit_meetings delete_meetings] }
+  end
+  shared_let(:other_user) do
+    create(:user,
+           lastname: "Second",
+           member_with_permissions: { project => %i[view_meetings] })
+  end
+  shared_let(:no_member_user) do
+    create(:user,
+           lastname: "Third")
+  end
+  shared_let(:meeting) do
+    create :recurring_meeting,
+           project:,
+           start_time: "2024-12-31T13:30:00Z",
+           duration: 1.5,
+           frequency: "weekly",
+           end_after: "specific_date",
+           end_date: "2025-01-15",
+           author: user
+  end
+
+  let(:current_user) { user }
+  let(:show_page) { Pages::RecurringMeeting::Show.new(meeting) }
+  let(:meetings_page) { Pages::Meetings::Index.new(project:) }
+
+  before do
+    travel_to(Date.new(2024, 12, 1))
+    login_as current_user
+
+    # Assuming the first init job has run
+    RecurringMeetings::InitNextOccurrenceJob.perform_now(meeting)
+  end
+
+  it "can delete a recurring meeting from the show page and return to the index page" do
+    show_page.visit!
+
+    click_on "recurring-meeting-action-menu"
+
+    accept_confirm(I18n.t("text_are_you_sure")) do
+      click_on "Delete meeting series"
+    end
+
+    expect(page).to have_current_path meetings_path # check path
+  end
+
+  it "can use the 'Create from template' button" do
+    show_page.visit!
+
+    show_page.create_from_template date: "01/07/2025 01:30 PM"
+    wait_for_reload
+
+    expect(page).to have_current_path project_meeting_path(project, Meeting.last)
+
+    show_page.visit!
+
+    show_page.expect_no_scheduled_meeting date: "01/07/2025 01:30 PM"
+    show_page.expect_open_meeting date: "01/07/2025 01:30 PM"
+  end
+
+  it "can cancel an occurrence" do
+    show_page.visit!
+
+    accept_confirm(I18n.t(:label_recurring_occurrence_delete_confirmation)) do
+      show_page.cancel_occurrence date: "12/31/2024 01:30 PM"
+    end
+
+    expect_flash(type: :success, message: "Successful cancellation.")
+
+    expect(page).to have_current_path(show_page.project_path)
+
+    show_page.expect_no_open_meeting date: "12/31/2024 01:30 PM"
+    show_page.expect_cancelled_meeting date: "12/31/2024 01:30 PM"
+  end
+
+  it "can edit the details of a recurring meeting" do
+    show_page.visit!
+
+    show_page.expect_subtitle text: "Every week on Tuesday at 01:30 PM, ends on 01/14/2025"
+
+    show_page.edit_meeting_series
+    show_page.in_edit_dialog do
+      page.select("Daily", from: "Frequency")
+      meetings_page.set_start_time "11:00"
+      page.select("a number of occurrences", from: "End series after")
+      page.fill_in("Occurrences", with: "8")
+
+      sleep 0.5
+      click_link_or_button("Save")
+    end
+    wait_for_network_idle
+    show_page.expect_subtitle text: "Daily at 11:00 AM, ends on 01/07/2025"
+  end
+
+  it "shows the correct actions based on status" do
+    show_page.visit!
+
+    show_page.expect_open_meeting date: "12/31/2024 01:30 PM"
+    show_page.expect_open_actions date: "12/31/2024 01:30 PM"
+
+    show_page.expect_scheduled_meeting date: "01/07/2025 01:30 PM"
+    show_page.expect_scheduled_actions date: "01/07/2025 01:30 PM"
+
+    accept_confirm(I18n.t(:label_recurring_occurrence_delete_confirmation)) do
+      show_page.cancel_occurrence date: "12/31/2024 01:30 PM"
+    end
+
+    wait_for_network_idle
+    show_page.expect_cancelled_meeting date: "12/31/2024 01:30 PM"
+    show_page.expect_cancelled_actions date: "12/31/2024 01:30 PM"
+  end
+
+  context "with view permissions only" do
+    let(:current_user) { other_user }
+
+    it "does not allow to act on the recurring meeting" do
+      show_page.visit!
+
+      expect(page).to have_no_content "Create from template"
+      show_page.expect_open_meeting date: "12/31/2024 01:30 PM"
+
+      within("li", text: "12/31/2024 01:30 PM") do
+        click_on "more-button"
+
+        expect(page).to have_css(".ActionListItem-label", count: 1)
+        expect(page).to have_css(".ActionListItem-label", text: "Download iCalendar event")
+
+        # Close it again
+        click_on "more-button"
+      end
+
+      show_page.expect_scheduled_meeting date: "01/07/2025 01:30 PM"
+      show_page.expect_scheduled_meeting date: "01/14/2025 01:30 PM"
+
+      expect(page).not_to have_test_selector "recurring-meeting-action-menu"
+    end
+  end
+end
diff --git a/modules/meeting/spec/features/structured_meetings/mobile_structure_meeting_spec.rb b/modules/meeting/spec/features/structured_meetings/mobile_structure_meeting_spec.rb
index eefba3dd0817..6f90d085d158 100644
--- a/modules/meeting/spec/features/structured_meetings/mobile_structure_meeting_spec.rb
+++ b/modules/meeting/spec/features/structured_meetings/mobile_structure_meeting_spec.rb
@@ -61,7 +61,7 @@
   end
 
   let(:current_user) { user }
-  let(:show_page) { Pages::StructuredMeeting::Mobile::Show.new(StructuredMeeting.order(id: :asc).last) }
+  let(:show_page) { Pages::StructuredMeeting::Mobile::Show.new(StructuredMeeting.last) }
 
   include_context "with mobile screen size"
 
diff --git a/modules/meeting/spec/features/structured_meetings/structured_meeting_crud_spec.rb b/modules/meeting/spec/features/structured_meetings/structured_meeting_crud_spec.rb
index fb52588d6d33..c762251f9a59 100644
--- a/modules/meeting/spec/features/structured_meetings/structured_meeting_crud_spec.rb
+++ b/modules/meeting/spec/features/structured_meetings/structured_meeting_crud_spec.rb
@@ -34,7 +34,8 @@
 
 RSpec.describe "Structured meetings CRUD",
                :js,
-               :with_cuprite do
+               :with_cuprite,
+               with_flag: { recurring_meetings: true } do
   include Components::Autocompleter::NgSelectAutocompleteHelpers
 
   shared_let(:project) { create(:project, enabled_module_names: %w[meetings work_package_tracking]) }
@@ -63,7 +64,7 @@
 
   let(:current_user) { user }
   let(:new_page) { Pages::Meetings::New.new(project) }
-  let(:meeting) { StructuredMeeting.order(id: :asc).last }
+  let(:meeting) { StructuredMeeting.last }
   let(:show_page) { Pages::StructuredMeeting::Show.new(meeting) }
   let(:meetings_page) { Pages::Meetings::Index.new(project:) }
 
@@ -72,7 +73,7 @@
     meetings_page.visit!
     expect(page).to have_current_path(meetings_page.path) # rubocop:disable RSpec/ExpectInHook
     meetings_page.click_on "add-meeting-button"
-    meetings_page.click_on "Dynamic"
+    meetings_page.click_on "One-time"
     meetings_page.set_title "Some title"
 
     meetings_page.set_start_date "2013-03-28"
@@ -290,6 +291,7 @@
       click_on("Save")
     end
 
+    wait_for_network_idle
     click_on("op-meetings-header-action-trigger")
 
     retry_block do
@@ -307,7 +309,7 @@
     fill_in "Title", with: "Some title"
     click_on "Create meeting"
 
-    new_meeting = StructuredMeeting.reorder(id: :asc).last
+    new_meeting = StructuredMeeting.last
     expect(page).to have_current_path "/projects/#{project.identifier}/meetings/#{new_meeting.id}"
 
     # check for copied agenda items
diff --git a/modules/meeting/spec/features/structured_meetings/structured_meeting_participant_spec.rb b/modules/meeting/spec/features/structured_meetings/structured_meeting_participant_spec.rb
index e89f4494ef90..5eba946db7b5 100644
--- a/modules/meeting/spec/features/structured_meetings/structured_meeting_participant_spec.rb
+++ b/modules/meeting/spec/features/structured_meetings/structured_meeting_participant_spec.rb
@@ -61,7 +61,7 @@
   end
 
   let(:current_user) { user }
-  let(:show_page) { Pages::StructuredMeeting::Show.new(StructuredMeeting.order(id: :asc).last) }
+  let(:show_page) { Pages::StructuredMeeting::Show.new(StructuredMeeting.last) }
 
   before do
     login_as current_user
diff --git a/modules/meeting/spec/features/structured_meetings/work_package_meetings_tab_spec.rb b/modules/meeting/spec/features/structured_meetings/work_package_meetings_tab_spec.rb
index a853bd2e4e0e..cef6c8721316 100644
--- a/modules/meeting/spec/features/structured_meetings/work_package_meetings_tab_spec.rb
+++ b/modules/meeting/spec/features/structured_meetings/work_package_meetings_tab_spec.rb
@@ -30,7 +30,9 @@
 require_relative "../../support/pages/work_package_meetings_tab"
 require_relative "../../support/pages/structured_meeting/show"
 
-RSpec.describe "Open the Meetings tab", :js do
+RSpec.describe "Open the Meetings tab",
+               :js,
+               :with_cuprite do
   shared_let(:project) { create(:project) }
   shared_let(:work_package) { create(:work_package, project:, subject: "A test work_package") }
 
@@ -256,9 +258,11 @@
           expect(page).to have_content(meeting_agenda_item_of_second_meeting.notes)
         end
 
-        meeting_containers = page.all("[data-test-selector^='op-meeting-container-']")
-        expect(meeting_containers[0]["data-test-selector"]).to eq("op-meeting-container-#{first_meeting.id}")
-        expect(meeting_containers[1]["data-test-selector"]).to eq("op-meeting-container-#{second_meeting.id}")
+        meeting_containers = page
+          .all("[data-test-selector^='op-meeting-container-']")
+          .map { |container| container["data-test-selector"] } # rubocop:disable Rails/Pluck
+        expect(meeting_containers).to contain_exactly("op-meeting-container-#{first_meeting.id}",
+                                                      "op-meeting-container-#{second_meeting.id}")
       end
     end
 
@@ -339,11 +343,10 @@
 
           meetings_tab.fill_and_submit_meeting_dialog(
             first_upcoming_meeting,
-            "A very important note added from the meetings tab to the first meeting!"
+            "A very important note added from the meetings tab to the first meeting!",
+            1
           )
 
-          meetings_tab.expect_upcoming_counter_to_be(1)
-
           page.within_test_selector("op-meeting-container-#{first_upcoming_meeting.id}") do
             expect(page).to have_content("A very important note added from the meetings tab to the first meeting!")
           end
@@ -352,11 +355,10 @@
 
           meetings_tab.fill_and_submit_meeting_dialog(
             second_upcoming_meeting,
-            "A very important note added from the meetings tab to the second meeting!"
+            "A very important note added from the meetings tab to the second meeting!",
+            2
           )
 
-          meetings_tab.expect_upcoming_counter_to_be(2)
-
           page.within_test_selector("op-meeting-container-#{second_upcoming_meeting.id}") do
             expect(page).to have_content("A very important note added from the meetings tab to the second meeting!")
           end
@@ -370,7 +372,8 @@
 
           meetings_tab.fill_and_submit_meeting_dialog(
             ongoing_meeting,
-            "Some notes to be added"
+            "Some notes to be added",
+            1
           )
 
           meetings_tab.expect_upcoming_counter_to_be(1)
@@ -409,7 +412,9 @@
           retry_block do
             click_on("Save")
 
-            expect(page).to have_content("Meeting can't be blank")
+            wait_for_network_idle
+
+            raise "Expected error message to be shown" unless page.has_content?("Meeting can't be blank")
           end
         end
 
@@ -421,7 +426,8 @@
 
           meetings_tab.fill_and_submit_meeting_dialog(
             first_upcoming_meeting,
-            "A very important note added from the meetings tab to the first meeting!"
+            "A very important note added from the meetings tab to the first meeting!",
+            1
           )
 
           meeting_page.visit!
diff --git a/modules/meeting/spec/models/meeting_spec.rb b/modules/meeting/spec/models/meeting_spec.rb
index 0604716d9558..4f1a513957b3 100644
--- a/modules/meeting/spec/models/meeting_spec.rb
+++ b/modules/meeting/spec/models/meeting_spec.rb
@@ -207,4 +207,27 @@
       expect(StructuredMeeting.acts_as_watchable_permission).to eq(:view_meetings)
     end
   end
+
+  describe "duration" do
+    it "accepts a float" do
+      meeting.duration = 1.5
+      expect(meeting).to be_valid
+      expect(meeting.duration).to eq(1.5)
+      expect(meeting.formatted_duration).to eq("1.5h")
+    end
+
+    it "accepts a string to be parsed by chronic" do
+      meeting.duration = "30m"
+      expect(meeting).to be_valid
+      expect(meeting.duration).to eq(0.5)
+      expect(meeting.formatted_duration).to eq("0.5h")
+    end
+
+    it "doesn't raise on nil" do
+      meeting.duration = nil
+      expect(meeting).not_to be_valid
+      expect(meeting.errors[:duration]).to include("is not a number.")
+      expect(meeting.formatted_duration).to be_nil
+    end
+  end
 end
diff --git a/modules/meeting/spec/models/recurring_meeting_spec.rb b/modules/meeting/spec/models/recurring_meeting_spec.rb
new file mode 100644
index 000000000000..5497bace6a7a
--- /dev/null
+++ b/modules/meeting/spec/models/recurring_meeting_spec.rb
@@ -0,0 +1,209 @@
+require "spec_helper"
+require_module_spec_helper
+
+RSpec.describe RecurringMeeting,
+               with_settings: {
+                 date_format: "%Y-%m-%d"
+               } do
+  describe "end_date" do
+    subject { build(:recurring_meeting, start_date: (Date.current + 2.days).iso8601, end_date:) }
+
+    context "with end_date before start_date" do
+      let(:end_date) { Date.current + 1.day }
+
+      it "is invalid" do
+        expect(subject).not_to be_valid
+        expect(subject.errors[:end_date]).to include("must be after #{subject.start_date}.")
+      end
+    end
+
+    context "with end_date in the past" do
+      let(:end_date) { Date.yesterday }
+
+      it "is invalid" do
+        expect(subject).not_to be_valid
+        expect(subject.errors[:end_date]).to include("must be in the future.")
+      end
+    end
+  end
+
+  describe "intervals" do
+    subject { build(:recurring_meeting) }
+
+    it "validates integer values >= 1" do
+      subject.interval = 1
+      expect(subject).to be_valid
+      expect(subject.errors[:interval]).to be_empty
+    end
+
+    it "validates max value" do
+      subject.interval = 101
+      expect(subject).not_to be_valid
+      expect(subject.errors[:interval]).to include("must be less than or equal to 100.")
+
+      subject.interval = 100
+      expect(subject).to be_valid
+    end
+
+    it "adds errors for invalid values", :aggregate_failures do
+      subject.interval = 0
+      expect(subject).not_to be_valid
+      expect(subject.errors[:interval]).to include("must be greater than or equal to 1.")
+
+      subject.interval = -1
+      expect(subject).not_to be_valid
+      expect(subject.errors[:interval]).to include("must be greater than or equal to 1.")
+
+      subject.interval = 0.1
+      expect(subject).not_to be_valid
+      expect(subject.errors[:interval]).to include("is not an integer.")
+
+      subject.interval = "asdf"
+      expect(subject).not_to be_valid
+      expect(subject.errors[:interval]).to include("is not a number.")
+    end
+  end
+
+  describe "iterations" do
+    subject { build(:recurring_meeting, end_after: "iterations") }
+
+    it "does not validate if end_after is not iterations" do
+      subject.end_after = "specific_date"
+      subject.iterations = nil
+      expect(subject).to be_valid
+    end
+
+    it "validates integer values >= 1" do
+      subject.iterations = 1
+      expect(subject).to be_valid
+      expect(subject.errors[:iterations]).to be_empty
+    end
+
+    it "validates max value" do
+      subject.iterations = 1001
+      expect(subject).not_to be_valid
+      expect(subject.errors[:iterations]).to include("must be less than or equal to 1000.")
+
+      subject.iterations = 1000
+      expect(subject).to be_valid
+    end
+
+    it "adds errors for invalid values", :aggregate_failures do
+      subject.iterations = 0
+      expect(subject).not_to be_valid
+      expect(subject.errors[:iterations]).to include("must be greater than or equal to 1.")
+
+      subject.iterations = -1
+      expect(subject).not_to be_valid
+      expect(subject.errors[:iterations]).to include("must be greater than or equal to 1.")
+
+      subject.iterations = 0.1
+      expect(subject).not_to be_valid
+      expect(subject.errors[:iterations]).to include("is not an integer.")
+
+      subject.iterations = "asdf"
+      expect(subject).not_to be_valid
+      expect(subject.errors[:iterations]).to include("is not a number.")
+    end
+  end
+
+  describe "daily schedule" do
+    subject do
+      build(:recurring_meeting,
+            start_time: Time.zone.tomorrow + 10.hours,
+            frequency: "daily",
+            end_after: "specific_date",
+            end_date: Time.zone.tomorrow + 1.week)
+    end
+
+    it "schedules daily", :aggregate_failures do
+      expect(subject.first_occurrence).to eq Time.zone.tomorrow + 10.hours
+      expect(subject.last_occurrence).to eq Time.zone.tomorrow + 6.days + 10.hours
+
+      occurrence_in_two_days = Time.zone.today + 2.days + 10.hours
+      Timecop.freeze(Time.zone.tomorrow + 11.hours) do
+        expect(subject.next_occurrence).to eq occurrence_in_two_days
+      end
+
+      next_occurrences = subject.scheduled_occurrences(limit: 5).map(&:to_time)
+      expect(next_occurrences).to eq [
+        Time.zone.tomorrow + 10.hours,
+        Time.zone.today + 2.days + 10.hours,
+        Time.zone.today + 3.days + 10.hours,
+        Time.zone.today + 4.days + 10.hours,
+        Time.zone.today + 5.days + 10.hours
+      ]
+
+      Timecop.freeze(Time.zone.tomorrow + 2.weeks) do
+        expect(subject.next_occurrence).to be_nil
+      end
+    end
+  end
+
+  describe "working_days schedule" do
+    subject do
+      build(:recurring_meeting,
+            start_time: DateTime.parse("2024-12-02T10:00Z"),
+            frequency: "working_days",
+            end_after: "specific_date",
+            end_date: DateTime.parse("2024-12-29T10:00Z"))
+    end
+
+    context "with working days set to four-week", with_settings: { working_days: [1, 2, 3, 4] } do
+      it "schedules working days", :aggregate_failures do
+        # Monday, 9AM
+        Timecop.freeze(DateTime.parse("2024-12-02T09:00Z")) do
+          expect(subject.first_occurrence).to eq Time.zone.today + 10.hours
+          # Last thursday of the year
+          expect(subject.last_occurrence).to eq DateTime.parse("2024-12-26T10:00Z")
+
+          next_occurrences = subject.scheduled_occurrences(limit: 5).map(&:to_time)
+          expect(next_occurrences).to eq [
+            DateTime.parse("2024-12-02T10:00Z"),
+            DateTime.parse("2024-12-03T10:00Z"),
+            DateTime.parse("2024-12-04T10:00Z"),
+            DateTime.parse("2024-12-05T10:00Z"),
+            DateTime.parse("2024-12-09T10:00Z")
+          ]
+        end
+
+        # Go to Saturday, expect next on Monday
+        Timecop.freeze(DateTime.parse("2024-12-07T09:00Z")) do
+          expect(subject.next_occurrence).to eq DateTime.parse("2024-12-09T10:00Z")
+        end
+      end
+    end
+  end
+
+  describe "weekly schedule" do
+    subject do
+      build(:recurring_meeting,
+            start_time: Time.zone.tomorrow + 10.hours,
+            frequency: "weekly",
+            end_after: "specific_date",
+            end_date: Time.zone.tomorrow + 4.weeks)
+    end
+
+    it "schedules weekly", :aggregate_failures do
+      expect(subject.first_occurrence).to eq Time.zone.tomorrow + 10.hours
+      expect(subject.last_occurrence).to eq Time.zone.tomorrow + 3.weeks + 10.hours
+
+      following_occurrence = Time.zone.tomorrow + 7.days + 10.hours
+      Timecop.freeze(Time.zone.tomorrow + 11.hours) do
+        expect(subject.next_occurrence).to eq following_occurrence
+      end
+
+      next_occurrences = subject.scheduled_occurrences(limit: 5).map(&:to_time)
+      expect(next_occurrences).to eq [
+        Time.zone.tomorrow + 10.hours,
+        Time.zone.tomorrow + 7.days + 10.hours,
+        Time.zone.tomorrow + 14.days + 10.hours,
+        Time.zone.tomorrow + 21.days + 10.hours
+      ]
+
+      Timecop.freeze(Time.zone.tomorrow + 5.weeks) do
+        expect(subject.next_occurrence).to be_nil
+      end
+    end
+  end
+end
diff --git a/modules/meeting/spec/requests/meetings_spec.rb b/modules/meeting/spec/requests/meetings_spec.rb
index cc21843fdb57..cd6b7af0b80e 100644
--- a/modules/meeting/spec/requests/meetings_spec.rb
+++ b/modules/meeting/spec/requests/meetings_spec.rb
@@ -141,8 +141,6 @@
         let(:send_notifications) { "1" }
 
         before do
-          meeting.participants.create!(user:, invited: true)
-
           subject
           perform_enqueued_jobs
         end
diff --git a/modules/meeting/spec/requests/recurring_meetings/recurring_meetings_index_spec.rb b/modules/meeting/spec/requests/recurring_meetings/recurring_meetings_index_spec.rb
new file mode 100644
index 000000000000..62b8d8c990c4
--- /dev/null
+++ b/modules/meeting/spec/requests/recurring_meetings/recurring_meetings_index_spec.rb
@@ -0,0 +1,69 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+
+RSpec.describe "Recurring meetings index",
+               :skip_csrf,
+               type: :rails_request do
+  shared_let(:project) { create(:project, enabled_module_names: %i[meetings]) }
+  shared_let(:user) { create(:user, member_with_permissions: { project => %i[view_meetings create_meetings edit_meetings] }) }
+  shared_let(:series) { create(:recurring_meeting, project:, author: user) }
+
+  let(:current_user) { user }
+
+  before do
+    login_as(current_user)
+  end
+
+  context "when user has permissions to access" do
+    it "does not show the recurring meetings" do
+      get recurring_meetings_path
+      expect(response).to have_http_status(:ok)
+    end
+
+    it "does not show project recurring meetings" do
+      get project_recurring_meetings_path(project)
+      expect(response).to have_http_status(:ok)
+    end
+  end
+
+  context "when user has no permissions to access" do
+    let(:current_user) { create(:user) }
+
+    it "does not show the recurring meetings" do
+      get recurring_meetings_path
+      expect(response).to have_http_status(:forbidden)
+    end
+
+    it "does not show project recurring meetings" do
+      get project_recurring_meetings_path(project)
+      expect(response).to have_http_status(:forbidden)
+    end
+  end
+end
diff --git a/modules/meeting/spec/requests/recurring_meetings/recurring_meetings_schedule_spec.rb b/modules/meeting/spec/requests/recurring_meetings/recurring_meetings_schedule_spec.rb
new file mode 100644
index 000000000000..33fb596bb52b
--- /dev/null
+++ b/modules/meeting/spec/requests/recurring_meetings/recurring_meetings_schedule_spec.rb
@@ -0,0 +1,115 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+require_relative "../../support/pages/recurring_meeting/show"
+
+RSpec.describe "Recurring meetings schedule text",
+               :skip_csrf,
+               type: :rails_request do
+  include Redmine::I18n
+
+  shared_let(:project) { create(:project, enabled_module_names: %i[meetings]) }
+  shared_let(:user) do
+    create(:user,
+           preferences: { time_zone: "Europe/London" },
+           member_with_permissions: { project => %i[view_meetings create_meetings] })
+  end
+  let(:current_user) { user }
+
+  let(:start_time_hour) { "10:00" }
+  let(:start_date) { "2024-12-05" }
+  let(:frequency) { "daily" }
+  let(:interval) { "1" }
+  let(:params) do
+    { meeting: { start_time_hour:, start_date:, frequency:, interval: } }
+  end
+  let(:format) { :html }
+
+  subject do
+    get humanize_schedule_recurring_meetings_path(params:, format:)
+    response
+  end
+
+  before do
+    login_as(current_user)
+  end
+
+  describe "setting schedule" do
+    it "returns the update text" do
+      expect(subject).to have_http_status(:ok)
+      expect(subject.body).to include("Daily at 10:00 AM")
+    end
+
+    context "when changing the frequency and interval" do
+      let(:frequency) { "weekly" }
+      let(:interval) { "2" }
+
+      it "returns the update text" do
+        expect(subject).to have_http_status(:ok)
+        expect(subject.body).to include("Every 2 weeks on Thursday at 10:00 AM")
+      end
+    end
+
+    context "when changing the interval" do
+      let(:interval) { "2" }
+
+      it "returns the update text" do
+        expect(subject).to have_http_status(:ok)
+        expect(subject.body).to include("Every 2 days at 10:00 AM")
+      end
+    end
+
+    context "when leaving the interval empty" do
+      let(:interval) { "" }
+
+      it "falls back to the default" do
+        expect(subject).to have_http_status(:ok)
+        expect(subject.body).to include("Daily at 10:00 AM")
+      end
+    end
+
+    context "when requesting with turbo" do
+      let(:format) { :turbo_stream }
+
+      it "returns an update turbo stream" do
+        expect(subject).to have_http_status(:ok)
+        expect(subject.body).to include("turbo-stream")
+        expect(subject.body).to include("Daily at 10:00 AM")
+      end
+    end
+  end
+
+  context "when user has no permissions to access" do
+    let(:current_user) { create(:user) }
+
+    it "does not allow to request it" do
+      expect(subject).to have_http_status(:forbidden)
+    end
+  end
+end
diff --git a/modules/meeting/spec/requests/recurring_meetings/recurring_meetings_show_spec.rb b/modules/meeting/spec/requests/recurring_meetings/recurring_meetings_show_spec.rb
new file mode 100644
index 000000000000..12ad0130c9df
--- /dev/null
+++ b/modules/meeting/spec/requests/recurring_meetings/recurring_meetings_show_spec.rb
@@ -0,0 +1,186 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+require_relative "../../support/pages/recurring_meeting/show"
+
+RSpec.describe "Recurring meetings show",
+               :skip_csrf,
+               type: :rails_request do
+  include Redmine::I18n
+
+  shared_let(:project) { create(:project, enabled_module_names: %i[meetings]) }
+  shared_let(:user) { create(:user, member_with_permissions: { project => %i[view_meetings create_meetings edit_meetings] }) }
+  shared_let(:recurring_meeting) do
+    create :recurring_meeting,
+           project:,
+           author: user,
+           start_time: Time.zone.today - 10.days + 10.hours,
+           frequency: "daily"
+  end
+
+  let(:current_user) { user }
+  let(:show_page) { Pages::RecurringMeeting::Show.new(recurring_meeting).with_capybara_page(page) }
+
+  before do
+    login_as(current_user)
+  end
+
+  context "when user has permissions to access" do
+    it "shows the recurring meetings" do
+      get recurring_meeting_path(recurring_meeting)
+      expect(response).to have_http_status(:ok)
+    end
+
+    it "shows project recurring meetings" do
+      get project_recurring_meeting_path(project, recurring_meeting)
+      expect(response).to have_http_status(:ok)
+    end
+  end
+
+  describe "past quick filter" do
+    let!(:past_instance) { create(:structured_meeting, recurring_meeting:, start_time: 1.day.ago + 10.hours) }
+    let!(:past_schedule) do
+      create :scheduled_meeting,
+             meeting: past_instance,
+             recurring_meeting:,
+             start_time: 1.day.ago + 10.hours
+    end
+
+    let!(:past_schedule_cancelled) do
+      create :scheduled_meeting,
+             recurring_meeting:,
+             start_time: 2.days.ago + 10.hours,
+             cancelled: true
+    end
+
+    it "does not show the cancelled meeting" do
+      get recurring_meeting_path(recurring_meeting, direction: "past")
+
+      expect(page).to have_text format_time(past_instance.start_time)
+      expect(page).to have_no_text format_time(past_schedule_cancelled.start_time)
+      expect(page).to have_no_css("li", text: "Cancelled")
+    end
+  end
+
+  describe "upcoming quick filter" do
+    context "with a rescheduled meeting" do
+      let!(:rescheduled_instance) do
+        create :structured_meeting,
+               recurring_meeting:,
+               start_time: Time.zone.today + 2.days + 10.hours
+      end
+      let!(:rescheduled) do
+        create :scheduled_meeting,
+               meeting: rescheduled_instance,
+               recurring_meeting:,
+               start_time: Time.zone.today + 1.day + 10.hours
+      end
+
+      it "shows rescheduled occurrences" do
+        get recurring_meeting_path(recurring_meeting)
+
+        old_date = format_time(rescheduled.start_time)
+        new_date = format_time(rescheduled_instance.start_time)
+        expect(page).to have_css("li s", text: old_date)
+        expect(page).to have_text("#{old_date}\n#{new_date}")
+      end
+    end
+
+    context "with a cancelled meeting" do
+      let!(:rescheduled) do
+        create :scheduled_meeting,
+               :cancelled,
+               recurring_meeting:,
+               start_time: Time.zone.today + 1.day + 10.hours
+      end
+
+      it "shows the cancelled occurrences" do
+        get recurring_meeting_path(recurring_meeting)
+
+        expect(page).to have_css("li", text: format_time(rescheduled.start_time))
+        expect(page).to have_css("li", text: "Cancelled")
+      end
+    end
+
+    context "with no scheduled meetings" do
+      it "shows the next five occurrences" do
+        # Assuming we're past today's occurrence
+        Timecop.freeze(Time.zone.today + 11.hours) do
+          get recurring_meeting_path(recurring_meeting)
+        end
+
+        (1..5).each do |date|
+          expect(page).to have_text format_time(Time.zone.today + date.days + 10.hours)
+        end
+      end
+    end
+  end
+
+  context "when user has no permissions to access" do
+    let(:current_user) { create(:user) }
+
+    it "does not show the recurring meetings" do
+      get recurring_meeting_path(recurring_meeting)
+      expect(response).to have_http_status(:not_found)
+    end
+
+    it "does not show project recurring meetings" do
+      get project_recurring_meeting_path(project, recurring_meeting)
+      expect(response).to have_http_status(:not_found)
+    end
+  end
+
+  describe "Show more" do
+    context "when there are more than 5 scheduled instances" do
+      it "shows the footer" do
+        get recurring_meeting_path(recurring_meeting)
+
+        expect(page).to have_css("#recurring-meetings-footer-component")
+      end
+    end
+
+    context "when there are 5 or fewer scheduled instances" do
+      let(:recurring_meeting) do
+        create :recurring_meeting,
+               project:,
+               author: user,
+               start_time: Time.zone.today + 1.day,
+               frequency: "daily",
+               end_after: "iterations",
+               iterations: 5
+      end
+
+      it "shows no footer" do
+        get recurring_meeting_path(recurring_meeting)
+
+        expect(page).to have_no_css("#recurring-meetings-footer-component")
+      end
+    end
+  end
+end
diff --git a/modules/meeting/spec/requests/recurring_meetings/recurring_meetings_template_completed_spec.rb b/modules/meeting/spec/requests/recurring_meetings/recurring_meetings_template_completed_spec.rb
new file mode 100644
index 000000000000..d7b49ad02e5a
--- /dev/null
+++ b/modules/meeting/spec/requests/recurring_meetings/recurring_meetings_template_completed_spec.rb
@@ -0,0 +1,124 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+require_relative "../../support/pages/recurring_meeting/show"
+
+RSpec.describe "Recurring meetings complete template",
+               :skip_csrf,
+               type: :rails_request,
+               with_settings: { date_format: "%Y-%m-%d" } do
+  include Redmine::I18n
+
+  shared_let(:project) { create(:project, enabled_module_names: %i[meetings]) }
+  shared_let(:user) { create(:user, member_with_permissions: { project => %i[view_meetings create_meetings edit_meetings] }) }
+  shared_let(:recurring_meeting) do
+    create :recurring_meeting,
+           project:,
+           author: user,
+           start_time: DateTime.parse("2024-12-05T10:00:00Z"),
+           frequency: "daily"
+  end
+
+  let(:current_user) { user }
+  let(:show_page) { Pages::RecurringMeeting::Show.new(recurring_meeting).with_capybara_page(page) }
+  let(:request) do
+    post template_completed_recurring_meeting_path(recurring_meeting)
+  end
+
+  subject do
+    Timecop.freeze("2024-12-04T10:00:00Z".to_datetime) { request }
+  end
+
+  before do
+    login_as(current_user)
+  end
+
+  context "when first occurrence is not existing" do
+    it "instantiates the first occurrence from template" do
+      expect { subject }.to change(recurring_meeting.scheduled_meetings, :count).by(1)
+      expect(response).to be_redirect
+
+      expect(recurring_meeting.scheduled_meetings.count).to eq(1)
+      first = recurring_meeting.scheduled_meetings.first
+      expect(first.start_time).to eq(DateTime.parse("2024-12-05T10:00:00Z"))
+      expect(first.start_time).to eq(recurring_meeting.first_occurrence.to_time)
+
+      meeting = first.meeting
+      expect(meeting.agenda_items.count).to eq(1)
+      expect(meeting.agenda_items.first.title).to eq("My template item")
+    end
+  end
+
+  context "when first occurrence is already created" do
+    let!(:meeting) { create(:structured_meeting, recurring_meeting:, start_time: recurring_meeting.start_time) }
+    let!(:schedule) do
+      create :scheduled_meeting,
+             meeting:,
+             recurring_meeting:,
+             start_time: recurring_meeting.start_time
+    end
+
+    it "does not create a new meeting" do
+      expect { subject }.not_to change(recurring_meeting.scheduled_meetings, :count)
+      expect(response).to be_redirect
+
+      expect(recurring_meeting.scheduled_meetings.count).to eq(1)
+      first = recurring_meeting.scheduled_meetings.first.meeting
+      expect(first).to eq(meeting)
+    end
+  end
+
+  context "when first occurrence is cancelled" do
+    let!(:schedule) do
+      create :scheduled_meeting,
+             :cancelled,
+             recurring_meeting:,
+             start_time: recurring_meeting.start_time
+    end
+
+    it "takes over that occurrence" do
+      expect { subject }.to change(recurring_meeting.meetings, :count).by(1)
+      expect(response).to be_redirect
+
+      expect(recurring_meeting.scheduled_meetings.count).to eq(1)
+      first = recurring_meeting.scheduled_meetings.first
+      expect(first).not_to be_cancelled
+      expect(first.meeting).to be_present
+    end
+  end
+
+  context "when user has no permissions to access" do
+    let(:current_user) { create(:user) }
+
+    it "does not authorize" do
+      subject
+      expect(response).to have_http_status(:not_found)
+    end
+  end
+end
diff --git a/modules/meeting/spec/services/meetings/create_service_integration_spec.rb b/modules/meeting/spec/services/meetings/create_service_integration_spec.rb
new file mode 100644
index 000000000000..973eb83bedeb
--- /dev/null
+++ b/modules/meeting/spec/services/meetings/create_service_integration_spec.rb
@@ -0,0 +1,91 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+
+RSpec.describe Meetings::CreateService, "integration", type: :model do
+  shared_let(:project) { create(:project, enabled_module_names: %i[meetings]) }
+  shared_let(:user) do
+    create(:user, member_with_permissions: { project => %i(view_meetings create_meetings) })
+  end
+  shared_let(:other_user) do
+    create(:user, member_with_permissions: { project => %i(view_meetings) })
+  end
+  let(:instance) { described_class.new(user:) }
+  let(:service_result) { subject }
+  let(:series) { service_result.result }
+  let(:params) { {} }
+  let(:default_params) do
+    {
+      project:,
+      title: "My test meeting"
+    }
+  end
+
+  subject { instance.call(**params, **default_params) }
+
+  describe "participants" do
+    context "when passed" do
+      let(:params) do
+        {
+          participants_attributes: [
+            { user_id: other_user.id, invited: true, attended: true }
+          ]
+        }
+      end
+
+      it "creates that meeting with that one participant" do
+        expect(subject).to be_success
+        expect(subject.result.participants.count).to eq(1)
+        expect(subject.result.participants.first.user).to eq(other_user)
+      end
+    end
+
+    context "when passed as empty" do
+      let(:params) do
+        {
+          participants_attributes: {}
+        }
+      end
+
+      it "creates the meeting with default" do
+        expect(subject).to be_success
+        expect(subject.result.participants.count).to eq(1)
+        expect(subject.result.participants.first.user).to eq(user)
+      end
+    end
+
+    context "when not passed" do
+      it "creates the meeting with default" do
+        expect(subject).to be_success
+        expect(subject.result.participants.count).to eq(1)
+        expect(subject.result.participants.first.user).to eq(user)
+      end
+    end
+  end
+end
diff --git a/modules/meeting/spec/services/meetings/update_service_integration_spec.rb b/modules/meeting/spec/services/meetings/update_service_integration_spec.rb
new file mode 100644
index 000000000000..697629cfaf50
--- /dev/null
+++ b/modules/meeting/spec/services/meetings/update_service_integration_spec.rb
@@ -0,0 +1,67 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+
+RSpec.describe Meetings::UpdateService, "integration", type: :model do
+  include Redmine::I18n
+
+  shared_let(:project) { create(:project, enabled_module_names: %i[meetings]) }
+  shared_let(:user) do
+    create(:user, member_with_permissions: { project => %i(view_meetings edit_meetings) })
+  end
+
+  let(:instance) { described_class.new(model: meeting, user:) }
+  let(:attributes) { {} }
+  let(:params) { {} }
+
+  let(:service_result) { instance.call(attributes:, **params) }
+  let(:updated_meeting) { service_result.result }
+
+  context "when meeting is in a series and scheduled to the future" do
+    let!(:recurring_meeting) { create(:recurring_meeting, project:, frequency: "daily") }
+    let!(:meeting) { create(:structured_meeting, recurring_meeting:, project:, start_time: Time.zone.tomorrow + 10.hours) }
+    let!(:schedule) do
+      create(:scheduled_meeting,
+             meeting:,
+             start_time: Time.zone.today + 10.hours,
+             recurring_meeting:)
+    end
+
+    context "when trying to move it to before the scheduled time" do
+      let(:params) do
+        { start_time: Time.zone.yesterday + 10.hours }
+      end
+
+      it "does not be valid" do
+        expect(service_result).not_to be_success
+        expect(service_result.errors[:start_date]).to include("must be after #{format_date(Time.zone.today + 10.hours)}.")
+      end
+    end
+  end
+end
diff --git a/modules/meeting/spec/services/recurring_meetings/create_service_integration_spec.rb b/modules/meeting/spec/services/recurring_meetings/create_service_integration_spec.rb
new file mode 100644
index 000000000000..deb3eba6caf8
--- /dev/null
+++ b/modules/meeting/spec/services/recurring_meetings/create_service_integration_spec.rb
@@ -0,0 +1,87 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+
+RSpec.describe RecurringMeetings::CreateService, "integration", type: :model do
+  shared_let(:project) { create(:project, enabled_module_names: %i[meetings]) }
+  shared_let(:user) do
+    create(:user, member_with_permissions: { project => %i(view_meetings create_meetings) })
+  end
+  let(:instance) { described_class.new(user:) }
+  let(:service_result) { subject }
+  let(:series) { service_result.result }
+  let(:params) { {} }
+
+  subject { instance.call(**params) }
+
+  context "with a daily schedule" do
+    let(:first_start) { Time.zone.tomorrow + 10.hours }
+    let(:params) do
+      {
+        start_time: first_start,
+        frequency: "daily",
+        interval: 1,
+        end_after: "specific_date",
+        end_date: 1.month.from_now,
+        project:,
+        title: "My daily"
+      }
+    end
+
+    it "creates the series, template, and schedule the init job" do
+      expect { subject }.to have_enqueued_job(RecurringMeetings::InitNextOccurrenceJob)
+      job = enqueued_jobs.detect { |h| h["job_class"] == "RecurringMeetings::InitNextOccurrenceJob" }
+      expect(DateTime.parse(job["scheduled_at"])).to eq(Time.zone.tomorrow + 10.hours)
+
+      expect(service_result).to be_success
+      expect(series).to be_persisted
+
+      expect(series.template).to be_a(StructuredMeeting)
+      expect(series.template).to be_template
+
+      expect(series.meetings.count).to eq(1)
+      expect(series.meetings.first).to be_template
+    end
+
+    context "when the template cannot be saved" do
+      let(:template) { StructuredMeeting.new }
+
+      before do
+        allow(StructuredMeeting).to receive(:new).and_return(template)
+        allow(template).to receive(:save).and_return(false)
+      end
+
+      it "does not create the series" do
+        expect { subject }.not_to have_enqueued_job(RecurringMeetings::InitNextOccurrenceJob)
+        expect(service_result).not_to be_success
+        expect(series).to be_new_record
+      end
+    end
+  end
+end
diff --git a/modules/meeting/spec/services/recurring_meetings/ical_service_spec.rb b/modules/meeting/spec/services/recurring_meetings/ical_service_spec.rb
new file mode 100644
index 000000000000..e8554a1c631b
--- /dev/null
+++ b/modules/meeting/spec/services/recurring_meetings/ical_service_spec.rb
@@ -0,0 +1,148 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+
+RSpec.describe RecurringMeetings::ICalService, type: :model do # rubocop:disable RSpec/SpecFilePathFormat
+  shared_let(:user) do
+    create(:user, firstname: "Bob", lastname: "Barker",
+                  mail: "bob@example.com", preferences: { time_zone: "America/New_York" })
+  end
+  shared_let(:user2) { create(:user, firstname: "Foo", lastname: "Fooer", mail: "foo@example.com") }
+  shared_let(:project) { create(:project, name: "My Project", identifier: "my-project") }
+
+  shared_let(:series) do
+    create(:recurring_meeting,
+           author: user,
+           project:,
+           title: "Weekly",
+           frequency: "weekly",
+           start_time: DateTime.parse("2024-12-01T10:00:00Z"),
+           end_date: "2025-12-01")
+  end
+
+  let(:template) { series.template }
+  let(:service) { described_class.new(user:, series:) }
+  let(:result) { service.call.result }
+
+  let(:parsed_ical) { Icalendar::Calendar.parse(result).first }
+  let(:parsed_events) { parsed_ical.events }
+
+  let(:series_event) { parsed_events.detect { |evt| evt.recurrence_id.nil? } }
+  let(:series_ical) { series_event.to_ical }
+
+  let(:standard_zone) { Icalendar::Calendar.parse(result).first.timezones.first.standards.first }
+  let(:daylight_zone) { Icalendar::Calendar.parse(result).first.timezones.first.daylights.first }
+
+  before do
+    template.update!(
+      location: "https://example.com/meet/important-meeting",
+      duration: 1.5
+    )
+    template.participants << MeetingParticipant.new(user:)
+    template.participants << MeetingParticipant.new(user: user2)
+  end
+
+  describe "exported series" do
+    it "contains serise and template information" do
+      expect(parsed_events.count).to eq(1)
+      expect(series_ical).to include("LOCATION:https://example.com/meet/important-meeting")
+      expect(series_ical).to include("SUMMARY:[My Project] Weekly")
+      expect(series_ical).to include("UID:#{Setting.app_title}-#{Setting.host_name}-meeting-series-#{series.id}")
+      expect(series_ical).to include("ATTENDEE;CN=Bob Barker;EMAIL=bob@example.com;PARTSTAT=NEEDS-ACTION;RSVP=TRU")
+      expect(series_ical).to include("ATTENDEE;CN=Foo Fooer;EMAIL=foo@example.com;PARTSTAT=NEEDS-ACTION;RSVP=TRUE")
+    end
+  end
+
+  describe "cancelled schedules" do
+    shared_let(:cancelled_schedule1) do
+      create(:scheduled_meeting,
+             :cancelled,
+             recurring_meeting: series,
+             start_time: DateTime.parse("2024-12-08T10:00:00Z"))
+    end
+
+    shared_let(:cancelled_schedule2) do
+      create(:scheduled_meeting,
+             :cancelled,
+             recurring_meeting: series,
+             start_time: DateTime.parse("2024-12-24T10:00:00Z"))
+    end
+
+    it "excludes them as EXDATE", :aggregate_failures do
+      expect(parsed_events.count).to eq(1)
+      expect(series_ical).to include("EXDATE;TZID=America/New_York:20241208T050000")
+      expect(series_ical).to include("EXDATE;TZID=America/New_York:20241224T050000")
+    end
+  end
+
+  describe "instantiated schedules" do
+    shared_let(:schedule) do
+      create(:scheduled_meeting,
+             :persisted,
+             recurring_meeting: series,
+             start_time: DateTime.parse("2024-12-08T10:00:00Z"))
+    end
+
+    shared_let(:schedule2) do
+      create(:scheduled_meeting,
+             :persisted,
+             recurring_meeting: series,
+             start_time: DateTime.parse("2024-12-08T10:00:00Z") + 10.weeks)
+    end
+
+    shared_let(:moved_schedule) do
+      create(:scheduled_meeting,
+             :persisted,
+             recurring_meeting: series,
+             start_time: DateTime.parse("2024-12-15T10:00:00Z"),
+             meeting_start_time: DateTime.parse("2024-12-16T11:30:00Z"))
+    end
+
+    it "creates additional events", :aggregate_failures do
+      expect(parsed_events.count).to eq(4)
+
+      first = parsed_events.detect { |evt| evt.recurrence_id == schedule.start_time }.to_ical
+      second = parsed_events.detect { |evt| evt.recurrence_id == schedule2.start_time }.to_ical
+      # Moved schedule still has the original start time as recurrence id
+      moved = parsed_events.detect { |evt| evt.recurrence_id == moved_schedule.start_time }.to_ical
+
+      expect(first).to include("DTSTART;TZID=America/New_York:20241208T050000")
+      expect(first).to include("DTEND;TZID=America/New_York:20241208T060000")
+      expect(first).to include("URL:http://#{Setting.host_name}/projects/my-project/meetings/#{schedule.meeting_id}")
+
+      expect(second).to include("DTSTART;TZID=America/New_York:20250216T050000")
+      expect(second).to include("DTEND;TZID=America/New_York:20250216T060000")
+      expect(second).to include("URL:http://#{Setting.host_name}/projects/my-project/meetings/#{schedule2.meeting_id}")
+
+      expect(moved).to include("DTSTART;TZID=America/New_York:20241216T063000")
+      expect(moved).to include("DTEND;TZID=America/New_York:20241216T073000")
+      expect(moved).to include("URL:http://#{Setting.host_name}/projects/my-project/meetings/#{moved_schedule.meeting_id}")
+    end
+  end
+end
diff --git a/modules/meeting/spec/services/recurring_meetings/update_service_integration_spec.rb b/modules/meeting/spec/services/recurring_meetings/update_service_integration_spec.rb
new file mode 100644
index 000000000000..11aab02ae46e
--- /dev/null
+++ b/modules/meeting/spec/services/recurring_meetings/update_service_integration_spec.rb
@@ -0,0 +1,122 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+
+RSpec.describe RecurringMeetings::UpdateService, "integration", type: :model do
+  shared_let(:project) { create(:project, enabled_module_names: %i[meetings]) }
+  shared_let(:user) do
+    create(:user, member_with_permissions: { project => %i(view_meetings edit_meetings) })
+  end
+  shared_let(:series, refind: true) do
+    create(:recurring_meeting,
+           project:,
+           start_time: Time.zone.today + 10.hours,
+           frequency: "daily",
+           interval: 1,
+           end_after: "specific_date",
+           end_date: 1.month.from_now)
+  end
+
+  let(:instance) { described_class.new(model: series, user:) }
+  let(:params) { {} }
+
+  let(:service_result) { instance.call(**params) }
+  let(:updated_meeting) { service_result.result }
+
+  context "with a cancelled meeting for tomorrow" do
+    let!(:scheduled_meeting) do
+      create(:scheduled_meeting,
+             :cancelled,
+             recurring_meeting: series,
+             start_time: Time.zone.today + 1.day + 10.hours)
+    end
+
+    context "when updating the start_date to the same time" do
+      let(:params) do
+        { start_date: Time.zone.today + 1.day }
+      end
+
+      it "keeps that cancelled occurrence" do
+        expect(service_result).to be_success
+        expect(updated_meeting.start_time).to eq(Time.zone.today + 1.day + 10.hours)
+
+        expect { scheduled_meeting.reload }.not_to raise_error
+      end
+    end
+
+    context "when updating the start_date to further in the future" do
+      let(:params) do
+        { start_date: Time.zone.today + 2.days }
+      end
+
+      it "deletes that cancelled occurrence" do
+        expect(service_result).to be_success
+        expect(updated_meeting.start_time).to eq(Time.zone.today + 2.days + 10.hours)
+
+        expect { scheduled_meeting.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      end
+    end
+  end
+
+  describe "rescheduling job" do
+    context "when updating the title" do
+      let(:params) do
+        { title: "New title" }
+      end
+
+      it "does not reschedule" do
+        expect { service_result }.not_to have_enqueued_job(RecurringMeetings::InitNextOccurrenceJob)
+        expect(service_result).to be_success
+      end
+    end
+
+    context "when updating the frequency and start_time" do
+      let(:params) do
+        { start_time: Time.zone.today + 2.days + 11.hours }
+      end
+
+      before do
+        ActiveJob::Base.disable_test_adapter
+        RecurringMeetings::InitNextOccurrenceJob
+          .set(wait_until: Time.zone.today + 1.day + 10.hours)
+          .perform_later(series)
+      end
+
+      it "reschedules" do
+        job = GoodJob::Job.find_by(job_class: "RecurringMeetings::InitNextOccurrenceJob")
+        expect(job.scheduled_at).to eq Time.zone.today + 1.day + 10.hours
+        expect(service_result).to be_success
+        expect { job.reload }.to raise_error(ActiveRecord::RecordNotFound)
+
+        new_job = GoodJob::Job.find_by(job_class: "RecurringMeetings::InitNextOccurrenceJob")
+        expect(new_job.scheduled_at).to eq Time.zone.today + 2.days + 11.hours
+      end
+    end
+  end
+end
diff --git a/modules/meeting/spec/support/pages/meetings/index.rb b/modules/meeting/spec/support/pages/meetings/index.rb
index e8633c583891..624ed36a3322 100644
--- a/modules/meeting/spec/support/pages/meetings/index.rb
+++ b/modules/meeting/spec/support/pages/meetings/index.rb
@@ -52,12 +52,21 @@ def set_title(text)
     end
 
     def set_start_date(date)
-      fill_in "Date", with: date, fill_options: { clear: :backspace }
+      fill_in "Date", with: date
+    end
+
+    def set_starts_on(date)
+      fill_in "Starts on", with: date
     end
 
     def set_start_time(time)
       input = page.find_by_id("meeting_start_time_hour")
       page.execute_script("arguments[0].value = arguments[1]", input.native, time)
+      page.execute_script("arguments[0].dispatchEvent(new Event('input'))", input.native)
+    end
+
+    def set_end_date(date)
+      fill_in "End date", with: date, fill_options: { clear: :backspace }
     end
 
     def set_project(project)
@@ -100,7 +109,7 @@ def expect_create_new_types
       click_on("add-meeting-button")
 
       expect(page).to have_link("Classic")
-      expect(page).to have_link("Dynamic")
+      expect(page).to have_link("One-time")
     end
 
     def expect_copy_action(meeting)
@@ -137,6 +146,18 @@ def set_sidebar_filter(filter_name)
       submenu.click_item(filter_name)
     end
 
+    def set_quick_filter(upcoming: true)
+      page.within("#content-body") do
+        if upcoming
+          click_link_or_button "Upcoming"
+        else
+          click_link_or_button "Past"
+        end
+      end
+
+      wait_for_network_idle
+    end
+
     def expect_no_meetings_listed
       within "#content-wrapper" do
         expect(page)
diff --git a/modules/meeting/spec/support/pages/recurring_meeting/show.rb b/modules/meeting/spec/support/pages/recurring_meeting/show.rb
new file mode 100644
index 000000000000..f3319dac3318
--- /dev/null
+++ b/modules/meeting/spec/support/pages/recurring_meeting/show.rb
@@ -0,0 +1,171 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require_relative "../meetings/base"
+
+module Pages::RecurringMeeting
+  class Show < ::Pages::Meetings::Base
+    attr_accessor :meeting
+
+    def initialize(meeting)
+      super
+
+      self.meeting = meeting
+    end
+
+    def path
+      recurring_meeting_path(meeting)
+    end
+
+    def project_path
+      project_recurring_meeting_path(meeting.project, meeting)
+    end
+
+    def expect_scheduled_meeting(date:)
+      within("li", text: date) do
+        expect(page).to have_css(".status", text: "Scheduled")
+      end
+    end
+
+    def expect_no_scheduled_meeting(date:)
+      within("li", text: date) do
+        expect(page).to have_no_css(".status", text: "Scheduled")
+      end
+    end
+
+    def expect_open_meeting(date:)
+      within("li", text: date) do
+        expect(page).to have_css(".status", text: "Open")
+      end
+    end
+
+    def expect_no_open_meeting(date:)
+      within("li", text: date) do
+        expect(page).to have_no_css(".status", text: "Open")
+      end
+    end
+
+    def expect_cancelled_meeting(date:)
+      within("li", text: date) do
+        expect(page).to have_css(".status", text: "Cancelled")
+      end
+    end
+
+    def expect_no_cancelled_meeting(date:)
+      within("li", text: date) do
+        expect(page).to have_no_css(".status", text: "Cancelled")
+      end
+    end
+
+    def expect_rescheduled_meeting(old_date:, new_date:)
+      within("li", text: old_date) do
+        expect(page).to have_css("s", text: old_date)
+        expect(page).to have_text("#{old_date}\n#{new_date}")
+      end
+    end
+
+    def create_from_template(date:)
+      within("li", text: date) do
+        click_on "Create from template"
+      end
+    end
+
+    def cancel_occurrence(date:)
+      within("li", text: date) do
+        click_on "more-button"
+        click_on "Cancel this occurrence"
+      end
+    end
+
+    def expect_subtitle(text:)
+      expect(page).to have_css(".PageHeader-description", text: text)
+    end
+
+    def edit_meeting_series
+      page.find_test_selector("recurring-meeting-action-menu").click
+      click_on "Edit meeting series"
+
+      expect(page).to have_css("#new-meeting-dialog")
+    end
+
+    def in_edit_dialog(&)
+      page.within("#new-meeting-dialog", &)
+    end
+
+    def expect_no_meeting(date:)
+      expect(page).to have_no_css("li", text: date)
+    end
+
+    def expect_no_actions(date:)
+      within("li", text: date) do
+        expect(page).not_to have_test_selector("more-button")
+      end
+    end
+
+    def expect_open_actions(date:)
+      within("li", text: date) do
+        click_on "more-button"
+
+        expect(page).to have_css(".ActionListItem-label", count: 2)
+        expect(page).to have_css(".ActionListItem-label", text: "Download iCalendar event")
+        expect(page).to have_css(".ActionListItem-label", text: "Cancel this occurrence")
+
+        # Close it again
+        click_on "more-button"
+      end
+    end
+
+    def expect_scheduled_actions(date:)
+      within("li", text: date) do
+        click_on "more-button"
+
+        expect(page).to have_css(".ActionListItem-label", count: 1)
+        expect(page).to have_css(".ActionListItem-label", text: "Cancel this occurrence")
+
+        # Close it again
+        click_on "more-button"
+      end
+    end
+
+    def expect_cancelled_actions(date:)
+      within("li", text: date) do
+        click_on "more-button"
+
+        expect(page).to have_css(".ActionListItem-label", count: 1)
+        expect(page).to have_css(".ActionListItem-label", text: "Restore this occurrence")
+
+        # Close it again
+        click_on "more-button"
+      end
+    end
+
+    # def for_meeting(date:, &)
+    #   within("li", text: date, &)
+    # end
+  end
+end
diff --git a/modules/meeting/spec/support/pages/work_package_meetings_tab.rb b/modules/meeting/spec/support/pages/work_package_meetings_tab.rb
index 118b7b9a53ee..bf081bafa8cb 100644
--- a/modules/meeting/spec/support/pages/work_package_meetings_tab.rb
+++ b/modules/meeting/spec/support/pages/work_package_meetings_tab.rb
@@ -98,13 +98,19 @@ def open_add_to_meeting_dialog
       page.find_test_selector("op-add-work-package-to-meeting-dialog-trigger").click
     end
 
-    def fill_and_submit_meeting_dialog(meeting, notes)
-      fill_in("meeting_agenda_item_meeting_id", with: meeting.title)
-      expect(page).to have_css(".ng-option-marked", text: meeting.title) # wait for selection
-      page.find(".ng-option-marked").click
-      page.find(".ck-editor__editable").set(notes)
-
-      click_on("Save")
+    def fill_and_submit_meeting_dialog(meeting, notes, counter)
+      retry_block do
+        fill_in("meeting_agenda_item_meeting_id", with: meeting.title)
+        page.find(".ng-option-marked", text: meeting.title) # wait for selection
+        page.find(".ng-option-marked").click
+        page.find(".ck-editor__editable").set(notes)
+
+        click_on("Save")
+
+        page.within_test_selector("op-upcoming-meetings-counter") do
+          raise "Expected counter to eq #{counter}" unless page.has_content?(counter)
+        end
+      end
     end
 
     private
diff --git a/modules/meeting/spec/workers/recurring_meetings/init_next_occurrence_job_spec.rb b/modules/meeting/spec/workers/recurring_meetings/init_next_occurrence_job_spec.rb
new file mode 100644
index 000000000000..2bc41fce308e
--- /dev/null
+++ b/modules/meeting/spec/workers/recurring_meetings/init_next_occurrence_job_spec.rb
@@ -0,0 +1,146 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+require_module_spec_helper
+
+RSpec.describe RecurringMeetings::InitNextOccurrenceJob, type: :model do
+  shared_let(:series) do
+    create(:recurring_meeting,
+           start_time: Time.zone.tomorrow + 10.hours,
+           frequency: "daily",
+           interval: 1,
+           end_after: "specific_date",
+           end_date: 1.month.from_now)
+  end
+
+  subject { described_class.perform_now(series) }
+
+  it "schedules the next occurrence" do
+    expect { subject }.to change(StructuredMeeting, :count).by(1)
+    expect(subject).to be_success
+
+    created_meeting = subject.result
+    expect(created_meeting.start_time).to eq(Time.zone.tomorrow + 10.hours)
+  end
+
+  context "when next occurrence is cancelled" do
+    let!(:schedule) do
+      create(:scheduled_meeting,
+             :cancelled,
+             recurring_meeting: series,
+             start_time: Time.zone.tomorrow + 10.hours)
+    end
+
+    it "does not schedule anything" do
+      expect { subject }.not_to change(StructuredMeeting, :count)
+      expect(subject).to be_nil
+    end
+  end
+
+  context "when next occurrence is already instantiated" do
+    let!(:instance) do
+      create(:structured_meeting,
+             recurring_meeting: series,
+             start_time: Time.zone.tomorrow + 10.hours)
+    end
+
+    let!(:schedule) do
+      create(:scheduled_meeting,
+             meeting: instance,
+             recurring_meeting: series,
+             start_time: Time.zone.tomorrow + 10.hours)
+    end
+
+    it "does not schedule anything" do
+      expect { subject }.not_to change(StructuredMeeting, :count)
+      expect(subject).to be_nil
+    end
+  end
+
+  context "when next occurrence is already instantiated, and moved" do
+    let!(:instance) do
+      create(:structured_meeting,
+             recurring_meeting: series,
+             start_time: Time.zone.tomorrow + 1.day + 10.hours)
+    end
+
+    let!(:schedule) do
+      create(:scheduled_meeting,
+             meeting: instance,
+             recurring_meeting: series,
+             start_time: Time.zone.tomorrow + 10.hours)
+    end
+
+    it "does not schedule anything" do
+      expect { subject }.not_to change(StructuredMeeting, :count)
+      expect(subject).to be_nil
+    end
+  end
+
+  context "when later occurrence is already instantiated" do
+    let!(:instance) do
+      create(:structured_meeting,
+             recurring_meeting: series,
+             start_time: Time.zone.tomorrow + 1.day + 10.hours)
+    end
+
+    let!(:schedule) do
+      create(:scheduled_meeting,
+             meeting: instance,
+             recurring_meeting: series,
+             start_time: Time.zone.tomorrow + 1.day + 10.hours)
+    end
+
+    it "schedules the one for tomorrow" do
+      expect { subject }.to change(StructuredMeeting, :count).by(1)
+      expect(subject).to be_success
+
+      created_meeting = subject.result
+      expect(created_meeting.start_time).to eq(Time.zone.tomorrow + 10.hours)
+    end
+  end
+
+  context "when called after end_date" do
+    it "does not schedule the next occurrence" do
+      Timecop.freeze(series.end_date + 1.day) do
+        expect { subject }.not_to change(StructuredMeeting, :count)
+        expect(subject).to be_nil
+      end
+    end
+  end
+
+  context "when called on last occurrence" do
+    it "does not schedule the next occurrence" do
+      Timecop.freeze(series.last_occurrence) do
+        expect { subject }.not_to change(StructuredMeeting, :count)
+        expect(subject).to be_nil
+      end
+    end
+  end
+end
diff --git a/modules/my_page/spec/features/my/my_page_spec.rb b/modules/my_page/spec/features/my/my_page_spec.rb
index 1e574feec951..88ebd892eb3c 100644
--- a/modules/my_page/spec/features/my/my_page_spec.rb
+++ b/modules/my_page/spec/features/my/my_page_spec.rb
@@ -54,6 +54,7 @@
   let(:my_page) do
     Pages::My::Page.new
   end
+  let(:global_html_title) { Components::HtmlTitle.new }
 
   before do
     login_as user
@@ -98,6 +99,8 @@ def find_area(name)
   end
 
   it "renders the default view, allows altering and saving" do
+    global_html_title.expect_first_segment "My page"
+
     # Waits for the default view to be created
     my_page.expect_toast(message: "Successful update")
 
diff --git a/modules/openid_connect/app/components/openid_connect/providers/metadata_details_form.rb b/modules/openid_connect/app/components/openid_connect/providers/metadata_details_form.rb
index ec28d450750e..11de02f39f99 100644
--- a/modules/openid_connect/app/components/openid_connect/providers/metadata_details_form.rb
+++ b/modules/openid_connect/app/components/openid_connect/providers/metadata_details_form.rb
@@ -30,12 +30,22 @@ module OpenIDConnect
   module Providers
     class MetadataDetailsForm < BaseForm
       form do |f|
-        OpenIDConnect::Provider::DISCOVERABLE_ATTRIBUTES_ALL.each do |attr|
+        OpenIDConnect::Provider::DISCOVERABLE_STRING_ATTRIBUTES_ALL.each do |attr|
           f.text_field(
             name: attr,
             label: I18n.t("activemodel.attributes.openid_connect/provider.#{attr}"),
             disabled: provider.seeded_from_env?,
-            required: OpenIDConnect::Provider::DISCOVERABLE_ATTRIBUTES_MANDATORY.include?(attr),
+            required: OpenIDConnect::Provider::DISCOVERABLE_STRING_ATTRIBUTES_MANDATORY.include?(attr),
+            input_width: :large
+          )
+        end
+
+        if OpenProject::FeatureDecisions.oidc_token_exchange_active?
+          f.text_field(
+            name: :grant_types_supported,
+            label: I18n.t("activemodel.attributes.openid_connect/provider.grant_types_supported"),
+            disabled: provider.seeded_from_env?,
+            required: false,
             input_width: :large
           )
         end
diff --git a/modules/openid_connect/app/models/openid_connect/provider.rb b/modules/openid_connect/app/models/openid_connect/provider.rb
index c61e5b04589a..158729ea15d4 100644
--- a/modules/openid_connect/app/models/openid_connect/provider.rb
+++ b/modules/openid_connect/app/models/openid_connect/provider.rb
@@ -3,12 +3,12 @@ class Provider < AuthProvider
     include HashBuilder
 
     OIDC_PROVIDERS = %w[google microsoft_entra custom].freeze
-    DISCOVERABLE_ATTRIBUTES_MANDATORY = %i[authorization_endpoint
-                                           userinfo_endpoint
-                                           token_endpoint
-                                           issuer].freeze
-    DISCOVERABLE_ATTRIBUTES_OPTIONAL = %i[end_session_endpoint jwks_uri].freeze
-    DISCOVERABLE_ATTRIBUTES_ALL = DISCOVERABLE_ATTRIBUTES_MANDATORY + DISCOVERABLE_ATTRIBUTES_OPTIONAL
+    DISCOVERABLE_STRING_ATTRIBUTES_MANDATORY = %i[authorization_endpoint
+                                                  userinfo_endpoint
+                                                  token_endpoint
+                                                  issuer].freeze
+    DISCOVERABLE_STRING_ATTRIBUTES_OPTIONAL = %i[end_session_endpoint jwks_uri].freeze
+    DISCOVERABLE_STRING_ATTRIBUTES_ALL = DISCOVERABLE_STRING_ATTRIBUTES_MANDATORY + DISCOVERABLE_STRING_ATTRIBUTES_OPTIONAL
 
     MAPPABLE_ATTRIBUTES = %i[login email first_name last_name admin].freeze
 
@@ -16,13 +16,15 @@ class Provider < AuthProvider
     store_attribute :options, :metadata_url, :string
     store_attribute :options, :icon, :string
 
-    DISCOVERABLE_ATTRIBUTES_ALL.each do |attribute|
+    DISCOVERABLE_STRING_ATTRIBUTES_ALL.each do |attribute|
       store_attribute :options, attribute, :string
     end
     MAPPABLE_ATTRIBUTES.each do |attribute|
       store_attribute :options, "mapping_#{attribute}", :string
     end
 
+    store_attribute :options, :grant_types_supported, :json, default: ["authorization_code", "implicit"]
+
     store_attribute :options, :client_id, :string
     store_attribute :options, :client_secret, :string
     store_attribute :options, :post_logout_redirect_uri, :string
@@ -55,7 +57,7 @@ def advanced_details_configured?
     def metadata_configured?
       return true if google? || entra_id?
 
-      DISCOVERABLE_ATTRIBUTES_MANDATORY.all? do |mandatory_attribute|
+      DISCOVERABLE_STRING_ATTRIBUTES_MANDATORY.all? do |mandatory_attribute|
         public_send(mandatory_attribute).present?
       end
     end
@@ -78,6 +80,12 @@ def configured?
       display_name.present? && advanced_details_configured? && metadata_configured?
     end
 
+    def token_exchange_capable?
+      return false if grant_types_supported.blank?
+
+      grant_types_supported.include?("urn:ietf:params:oauth:grant-type:token-exchange")
+    end
+
     def icon
       case oidc_provider
       when "google"
diff --git a/modules/openid_connect/app/services/openid_connect/configuration_mapper.rb b/modules/openid_connect/app/services/openid_connect/configuration_mapper.rb
index bd9f5247febe..d2d16bc0af1a 100644
--- a/modules/openid_connect/app/services/openid_connect/configuration_mapper.rb
+++ b/modules/openid_connect/app/services/openid_connect/configuration_mapper.rb
@@ -47,7 +47,7 @@ def call! # rubocop:disable Metrics/AbcSize
         "host" => options["host"],
         "port" => options["port"],
         "scheme" => options["scheme"],
-        "claims" => options["claims"],
+        "claims" => extract_claims(options["claims"]),
         "tenant" => options["tenant"],
         "post_logout_redirect_uri" => options["post_logout_redirect_uri"],
         "limit_self_registration" => options["limit_self_registration"],
@@ -69,6 +69,15 @@ def call! # rubocop:disable Metrics/AbcSize
 
     private
 
+    def extract_claims(claims_value)
+      case claims_value
+      when Hash
+        claims_value.to_json
+      else
+        claims_value.to_s
+      end
+    end
+
     def extract_scope(value)
       return if value.blank?
 
diff --git a/modules/openid_connect/app/services/openid_connect/providers/set_attributes_service.rb b/modules/openid_connect/app/services/openid_connect/providers/set_attributes_service.rb
index e0b2cbec2417..8e4a9bbd64fe 100644
--- a/modules/openid_connect/app/services/openid_connect/providers/set_attributes_service.rb
+++ b/modules/openid_connect/app/services/openid_connect/providers/set_attributes_service.rb
@@ -44,9 +44,19 @@ def set_attributes(params)
 
         super
 
+        update_grant_types_supported if params.key?(:grant_types_supported)
         update_available_state
       end
 
+      # This is a workaround for a non-ideal UI
+      # We only offer users to edit the supported grant types in a text input field,
+      # though they are indeed editing a list of grants.
+      def update_grant_types_supported
+        return unless params[:grant_types_supported].is_a? String
+
+        model.grant_types_supported = params[:grant_types_supported].split
+      end
+
       def update_available_state
         model.change_by_system do
           model.available = model.configured?
diff --git a/modules/openid_connect/app/services/openid_connect/providers/update_service.rb b/modules/openid_connect/app/services/openid_connect/providers/update_service.rb
index 0b6a75c29ec5..4dbc0f5fb762 100644
--- a/modules/openid_connect/app/services/openid_connect/providers/update_service.rb
+++ b/modules/openid_connect/app/services/openid_connect/providers/update_service.rb
@@ -30,13 +30,15 @@ module OpenIDConnect
   module Providers
     class UpdateService < BaseServices::Update
       class AttributesContract < Dry::Validation::Contract
-        params do
-          OpenIDConnect::Provider::DISCOVERABLE_ATTRIBUTES_MANDATORY.each do |attribute|
+        json do
+          OpenIDConnect::Provider::DISCOVERABLE_STRING_ATTRIBUTES_MANDATORY.each do |attribute|
             required(attribute).filled(:string)
           end
-          OpenIDConnect::Provider::DISCOVERABLE_ATTRIBUTES_OPTIONAL.each do |attribute|
+          OpenIDConnect::Provider::DISCOVERABLE_STRING_ATTRIBUTES_OPTIONAL.each do |attribute|
             optional(attribute).filled(:string)
           end
+
+          optional(:grant_types_supported).array(:string)
         end
       end
 
diff --git a/modules/openid_connect/config/locales/crowdin/af.yml b/modules/openid_connect/config/locales/crowdin/af.yml
index e5cab04ca0ae..15edaefb5c44 100644
--- a/modules/openid_connect/config/locales/crowdin/af.yml
+++ b/modules/openid_connect/config/locales/crowdin/af.yml
@@ -14,6 +14,7 @@ af:
         client_secret: Client secret
         secret: Secret
         scope: Scope
+        grant_types_supported: Supported grant types
         limit_self_registration: Limit self registration
         authorization_endpoint: Authorization endpoint
         userinfo_endpoint: User information endpoint
diff --git a/modules/openid_connect/config/locales/crowdin/ar.yml b/modules/openid_connect/config/locales/crowdin/ar.yml
index c3600cb08570..4956089666bf 100644
--- a/modules/openid_connect/config/locales/crowdin/ar.yml
+++ b/modules/openid_connect/config/locales/crowdin/ar.yml
@@ -14,6 +14,7 @@ ar:
         client_secret: Client secret
         secret: السر
         scope: النطاق
+        grant_types_supported: Supported grant types
         limit_self_registration: Limit self registration
         authorization_endpoint: Authorization endpoint
         userinfo_endpoint: User information endpoint
diff --git a/modules/openid_connect/config/locales/crowdin/az.yml b/modules/openid_connect/config/locales/crowdin/az.yml
index 998048ff3da3..e87a4e3ff579 100644
--- a/modules/openid_connect/config/locales/crowdin/az.yml
+++ b/modules/openid_connect/config/locales/crowdin/az.yml
@@ -14,6 +14,7 @@ az:
         client_secret: Client secret
         secret: Secret
         scope: Scope
+        grant_types_supported: Supported grant types
         limit_self_registration: Limit self registration
         authorization_endpoint: Authorization endpoint
         userinfo_endpoint: User information endpoint
diff --git a/modules/openid_connect/config/locales/crowdin/be.yml b/modules/openid_connect/config/locales/crowdin/be.yml
index 826e82deb78c..2f9d950ea357 100644
--- a/modules/openid_connect/config/locales/crowdin/be.yml
+++ b/modules/openid_connect/config/locales/crowdin/be.yml
@@ -14,6 +14,7 @@ be:
         client_secret: Client secret
         secret: Secret
         scope: Scope
+        grant_types_supported: Supported grant types
         limit_self_registration: Limit self registration
         authorization_endpoint: Authorization endpoint
         userinfo_endpoint: User information endpoint
diff --git a/modules/openid_connect/config/locales/crowdin/bg.yml b/modules/openid_connect/config/locales/crowdin/bg.yml
index 840e3b0f149a..2b7d37d5693a 100644
--- a/modules/openid_connect/config/locales/crowdin/bg.yml
+++ b/modules/openid_connect/config/locales/crowdin/bg.yml
@@ -14,6 +14,7 @@ bg:
         client_secret: Client secret
         secret: Тайна
         scope: Обхват
+        grant_types_supported: Supported grant types
         limit_self_registration: Limit self registration
         authorization_endpoint: Authorization endpoint
         userinfo_endpoint: User information endpoint
diff --git a/modules/openid_connect/config/locales/crowdin/ca.yml b/modules/openid_connect/config/locales/crowdin/ca.yml
index 6c92ab3cef2d..a7e1bb448353 100644
--- a/modules/openid_connect/config/locales/crowdin/ca.yml
+++ b/modules/openid_connect/config/locales/crowdin/ca.yml
@@ -14,6 +14,7 @@ ca:
         client_secret: Client secret
         secret: Secret
         scope: Abast
+        grant_types_supported: Supported grant types
         limit_self_registration: Limitar el registre per part dels propis usuaris
         authorization_endpoint: Authorization endpoint
         userinfo_endpoint: User information endpoint
diff --git a/modules/openid_connect/config/locales/crowdin/ckb-IR.yml b/modules/openid_connect/config/locales/crowdin/ckb-IR.yml
index 0a2933627bd0..9cbadd0ec49a 100644
--- a/modules/openid_connect/config/locales/crowdin/ckb-IR.yml
+++ b/modules/openid_connect/config/locales/crowdin/ckb-IR.yml
@@ -14,6 +14,7 @@ ckb-IR:
         client_secret: Client secret
         secret: Secret
         scope: Scope
+        grant_types_supported: Supported grant types
         limit_self_registration: Limit self registration
         authorization_endpoint: Authorization endpoint
         userinfo_endpoint: User information endpoint
diff --git a/modules/openid_connect/config/locales/crowdin/cs.yml b/modules/openid_connect/config/locales/crowdin/cs.yml
index 94bfd92ea4e2..75d6066a6404 100644
--- a/modules/openid_connect/config/locales/crowdin/cs.yml
+++ b/modules/openid_connect/config/locales/crowdin/cs.yml
@@ -8,14 +8,15 @@ cs:
     attributes:
       openid_connect/provider:
         name: Jméno
-        slug: Unique identifier
+        slug: Jedinečný identifikátor
         display_name: Zobrazovaný název
         client_id: ID klienta
         client_secret: Client secret
         secret: Tajný klíč
         scope: Rozsah
+        grant_types_supported: Supported grant types
         limit_self_registration: Omezit vlastní registraci
-        authorization_endpoint: Authorization endpoint
+        authorization_endpoint: Koncový bod autorizace
         userinfo_endpoint: User information endpoint
         token_endpoint: Token endpoint
         end_session_endpoint: End session endpoint
@@ -27,7 +28,7 @@ cs:
         icon: Vlastní ikona
         claims: Nároky
         acr_values: ACR hodnoty
-        redirect_url: Redirect URL
+        redirect_url: Přesměrování URL
   activerecord:
     errors:
       models:
@@ -35,7 +36,7 @@ cs:
           attributes:
             metadata_url:
               format: "Discovery endpoint URL %{message}"
-              response_is_not_successful: " responds with %{status}."
+              response_is_not_successful: " odpovídá s %{status}."
               response_is_not_json: " nevrací JSON obsah."
               response_misses_required_attributes: " does not return required attributes. Missing attributes are: %{missing_attributes}."
   provider:
@@ -69,21 +70,21 @@ cs:
       acr_values: >
         Request non-essential claims in an easier format. See [our documentation on acr_values](docs_url) for more information.
       mapping_login: >
-        Provide a custom mapping in the userinfo response to be used for the login attribute.
+        Zadejte vlastní mapování v odpovědi o uživatelských informacích, která bude použita pro přihlašovací atribut.
       mapping_email: >
-        Provide a custom mapping in the userinfo response to be used for the email attribute.
+        Zadejte vlastní mapování v odpovědi userinfo, které se použije pro atribut e-mail.
       mapping_first_name: >
-        Provide a custom mapping in the userinfo response to be used for the first name.
+        Zadejte vlastní mapování v odpovědi userinfo, které se použije pro křestní jméno.
       mapping_last_name: >
-        Provide a custom mapping in the userinfo response to be used for the last name.
+        Zadejte vlastní mapování v odpovědi userinfo, které se použije pro příjmení.
       mapping_admin: >
         Provide a custom mapping in the userinfo response to be used for the admin status. It expects a boolean attribute to be returned.
     settings:
-      metadata_none: I don't have this information
+      metadata_none: Nemám tyto informace
       metadata_url: I have a discovery endpoint URL
       endpoint_url: URL koncového bodu
     providers:
-      label_providers: "Providers"
+      label_providers: "Poskytovatelé"
       seeded_from_env: "This provider was seeded from the environment configuration. It cannot be edited."
       google:
         name: Google
@@ -92,11 +93,11 @@ cs:
       custom:
         name: Vlastní
       upsale:
-        description: Connect OpenProject to an OpenID connect identity provider
+        description: Připojit OpenProject k poskytovateli OpenID připojení identity
       label_add_new: Přidat nového poskytovatele OpenID
       label_edit: Upravit poskytovatele OpenID %{name}
-      label_empty_title: No OpenID providers configured yet.
-      label_empty_description: Add a provider to see them here.
+      label_empty_title: Zatím nejsou nakonfigurováni žádní poskytovatelé OpenID.
+      label_empty_description: Přidejte poskytovatele, abyste je viděli zde.
       label_metadata: OpenID Connect Discovery Endpoint
       label_automatic_configuration: Automatická konfigurace
       label_optional_configuration: Volitelná konfigurace
@@ -115,7 +116,7 @@ cs:
         metadata_form_description: If your identity provider has a discovery endpoint URL. Use it below to pre-fill configuration.
         configuration_metadata: The information has been pre-filled using the supplied discovery endpoint. In most cases, they do not require editing.
         configuration: Configuration details of the OpenID Connect provider
-        display_name: The display name visible to users.
+        display_name: Zobrazované jméno viditelné pro uživatele.
         attribute_mapping: Configure the mapping of attributes between OpenProject and the OpenID Connect provider.
         claims: Request additional claims for the ID token or userinfo response.
     setting_instructions:
diff --git a/modules/openid_connect/config/locales/crowdin/da.yml b/modules/openid_connect/config/locales/crowdin/da.yml
index 334671687c2a..2cab9054cfd1 100644
--- a/modules/openid_connect/config/locales/crowdin/da.yml
+++ b/modules/openid_connect/config/locales/crowdin/da.yml
@@ -14,6 +14,7 @@ da:
         client_secret: Client secret
         secret: Secret
         scope: Scope
+        grant_types_supported: Supported grant types
         limit_self_registration: Limit self registration
         authorization_endpoint: Authorization endpoint
         userinfo_endpoint: User information endpoint
diff --git a/modules/openid_connect/config/locales/crowdin/de.yml b/modules/openid_connect/config/locales/crowdin/de.yml
index b58b9f09b335..f08598e8efe2 100644
--- a/modules/openid_connect/config/locales/crowdin/de.yml
+++ b/modules/openid_connect/config/locales/crowdin/de.yml
@@ -14,6 +14,7 @@ de:
         client_secret: Clientschlüssel
         secret: Secret
         scope: Geltungsbereich
+        grant_types_supported: Unterstützte Grant-Typen
         limit_self_registration: Selbstregistrierung begrenzen
         authorization_endpoint: Autorisierungsendpunkt
         userinfo_endpoint: Endpunkt für Benutzerinformationen
diff --git a/modules/openid_connect/config/locales/crowdin/el.yml b/modules/openid_connect/config/locales/crowdin/el.yml
index 287bd25e9dc9..ed90a9de4ac2 100644
--- a/modules/openid_connect/config/locales/crowdin/el.yml
+++ b/modules/openid_connect/config/locales/crowdin/el.yml
@@ -14,6 +14,7 @@ el:
         client_secret: Client secret
         secret: Μυστικό
         scope: Φυσικό Αντικείμενο
+        grant_types_supported: Supported grant types
         limit_self_registration: Limit self registration
         authorization_endpoint: Authorization endpoint
         userinfo_endpoint: User information endpoint
diff --git a/modules/openid_connect/config/locales/crowdin/eo.yml b/modules/openid_connect/config/locales/crowdin/eo.yml
index 92fcadeba9cc..3d6e1825727b 100644
--- a/modules/openid_connect/config/locales/crowdin/eo.yml
+++ b/modules/openid_connect/config/locales/crowdin/eo.yml
@@ -14,6 +14,7 @@ eo:
         client_secret: Client secret
         secret: Secret
         scope: Scope
+        grant_types_supported: Supported grant types
         limit_self_registration: Limit self registration
         authorization_endpoint: Authorization endpoint
         userinfo_endpoint: User information endpoint
diff --git a/modules/openid_connect/config/locales/crowdin/es.yml b/modules/openid_connect/config/locales/crowdin/es.yml
index 52ab06aaf19f..87bde9ba3bd7 100644
--- a/modules/openid_connect/config/locales/crowdin/es.yml
+++ b/modules/openid_connect/config/locales/crowdin/es.yml
@@ -14,6 +14,7 @@ es:
         client_secret: Secreto del cliente
         secret: Secreto
         scope: Ámbito
+        grant_types_supported: Tipos de concesiones admitidos
         limit_self_registration: Limitar autorregistro
         authorization_endpoint: Terminal de autorización
         userinfo_endpoint: Terminal de información de usuario
diff --git a/modules/openid_connect/config/locales/crowdin/et.yml b/modules/openid_connect/config/locales/crowdin/et.yml
index fbf583040266..e50b9fa624ef 100644
--- a/modules/openid_connect/config/locales/crowdin/et.yml
+++ b/modules/openid_connect/config/locales/crowdin/et.yml
@@ -14,6 +14,7 @@ et:
         client_secret: Client secret
         secret: Secret
         scope: Scope
+        grant_types_supported: Supported grant types
         limit_self_registration: Limit self registration
         authorization_endpoint: Authorization endpoint
         userinfo_endpoint: User information endpoint
diff --git a/modules/openid_connect/config/locales/crowdin/eu.yml b/modules/openid_connect/config/locales/crowdin/eu.yml
index 1c2a17f0725f..702b1d812cdf 100644
--- a/modules/openid_connect/config/locales/crowdin/eu.yml
+++ b/modules/openid_connect/config/locales/crowdin/eu.yml
@@ -14,6 +14,7 @@ eu:
         client_secret: Client secret
         secret: Secret
         scope: Scope
+        grant_types_supported: Supported grant types
         limit_self_registration: Limit self registration
         authorization_endpoint: Authorization endpoint
         userinfo_endpoint: User information endpoint
diff --git a/modules/openid_connect/config/locales/crowdin/fa.yml b/modules/openid_connect/config/locales/crowdin/fa.yml
index c899511c01d9..77e847597ab8 100644
--- a/modules/openid_connect/config/locales/crowdin/fa.yml
+++ b/modules/openid_connect/config/locales/crowdin/fa.yml
@@ -14,6 +14,7 @@ fa:
         client_secret: Client secret
         secret: Secret
         scope: Scope
+        grant_types_supported: Supported grant types
         limit_self_registration: Limit self registration
         authorization_endpoint: Authorization endpoint
         userinfo_endpoint: User information endpoint
diff --git a/modules/openid_connect/config/locales/crowdin/fi.yml b/modules/openid_connect/config/locales/crowdin/fi.yml
index 9893b4afe2ce..84c479c34d41 100644
--- a/modules/openid_connect/config/locales/crowdin/fi.yml
+++ b/modules/openid_connect/config/locales/crowdin/fi.yml
@@ -14,6 +14,7 @@ fi:
         client_secret: Client secret
         secret: Secret
         scope: Scope
+        grant_types_supported: Supported grant types
         limit_self_registration: Limit self registration
         authorization_endpoint: Authorization endpoint
         userinfo_endpoint: User information endpoint
diff --git a/modules/openid_connect/config/locales/crowdin/fil.yml b/modules/openid_connect/config/locales/crowdin/fil.yml
index 16ba7b4b01f4..e9242bad33e1 100644
--- a/modules/openid_connect/config/locales/crowdin/fil.yml
+++ b/modules/openid_connect/config/locales/crowdin/fil.yml
@@ -14,6 +14,7 @@ fil:
         client_secret: Client secret
         secret: Secret
         scope: Scope
+        grant_types_supported: Supported grant types
         limit_self_registration: Limit self registration
         authorization_endpoint: Authorization endpoint
         userinfo_endpoint: User information endpoint
diff --git a/modules/openid_connect/config/locales/crowdin/fr.yml b/modules/openid_connect/config/locales/crowdin/fr.yml
index 293744ae3b84..0861f30919a4 100644
--- a/modules/openid_connect/config/locales/crowdin/fr.yml
+++ b/modules/openid_connect/config/locales/crowdin/fr.yml
@@ -14,6 +14,7 @@ fr:
         client_secret: Clé secrète du client
         secret: Secret
         scope: Portée
+        grant_types_supported: Types d'autorisations pris en charge
         limit_self_registration: Limiter l'inscription automatique
         authorization_endpoint: Point de terminaison d'autorisation
         userinfo_endpoint: Point de terminaison des informations de l'utilisateur
diff --git a/modules/openid_connect/config/locales/crowdin/he.yml b/modules/openid_connect/config/locales/crowdin/he.yml
index ff542006a208..f15d44631e9e 100644
--- a/modules/openid_connect/config/locales/crowdin/he.yml
+++ b/modules/openid_connect/config/locales/crowdin/he.yml
@@ -14,6 +14,7 @@ he:
         client_secret: Client secret
         secret: Secret
         scope: Scope
+        grant_types_supported: Supported grant types
         limit_self_registration: Limit self registration
         authorization_endpoint: Authorization endpoint
         userinfo_endpoint: User information endpoint
diff --git a/modules/openid_connect/config/locales/crowdin/hi.yml b/modules/openid_connect/config/locales/crowdin/hi.yml
index 9eb049a29f0b..e5801ce1e847 100644
--- a/modules/openid_connect/config/locales/crowdin/hi.yml
+++ b/modules/openid_connect/config/locales/crowdin/hi.yml
@@ -14,6 +14,7 @@ hi:
         client_secret: Client secret
         secret: Secret
         scope: Scope
+        grant_types_supported: Supported grant types
         limit_self_registration: Limit self registration
         authorization_endpoint: Authorization endpoint
         userinfo_endpoint: User information endpoint
diff --git a/modules/openid_connect/config/locales/crowdin/hr.yml b/modules/openid_connect/config/locales/crowdin/hr.yml
index e92961044358..a680b3e5e88d 100644
--- a/modules/openid_connect/config/locales/crowdin/hr.yml
+++ b/modules/openid_connect/config/locales/crowdin/hr.yml
@@ -14,6 +14,7 @@ hr:
         client_secret: Client secret
         secret: Secret
         scope: Scope
+        grant_types_supported: Supported grant types
         limit_self_registration: Limit self registration
         authorization_endpoint: Authorization endpoint
         userinfo_endpoint: User information endpoint
diff --git a/modules/openid_connect/config/locales/crowdin/hu.yml b/modules/openid_connect/config/locales/crowdin/hu.yml
index 1a3f0e833971..7d6966dffe33 100644
--- a/modules/openid_connect/config/locales/crowdin/hu.yml
+++ b/modules/openid_connect/config/locales/crowdin/hu.yml
@@ -14,6 +14,7 @@ hu:
         client_secret: Client secret
         secret: Titok
         scope: Hatókör
+        grant_types_supported: Supported grant types
         limit_self_registration: Limit self registration
         authorization_endpoint: Authorization endpoint
         userinfo_endpoint: User information endpoint
diff --git a/modules/openid_connect/config/locales/crowdin/id.yml b/modules/openid_connect/config/locales/crowdin/id.yml
index 61b351e6b019..ce904af593a9 100644
--- a/modules/openid_connect/config/locales/crowdin/id.yml
+++ b/modules/openid_connect/config/locales/crowdin/id.yml
@@ -14,6 +14,7 @@ id:
         client_secret: Client secret
         secret: Rahasia
         scope: Cakupan
+        grant_types_supported: Supported grant types
         limit_self_registration: Limit self registration
         authorization_endpoint: Authorization endpoint
         userinfo_endpoint: User information endpoint
diff --git a/modules/openid_connect/config/locales/crowdin/it.yml b/modules/openid_connect/config/locales/crowdin/it.yml
index 2fe433ece02c..b4b9714d3550 100644
--- a/modules/openid_connect/config/locales/crowdin/it.yml
+++ b/modules/openid_connect/config/locales/crowdin/it.yml
@@ -14,6 +14,7 @@ it:
         client_secret: Chiave segreta del client
         secret: Parola chiave
         scope: Ambito
+        grant_types_supported: Tipi di autorizzazioni supportate
         limit_self_registration: Limita registrazione autonoma
         authorization_endpoint: Endpoint di autorizzazione
         userinfo_endpoint: Informazioni sull'endpoint dell'utente
diff --git a/modules/openid_connect/config/locales/crowdin/ja.yml b/modules/openid_connect/config/locales/crowdin/ja.yml
index 2b8c1674ad37..545cc3b419f8 100644
--- a/modules/openid_connect/config/locales/crowdin/ja.yml
+++ b/modules/openid_connect/config/locales/crowdin/ja.yml
@@ -14,6 +14,7 @@ ja:
         client_secret: Client secret
         secret: シークレット
         scope: スコープ
+        grant_types_supported: Supported grant types
         limit_self_registration: Limit self registration
         authorization_endpoint: Authorization endpoint
         userinfo_endpoint: User information endpoint
diff --git a/modules/openid_connect/config/locales/crowdin/ka.yml b/modules/openid_connect/config/locales/crowdin/ka.yml
index 2bc51f64580f..3303296510a2 100644
--- a/modules/openid_connect/config/locales/crowdin/ka.yml
+++ b/modules/openid_connect/config/locales/crowdin/ka.yml
@@ -14,6 +14,7 @@ ka:
         client_secret: Client secret
         secret: საიდუმლო
         scope: ფარგლები
+        grant_types_supported: Supported grant types
         limit_self_registration: Limit self registration
         authorization_endpoint: Authorization endpoint
         userinfo_endpoint: User information endpoint
diff --git a/modules/openid_connect/config/locales/crowdin/kk.yml b/modules/openid_connect/config/locales/crowdin/kk.yml
index 49d43fa92ef1..a444bf78bd94 100644
--- a/modules/openid_connect/config/locales/crowdin/kk.yml
+++ b/modules/openid_connect/config/locales/crowdin/kk.yml
@@ -14,6 +14,7 @@ kk:
         client_secret: Client secret
         secret: Secret
         scope: Scope
+        grant_types_supported: Supported grant types
         limit_self_registration: Limit self registration
         authorization_endpoint: Authorization endpoint
         userinfo_endpoint: User information endpoint
diff --git a/modules/openid_connect/config/locales/crowdin/ko.yml b/modules/openid_connect/config/locales/crowdin/ko.yml
index 97913223445e..4e716f19a9ce 100644
--- a/modules/openid_connect/config/locales/crowdin/ko.yml
+++ b/modules/openid_connect/config/locales/crowdin/ko.yml
@@ -14,6 +14,7 @@ ko:
         client_secret: 클라이언트 비밀번호
         secret: 비밀번호
         scope: 범위
+        grant_types_supported: 지원되는 인증 유형
         limit_self_registration: 자체 등록 제한
         authorization_endpoint: 권한 부여 엔드포인트
         userinfo_endpoint: 사용자 정보 엔드포인트
diff --git a/modules/openid_connect/config/locales/crowdin/lt.yml b/modules/openid_connect/config/locales/crowdin/lt.yml
index 8b21a7bd605d..e5c53c975c3a 100644
--- a/modules/openid_connect/config/locales/crowdin/lt.yml
+++ b/modules/openid_connect/config/locales/crowdin/lt.yml
@@ -14,6 +14,7 @@ lt:
         client_secret: Client secret
         secret: Paslaptis
         scope: Apimtis
+        grant_types_supported: Supported grant types
         limit_self_registration: Riboti savarankišką registraciją
         authorization_endpoint: Authorization endpoint
         userinfo_endpoint: User information endpoint
diff --git a/modules/openid_connect/config/locales/crowdin/lv.yml b/modules/openid_connect/config/locales/crowdin/lv.yml
index 5730c6228f4a..00f857a86f51 100644
--- a/modules/openid_connect/config/locales/crowdin/lv.yml
+++ b/modules/openid_connect/config/locales/crowdin/lv.yml
@@ -14,6 +14,7 @@ lv:
         client_secret: Client secret
         secret: Secret
         scope: Scope
+        grant_types_supported: Supported grant types
         limit_self_registration: Limit self registration
         authorization_endpoint: Authorization endpoint
         userinfo_endpoint: User information endpoint
diff --git a/modules/openid_connect/config/locales/crowdin/mn.yml b/modules/openid_connect/config/locales/crowdin/mn.yml
index 5a7e93b75ab9..c0689a1c429f 100644
--- a/modules/openid_connect/config/locales/crowdin/mn.yml
+++ b/modules/openid_connect/config/locales/crowdin/mn.yml
@@ -14,6 +14,7 @@ mn:
         client_secret: Client secret
         secret: Secret
         scope: Scope
+        grant_types_supported: Supported grant types
         limit_self_registration: Limit self registration
         authorization_endpoint: Authorization endpoint
         userinfo_endpoint: User information endpoint
diff --git a/modules/openid_connect/config/locales/crowdin/ms.yml b/modules/openid_connect/config/locales/crowdin/ms.yml
index 9e24b6dfe5f3..4dc38fe7b711 100644
--- a/modules/openid_connect/config/locales/crowdin/ms.yml
+++ b/modules/openid_connect/config/locales/crowdin/ms.yml
@@ -8,116 +8,117 @@ ms:
     attributes:
       openid_connect/provider:
         name: Nama
-        slug: Unique identifier
+        slug: Pengecam unik
         display_name: Nama paparan
-        client_id: Client ID
-        client_secret: Client secret
+        client_id: ID Pelanggan
+        client_secret: Rahsia pelanggan
         secret: "Rahsia\n"
         scope: Skop
+        grant_types_supported: Jenis geran yang disokong
         limit_self_registration: Hadkan pendaftaran sendiri
-        authorization_endpoint: Authorization endpoint
-        userinfo_endpoint: User information endpoint
-        token_endpoint: Token endpoint
-        end_session_endpoint: End session endpoint
-        post_logout_redirect_uri: Post logout redirect URI
+        authorization_endpoint: Titik akhir kebenaran
+        userinfo_endpoint: Titik akhir maklumat pengguna
+        token_endpoint: Titik akhir token
+        end_session_endpoint: Titik tamat sesi
+        post_logout_redirect_uri: Post log keluar ubah hala URI
         jwks_uri: JWKS URI
-        issuer: Issuer
-        tenant: Tenant
-        metadata_url: Metadata URL
-        icon: Custom icon
-        claims: Claims
-        acr_values: ACR values
-        redirect_url: Redirect URL
+        issuer: Pengeluar
+        tenant: Penyewa
+        metadata_url: URL metadata
+        icon: Ikon tersuai
+        claims: Tuntutan
+        acr_values: Nila ACR
+        redirect_url: Ubah hala URL
   activerecord:
     errors:
       models:
         openid_connect/provider:
           attributes:
             metadata_url:
-              format: "Discovery endpoint URL %{message}"
-              response_is_not_successful: " responds with %{status}."
-              response_is_not_json: " does not return JSON body."
-              response_misses_required_attributes: " does not return required attributes. Missing attributes are: %{missing_attributes}."
+              format: "URL titik akhir penemuan %{message}"
+              response_is_not_successful: "membalas dengan %{status}."
+              response_is_not_json: "tidak mengembalikan badan JSON."
+              response_misses_required_attributes: "tidak mengembalikan atribut yang diperlukan. Atribut yang tiada ialah: %{missing_attributes}."
   provider:
     delete_warning:
-      input_delete_confirmation: Enter the provider name %{name} to confirm deletion.
-      irreversible_notice: Deleting an SSO provider is an irreversible action.
-      provider: 'Are you sure you want to delete the SSO provider %{name}? To confirm this action please enter the name of the provider in the field below, this will:'
-      delete_result_1: Remove the provider from the list of available providers.
+      input_delete_confirmation: Masukkan nama pembekal %{name} untuk mengesahkan pemadaman.
+      irreversible_notice: Memadamkan pembekal SSO ialah tindakan yang tidak boleh diubah.
+      provider: 'Adakah anda pasti mahu memadamkan pembekal SSO %{name}? Untuk mengesahkan tindakan ini sila masukkan nama pembekal dalam medan di bawah, ini akan:'
+      delete_result_1: Alih keluar pembekal daripada senarai pembekal yang tersedia.
       delete_result_user_count:
-        zero: No users are currently using this provider. No further action is required.
-        one: "One user is currently still using this provider. They will need to be re-invited or logging in with another provider."
-        other: "%{count} users are currently still using this provider. They will need to be re-invited or logging in with another provider."
-      delete_result_direct: This provider is marked as a direct login provider. The setting will be removed and users will no longer be redirected to the provider for login.
+        zero: Tiada pengguna yang menggunakan penyedia ini pada masa ini. Tiada tindakan lanjut diperlukan.
+        one: "Seorang pengguna masih menggunakan penyedia ini pada masa ini. Mereka perlu dijemput semula atau log masuk dengan penyedia lain."
+        other: "%{count} pengguna pada masa ini masih menggunakan penyedia ini. Mereka perlu dijemput semula atau log masuk dengan penyedia lain."
+      delete_result_direct: Pembekal ini ditandakan sebagai pembekal log masuk langsung. Tetapan akan dialih keluar dan pengguna tidak lagi akan diubah hala ke pembekal untuk log masuk.
   openid_connect:
     menu_title: Penyedia OpenID
-    delete_title: "Delete OpenID Connect provider"
+    delete_title: "Padam pembekal OpenID Connect"
     instructions:
-      redirect_url: This is the redirect URL that the OpenID Connect provider should use to redirect back to OpenProject after a successful login.
-      endpoint_url: The endpoint URL given to you by the OpenID Connect provider
-      metadata_none: I don't have this information
-      metadata_url: I have a discovery endpoint URL
-      client_id: This is the client ID given to you by your OpenID Connect provider
-      client_secret: This is the client secret given to you by your OpenID Connect provider
-      limit_self_registration: If enabled, users can only register using this provider if configuration on the provider's end allows it.
-      display_name: The name of the provider. This will be displayed as the login button and in the list of providers.
-      tenant: 'Please replace the default tenant with your own if applicable. See <a href=" https://learn.microsoft.com/en-us/entra/identity-platform/v2-protocols-oidc#find-your-apps-openid-configuration-document-uri">this</a>.'
-      scope: If you want to request custom scopes, you can add one or multiple scope values separated by spaces here. For more information, see the [OpenID Connect documentation](docs_url).
-      post_logout_redirect_uri: The URL the OpenID Connect provider should redirect to after a logout request.
+      redirect_url: Ini ialah URL ubah hala yang harus digunakan oleh pembekal OpenID Connect untuk mengubah hala semula ke OpenProject selepas log masuk berjaya.
+      endpoint_url: URL titik akhir yang diberikan kepada anda oleh pembekal OpenID Connect
+      metadata_none: Saya tidak mempunyai maklumat ini
+      metadata_url: Saya mempunyai URL titik akhir penemuan
+      client_id: Ini ialah ID klien yang diberikan kepada anda oleh pembekal OpenID Connect anda
+      client_secret: Ini ialah rahsia pelanggan yang diberikan kepada anda oleh pembekal OpenID Connect anda
+      limit_self_registration: Jika didayakan, pengguna hanya boleh mendaftar menggunakan pembekal ini jika konfigurasi di hujung pembekal membenarkannya.
+      display_name: Nama pembekal. Ini akan dipaparkan sebagai butang log masuk dan dalam senarai pembekal.
+      tenant: 'Sila gantikan penyewa lalai dengan penyewa anda sendiri jika berkenaan. Lihat <a href=" https://learn.microsoft.com/en-us/entra/identity-platform/v2-protocols-oidc#find-your-apps-openid-configuration-document-uri">ini</ a>.'
+      scope: Jika anda ingin meminta skop tersuai, anda boleh menambah satu atau berbilang nilai skop yang dipisahkan oleh ruang di sini. Untuk mendapatkan maklumat lanjut, lihat [dokumentasi OpenID Connect](docs_url).
+      post_logout_redirect_uri: URL penyedia OpenID Connect harus mengubah hala selepas permintaan log keluar.
       claims: >
-        You can request additional claims for the userinfo and id token endpoints. Please see [our OpenID connect documentation](docs_url) for more information.
+        Anda boleh meminta tuntutan tambahan untuk maklumat pengguna dan titik akhir token id. Sila lihat [dokumentasi sambungan OpenID kami](docs_url) untuk mendapatkan maklumat lanjut.
       acr_values: >
-        Request non-essential claims in an easier format. See [our documentation on acr_values](docs_url) for more information.
+        Minta tuntutan yang tidak penting dalam format yang lebih mudah. Lihat [dokumentasi kami tentang acr_values](docs_url) untuk mendapatkan maklumat lanjut.
       mapping_login: >
-        Provide a custom mapping in the userinfo response to be used for the login attribute.
+        Sediakan pemetaan tersuai dalam respons info pengguna untuk digunakan untuk atribut log masuk.
       mapping_email: >
-        Provide a custom mapping in the userinfo response to be used for the email attribute.
+        Sediakan pemetaan tersuai dalam respons info pengguna untuk digunakan untuk atribut e-mel.
       mapping_first_name: >
-        Provide a custom mapping in the userinfo response to be used for the first name.
+        Sediakan pemetaan tersuai dalam respons info pengguna untuk digunakan untuk nama pertama.
       mapping_last_name: >
-        Provide a custom mapping in the userinfo response to be used for the last name.
+        Sediakan pemetaan tersuai dalam respons info pengguna untuk digunakan untuk nama akhir.
       mapping_admin: >
-        Provide a custom mapping in the userinfo response to be used for the admin status. It expects a boolean attribute to be returned.
+        Sediakan pemetaan tersuai dalam respons info pengguna untuk digunakan untuk status pentadbir. Ia menjangkakan atribut boolean akan dikembalikan.
     settings:
-      metadata_none: I don't have this information
-      metadata_url: I have a discovery endpoint URL
-      endpoint_url: Endpoint URL
+      metadata_none: Saya tidak mempunyai maklumat ini
+      metadata_url: Saya mempunyai URL titik akhir penemuan
+      endpoint_url: URL titik akhir
     providers:
-      label_providers: "Providers"
-      seeded_from_env: "This provider was seeded from the environment configuration. It cannot be edited."
+      label_providers: "Pembekal"
+      seeded_from_env: "Pembekal ini telah dipilih daripada konfigurasi persekitaran. Ia tidak boleh disunting."
       google:
         name: Google
       microsoft_entra:
         name: Microsoft Entra
       custom:
-        name: Custom
+        name: Adat
       upsale:
-        description: Connect OpenProject to an OpenID connect identity provider
+        description: Sambungkan OpenProject kepada pembekal identiti sambungan OpenID
       label_add_new: Tambah penyedia OpenID baharu
       label_edit: Edit penyedia OpenID %{name}
-      label_empty_title: No OpenID providers configured yet.
-      label_empty_description: Add a provider to see them here.
+      label_empty_title: Tiada pembekal OpenID dikonfigurasikan lagi.
+      label_empty_description: Tambah pembekal untuk melihat mereka di sini.
       label_metadata: OpenID Connect Discovery Endpoint
-      label_automatic_configuration: Automatic configuration
-      label_optional_configuration: Optional configuration
-      label_advanced_configuration: Advanced configuration
+      label_automatic_configuration: Konfigurasi automatik
+      label_optional_configuration: Konfigurasi pilihan
+      label_advanced_configuration: Konfigurasi lanjutan
       label_configuration_details: Metadata
-      label_client_details: Client details
-      label_attribute_mapping: Attribute mapping
-      client_details_description: Configuration details of OpenProject as an OIDC client
+      label_client_details: Butiran pelanggan
+      label_attribute_mapping: Pemetaan atribut
+      client_details_description: Butiran konfigurasi OpenProject sebagai pelanggan OIDC
       no_results_table: Belum ada penyedia yang ditetapkan lagi.
       plural: Penyedia OpenID
       singular: Penyedia OpenID
       section_texts:
-        metadata: Pre-fill configuration using an OpenID Connect discovery endpoint URL
-        metadata_form_banner: Editing the discovery endpoint may override existing pre-filled metadata values.
-        metadata_form_title: OpenID Connect Discovery endpoint
-        metadata_form_description: If your identity provider has a discovery endpoint URL. Use it below to pre-fill configuration.
-        configuration_metadata: The information has been pre-filled using the supplied discovery endpoint. In most cases, they do not require editing.
-        configuration: Configuration details of the OpenID Connect provider
-        display_name: The display name visible to users.
-        attribute_mapping: Configure the mapping of attributes between OpenProject and the OpenID Connect provider.
-        claims: Request additional claims for the ID token or userinfo response.
+        metadata: Konfigurasi praisi menggunakan URL titik akhir penemuan OpenID Connect
+        metadata_form_banner: Mengedit titik akhir penemuan mungkin mengatasi nilai metadata pra-isi sedia ada.
+        metadata_form_title: Titik akhir OpenID Connect Discovery
+        metadata_form_description: Jika pembekal identiti anda mempunyai URL titik akhir penemuan. Gunakannya di bawah untuk praisi konfigurasi.
+        configuration_metadata: Maklumat telah diisi terlebih dahulu menggunakan titik akhir penemuan yang dibekalkan. Dalam kebanyakan kes, mereka tidak memerlukan penyuntingan.
+        configuration: Butiran konfigurasi pembekal OpenID Connect
+        display_name: Nama paparan boleh dilihat oleh pengguna.
+        attribute_mapping: Konfigurasikan pemetaan atribut antara OpenProject dan pembekal OpenID Connect.
+        claims: Minta tuntutan tambahan untuk token ID atau respons maklumat pengguna.
     setting_instructions:
       limit_self_registration: >
         Jika pengguna yang dibenarkan hanya boleh mendaftar menggunakan penyediaan ini jika tetapan pendaftaran sendiri dibenarkan.
diff --git a/modules/openid_connect/config/locales/crowdin/ne.yml b/modules/openid_connect/config/locales/crowdin/ne.yml
index 2c5bc8e68b5f..15568c739a3c 100644
--- a/modules/openid_connect/config/locales/crowdin/ne.yml
+++ b/modules/openid_connect/config/locales/crowdin/ne.yml
@@ -14,6 +14,7 @@ ne:
         client_secret: Client secret
         secret: Secret
         scope: Scope
+        grant_types_supported: Supported grant types
         limit_self_registration: Limit self registration
         authorization_endpoint: Authorization endpoint
         userinfo_endpoint: User information endpoint
diff --git a/modules/openid_connect/config/locales/crowdin/nl.yml b/modules/openid_connect/config/locales/crowdin/nl.yml
index 273c6a69faa6..32193db7c468 100644
--- a/modules/openid_connect/config/locales/crowdin/nl.yml
+++ b/modules/openid_connect/config/locales/crowdin/nl.yml
@@ -14,6 +14,7 @@ nl:
         client_secret: Client secret
         secret: Geheim
         scope: Scope
+        grant_types_supported: Ondersteunde subsidietypen
         limit_self_registration: Beperk zelf-registratie
         authorization_endpoint: Autorisatie eindpunt
         userinfo_endpoint: Eindpunt gebruikersinformatie
@@ -90,34 +91,34 @@ nl:
       microsoft_entra:
         name: Microsoft Entra
       custom:
-        name: Custom
+        name: Aangepast
       upsale:
-        description: Connect OpenProject to an OpenID connect identity provider
+        description: OpenProject verbinden met een OpenID connect identity provider
       label_add_new: Voeg een nieuwe OpenID provider toe
       label_edit: OpenID provider %{name} bewerken
-      label_empty_title: No OpenID providers configured yet.
-      label_empty_description: Add a provider to see them here.
-      label_metadata: OpenID Connect Discovery Endpoint
-      label_automatic_configuration: Automatic configuration
-      label_optional_configuration: Optional configuration
-      label_advanced_configuration: Advanced configuration
+      label_empty_title: Er zijn nog geen OpenID providers geconfigureerd.
+      label_empty_description: Voeg een provider toe om ze hier te zien.
+      label_metadata: OpenID Connect Discovery Eindpunt
+      label_automatic_configuration: Automatische configuratie
+      label_optional_configuration: Optionele configuratie
+      label_advanced_configuration: Geavanceerde configuratie
       label_configuration_details: Metadata
-      label_client_details: Client details
-      label_attribute_mapping: Attribute mapping
-      client_details_description: Configuration details of OpenProject as an OIDC client
+      label_client_details: Client gegevens
+      label_attribute_mapping: Attribuut toewijzen
+      client_details_description: Configuratie details van OpenProject als een OIDC client
       no_results_table: Er zijn nog geen aanbieders gedefinieerd.
       plural: OpenID aanbieders
       singular: OpenID aanbieders
       section_texts:
-        metadata: Pre-fill configuration using an OpenID Connect discovery endpoint URL
-        metadata_form_banner: Editing the discovery endpoint may override existing pre-filled metadata values.
-        metadata_form_title: OpenID Connect Discovery endpoint
-        metadata_form_description: If your identity provider has a discovery endpoint URL. Use it below to pre-fill configuration.
-        configuration_metadata: The information has been pre-filled using the supplied discovery endpoint. In most cases, they do not require editing.
-        configuration: Configuration details of the OpenID Connect provider
-        display_name: The display name visible to users.
-        attribute_mapping: Configure the mapping of attributes between OpenProject and the OpenID Connect provider.
-        claims: Request additional claims for the ID token or userinfo response.
+        metadata: Configuratie vooraf invullen met behulp van een OpenID Connect discovery eindpunt URL
+        metadata_form_banner: Het bewerken van het zoekeindpunt kan bestaande, vooraf ingevulde metadatawaarden overschrijven.
+        metadata_form_title: OpenID Connect Discovery eindpunt
+        metadata_form_description: Als uw identity provider een discovery eindpunt URL heeft. Gebruik deze hieronder om de configuratie te vooraf in te vullen.
+        configuration_metadata: De informatie is vooraf ingevuld met behulp van het meegeleverde discovery eindpunt. In de meeste gevallen hoeft deze niet bewerkt te worden.
+        configuration: Configuratiegegevens van de OpenID Connect provider
+        display_name: De weergavenaam die zichtbaar is voor gebruikers.
+        attribute_mapping: Configureer de koppeling van attributen tussen OpenProject en de OpenID Connect-provider.
+        claims: Vraag extra claims aan voor de ID-token of gebruikersinfo reactie.
     setting_instructions:
       limit_self_registration: >
         If enabled users can only register using this provider if the self registration setting allows for it.
diff --git a/modules/openid_connect/config/locales/crowdin/no.yml b/modules/openid_connect/config/locales/crowdin/no.yml
index a49e692bca5c..e1d916fb3587 100644
--- a/modules/openid_connect/config/locales/crowdin/no.yml
+++ b/modules/openid_connect/config/locales/crowdin/no.yml
@@ -14,6 +14,7 @@
         client_secret: Client secret
         secret: Hemmelig nøkkel
         scope: Omfang
+        grant_types_supported: Supported grant types
         limit_self_registration: Begrens egenregistrering
         authorization_endpoint: Authorization endpoint
         userinfo_endpoint: User information endpoint
diff --git a/modules/openid_connect/config/locales/crowdin/pl.yml b/modules/openid_connect/config/locales/crowdin/pl.yml
index e856b86be59b..63491d9e83f6 100644
--- a/modules/openid_connect/config/locales/crowdin/pl.yml
+++ b/modules/openid_connect/config/locales/crowdin/pl.yml
@@ -14,6 +14,7 @@ pl:
         client_secret: Hasło klienta
         secret: Tajny klucz
         scope: Zakres
+        grant_types_supported: Obsługiwane typy udzielania
         limit_self_registration: Ogranicz samodzielną rejestrację
         authorization_endpoint: Punkt końcowy autoryzacji
         userinfo_endpoint: Punkt końcowy informacji o użytkowniku
diff --git a/modules/openid_connect/config/locales/crowdin/pt-BR.yml b/modules/openid_connect/config/locales/crowdin/pt-BR.yml
index 7812220bcc50..f13a91d5e474 100644
--- a/modules/openid_connect/config/locales/crowdin/pt-BR.yml
+++ b/modules/openid_connect/config/locales/crowdin/pt-BR.yml
@@ -14,6 +14,7 @@ pt-BR:
         client_secret: Segredo do cliente
         secret: Chave
         scope: Escopo
+        grant_types_supported: Tipos de concessão suportados
         limit_self_registration: Limitar registro automático
         authorization_endpoint: Endpoint de autorização
         userinfo_endpoint: Endpoint de informações do usuários
diff --git a/modules/openid_connect/config/locales/crowdin/pt-PT.yml b/modules/openid_connect/config/locales/crowdin/pt-PT.yml
index e3b6128502c9..1c1a4b3b9877 100644
--- a/modules/openid_connect/config/locales/crowdin/pt-PT.yml
+++ b/modules/openid_connect/config/locales/crowdin/pt-PT.yml
@@ -14,6 +14,7 @@ pt-PT:
         client_secret: Client Secret
         secret: Segredo
         scope: Contexto
+        grant_types_supported: Tipos de concessões suportadas
         limit_self_registration: Limitar auto-registo
         authorization_endpoint: Endpoint da autorização
         userinfo_endpoint: Endpoint da informação do utilizador
diff --git a/modules/openid_connect/config/locales/crowdin/ro.yml b/modules/openid_connect/config/locales/crowdin/ro.yml
index 5d98337b68ce..0405cb6caf39 100644
--- a/modules/openid_connect/config/locales/crowdin/ro.yml
+++ b/modules/openid_connect/config/locales/crowdin/ro.yml
@@ -14,6 +14,7 @@ ro:
         client_secret: Client secret
         secret: Secret
         scope: Scop
+        grant_types_supported: Supported grant types
         limit_self_registration: Limit self registration
         authorization_endpoint: Authorization endpoint
         userinfo_endpoint: User information endpoint
diff --git a/modules/openid_connect/config/locales/crowdin/ru.yml b/modules/openid_connect/config/locales/crowdin/ru.yml
index 09d5c477af7e..2053cf29e035 100644
--- a/modules/openid_connect/config/locales/crowdin/ru.yml
+++ b/modules/openid_connect/config/locales/crowdin/ru.yml
@@ -14,6 +14,7 @@ ru:
         client_secret: Закрытый ключ клиента
         secret: Секретный ключ
         scope: Область
+        grant_types_supported: Поддерживаемые типы разрешений
         limit_self_registration: Ограничить саморегистрацию
         authorization_endpoint: Конечная точка авторизации
         userinfo_endpoint: Конечная точка получения информации о пользователе
diff --git a/modules/openid_connect/config/locales/crowdin/rw.yml b/modules/openid_connect/config/locales/crowdin/rw.yml
index 22e141b152ff..8a2635811013 100644
--- a/modules/openid_connect/config/locales/crowdin/rw.yml
+++ b/modules/openid_connect/config/locales/crowdin/rw.yml
@@ -14,6 +14,7 @@ rw:
         client_secret: Client secret
         secret: Secret
         scope: Scope
+        grant_types_supported: Supported grant types
         limit_self_registration: Limit self registration
         authorization_endpoint: Authorization endpoint
         userinfo_endpoint: User information endpoint
diff --git a/modules/openid_connect/config/locales/crowdin/si.yml b/modules/openid_connect/config/locales/crowdin/si.yml
index 69b0cfde684b..d44ab90b5d55 100644
--- a/modules/openid_connect/config/locales/crowdin/si.yml
+++ b/modules/openid_connect/config/locales/crowdin/si.yml
@@ -14,6 +14,7 @@ si:
         client_secret: Client secret
         secret: Secret
         scope: Scope
+        grant_types_supported: Supported grant types
         limit_self_registration: Limit self registration
         authorization_endpoint: Authorization endpoint
         userinfo_endpoint: User information endpoint
diff --git a/modules/openid_connect/config/locales/crowdin/sk.yml b/modules/openid_connect/config/locales/crowdin/sk.yml
index a33bf7eed056..c07b2e2ddd6f 100644
--- a/modules/openid_connect/config/locales/crowdin/sk.yml
+++ b/modules/openid_connect/config/locales/crowdin/sk.yml
@@ -14,6 +14,7 @@ sk:
         client_secret: Client secret
         secret: Secret
         scope: Scope
+        grant_types_supported: Supported grant types
         limit_self_registration: Limit self registration
         authorization_endpoint: Authorization endpoint
         userinfo_endpoint: User information endpoint
diff --git a/modules/openid_connect/config/locales/crowdin/sl.yml b/modules/openid_connect/config/locales/crowdin/sl.yml
index 6edf3b7868a1..bb00aa8ace64 100644
--- a/modules/openid_connect/config/locales/crowdin/sl.yml
+++ b/modules/openid_connect/config/locales/crowdin/sl.yml
@@ -14,6 +14,7 @@ sl:
         client_secret: Client secret
         secret: Skrivnost
         scope: Področje
+        grant_types_supported: Supported grant types
         limit_self_registration: Omeji samoregistracijo
         authorization_endpoint: Authorization endpoint
         userinfo_endpoint: User information endpoint
diff --git a/modules/openid_connect/config/locales/crowdin/sr.yml b/modules/openid_connect/config/locales/crowdin/sr.yml
index 43b321a70b0f..20d0b9b2732a 100644
--- a/modules/openid_connect/config/locales/crowdin/sr.yml
+++ b/modules/openid_connect/config/locales/crowdin/sr.yml
@@ -14,6 +14,7 @@ sr:
         client_secret: Client secret
         secret: Secret
         scope: Scope
+        grant_types_supported: Supported grant types
         limit_self_registration: Limit self registration
         authorization_endpoint: Authorization endpoint
         userinfo_endpoint: User information endpoint
diff --git a/modules/openid_connect/config/locales/crowdin/sv.yml b/modules/openid_connect/config/locales/crowdin/sv.yml
index fb14d3839f14..7a7508050248 100644
--- a/modules/openid_connect/config/locales/crowdin/sv.yml
+++ b/modules/openid_connect/config/locales/crowdin/sv.yml
@@ -14,6 +14,7 @@ sv:
         client_secret: Client secret
         secret: Hemlighet
         scope: Omfattning
+        grant_types_supported: Supported grant types
         limit_self_registration: Limit self registration
         authorization_endpoint: Authorization endpoint
         userinfo_endpoint: User information endpoint
diff --git a/modules/openid_connect/config/locales/crowdin/th.yml b/modules/openid_connect/config/locales/crowdin/th.yml
index 6df03dca9103..2c84c754d1c7 100644
--- a/modules/openid_connect/config/locales/crowdin/th.yml
+++ b/modules/openid_connect/config/locales/crowdin/th.yml
@@ -14,6 +14,7 @@ th:
         client_secret: Client secret
         secret: Secret
         scope: Scope
+        grant_types_supported: Supported grant types
         limit_self_registration: Limit self registration
         authorization_endpoint: Authorization endpoint
         userinfo_endpoint: User information endpoint
diff --git a/modules/openid_connect/config/locales/crowdin/tr.yml b/modules/openid_connect/config/locales/crowdin/tr.yml
index d51b2c62cf99..ef3ba40ea586 100644
--- a/modules/openid_connect/config/locales/crowdin/tr.yml
+++ b/modules/openid_connect/config/locales/crowdin/tr.yml
@@ -14,6 +14,7 @@ tr:
         client_secret: İstemci gizliliği
         secret: Gizli
         scope: kapsam
+        grant_types_supported: Supported grant types
         limit_self_registration: Limit self registration
         authorization_endpoint: Yetkilendirme bitiş noktası
         userinfo_endpoint: Kullanıcı bilgisi bitiş noktası
diff --git a/modules/openid_connect/config/locales/crowdin/uk.yml b/modules/openid_connect/config/locales/crowdin/uk.yml
index 2e23f69e6d10..e5fe60b0a2a4 100644
--- a/modules/openid_connect/config/locales/crowdin/uk.yml
+++ b/modules/openid_connect/config/locales/crowdin/uk.yml
@@ -14,6 +14,7 @@ uk:
         client_secret: Client secret
         secret: Таємний код
         scope: Область використання
+        grant_types_supported: Підтримувані типи дозволів
         limit_self_registration: Обмежити самостійну реєстрацію
         authorization_endpoint: Кінцева точка авторизації
         userinfo_endpoint: Кінцева точка доступу до даних користувача
diff --git a/modules/openid_connect/config/locales/crowdin/uz.yml b/modules/openid_connect/config/locales/crowdin/uz.yml
index 220b3facffaf..9d8c343094f5 100644
--- a/modules/openid_connect/config/locales/crowdin/uz.yml
+++ b/modules/openid_connect/config/locales/crowdin/uz.yml
@@ -14,6 +14,7 @@ uz:
         client_secret: Client secret
         secret: Secret
         scope: Scope
+        grant_types_supported: Supported grant types
         limit_self_registration: Limit self registration
         authorization_endpoint: Authorization endpoint
         userinfo_endpoint: User information endpoint
diff --git a/modules/openid_connect/config/locales/crowdin/vi.yml b/modules/openid_connect/config/locales/crowdin/vi.yml
index cfd53d4ad83d..0afcfe8273ae 100644
--- a/modules/openid_connect/config/locales/crowdin/vi.yml
+++ b/modules/openid_connect/config/locales/crowdin/vi.yml
@@ -14,6 +14,7 @@ vi:
         client_secret: Client secret
         secret: Bí mật
         scope: Phạm vi
+        grant_types_supported: Supported grant types
         limit_self_registration: Giới hạn đăng ký tự động
         authorization_endpoint: Authorization endpoint
         userinfo_endpoint: User information endpoint
diff --git a/modules/openid_connect/config/locales/crowdin/zh-CN.yml b/modules/openid_connect/config/locales/crowdin/zh-CN.yml
index c946d002dd2b..88ba9bdcd1fb 100644
--- a/modules/openid_connect/config/locales/crowdin/zh-CN.yml
+++ b/modules/openid_connect/config/locales/crowdin/zh-CN.yml
@@ -14,6 +14,7 @@ zh-CN:
         client_secret: 客户端密钥
         secret: 密钥
         scope: 范围
+        grant_types_supported: 支持的授权类型
         limit_self_registration: 限制自行注册
         authorization_endpoint: 验证端点
         userinfo_endpoint: 用户信息端点
diff --git a/modules/openid_connect/config/locales/crowdin/zh-TW.yml b/modules/openid_connect/config/locales/crowdin/zh-TW.yml
index 61b9f6383ebe..642f7c1105f2 100644
--- a/modules/openid_connect/config/locales/crowdin/zh-TW.yml
+++ b/modules/openid_connect/config/locales/crowdin/zh-TW.yml
@@ -14,6 +14,7 @@ zh-TW:
         client_secret: 用戶端密鑰
         secret: 金鑰
         scope: 範圍
+        grant_types_supported: 支援授權類型
         limit_self_registration: 限制自行註冊
         authorization_endpoint: 授權端點
         userinfo_endpoint: 使用者資訊端點
diff --git a/modules/openid_connect/config/locales/en.yml b/modules/openid_connect/config/locales/en.yml
index e1a8f4431cdd..73601220a801 100644
--- a/modules/openid_connect/config/locales/en.yml
+++ b/modules/openid_connect/config/locales/en.yml
@@ -15,6 +15,7 @@ en:
         client_secret: Client secret
         secret: Secret
         scope: Scope
+        grant_types_supported: Supported grant types
         limit_self_registration: Limit self registration
         authorization_endpoint: Authorization endpoint
         userinfo_endpoint: User information endpoint
diff --git a/modules/openid_connect/spec/models/provider_spec.rb b/modules/openid_connect/spec/models/provider_spec.rb
new file mode 100644
index 000000000000..ae79365b76a2
--- /dev/null
+++ b/modules/openid_connect/spec/models/provider_spec.rb
@@ -0,0 +1,55 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+require "spec_helper"
+
+RSpec.describe OpenIDConnect::Provider do
+  let(:provider) do
+    create(:oidc_provider, options: {
+             "grant_types_supported" => supported_grant_types
+           })
+  end
+  let(:supported_grant_types) { %w[authorization_code implicit] }
+
+  describe "#token_exchange_capable?" do
+    subject { provider.token_exchange_capable? }
+
+    it { is_expected.to be_falsey }
+
+    context "when the provider supports the token exchange grant" do
+      let(:supported_grant_types) { %w[authorization_code implicit urn:ietf:params:oauth:grant-type:token-exchange] }
+
+      it { is_expected.to be_truthy }
+    end
+
+    context "when supported grant types are nil (legacy providers)" do
+      let(:supported_grant_types) { nil }
+
+      it { is_expected.to be_falsey }
+    end
+  end
+end
diff --git a/modules/openid_connect/spec/services/openid_connect/configuration_mapper_spec.rb b/modules/openid_connect/spec/services/openid_connect/configuration_mapper_spec.rb
index e8daef6db17e..c308beceff40 100644
--- a/modules/openid_connect/spec/services/openid_connect/configuration_mapper_spec.rb
+++ b/modules/openid_connect/spec/services/openid_connect/configuration_mapper_spec.rb
@@ -136,6 +136,45 @@
     end
   end
 
+  describe "claims" do
+    subject { result["claims"] }
+
+    let(:parsed_hash) do
+      {
+        "id_token" => {
+          "roles" => {
+            "essential" => true,
+            "values" => ["openproject.login"]
+          }
+        }
+      }
+    end
+
+    context "when provided as string" do
+      let(:configuration) { { claims: parsed_hash.to_json } }
+
+      it "outputs as a string", :aggregate_failures do
+        expect(subject).to be_a String
+        expect(JSON.parse(subject)).to eq(parsed_hash)
+      end
+    end
+
+    context "when provided as Hash" do
+      let(:configuration) { { claims: parsed_hash } }
+
+      it "converts to string", :aggregate_failures do
+        expect(subject).to be_a String
+        expect(JSON.parse(subject)).to eq(parsed_hash)
+      end
+    end
+
+    context "when not provided" do
+      let(:configuration) { {} }
+
+      it { is_expected.to be_blank }
+    end
+  end
+
   %w[authorization_endpoint token_endpoint userinfo_endpoint end_session_endpoint jwks_uri].each do |key|
     describe "setting #{key}" do
       subject { result }
diff --git a/modules/overviews/app/components/project_life_cycles/sections/edit_component.html.erb b/modules/overviews/app/components/project_life_cycles/sections/edit_component.html.erb
new file mode 100644
index 000000000000..506d398e3a76
--- /dev/null
+++ b/modules/overviews/app/components/project_life_cycles/sections/edit_component.html.erb
@@ -0,0 +1,26 @@
+<%= helpers.angular_component_tag 'opce-custom-modal-overlay' %>
+<%=
+  component_wrapper do
+    primer_form_with(
+      id: "project-life-cycles-edit-form",
+      model:,
+      method: :put,
+      data: {
+        "controller": "overview--project-life-cycles-form",
+        "overview--project-life-cycles-form-target": "form",
+        "application-target": "dynamic",
+        turbo: true,
+        turbo_stream: true,
+        preview_url: project_life_cycles_form_path(project_id: model.id),
+        "test-selector": "async-dialog-content"
+      },
+      url: update_project_life_cycles_path(project_id: model.id),
+    ) do |f|
+      render(Primer::Forms::SpacingWrapper.new) do
+        f.fields_for(:available_life_cycle_steps) do |life_cycle_form|
+          render(Projects::LifeCycles::Form.new(life_cycle_form))
+        end
+      end
+    end
+  end
+%>
diff --git a/modules/overviews/app/components/project_life_cycles/sections/edit_component.rb b/modules/overviews/app/components/project_life_cycles/sections/edit_component.rb
new file mode 100644
index 000000000000..69e395d772f7
--- /dev/null
+++ b/modules/overviews/app/components/project_life_cycles/sections/edit_component.rb
@@ -0,0 +1,37 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module ProjectLifeCycles
+  module Sections
+    class EditComponent < ApplicationComponent
+      include ApplicationHelper
+      include OpTurbo::Streamable
+      include OpPrimer::ComponentHelpers
+    end
+  end
+end
diff --git a/modules/overviews/app/components/project_life_cycles/sections/edit_dialog_component.html.erb b/modules/overviews/app/components/project_life_cycles/sections/edit_dialog_component.html.erb
new file mode 100644
index 000000000000..a2eab213ea09
--- /dev/null
+++ b/modules/overviews/app/components/project_life_cycles/sections/edit_dialog_component.html.erb
@@ -0,0 +1,32 @@
+<%=
+  render(Primer::Alpha::Dialog.new(title: t("label_life_cycle_step_plural"),
+                                   size: :large,
+                                   id: dialog_id)) do |d|
+    d.with_header(variant: :large)
+    d.with_body(classes: "Overlay-body_autocomplete_height") do
+      render(::ProjectLifeCycles::Sections::EditComponent.new(model))
+    end
+    d.with_footer do
+      component_collection do |footer_collection|
+        footer_collection.with_component(Primer::ButtonComponent.new(
+          data: {
+            "close-dialog-id": dialog_id
+          }
+        )) do
+          t("button_cancel")
+        end
+        footer_collection.with_component(Primer::ButtonComponent.new(
+          scheme: :primary,
+          type: :submit,
+          form: "project-life-cycles-edit-form",
+          data: {
+            test_selector: 'save-project-life-cycles-button',
+            turbo: true
+          }
+        )) do
+          t("button_save")
+        end
+      end
+    end
+  end
+%>
diff --git a/modules/overviews/app/components/project_life_cycles/sections/edit_dialog_component.rb b/modules/overviews/app/components/project_life_cycles/sections/edit_dialog_component.rb
new file mode 100644
index 000000000000..45f2689421ea
--- /dev/null
+++ b/modules/overviews/app/components/project_life_cycles/sections/edit_dialog_component.rb
@@ -0,0 +1,41 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module ProjectLifeCycles
+  module Sections
+    class EditDialogComponent < ApplicationComponent
+      include ApplicationHelper
+      include OpTurbo::Streamable
+      include OpPrimer::ComponentHelpers
+
+      def dialog_id
+        "edit-project-life-cycles-dialog"
+      end
+    end
+  end
+end
diff --git a/modules/overviews/app/components/project_life_cycles/sections/project_life_cycles/show_component.html.erb b/modules/overviews/app/components/project_life_cycles/sections/project_life_cycles/show_component.html.erb
new file mode 100644
index 000000000000..ea3f87c3b8ab
--- /dev/null
+++ b/modules/overviews/app/components/project_life_cycles/sections/project_life_cycles/show_component.html.erb
@@ -0,0 +1,28 @@
+<%=
+  flex_layout(align_items: :flex_start,
+              justify_content: :space_between,
+              classes: 'op-project-life-cycle-container',
+              data: {
+                test_selector: "project-life-cycle-#{model.id}"
+              }) do |life_cycle_container|
+    life_cycle_container.with_row(mb: 1, flex_layout: true, ) do |row|
+      row.with_column(mr: 1, classes: icon_color_class) do
+        render Primer::Beta::Octicon.new(icon:)
+      end
+
+      row.with_column do
+        render(Primer::Beta::Text.new(font_weight: :bold)) do
+          text
+        end
+      end
+    end
+
+    life_cycle_container.with_row(w: :full) do
+      if not_set?
+        render(Primer::Beta::Text.new()) { t('placeholders.default') }
+      else
+        render_value
+      end
+    end
+  end
+%>
diff --git a/modules/overviews/app/components/project_life_cycles/sections/project_life_cycles/show_component.rb b/modules/overviews/app/components/project_life_cycles/sections/project_life_cycles/show_component.rb
new file mode 100644
index 000000000000..43e1f19da34f
--- /dev/null
+++ b/modules/overviews/app/components/project_life_cycles/sections/project_life_cycles/show_component.rb
@@ -0,0 +1,75 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module ProjectLifeCycles
+  module Sections
+    module ProjectLifeCycles
+      class ShowComponent < ApplicationComponent
+        include ApplicationHelper
+        include OpPrimer::ComponentHelpers
+
+        private
+
+        def not_set?
+          model.not_set?
+        end
+
+        def render_value
+          render(Primer::Beta::Text.new) do
+            concat [
+              model.start_date,
+              model.end_date
+            ]
+            .compact
+            .map { |d| helpers.format_date(d) }
+            .join(" - ")
+          end
+        end
+
+        def icon
+          case model
+          when Project::Stage
+            :"git-commit"
+          when Project::Gate
+            :diamond
+          else
+            raise NotImplementedError, "Unknown model #{model.class} to render a LifeCycleForm with"
+          end
+        end
+
+        def icon_color_class
+          helpers.hl_inline_class("life_cycle_step_definition", model.definition)
+        end
+
+        def text
+          model.name
+        end
+      end
+    end
+  end
+end
diff --git a/modules/overviews/app/components/project_life_cycles/sections/show_component.html.erb b/modules/overviews/app/components/project_life_cycles/sections/show_component.html.erb
new file mode 100644
index 000000000000..c8a801c9f9dd
--- /dev/null
+++ b/modules/overviews/app/components/project_life_cycles/sections/show_component.html.erb
@@ -0,0 +1,34 @@
+<%=
+  component_wrapper do
+    render(Primer::OpenProject::SidePanel::Section.new(
+      classes: 'op-project-life-cyle-section-container',
+      test_selector: "project-life-cycle-section"
+    )) do |section|
+      section.with_title { t("label_life_cycle_step_plural") }
+
+      if allowed_to_edit?
+        section.with_action_icon(
+          icon: :pencil,
+          tag: :a,
+          href: project_life_cycles_dialog_path(project_id: @project.id),
+          data: {
+            controller: 'async-dialog'
+          },
+          test_selector: "project-life-cycles-edit-button",
+          aria: { label: I18n.t(:label_edit) }
+        )
+      end
+
+      flex_layout do |details_container|
+        @life_cycle_steps.each_with_index do |life_cycle_step, i|
+          margin = i == @life_cycle_steps.size - 1 ? 0 : 3
+          details_container.with_row(mb: margin) do
+            render(ProjectLifeCycles::Sections::ProjectLifeCycles::ShowComponent.new(
+              life_cycle_step
+            ))
+          end
+        end
+      end
+    end
+  end
+%>
diff --git a/modules/overviews/app/components/project_life_cycles/sections/show_component.rb b/modules/overviews/app/components/project_life_cycles/sections/show_component.rb
new file mode 100644
index 000000000000..f848609e596f
--- /dev/null
+++ b/modules/overviews/app/components/project_life_cycles/sections/show_component.rb
@@ -0,0 +1,50 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module ProjectLifeCycles
+  module Sections
+    class ShowComponent < ApplicationComponent
+      include ApplicationHelper
+      include OpPrimer::ComponentHelpers
+      include OpTurbo::Streamable
+
+      def initialize(project:)
+        super
+
+        @project = project
+        @life_cycle_steps = @project.available_life_cycle_steps
+      end
+
+      private
+
+      def allowed_to_edit?
+        User.current.allowed_in_project?(:edit_project_stages_and_gates, @project)
+      end
+    end
+  end
+end
diff --git a/modules/overviews/app/components/project_life_cycles/side_panel_component.html.erb b/modules/overviews/app/components/project_life_cycles/side_panel_component.html.erb
new file mode 100644
index 000000000000..763a30ed12c3
--- /dev/null
+++ b/modules/overviews/app/components/project_life_cycles/side_panel_component.html.erb
@@ -0,0 +1,10 @@
+<%=
+  component_wrapper do
+    render(Primer::OpenProject::SidePanel.new(
+      spacious: true,
+      test_selector: "project-life-cycles-sidebar-async-content"
+    )) do |panel|
+      panel.with_section(ProjectLifeCycles::Sections::ShowComponent.new(project: @project))
+    end
+  end
+%>
diff --git a/modules/overviews/app/components/project_life_cycles/side_panel_component.rb b/modules/overviews/app/components/project_life_cycles/side_panel_component.rb
new file mode 100644
index 000000000000..d837969ffa31
--- /dev/null
+++ b/modules/overviews/app/components/project_life_cycles/side_panel_component.rb
@@ -0,0 +1,41 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module ProjectLifeCycles
+  class SidePanelComponent < ApplicationComponent
+    include ApplicationHelper
+    include OpPrimer::ComponentHelpers
+    include OpTurbo::Streamable
+
+    def initialize(project:)
+      super
+
+      @project = project
+    end
+  end
+end
diff --git a/modules/overviews/app/controllers/overviews/overviews_controller.rb b/modules/overviews/app/controllers/overviews/overviews_controller.rb
index 9f1e34476aff..679701ae7bca 100644
--- a/modules/overviews/app/controllers/overviews/overviews_controller.rb
+++ b/modules/overviews/app/controllers/overviews/overviews_controller.rb
@@ -1,3 +1,31 @@
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+# ++
+
 module ::Overviews
   class OverviewsController < ::Grids::BaseInProjectController
     include OpTurbo::ComponentStream
@@ -27,7 +55,6 @@ def project_custom_field_section_dialog
 
     def update_project_custom_values
       section = find_project_custom_field_section
-
       service_call = ::Projects::UpdateService
                       .new(
                         user: current_user,
@@ -49,6 +76,50 @@ def update_project_custom_values
       respond_to_with_turbo_streams(status: service_call.success? ? :ok : :unprocessable_entity)
     end
 
+    def project_life_cycles_sidebar
+      render :project_life_cycles_sidebar, layout: false
+    end
+
+    def project_life_cycles_dialog
+      respond_with_dialog(
+        ProjectLifeCycles::Sections::EditDialogComponent.new(@project)
+      )
+    end
+
+    def project_life_cycles_form
+      service_call = ::ProjectLifeCycleSteps::PreviewAttributesService
+                .new(user: current_user,
+                     model: @project,
+                     contract_class: ProjectLifeCycleSteps::UpdateContract)
+                .call(permitted_params.project_life_cycles)
+
+      update_via_turbo_stream(
+        component: ProjectLifeCycles::Sections::EditComponent.new(service_call.result),
+        method: "morph"
+      )
+      # TODO: :unprocessable_entity is not nice, change the dialog logic to accept :ok
+      # without dismissing the dialog, alternatively use turbo frames instead of streams.
+      respond_to_with_turbo_streams(status: :unprocessable_entity)
+    end
+
+    def update_project_life_cycles
+      service_call = ::ProjectLifeCycleSteps::UpdateService
+                      .new(user: current_user, model: @project)
+                      .call(permitted_params.project_life_cycles)
+
+      if service_call.success?
+        update_via_turbo_stream(
+          component: ProjectLifeCycles::SidePanelComponent.new(project: @project)
+        )
+      else
+        update_via_turbo_stream(
+          component: ProjectLifeCycles::Sections::EditComponent.new(service_call.result)
+        )
+      end
+
+      respond_to_with_turbo_streams(status: service_call.success? ? :ok : :unprocessable_entity)
+    end
+
     def jump_to_project_menu_item
       if params[:jump]
         # try to redirect to the requested menu item
@@ -63,9 +134,13 @@ def find_project_custom_field_section
     end
 
     def set_sidebar_enabled
-      @sidebar_enabled =
+      @custom_fields_sidebar_enabled =
         User.current.allowed_in_project?(:view_project_attributes, @project) &&
         @project.project_custom_fields.visible.any?
+      @life_cycles_sidebar_enabled =
+        OpenProject::FeatureDecisions.stages_and_gates_active? &&
+        User.current.allowed_in_project?(:view_project_stages_and_gates, @project) &&
+        @project.life_cycle_steps.active.any?
     end
 
     def handle_errors(project_with_errors, section)
diff --git a/modules/overviews/app/views/overviews/overviews/project_life_cycles_sidebar.html.erb b/modules/overviews/app/views/overviews/overviews/project_life_cycles_sidebar.html.erb
new file mode 100644
index 000000000000..1b05538bb3c7
--- /dev/null
+++ b/modules/overviews/app/views/overviews/overviews/project_life_cycles_sidebar.html.erb
@@ -0,0 +1,31 @@
+<%#-- copyright
+OpenProject is an open source project management software.
+Copyright (C) the OpenProject GmbH
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License version 3.
+
+OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+Copyright (C) 2006-2013 Jean-Philippe Lang
+Copyright (C) 2010-2013 the ChiliProject Team
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+See COPYRIGHT and LICENSE files for more details.
+
+++#%>
+<%= content_tag("turbo-frame", id: "project-life-cycles-sidebar") do %>
+  <%= render(ProjectLifeCycles::SidePanelComponent.new(project: @project)) %>
+<% end %>
diff --git a/modules/overviews/app/views/overviews/overviews/show.html.erb b/modules/overviews/app/views/overviews/overviews/show.html.erb
index bd1d6114ccb7..a323d0ca45e8 100644
--- a/modules/overviews/app/views/overviews/overviews/show.html.erb
+++ b/modules/overviews/app/views/overviews/overviews/show.html.erb
@@ -1,15 +1,10 @@
 <% content_for :header_tags do %>
-  <meta name="sidebar_enabled" data-enabled="<%= @sidebar_enabled %>">
+  <meta name="custom_fields_sidebar_enabled" data-enabled="<%= @custom_fields_sidebar_enabled %>">
+  <meta name="life_cycles_sidebar_enabled" data-enabled="<%= @life_cycles_sidebar_enabled %>">
 <% end -%>
 
 <%=
-  render(Primer::OpenProject::PageHeader.new(
-    data: {
-      'controller': 'overview-header',
-      'application-target': 'dynamic',
-      turbo: true
-    }
-  )) do |header|
+  render(Primer::OpenProject::PageHeader.new) do |header|
     header.with_title(variant: :medium) { t("overviews.label") }
     header.with_breadcrumbs(
       [
diff --git a/modules/overviews/config/routes.rb b/modules/overviews/config/routes.rb
index 9a007f2a0e7e..c6a9a0b1b446 100644
--- a/modules/overviews/config/routes.rb
+++ b/modules/overviews/config/routes.rb
@@ -9,5 +9,14 @@
                                                                                 as: :project_custom_field_section_dialog
     put "projects/:project_id/update_project_custom_values/:section_id", to: "overviews/overviews#update_project_custom_values",
                                                                          as: :update_project_custom_values
+
+    get "projects/:project_id/project_life_cycles_sidebar", to: "overviews/overviews#project_life_cycles_sidebar",
+                                                            as: :project_life_cycles_sidebar
+    get "projects/:project_id/project_life_cycles_dialog", to: "overviews/overviews#project_life_cycles_dialog",
+                                                           as: :project_life_cycles_dialog
+    put "projects/:project_id/project_life_cycles_form",   to: "overviews/overviews#project_life_cycles_form",
+                                                           as: :project_life_cycles_form
+    put "projects/:project_id/update_project_life_cycles", to: "overviews/overviews#update_project_life_cycles",
+                                                           as: :update_project_life_cycles
   end
 end
diff --git a/modules/overviews/lib/overviews/engine.rb b/modules/overviews/lib/overviews/engine.rb
index eb934b7c033b..f9e5988c90b8 100644
--- a/modules/overviews/lib/overviews/engine.rb
+++ b/modules/overviews/lib/overviews/engine.rb
@@ -63,6 +63,20 @@ class Engine < ::Rails::Engine
             "overviews/overviews/update_project_custom_values"
           )
 
+        OpenProject::AccessControl.permission(:view_project_stages_and_gates)
+          .controller_actions
+          .push(
+            "overviews/overviews/project_life_cycles_sidebar"
+          )
+
+        OpenProject::AccessControl.permission(:edit_project_stages_and_gates)
+          .controller_actions
+          .push(
+            "overviews/overviews/project_life_cycles_dialog",
+            "overviews/overviews/project_life_cycles_form",
+            "overviews/overviews/update_project_life_cycles"
+          )
+
         OpenProject::AccessControl.permission(:view_work_packages)
           .controller_actions
           .push(
diff --git a/modules/recaptcha/config/locales/crowdin/ms.yml b/modules/recaptcha/config/locales/crowdin/ms.yml
index e622b193112a..278f3a55d6f3 100644
--- a/modules/recaptcha/config/locales/crowdin/ms.yml
+++ b/modules/recaptcha/config/locales/crowdin/ms.yml
@@ -9,7 +9,7 @@ ms:
     verify_account: "Sahkan akaun anda"
     error_captcha: "Akaun anda tidak dapat disahkan. Sila hubungi pentadbir."
     settings:
-      website_key: 'Website key (May also be called "Site key")'
+      website_key: 'Kunci tapak web (Boleh juga dipanggil "Kunci tapak")'
       response_limit: 'Had tindak balas untuk HCaptcha'
       response_limit_text: 'Bilangan maksimum aksara bagi menganggap tindak balas HCaptcha sebagai sah.'
       website_key_text: 'Masukkan kekunci laman web yang anda telah ciptakan di konsol pentadbir bagi domain ini.'
@@ -22,4 +22,4 @@ ms:
       type_hcaptcha: 'HCaptcha'
       type_turnstile: 'Cloudflare Turnstile™'
       captcha_description_html: >
-        reCAPTCHA is a free service by Google that can be enabled for your OpenProject instance. If enabled, a captcha form will be rendered upon login for all users that have not verified a captcha yet. <br/> Please see the following link for more details on reCAPTCHA and their versions, and how to create the website and secret keys: %{recaptcha_link} <br/> HCaptcha is a Google-free alternative that you can use if you do not want to use reCAPTCHA. See this link for more information: %{hcaptcha_link} <br/> Cloudflare Turnstile™ is another alternative that is more convenient for users while still providing the same level of security. See this link for more information: %{turnstile_link}
+        reCAPTCHA ialah perkhidmatan percuma oleh Google yang boleh didayakan untuk contoh OpenProject anda. Jika didayakan, borang captcha akan dipaparkan semasa log masuk untuk semua pengguna yang belum mengesahkan captcha lagi. <br/> Sila lihat pautan berikut untuk mendapatkan butiran lanjut tentang reCAPTCHA dan versinya serta cara membuat tapak web dan kunci rahsia: %{recaptcha_link} <br/> HCaptcha ialah alternatif bebas Google yang boleh anda gunakan jika anda melakukannya tidak mahu menggunakan reCAPTCHA. Lihat pautan ini untuk mendapatkan maklumat lanjut: %{hcaptcha_link} <br/> Cloudflare Turnstile™ ialah alternatif lain yang lebih mudah untuk pengguna sambil masih menyediakan tahap keselamatan yang sama. Lihat pautan ini untuk mendapatkan maklumat lanjut: %{turnstile_link}
diff --git a/modules/reporting/app/components/cost_reports/index_page_header_component.html.erb b/modules/reporting/app/components/cost_reports/index_page_header_component.html.erb
index 4c59a126a115..92d133f1d002 100644
--- a/modules/reporting/app/components/cost_reports/index_page_header_component.html.erb
+++ b/modules/reporting/app/components/cost_reports/index_page_header_component.html.erb
@@ -5,16 +5,39 @@
 
     if show_export_button?
       header.with_action_button(scheme: :default,
-                                aria: { label: t(:export_to_excel)},
+                                aria: { label: t(:export_to_excel) },
                                 title: t(:export_to_excel),
                                 mobile_icon: "op-file-xls-descriptions",
                                 mobile_label: t(:export_to_excel),
                                 tag: :a,
-                                href: url_for({ controller: "cost_reports" , action: :index, format: 'xls', project_id: @project })
+                                href: url_for({ controller: "cost_reports", action: :index, format: 'xls', project_id: @project }),
+                                data: {
+                                  controller: "costs--export",
+                                  "application-target": "dynamic",
+                                  "costs--export-job-status-dialog-url-value": job_status_dialog_path('_job_uuid_'),
+                                  action: "click->costs--export#download"
+                                }
       ) do |button|
         button.with_leading_visual_icon(icon: "op-file-xls-descriptions")
         t(:export_to_excel)
       end
+      header.with_action_button(scheme: :default,
+                                aria: { label: t("export.timesheet.button") },
+                                title: t("export.timesheet.button"),
+                                mobile_icon: "op-file-xls-descriptions",
+                                mobile_label: t("export.timesheet.button"),
+                                tag: :a,
+                                href: url_for({ controller: "cost_reports", action: :index, format: 'pdf', project_id: @project }),
+                                data: {
+                                  controller: "costs--export",
+                                  "application-target": "dynamic",
+                                  "costs--export-job-status-dialog-url-value": job_status_dialog_path('_job_uuid_'),
+                                  action: "click->costs--export#download"
+                                }
+      ) do |button|
+        button.with_leading_visual_icon(icon: "op-file-xls-descriptions")
+        t("export.timesheet.button")
+      end
       call_hook(:view_cost_report_toolbar)
     end
   end
diff --git a/modules/reporting/app/controllers/cost_reports_controller.rb b/modules/reporting/app/controllers/cost_reports_controller.rb
index edb12e8baf26..80cefdf73c98 100644
--- a/modules/reporting/app/controllers/cost_reports_controller.rb
+++ b/modules/reporting/app/controllers/cost_reports_controller.rb
@@ -76,23 +76,38 @@ def check_cache
 
   def index
     table
+    return if performed?
 
-    unless performed?
-      respond_to do |format|
-        format.html do
-          session[report_engine.name.underscore.to_sym].try(:delete, :name)
-          render locals: { menu_name: project_or_global_menu }
-        end
+    respond_to do |format|
+      format.html { render_html }
+      format.xls { export(:xls) }
+      format.pdf { export(:pdf) }
+    end
+  end
 
-        format.xls do
-          job_id = ::CostQuery::ScheduleExportService
-            .new(user: current_user)
-            .call(filter_params:, project: @project, cost_types: @cost_types)
-            .result
+  def render_html
+    session[session_name].try(:delete, :name)
+    # get rid of unsaved filters and grouping
+    store_query(@query) if @query&.id != session[session_name].try(:id)
+    render locals: { menu_name: project_or_global_menu }
+  end
 
-          redirect_to job_status_path(job_id)
-        end
-      end
+  def export(format)
+    job_id = ::CostQuery::ScheduleExportService
+               .new(user: current_user)
+               .call(
+                 format:,
+                 query_id: @query.id,
+                 query_name: @query.name,
+                 filter_params: filter_params,
+                 project: @project,
+                 cost_types: @cost_types
+               ).result
+
+    if request.headers["Accept"]&.include?("application/json")
+      render json: { job_id: }
+    else
+      redirect_to job_status_path(job_id)
     end
   end
 
@@ -241,7 +256,7 @@ def default_filter_parameters
   # Get the filter params with an optional project context
   def filter_params
     filters = http_filter_parameters if set_filter?
-    filters ||= session[report_engine.name.underscore.to_sym].try(:[], :filters)
+    filters ||= session[session_name].try(:[], :filters)
     filters ||= default_filter_parameters
 
     update_project_context!(filters)
@@ -253,7 +268,7 @@ def filter_params
   # Return the active group bys
   def group_params
     groups = http_group_parameters if set_filter?
-    groups ||= session[report_engine.name.underscore.to_sym].try(:[], :groups)
+    groups ||= session[session_name].try(:[], :groups)
     groups || default_group_parameters
   end
 
@@ -358,7 +373,8 @@ def determine_engine
   # save_private_cost_reports permission as well
   #
   # @Override
-  def allowed_in_report?(action, report, user = User.current) # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity
+  # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity
+  def allowed_in_report?(action, report, user = User.current)
     # admins may do everything
     return true if user.admin?
 
@@ -390,6 +406,7 @@ def allowed_in_report?(action, report, user = User.current) # rubocop:disable Me
       Array(permissions).any? { |permission| user.allowed_in_any_project?(permission) }
     end
   end
+  # rubocop:enable Metrics/AbcSize, Metrics/PerceivedComplexity
 
   private
 
@@ -399,8 +416,8 @@ def find_optional_user
 
   def get_filter_class(name)
     filter = report_engine::Filter
-      .all
-      .detect { |cls| cls.to_s.demodulize.underscore == name.to_s }
+               .all
+               .detect { |cls| cls.to_s.demodulize.underscore == name.to_s }
 
     raise ArgumentError.new("Filter with name #{name} does not exist.") unless filter
 
@@ -479,8 +496,8 @@ def force_default?
   # Prepare the query from the request
   def prepare_query
     determine_settings
-    @query = build_query(session[report_engine.name.underscore.to_sym][:filters],
-                         session[report_engine.name.underscore.to_sym][:groups])
+    @query = build_query(session[session_name][:filters],
+                         session[session_name][:groups])
 
     set_cost_type if @unit_id.present?
   end
@@ -489,16 +506,16 @@ def prepare_query
   # Determine the query settings the current request and save it to
   # the session.
   def determine_settings
-    if force_default?
-      filters = default_filter_parameters
-      groups  = default_group_parameters
-      session[report_engine.name.underscore.to_sym].try :delete, :name
-    else
-      filters = filter_params
-      groups  = group_params
-    end
-    cookie = session[report_engine.name.underscore.to_sym] || {}
-    session[report_engine.name.underscore.to_sym] = cookie.merge(filters:, groups:)
+    return reset_settings if force_default?
+
+    cookie = session[session_name] || {}
+    session[session_name] = cookie.merge(filters: filter_params, groups: group_params)
+  end
+
+  def reset_settings
+    session[session_name].try :delete, :name
+    cookie = session[session_name] || {}
+    session[session_name] = cookie.merge(filters: default_filter_parameters, groups: default_group_parameters)
   end
 
   ##
@@ -524,16 +541,25 @@ def build_query(filters, groups = {})
   # Store query in the session
   def store_query(_query)
     cookie = {}
-    cookie[:groups] = @query.group_bys.inject({}) do |h, group|
-      ((h[:"#{group.type}s"] ||= []) << group.underscore_name.to_sym) && h
-    end
-    cookie[:filters] = @query.filters.inject(operators: {}, values: {}) do |h, filter|
+    cookie[:groups] = cookie_groups
+    cookie[:filters] = cookie_filters
+    cookie[:name] = @query.name if @query.name
+    cookie[:id] = @query.id
+    session[session_name] = cookie
+  end
+
+  def cookie_filters
+    @query.filters.inject(operators: {}, values: {}) do |h, filter|
       h[:operators][filter.underscore_name.to_sym] = filter.operator.to_s
       h[:values][filter.underscore_name.to_sym] = filter.values
       h
     end
-    cookie[:name] = @query.name if @query.name
-    session[report_engine.name.underscore.to_sym] = cookie
+  end
+
+  def cookie_groups
+    @query.group_bys.inject({}) do |h, group|
+      ((h[:"#{group.type}s"] ||= []) << group.underscore_name.to_sym) && h
+    end
   end
 
   ##
@@ -566,4 +592,8 @@ def find_optional_report(query = "1=0")
     end
   rescue ActiveRecord::RecordNotFound
   end
+
+  def session_name
+    @session_name ||= report_engine.name.underscore.to_sym
+  end
 end
diff --git a/modules/reporting/app/models/cost_query.rb b/modules/reporting/app/models/cost_query.rb
index 4d29547b7f6d..5317137f98b3 100644
--- a/modules/reporting/app/models/cost_query.rb
+++ b/modules/reporting/app/models/cost_query.rb
@@ -85,6 +85,25 @@ def self.exists_in?(project, user)
     public(project).or(private(project, user)).exists?
   end
 
+  # rubocop:disable Metrics/AbcSize
+  def self.build_query(project, filters, groups = {})
+    query = CostQuery.new(project:)
+    query.tap do |q|
+      filters[:operators].each do |filter, operator|
+        unless filters[:values][filter] == ["<<inactive>>"]
+          values = Array(filters[:values][filter]).map { |v| v == "<<null>>" ? nil : v }
+          q.filter(filter.to_sym,
+                   operator:,
+                   values:)
+        end
+      end
+    end
+    groups[:columns].try(:reverse_each) { |c| query.column(c) }
+    groups[:rows].try(:reverse_each) { |r| query.row(r) }
+    query
+  end
+  # rubocop:enable Metrics/AbcSize
+
   def serialize
     # have to take the reverse group_bys to retain the original order when deserializing
     self.serialized = { filters: filters.map(&:serialize).reject(&:nil?).sort_by(&:first),
diff --git a/modules/reporting/app/services/cost_query/schedule_export_service.rb b/modules/reporting/app/services/cost_query/schedule_export_service.rb
index 991a38334040..7d2f0a336535 100644
--- a/modules/reporting/app/services/cost_query/schedule_export_service.rb
+++ b/modules/reporting/app/services/cost_query/schedule_export_service.rb
@@ -33,21 +33,24 @@ def initialize(user:)
     self.user = user
   end
 
-  def call(filter_params:, project:, cost_types:)
+  def call(format:, query_id:, query_name:, filter_params:, project:, cost_types:)
     export_storage = ::CostQuery::Export.create
-    job = schedule_export(export_storage, filter_params, project, cost_types)
+    job = schedule_export(format, export_storage, query_id, query_name, filter_params, project, cost_types)
 
     ServiceResult.success result: job.job_id
   end
 
   private
 
-  def schedule_export(export_storage, filter_params, project, cost_types)
-    ::CostQuery::ExportJob.perform_later(export: export_storage,
-                                         user:,
-                                         mime_type: :xls,
-                                         query: filter_params,
-                                         project:,
-                                         cost_types:)
+  def schedule_export(format, export_storage, query_id, query_name, filter_params, project, cost_types)
+    job = format == :pdf ? ::CostQuery::PDF::ExportTimesheetJob : ::CostQuery::XLS::ExportJob
+    job.perform_later(export: export_storage,
+                      user:,
+                      mime_type: format,
+                      query_id:,
+                      query_name:,
+                      query: filter_params,
+                      project:,
+                      cost_types:)
   end
 end
diff --git a/modules/reporting/app/workers/cost_query/pdf/export_timesheet_job.rb b/modules/reporting/app/workers/cost_query/pdf/export_timesheet_job.rb
new file mode 100644
index 000000000000..058cb2061369
--- /dev/null
+++ b/modules/reporting/app/workers/cost_query/pdf/export_timesheet_job.rb
@@ -0,0 +1,40 @@
+require "active_storage/filename"
+
+class CostQuery::PDF::ExportTimesheetJob < Exports::ExportJob
+  self.model = ::CostQuery
+
+  def project
+    options[:project]
+  end
+
+  def title
+    I18n.t("export.timesheet.title")
+  end
+
+  private
+
+  def export!
+    handle_export_result(export, pdf_report_result)
+  end
+
+  def prepare!
+    CostQuery::Cache.check
+    self.query = CostQuery.build_query(project, query)
+    query.name = options[:query_name]
+  end
+
+  def pdf_report_result
+    content = generate_timesheet
+    time = Time.current.strftime("%Y-%m-%d-T-%H-%M-%S")
+    export_title = "timesheet-#{time}.pdf"
+    ::Exports::Result.new(format: :pdf,
+                          title: export_title,
+                          mime_type: "application/pdf",
+                          content:)
+  end
+
+  def generate_timesheet
+    generator = ::CostQuery::PDF::TimesheetGenerator.new(query, project)
+    generator.generate!
+  end
+end
diff --git a/modules/reporting/app/workers/cost_query/pdf/timesheet_generator.rb b/modules/reporting/app/workers/cost_query/pdf/timesheet_generator.rb
new file mode 100644
index 000000000000..4c2735ab7d5b
--- /dev/null
+++ b/modules/reporting/app/workers/cost_query/pdf/timesheet_generator.rb
@@ -0,0 +1,387 @@
+class CostQuery::PDF::TimesheetGenerator
+  include WorkPackage::PDFExport::Common::Common
+  include WorkPackage::PDFExport::Common::Attachments
+  include WorkPackage::PDFExport::Common::Logo
+  include WorkPackage::PDFExport::Export::Cover
+  include WorkPackage::PDFExport::Export::Page
+  include WorkPackage::PDFExport::Export::Style
+
+  H1_FONT_SIZE = 26
+  H1_MARGIN_BOTTOM = 2
+  HR_MARGIN_BOTTOM = 16
+  TABLE_CELL_FONT_SIZE = 10
+  TABLE_CELL_BORDER_COLOR = "BBBBBB".freeze
+  TABLE_CELL_PADDING = 4
+  COMMENT_FONT_COLOR = "636C76".freeze
+  H2_FONT_SIZE = 20
+  H2_MARGIN_BOTTOM = 10
+  COLUMN_DATE_WIDTH = 66
+  COLUMN_ACTIVITY_WIDTH = 100
+  COLUMN_HOURS_WIDTH = 60
+  COLUMN_TIME_WIDTH = 110
+  COLUMN_WP_WIDTH = 190
+
+  attr_accessor :pdf
+
+  def initialize(query, project)
+    @query = query
+    @project = project
+    @total_page_nr = nil
+    @page_count = 1
+    setup_page!
+  end
+
+  def heading
+    query.name || I18n.t(:"export.timesheet.timesheet")
+  end
+
+  def footer_title
+    heading
+  end
+
+  def cover_page_title
+    "OpenProject"
+  end
+
+  def cover_page_heading
+    heading
+  end
+
+  def cover_page_dates
+    start_date, end_date = all_entries.map(&:spent_on).minmax
+    "#{format_date(start_date)} - #{format_date(end_date)}" if start_date && end_date
+  end
+
+  def cover_page_subheading
+    User.current&.name
+  end
+
+  def project
+    @project
+  end
+
+  def query
+    @query
+  end
+
+  def options
+    {}
+  end
+
+  def setup_page!
+    self.pdf = get_pdf
+    configure_page_size!(:portrait)
+    pdf.title = heading
+  end
+
+  def generate!
+    render_doc
+    if wants_total_page_nrs?
+      @total_page_nr = pdf.page_count + @page_count
+      @page_count = 1
+      setup_page! # clear current pdf
+      render_doc
+    end
+    pdf.render
+  rescue StandardError => e
+    Rails.logger.error { "Failed to generate PDF: #{e} #{e.message}}." }
+    error(I18n.t(:error_pdf_failed_to_export, error: e.message))
+  end
+
+  def render_doc
+    write_cover_page! if with_cover?
+    write_heading!
+    write_hr!
+    write_entries!
+    write_headers!
+    write_footers!
+  end
+
+  def write_entries!
+    all_entries
+      .group_by(&:user)
+      .each do |user, result|
+      write_table(user, result)
+    end
+  end
+
+  def all_entries
+    @all_entries ||= begin
+      ids = query
+              .each_direct_result
+              .filter { |r| r.fields["type"] == "TimeEntry" }
+              .flat_map { |r| r.fields["id"] }
+
+      TimeEntry.where(id: ids).includes(%i[user activity work_package project])
+    end
+  end
+
+  def build_table_rows(entries)
+    rows = [table_header_columns]
+    entries
+      .group_by(&:spent_on)
+      .sort
+      .each do |spent_on, lines|
+      rows.concat(build_table_day_rows(spent_on, lines))
+    end
+    rows
+  end
+
+  def build_table_day_rows(spent_on, entries)
+    day_rows = []
+    entries.each do |entry|
+      day_rows.push(build_table_row(spent_on, entry))
+      if entry.comments.present?
+        day_rows.push(build_table_row_comment(entry))
+      end
+    end
+    day_rows
+  end
+
+  def build_table_row(spent_on, entry)
+    [
+      { content: format_date(spent_on), rowspan: entry.comments.present? ? 2 : 1 },
+      entry.work_package&.subject || "",
+      with_times_column? ? format_spent_on_time(entry) : nil,
+      format_hours(entry.hours),
+      entry.activity&.name || ""
+    ].compact
+  end
+
+  def build_table_row_comment(entry)
+    [{
+      content: entry.comments,
+      text_color: COMMENT_FONT_COLOR,
+      font_style: :italic,
+      colspan: table_columns_widths.size
+    }]
+  end
+
+  def table_header_columns
+    [
+      { content: TimeEntry.human_attribute_name(:spent_on), rowspan: 1 },
+      I18n.t(:"activerecord.models.work_package"),
+      with_times_column? ? I18n.t(:"export.timesheet.time") : nil,
+      TimeEntry.human_attribute_name(:hours),
+      TimeEntry.human_attribute_name(:activity)
+    ].compact
+  end
+
+  def table_columns_widths
+    @table_columns_widths ||= if with_times_column?
+                                [COLUMN_DATE_WIDTH, COLUMN_WP_WIDTH, COLUMN_TIME_WIDTH, COLUMN_HOURS_WIDTH,
+                                 COLUMN_ACTIVITY_WIDTH]
+                              else
+                                [COLUMN_DATE_WIDTH, COLUMN_WP_WIDTH + COLUMN_TIME_WIDTH, COLUMN_HOURS_WIDTH,
+                                 COLUMN_ACTIVITY_WIDTH]
+                              end
+  end
+
+  def build_table(rows)
+    pdf.make_table(
+      rows,
+      header: true,
+      width: table_columns_widths.sum,
+      column_widths: table_columns_widths,
+      cell_style: {
+        size: TABLE_CELL_FONT_SIZE,
+        border_color: TABLE_CELL_BORDER_COLOR,
+        border_width: 0.5,
+        borders: %i[top bottom],
+        padding: [TABLE_CELL_PADDING, TABLE_CELL_PADDING, TABLE_CELL_PADDING + 2, TABLE_CELL_PADDING]
+      }
+    ) do |table|
+      adjust_borders_first_column(table)
+      adjust_borders_last_column(table)
+      adjust_borders_spanned_column(table)
+      adjust_border_header_row(table)
+    end
+  end
+
+  def adjust_borders_first_column(table)
+    table.columns(0).borders = %i[top bottom left right]
+  end
+
+  def adjust_borders_last_column(table)
+    table.columns(table_columns_widths.length - 1).style do |c|
+      c.borders = c.borders + [:right]
+    end
+  end
+
+  def adjust_borders_spanned_column(table)
+    table.columns(1).style do |c|
+      if c.colspan > 1
+        c.borders = %i[left right bottom]
+        c.padding = [0, TABLE_CELL_PADDING, TABLE_CELL_PADDING + 2, TABLE_CELL_PADDING]
+        row_nr = c.row - 1
+        values = table.columns(1..-1).rows(row_nr..row_nr)
+        values.each do |cell|
+          cell.borders = cell.borders - [:bottom]
+        end
+      end
+    end
+  end
+
+  def adjust_border_header_row(table)
+    table.rows(0).style do |c|
+      c.borders = c.borders + [:top]
+      c.font_style = :bold
+    end
+  end
+
+  def split_group_rows(table_rows)
+    measure_table = build_table(table_rows)
+    groups = []
+    index = 0
+    while index < table_rows.length
+      row = table_rows[index]
+      rows = [row]
+      height = measure_table.row(index).height
+      index += 1
+      if (row[0][:rowspan] || 1) > 1
+        rows.push(table_rows[index])
+        height += measure_table.row(index).height
+        index += 1
+      end
+      groups.push({ rows:, height: })
+    end
+    groups
+  end
+
+  def write_table(user, entries)
+    rows = build_table_rows(entries)
+    # prawn-table does not support splitting a rowspan cell on page break, so we have to merge the first column manually
+    # for easier handling existing rowspan cells are grouped as one row
+    grouped_rows = split_group_rows(rows)
+    # start a new page if the username would be printed alone at the end of the page
+    pdf.start_new_page if available_space_from_bottom < grouped_rows[0][:height] + grouped_rows[1][:height] + username_height
+    write_username(user)
+    write_grouped_tables(grouped_rows)
+  end
+
+  def available_space_from_bottom
+    margin_bottom = pdf.options[:bottom_margin] + 20 # 20 is the safety margin
+    pdf.y - margin_bottom
+  end
+
+  def write_grouped_tables(grouped_rows)
+    header_row = grouped_rows[0]
+    current_table = []
+    current_table_height = 0
+    grouped_rows.each do |grouped_row|
+      grouped_row_height = grouped_row[:height]
+      if current_table_height + grouped_row_height >= available_space_from_bottom
+        write_grouped_row_table(current_table)
+        pdf.start_new_page
+        current_table = [header_row]
+        current_table_height = header_row[:height]
+      end
+      current_table.push(grouped_row)
+      current_table_height += grouped_row_height
+    end
+    write_grouped_row_table(current_table)
+    pdf.move_down(28)
+  end
+
+  def write_grouped_row_table(grouped_rows)
+    current_table = []
+    merge_first_columns(grouped_rows)
+    grouped_rows.map! { |row| current_table.concat(row[:rows]) }
+    build_table(current_table).draw
+  end
+
+  def merge_first_columns(grouped_rows)
+    last_row = grouped_rows[1]
+    index = 2
+    while index < grouped_rows.length
+      grouped_row = grouped_rows[index]
+      last_row = merge_first_rows(grouped_row, last_row)
+      index += 1
+    end
+  end
+
+  def merge_first_rows(grouped_row, last_row)
+    grouped_cell = grouped_row[:rows][0][0]
+    last_cell = last_row[:rows][0][0]
+    if grouped_cell[:content] == last_cell[:content]
+      last_cell[:rowspan] += grouped_cell[:rowspan]
+      grouped_row[:rows][0].shift
+      last_row
+    else
+      grouped_row
+    end
+  end
+
+  def sorted_results
+    query.each_direct_result.map(&:itself)
+  end
+
+  def write_hr!
+    hr_style = styles.cover_header_border
+    write_horizontal_line(pdf.cursor, hr_style[:height], hr_style[:color])
+    pdf.move_down(HR_MARGIN_BOTTOM)
+  end
+
+  def write_heading!
+    pdf.formatted_text([{ text: heading, size: H1_FONT_SIZE, style: :bold }])
+    pdf.move_down(H1_MARGIN_BOTTOM)
+  end
+
+  def username_height
+    20 + 10
+  end
+
+  def write_username(user)
+    pdf.formatted_text([{ text: user.name, size: H2_FONT_SIZE }])
+    pdf.move_down(H2_MARGIN_BOTTOM)
+  end
+
+  def footer_date
+    if pdf.page_number == 1
+      format_time(Time.zone.now)
+    else
+      format_date(Time.zone.now)
+    end
+  end
+
+  def format_hours(hours)
+    return "" if hours < 0
+
+    DurationConverter.output(hours)
+  end
+
+  def format_spent_on_time(entry)
+    start_timestamp = entry.start_timestamp
+    return "" if start_timestamp.nil?
+
+    result = format_time(start_timestamp, include_date: false)
+    end_timestamp = entry.end_timestamp
+    return result if end_timestamp.nil?
+
+    days_between_suffix = format_days_between(start_timestamp, end_timestamp)
+    "#{result} - #{format_time(end_timestamp, include_date: false)}#{days_between_suffix}"
+  end
+
+  def format_days_between(start_timestamp, end_timestamp)
+    days_between = (end_timestamp.to_date - start_timestamp.to_date).to_i
+    if days_between.positive?
+      " (+#{days_formatter.format_value(days_between, nil).delete(' ')})"
+    end
+  end
+
+  def days_formatter
+    @days_formatter ||= WorkPackage::Exports::Formatters::Days.new(nil)
+  end
+
+  def with_times_column?
+    Setting.allow_tracking_start_and_end_times
+  end
+
+  def with_cover?
+    true
+  end
+
+  def wants_total_page_nrs?
+    true
+  end
+end
diff --git a/modules/reporting/app/workers/cost_query/export_job.rb b/modules/reporting/app/workers/cost_query/xls/export_job.rb
similarity index 56%
rename from modules/reporting/app/workers/cost_query/export_job.rb
rename to modules/reporting/app/workers/cost_query/xls/export_job.rb
index baf38d88896b..e9cdda62daab 100644
--- a/modules/reporting/app/workers/cost_query/export_job.rb
+++ b/modules/reporting/app/workers/cost_query/xls/export_job.rb
@@ -1,12 +1,8 @@
 require "active_storage/filename"
 
-class CostQuery::ExportJob < Exports::ExportJob
+class CostQuery::XLS::ExportJob < Exports::ExportJob
   self.model = ::CostQuery
 
-  def title
-    I18n.t("export.cost_reports.title")
-  end
-
   def project
     options[:project]
   end
@@ -15,11 +11,15 @@ def cost_types
     options[:cost_types]
   end
 
+  def title
+    I18n.t("export.cost_reports.title")
+  end
+
   private
 
   def prepare!
     CostQuery::Cache.check
-    self.query = build_query(query)
+    self.query = CostQuery.build_query(project, query)
   end
 
   def export!
@@ -39,24 +39,4 @@ def xls_report_result
                           mime_type: "application/vnd.ms-excel",
                           content:)
   end
-
-  # rubocop:disable Metrics/AbcSize
-  def build_query(filters, groups = {})
-    query = CostQuery.new(project:)
-    query.tap do |q|
-      filters[:operators].each do |filter, operator|
-        unless filters[:values][filter] == ["<<inactive>>"]
-          values = Array(filters[:values][filter]).map { |v| v == "<<null>>" ? nil : v }
-          q.filter(filter.to_sym,
-                   operator:,
-                   values:)
-        end
-      end
-    end
-    groups[:columns].try(:reverse_each) { |c| query.column(c) }
-    groups[:rows].try(:reverse_each) { |r| query.row(r) }
-    query
-  end
-
-  # rubocop:enable Metrics/AbcSize
 end
diff --git a/modules/reporting/config/locales/crowdin/af.yml b/modules/reporting/config/locales/crowdin/af.yml
index f617532533bc..57c062824a6c 100644
--- a/modules/reporting/config/locales/crowdin/af.yml
+++ b/modules/reporting/config/locales/crowdin/af.yml
@@ -86,6 +86,11 @@ af:
   validation_failure_date: "is not a valid date"
   validation_failure_integer: "is not a valid integer"
   export:
+    timesheet:
+      title: "Your PDF timesheet export"
+      button: "Export PDF timesheet"
+      timesheet: "Timesheet"
+      time: "Time"
     cost_reports:
       title: "Your Cost Reports XLS export"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/ar.yml b/modules/reporting/config/locales/crowdin/ar.yml
index 61c27bfd8a3c..6bc2fadeb24e 100644
--- a/modules/reporting/config/locales/crowdin/ar.yml
+++ b/modules/reporting/config/locales/crowdin/ar.yml
@@ -86,6 +86,11 @@ ar:
   validation_failure_date: "ليس تاريخًا صالحًا"
   validation_failure_integer: "ليس عددًا صحيحًا صالحًا"
   export:
+    timesheet:
+      title: "Your PDF timesheet export"
+      button: "Export PDF timesheet"
+      timesheet: "Timesheet"
+      time: "Time"
     cost_reports:
       title: "Your Cost Reports XLS export"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/az.yml b/modules/reporting/config/locales/crowdin/az.yml
index 4e5ffec447cd..8494a1d7445e 100644
--- a/modules/reporting/config/locales/crowdin/az.yml
+++ b/modules/reporting/config/locales/crowdin/az.yml
@@ -86,6 +86,11 @@ az:
   validation_failure_date: "is not a valid date"
   validation_failure_integer: "is not a valid integer"
   export:
+    timesheet:
+      title: "Your PDF timesheet export"
+      button: "Export PDF timesheet"
+      timesheet: "Timesheet"
+      time: "Time"
     cost_reports:
       title: "Your Cost Reports XLS export"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/be.yml b/modules/reporting/config/locales/crowdin/be.yml
index 8e2f2499f896..738a5431b765 100644
--- a/modules/reporting/config/locales/crowdin/be.yml
+++ b/modules/reporting/config/locales/crowdin/be.yml
@@ -86,6 +86,11 @@ be:
   validation_failure_date: "is not a valid date"
   validation_failure_integer: "is not a valid integer"
   export:
+    timesheet:
+      title: "Your PDF timesheet export"
+      button: "Export PDF timesheet"
+      timesheet: "Timesheet"
+      time: "Time"
     cost_reports:
       title: "Your Cost Reports XLS export"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/bg.yml b/modules/reporting/config/locales/crowdin/bg.yml
index 6078453933e1..2b6dbcff67d2 100644
--- a/modules/reporting/config/locales/crowdin/bg.yml
+++ b/modules/reporting/config/locales/crowdin/bg.yml
@@ -86,6 +86,11 @@ bg:
   validation_failure_date: "не е валидна дата"
   validation_failure_integer: "не е валидно цяло число"
   export:
+    timesheet:
+      title: "Your PDF timesheet export"
+      button: "Export PDF timesheet"
+      timesheet: "Timesheet"
+      time: "Time"
     cost_reports:
       title: "Вашият износ на отчети за разходите XLS"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/ca.yml b/modules/reporting/config/locales/crowdin/ca.yml
index b916dcbeec3d..aef19f3a48d4 100644
--- a/modules/reporting/config/locales/crowdin/ca.yml
+++ b/modules/reporting/config/locales/crowdin/ca.yml
@@ -86,6 +86,11 @@ ca:
   validation_failure_date: "no és una data vàlida"
   validation_failure_integer: "no és un enter vàlid"
   export:
+    timesheet:
+      title: "Your PDF timesheet export"
+      button: "Export PDF timesheet"
+      timesheet: "Timesheet"
+      time: "Time"
     cost_reports:
       title: "La teva exportació de l'informe de costos XLS"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/ckb-IR.yml b/modules/reporting/config/locales/crowdin/ckb-IR.yml
index d35738b1e445..64b6bc7ffa5c 100644
--- a/modules/reporting/config/locales/crowdin/ckb-IR.yml
+++ b/modules/reporting/config/locales/crowdin/ckb-IR.yml
@@ -86,6 +86,11 @@ ckb-IR:
   validation_failure_date: "is not a valid date"
   validation_failure_integer: "is not a valid integer"
   export:
+    timesheet:
+      title: "Your PDF timesheet export"
+      button: "Export PDF timesheet"
+      timesheet: "Timesheet"
+      time: "Time"
     cost_reports:
       title: "Your Cost Reports XLS export"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/cs.yml b/modules/reporting/config/locales/crowdin/cs.yml
index 0324c1791dfb..988da86fc741 100644
--- a/modules/reporting/config/locales/crowdin/cs.yml
+++ b/modules/reporting/config/locales/crowdin/cs.yml
@@ -86,6 +86,11 @@ cs:
   validation_failure_date: "není platné datum"
   validation_failure_integer: "není platné číslo"
   export:
+    timesheet:
+      title: "Export vašeho výkazu do formátu PDF"
+      button: "Exportovat výkaz PDF"
+      timesheet: "Pracovní výkaz"
+      time: "Čas"
     cost_reports:
       title: "Váš export XLS zprávy o nákladech"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/da.yml b/modules/reporting/config/locales/crowdin/da.yml
index a3c882ab617d..41e76bce110e 100644
--- a/modules/reporting/config/locales/crowdin/da.yml
+++ b/modules/reporting/config/locales/crowdin/da.yml
@@ -86,6 +86,11 @@ da:
   validation_failure_date: "er en ugyldig dato"
   validation_failure_integer: "er et ugyldigt heltal"
   export:
+    timesheet:
+      title: "Your PDF timesheet export"
+      button: "Export PDF timesheet"
+      timesheet: "Timesheet"
+      time: "Time"
     cost_reports:
       title: "Your Cost Reports XLS export"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/de.yml b/modules/reporting/config/locales/crowdin/de.yml
index 6030bae93c88..c2095cf00632 100644
--- a/modules/reporting/config/locales/crowdin/de.yml
+++ b/modules/reporting/config/locales/crowdin/de.yml
@@ -86,6 +86,11 @@ de:
   validation_failure_date: "ist kein gültiges Datum"
   validation_failure_integer: "ist keine ganze Zahl"
   export:
+    timesheet:
+      title: "Ihr PDF-Export des Stundenzettels"
+      button: "Stundenzettel als PDF exportieren"
+      timesheet: "Stundenzettel"
+      time: "Stunden"
     cost_reports:
       title: "Kostenbericht als XLS-Export"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/el.yml b/modules/reporting/config/locales/crowdin/el.yml
index f9915dd7309f..7f3b0f679be9 100644
--- a/modules/reporting/config/locales/crowdin/el.yml
+++ b/modules/reporting/config/locales/crowdin/el.yml
@@ -86,6 +86,11 @@ el:
   validation_failure_date: "δεν είναι έγκυρη ημερομηνία"
   validation_failure_integer: "δεν είναι έγκυρος ακέραιος αριθμός"
   export:
+    timesheet:
+      title: "Your PDF timesheet export"
+      button: "Export PDF timesheet"
+      timesheet: "Timesheet"
+      time: "Time"
     cost_reports:
       title: "Your Cost Reports XLS export"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/eo.yml b/modules/reporting/config/locales/crowdin/eo.yml
index 9dcef2eba7c3..bce2b1795803 100644
--- a/modules/reporting/config/locales/crowdin/eo.yml
+++ b/modules/reporting/config/locales/crowdin/eo.yml
@@ -86,6 +86,11 @@ eo:
   validation_failure_date: "is not a valid date"
   validation_failure_integer: "is not a valid integer"
   export:
+    timesheet:
+      title: "Your PDF timesheet export"
+      button: "Export PDF timesheet"
+      timesheet: "Timesheet"
+      time: "Time"
     cost_reports:
       title: "Your Cost Reports XLS export"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/es.yml b/modules/reporting/config/locales/crowdin/es.yml
index 3f00d37bf8d0..7c7a26d855ef 100644
--- a/modules/reporting/config/locales/crowdin/es.yml
+++ b/modules/reporting/config/locales/crowdin/es.yml
@@ -86,6 +86,11 @@ es:
   validation_failure_date: "no es una fecha válida"
   validation_failure_integer: "no es un entero válido"
   export:
+    timesheet:
+      title: "Su exportación de registro horario en PDF"
+      button: "Exportar registro horario en PDF"
+      timesheet: "Registro horario"
+      time: "Tiempo"
     cost_reports:
       title: "Su exportación de informes de costes XLS"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/et.yml b/modules/reporting/config/locales/crowdin/et.yml
index 4a183d25bf69..11fd40508e8d 100644
--- a/modules/reporting/config/locales/crowdin/et.yml
+++ b/modules/reporting/config/locales/crowdin/et.yml
@@ -86,6 +86,11 @@ et:
   validation_failure_date: "pole korrektne kuupäev"
   validation_failure_integer: "pole täisarv"
   export:
+    timesheet:
+      title: "Your PDF timesheet export"
+      button: "Export PDF timesheet"
+      timesheet: "Timesheet"
+      time: "Time"
     cost_reports:
       title: "Your Cost Reports XLS export"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/eu.yml b/modules/reporting/config/locales/crowdin/eu.yml
index 42288069c064..db594cb00694 100644
--- a/modules/reporting/config/locales/crowdin/eu.yml
+++ b/modules/reporting/config/locales/crowdin/eu.yml
@@ -86,6 +86,11 @@ eu:
   validation_failure_date: "is not a valid date"
   validation_failure_integer: "is not a valid integer"
   export:
+    timesheet:
+      title: "Your PDF timesheet export"
+      button: "Export PDF timesheet"
+      timesheet: "Timesheet"
+      time: "Time"
     cost_reports:
       title: "Your Cost Reports XLS export"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/fa.yml b/modules/reporting/config/locales/crowdin/fa.yml
index fa647885b55b..05b1ba74b22a 100644
--- a/modules/reporting/config/locales/crowdin/fa.yml
+++ b/modules/reporting/config/locales/crowdin/fa.yml
@@ -86,6 +86,11 @@ fa:
   validation_failure_date: "is not a valid date"
   validation_failure_integer: "عدد درست نیست"
   export:
+    timesheet:
+      title: "Your PDF timesheet export"
+      button: "Export PDF timesheet"
+      timesheet: "Timesheet"
+      time: "Time"
     cost_reports:
       title: "Your Cost Reports XLS export"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/fi.yml b/modules/reporting/config/locales/crowdin/fi.yml
index f830e2d37663..9a2748920c48 100644
--- a/modules/reporting/config/locales/crowdin/fi.yml
+++ b/modules/reporting/config/locales/crowdin/fi.yml
@@ -86,6 +86,11 @@ fi:
   validation_failure_date: "ei ole kelvollinen päivämäärä"
   validation_failure_integer: "ei ole kelvollinen kokonaisluku"
   export:
+    timesheet:
+      title: "Your PDF timesheet export"
+      button: "Export PDF timesheet"
+      timesheet: "Timesheet"
+      time: "Time"
     cost_reports:
       title: "Your Cost Reports XLS export"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/fil.yml b/modules/reporting/config/locales/crowdin/fil.yml
index bdb0afc98457..cf1237ed162b 100644
--- a/modules/reporting/config/locales/crowdin/fil.yml
+++ b/modules/reporting/config/locales/crowdin/fil.yml
@@ -86,6 +86,11 @@ fil:
   validation_failure_date: "is not a valid date"
   validation_failure_integer: "is not a valid integer"
   export:
+    timesheet:
+      title: "Your PDF timesheet export"
+      button: "Export PDF timesheet"
+      timesheet: "Timesheet"
+      time: "Time"
     cost_reports:
       title: "Your Cost Reports XLS export"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/fr.yml b/modules/reporting/config/locales/crowdin/fr.yml
index 056f59b49830..645658854f6f 100644
--- a/modules/reporting/config/locales/crowdin/fr.yml
+++ b/modules/reporting/config/locales/crowdin/fr.yml
@@ -86,6 +86,11 @@ fr:
   validation_failure_date: "n'est pas une date valide"
   validation_failure_integer: "n'est pas un nombre entier valide"
   export:
+    timesheet:
+      title: "Export de votre feuille de temps PDF"
+      button: "Exporter la feuille de temps PDF"
+      timesheet: "Feuille de temps"
+      time: "Temps"
     cost_reports:
       title: "Exportation XLS de vos rapports de coûts"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/he.yml b/modules/reporting/config/locales/crowdin/he.yml
index 473775a2ca90..1b6c555c0731 100644
--- a/modules/reporting/config/locales/crowdin/he.yml
+++ b/modules/reporting/config/locales/crowdin/he.yml
@@ -86,6 +86,11 @@ he:
   validation_failure_date: "אינו תאריך בר תוקף"
   validation_failure_integer: "אינו מספר שלם חוקי"
   export:
+    timesheet:
+      title: "Your PDF timesheet export"
+      button: "Export PDF timesheet"
+      timesheet: "Timesheet"
+      time: "Time"
     cost_reports:
       title: "Your Cost Reports XLS export"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/hi.yml b/modules/reporting/config/locales/crowdin/hi.yml
index 71ab923ff234..b1d47b506e16 100644
--- a/modules/reporting/config/locales/crowdin/hi.yml
+++ b/modules/reporting/config/locales/crowdin/hi.yml
@@ -86,6 +86,11 @@ hi:
   validation_failure_date: "is not a valid date"
   validation_failure_integer: "is not a valid integer"
   export:
+    timesheet:
+      title: "Your PDF timesheet export"
+      button: "Export PDF timesheet"
+      timesheet: "Timesheet"
+      time: "Time"
     cost_reports:
       title: "Your Cost Reports XLS export"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/hr.yml b/modules/reporting/config/locales/crowdin/hr.yml
index 6c7b53f73e44..28a98ea6434b 100644
--- a/modules/reporting/config/locales/crowdin/hr.yml
+++ b/modules/reporting/config/locales/crowdin/hr.yml
@@ -86,6 +86,11 @@ hr:
   validation_failure_date: "nije valjan datum"
   validation_failure_integer: "nije valjan cijeli broj"
   export:
+    timesheet:
+      title: "Your PDF timesheet export"
+      button: "Export PDF timesheet"
+      timesheet: "Timesheet"
+      time: "Time"
     cost_reports:
       title: "Your Cost Reports XLS export"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/hu.yml b/modules/reporting/config/locales/crowdin/hu.yml
index f07d543052be..78d965eee2e0 100644
--- a/modules/reporting/config/locales/crowdin/hu.yml
+++ b/modules/reporting/config/locales/crowdin/hu.yml
@@ -86,6 +86,11 @@ hu:
   validation_failure_date: "nem érvényes dátum"
   validation_failure_integer: "nem érvényes egész szám"
   export:
+    timesheet:
+      title: "Your PDF timesheet export"
+      button: "Export PDF timesheet"
+      timesheet: "Timesheet"
+      time: "Time"
     cost_reports:
       title: "Költségjelentés készítése XLS formában"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/id.yml b/modules/reporting/config/locales/crowdin/id.yml
index d7f72048887a..a2c5b977deba 100644
--- a/modules/reporting/config/locales/crowdin/id.yml
+++ b/modules/reporting/config/locales/crowdin/id.yml
@@ -86,6 +86,11 @@ id:
   validation_failure_date: "validasi tanggal gagal"
   validation_failure_integer: "validasi bilangan bulat gagal"
   export:
+    timesheet:
+      title: "Your PDF timesheet export"
+      button: "Ekspor absensi PDF"
+      timesheet: "Absensi"
+      time: "Waktu"
     cost_reports:
       title: "Ekspor XLS Laporan Biaya Anda"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/it.yml b/modules/reporting/config/locales/crowdin/it.yml
index d68fba3b8275..d1d0f0cd3a03 100644
--- a/modules/reporting/config/locales/crowdin/it.yml
+++ b/modules/reporting/config/locales/crowdin/it.yml
@@ -86,6 +86,11 @@ it:
   validation_failure_date: "non è una data valida"
   validation_failure_integer: "non è un numero intero valido"
   export:
+    timesheet:
+      title: "Esportazione del tuo foglio presenze in formato PDF"
+      button: "Esportazione del foglio presenze in PDF"
+      timesheet: "Foglio presenze"
+      time: "Ora"
     cost_reports:
       title: "Esportazione XLS dei report sui costi"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/ja.yml b/modules/reporting/config/locales/crowdin/ja.yml
index d73d1a3f1d9e..f4e5a172fbfb 100644
--- a/modules/reporting/config/locales/crowdin/ja.yml
+++ b/modules/reporting/config/locales/crowdin/ja.yml
@@ -86,6 +86,11 @@ ja:
   validation_failure_date: "は有効な日付ではありません。"
   validation_failure_integer: "は有効な整数ではありません。"
   export:
+    timesheet:
+      title: "Your PDF timesheet export"
+      button: "Export PDF timesheet"
+      timesheet: "Timesheet"
+      time: "Time"
     cost_reports:
       title: "あなたのコストレポートXLSのエクスポート"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/ka.yml b/modules/reporting/config/locales/crowdin/ka.yml
index 93685fdcb025..17f4b561e06e 100644
--- a/modules/reporting/config/locales/crowdin/ka.yml
+++ b/modules/reporting/config/locales/crowdin/ka.yml
@@ -86,6 +86,11 @@ ka:
   validation_failure_date: "is not a valid date"
   validation_failure_integer: "is not a valid integer"
   export:
+    timesheet:
+      title: "Your PDF timesheet export"
+      button: "Export PDF timesheet"
+      timesheet: "Timesheet"
+      time: "Time"
     cost_reports:
       title: "Your Cost Reports XLS export"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/kk.yml b/modules/reporting/config/locales/crowdin/kk.yml
index 8bf1fb6095da..0879b51229e1 100644
--- a/modules/reporting/config/locales/crowdin/kk.yml
+++ b/modules/reporting/config/locales/crowdin/kk.yml
@@ -86,6 +86,11 @@ kk:
   validation_failure_date: "is not a valid date"
   validation_failure_integer: "is not a valid integer"
   export:
+    timesheet:
+      title: "Your PDF timesheet export"
+      button: "Export PDF timesheet"
+      timesheet: "Timesheet"
+      time: "Time"
     cost_reports:
       title: "Your Cost Reports XLS export"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/ko.yml b/modules/reporting/config/locales/crowdin/ko.yml
index ab4a55fcc858..501becdbb06a 100644
--- a/modules/reporting/config/locales/crowdin/ko.yml
+++ b/modules/reporting/config/locales/crowdin/ko.yml
@@ -86,6 +86,11 @@ ko:
   validation_failure_date: "은(는) 유효한 날짜가 아닙니다."
   validation_failure_integer: "은(는) 유효한 정수가 아닙니다."
   export:
+    timesheet:
+      title: "내 PDF 타임시트 내보내기"
+      button: "PDF 타임시트 내보내기"
+      timesheet: "타임시트"
+      time: "시간"
     cost_reports:
       title: "비용 리포트 XML로 내보내기"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/lt.yml b/modules/reporting/config/locales/crowdin/lt.yml
index 77c767edddeb..4463ae0a5c5f 100644
--- a/modules/reporting/config/locales/crowdin/lt.yml
+++ b/modules/reporting/config/locales/crowdin/lt.yml
@@ -86,6 +86,11 @@ lt:
   validation_failure_date: "nėra tinkama data"
   validation_failure_integer: "nėra tinkamas sveikas skaičius"
   export:
+    timesheet:
+      title: "Your PDF timesheet export"
+      button: "Export PDF timesheet"
+      timesheet: "Timesheet"
+      time: "Time"
     cost_reports:
       title: "Jūsų kainos ataskaitų XLS eksportas"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/lv.yml b/modules/reporting/config/locales/crowdin/lv.yml
index 3d3b7742aad0..a3fd4fbbcd3b 100644
--- a/modules/reporting/config/locales/crowdin/lv.yml
+++ b/modules/reporting/config/locales/crowdin/lv.yml
@@ -86,6 +86,11 @@ lv:
   validation_failure_date: "nav derīgs datums"
   validation_failure_integer: "nav derīgs vesels skaitlis"
   export:
+    timesheet:
+      title: "Your PDF timesheet export"
+      button: "Export PDF timesheet"
+      timesheet: "Timesheet"
+      time: "Time"
     cost_reports:
       title: "Your Cost Reports XLS export"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/mn.yml b/modules/reporting/config/locales/crowdin/mn.yml
index a19f68253498..d6254bf6dff7 100644
--- a/modules/reporting/config/locales/crowdin/mn.yml
+++ b/modules/reporting/config/locales/crowdin/mn.yml
@@ -86,6 +86,11 @@ mn:
   validation_failure_date: "is not a valid date"
   validation_failure_integer: "is not a valid integer"
   export:
+    timesheet:
+      title: "Your PDF timesheet export"
+      button: "Export PDF timesheet"
+      timesheet: "Timesheet"
+      time: "Time"
     cost_reports:
       title: "Your Cost Reports XLS export"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/ms.yml b/modules/reporting/config/locales/crowdin/ms.yml
index 0d016ef01e5e..2b571189d0c3 100644
--- a/modules/reporting/config/locales/crowdin/ms.yml
+++ b/modules/reporting/config/locales/crowdin/ms.yml
@@ -23,7 +23,7 @@ ms:
   plugin_openproject_reporting:
     name: "Pelaporan OpenProject"
     description: "Plugin ini membenarkan untuk mencipta laporan kos tersuai dengan penyaring dan pengumpulan yang dibuat oleh plugin Masa dan kos OpenProject."
-  button_save_report_as: "Save report as..."
+  button_save_report_as: "Simpan laporan sebagai..."
   comments: "Komen"
   cost_reports_title: "Masa dan kos"
   label_cost_report: "Laporan kos"
@@ -86,6 +86,11 @@ ms:
   validation_failure_date: "bukan tarikh yang sah"
   validation_failure_integer: "bukan integer yang sah"
   export:
+    timesheet:
+      title: "Eksport helaian masa PDF anda"
+      button: "Eksport lembaran masa PDF"
+      timesheet: "Lembaran masa"
+      time: "Masa"
     cost_reports:
       title: "Eksport Laporan Kos XLS anda"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/ne.yml b/modules/reporting/config/locales/crowdin/ne.yml
index e4653bd905e5..05f56d7be845 100644
--- a/modules/reporting/config/locales/crowdin/ne.yml
+++ b/modules/reporting/config/locales/crowdin/ne.yml
@@ -86,6 +86,11 @@ ne:
   validation_failure_date: "is not a valid date"
   validation_failure_integer: "is not a valid integer"
   export:
+    timesheet:
+      title: "Your PDF timesheet export"
+      button: "Export PDF timesheet"
+      timesheet: "Timesheet"
+      time: "Time"
     cost_reports:
       title: "Your Cost Reports XLS export"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/nl.yml b/modules/reporting/config/locales/crowdin/nl.yml
index 13c1214251bd..75e59f722a53 100644
--- a/modules/reporting/config/locales/crowdin/nl.yml
+++ b/modules/reporting/config/locales/crowdin/nl.yml
@@ -86,6 +86,11 @@ nl:
   validation_failure_date: "is geen geldige datum"
   validation_failure_integer: "is geen geldig geheel getal"
   export:
+    timesheet:
+      title: "Uw PDF-tijdregistratie export"
+      button: "Exporteer PDF-tijdregistratie"
+      timesheet: "Tijdregistratie"
+      time: "Tijd"
     cost_reports:
       title: "Jouw kostenrapporten XLS export"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/no.yml b/modules/reporting/config/locales/crowdin/no.yml
index c2e8bf679c9e..385d44f3b806 100644
--- a/modules/reporting/config/locales/crowdin/no.yml
+++ b/modules/reporting/config/locales/crowdin/no.yml
@@ -86,6 +86,11 @@
   validation_failure_date: "er ikke en gyldig dato"
   validation_failure_integer: "er ikke et gyldig heltall"
   export:
+    timesheet:
+      title: "Your PDF timesheet export"
+      button: "Export PDF timesheet"
+      timesheet: "Timesheet"
+      time: "Time"
     cost_reports:
       title: "Din XLS-eksport av kostnadsrapporter"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/pl.yml b/modules/reporting/config/locales/crowdin/pl.yml
index 33ea7fac3472..455268d97910 100644
--- a/modules/reporting/config/locales/crowdin/pl.yml
+++ b/modules/reporting/config/locales/crowdin/pl.yml
@@ -86,6 +86,11 @@ pl:
   validation_failure_date: "nie jest poprawną datą"
   validation_failure_integer: "nie jest prawidłową liczbą całkowitą"
   export:
+    timesheet:
+      title: "Eksport Twojej karty czasu pracy w formacie PDF"
+      button: "Wyeksportuj kartę czasu pracy w formacie PDF"
+      timesheet: "Karta czasu pracy"
+      time: "Czas"
     cost_reports:
       title: "Twój eksport raportów kosztów w formacie XLS"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/pt-BR.yml b/modules/reporting/config/locales/crowdin/pt-BR.yml
index 6d1af56ae022..03be8d4c19a6 100644
--- a/modules/reporting/config/locales/crowdin/pt-BR.yml
+++ b/modules/reporting/config/locales/crowdin/pt-BR.yml
@@ -86,6 +86,11 @@ pt-BR:
   validation_failure_date: "não é uma data válida"
   validation_failure_integer: "não é um valor inteiro válido"
   export:
+    timesheet:
+      title: "Sua exportação de planilha de horas em PDF"
+      button: "Exportar planilha de horas em PDF"
+      timesheet: "Planilha de horas"
+      time: "Hora"
     cost_reports:
       title: "Exportação XLS dos seus relatórios de custos"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/pt-PT.yml b/modules/reporting/config/locales/crowdin/pt-PT.yml
index eb8aa480d16f..3b9d69aa43ce 100644
--- a/modules/reporting/config/locales/crowdin/pt-PT.yml
+++ b/modules/reporting/config/locales/crowdin/pt-PT.yml
@@ -86,6 +86,11 @@ pt-PT:
   validation_failure_date: "não é uma data válida"
   validation_failure_integer: "não é um número inteiro válido"
   export:
+    timesheet:
+      title: "A sua exportação do registo horário em PDF"
+      button: "Exportar registo horário em PDF"
+      timesheet: "Registo horário"
+      time: "Hora"
     cost_reports:
       title: "A sua exportação dos Relatórios de Custo XLS"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/ro.yml b/modules/reporting/config/locales/crowdin/ro.yml
index 843909fe1ef6..495c67319309 100644
--- a/modules/reporting/config/locales/crowdin/ro.yml
+++ b/modules/reporting/config/locales/crowdin/ro.yml
@@ -86,6 +86,11 @@ ro:
   validation_failure_date: "nu e o dată validă"
   validation_failure_integer: "nu e un întreg valid"
   export:
+    timesheet:
+      title: "Your PDF timesheet export"
+      button: "Export PDF timesheet"
+      timesheet: "Timesheet"
+      time: "Timp"
     cost_reports:
       title: "Exportul dumneavoastră de rapoarte de costuri XLS"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/ru.yml b/modules/reporting/config/locales/crowdin/ru.yml
index cf25ab9cc973..02fdaa9f09f4 100644
--- a/modules/reporting/config/locales/crowdin/ru.yml
+++ b/modules/reporting/config/locales/crowdin/ru.yml
@@ -86,6 +86,11 @@ ru:
   validation_failure_date: "не является допустимой датой"
   validation_failure_integer: "не является допустимым целым числом"
   export:
+    timesheet:
+      title: "Ваши табели учета рабочего времени, экспортированные в PDF"
+      button: "Экспорт табеля учета рабочего времени в PDF"
+      timesheet: "Табель учета рабочего времени"
+      time: "Время"
     cost_reports:
       title: "Экспорт ваших отчетов о затратах в XLS"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/rw.yml b/modules/reporting/config/locales/crowdin/rw.yml
index 6a276a232a8a..19c783f56867 100644
--- a/modules/reporting/config/locales/crowdin/rw.yml
+++ b/modules/reporting/config/locales/crowdin/rw.yml
@@ -86,6 +86,11 @@ rw:
   validation_failure_date: "is not a valid date"
   validation_failure_integer: "is not a valid integer"
   export:
+    timesheet:
+      title: "Your PDF timesheet export"
+      button: "Export PDF timesheet"
+      timesheet: "Timesheet"
+      time: "Time"
     cost_reports:
       title: "Your Cost Reports XLS export"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/si.yml b/modules/reporting/config/locales/crowdin/si.yml
index 95217d9ed61e..09b324f68034 100644
--- a/modules/reporting/config/locales/crowdin/si.yml
+++ b/modules/reporting/config/locales/crowdin/si.yml
@@ -86,6 +86,11 @@ si:
   validation_failure_date: "is not a valid date"
   validation_failure_integer: "is not a valid integer"
   export:
+    timesheet:
+      title: "Your PDF timesheet export"
+      button: "Export PDF timesheet"
+      timesheet: "Timesheet"
+      time: "Time"
     cost_reports:
       title: "Your Cost Reports XLS export"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/sk.yml b/modules/reporting/config/locales/crowdin/sk.yml
index 61797830140e..826a97504012 100644
--- a/modules/reporting/config/locales/crowdin/sk.yml
+++ b/modules/reporting/config/locales/crowdin/sk.yml
@@ -86,6 +86,11 @@ sk:
   validation_failure_date: "nie je platný dátum"
   validation_failure_integer: "nie je platné celé číslo"
   export:
+    timesheet:
+      title: "Your PDF timesheet export"
+      button: "Export PDF timesheet"
+      timesheet: "Timesheet"
+      time: "Time"
     cost_reports:
       title: "Váš XLS export správy o nákladoch"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/sl.yml b/modules/reporting/config/locales/crowdin/sl.yml
index da32b0289575..8743ad06ceb5 100644
--- a/modules/reporting/config/locales/crowdin/sl.yml
+++ b/modules/reporting/config/locales/crowdin/sl.yml
@@ -86,6 +86,11 @@ sl:
   validation_failure_date: "ni veljaven datum"
   validation_failure_integer: "ni veljavno število"
   export:
+    timesheet:
+      title: "Your PDF timesheet export"
+      button: "Export PDF timesheet"
+      timesheet: "Timesheet"
+      time: "Time"
     cost_reports:
       title: "Your Cost Reports XLS export"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/sr.yml b/modules/reporting/config/locales/crowdin/sr.yml
index 7d67c2b20d9c..54409bbea091 100644
--- a/modules/reporting/config/locales/crowdin/sr.yml
+++ b/modules/reporting/config/locales/crowdin/sr.yml
@@ -86,6 +86,11 @@ sr:
   validation_failure_date: "is not a valid date"
   validation_failure_integer: "is not a valid integer"
   export:
+    timesheet:
+      title: "Your PDF timesheet export"
+      button: "Export PDF timesheet"
+      timesheet: "Timesheet"
+      time: "Time"
     cost_reports:
       title: "Your Cost Reports XLS export"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/sv.yml b/modules/reporting/config/locales/crowdin/sv.yml
index 13138c8c653c..8a989f5df991 100644
--- a/modules/reporting/config/locales/crowdin/sv.yml
+++ b/modules/reporting/config/locales/crowdin/sv.yml
@@ -86,6 +86,11 @@ sv:
   validation_failure_date: "inte är ett giltigt datum"
   validation_failure_integer: "är inte ett giltigt heltal"
   export:
+    timesheet:
+      title: "Your PDF timesheet export"
+      button: "Export PDF timesheet"
+      timesheet: "Timesheet"
+      time: "Time"
     cost_reports:
       title: "Your Cost Reports XLS export"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/th.yml b/modules/reporting/config/locales/crowdin/th.yml
index c145befd0d23..9e86a22d4db0 100644
--- a/modules/reporting/config/locales/crowdin/th.yml
+++ b/modules/reporting/config/locales/crowdin/th.yml
@@ -86,6 +86,11 @@ th:
   validation_failure_date: "is not a valid date"
   validation_failure_integer: "is not a valid integer"
   export:
+    timesheet:
+      title: "Your PDF timesheet export"
+      button: "Export PDF timesheet"
+      timesheet: "Timesheet"
+      time: "Time"
     cost_reports:
       title: "Your Cost Reports XLS export"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/tr.yml b/modules/reporting/config/locales/crowdin/tr.yml
index 27927363d31f..08170e99acb4 100644
--- a/modules/reporting/config/locales/crowdin/tr.yml
+++ b/modules/reporting/config/locales/crowdin/tr.yml
@@ -86,6 +86,11 @@ tr:
   validation_failure_date: "geçerli bir tarih değil"
   validation_failure_integer: "geçerli bir tamsayı değil"
   export:
+    timesheet:
+      title: "Your PDF timesheet export"
+      button: "Export PDF timesheet"
+      timesheet: "Timesheet"
+      time: "Time"
     cost_reports:
       title: "Maliyet Raporlarınızın XLS çıktısı"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/uk.yml b/modules/reporting/config/locales/crowdin/uk.yml
index 1216f353b5b3..7bd51c681c25 100644
--- a/modules/reporting/config/locales/crowdin/uk.yml
+++ b/modules/reporting/config/locales/crowdin/uk.yml
@@ -86,6 +86,11 @@ uk:
   validation_failure_date: "є недійсною датою"
   validation_failure_integer: "не є дійсним цілим числом"
   export:
+    timesheet:
+      title: "Ваші табелі обліку часу, експортовані в PDF"
+      button: "Експортувати табель обліку часу в PDF"
+      timesheet: "Табель обліку часу"
+      time: "Час"
     cost_reports:
       title: "Експорт звітів про витрати у форматі XLS"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/uz.yml b/modules/reporting/config/locales/crowdin/uz.yml
index e64740d92200..32a28ee62f74 100644
--- a/modules/reporting/config/locales/crowdin/uz.yml
+++ b/modules/reporting/config/locales/crowdin/uz.yml
@@ -86,6 +86,11 @@ uz:
   validation_failure_date: "is not a valid date"
   validation_failure_integer: "is not a valid integer"
   export:
+    timesheet:
+      title: "Your PDF timesheet export"
+      button: "Export PDF timesheet"
+      timesheet: "Timesheet"
+      time: "Time"
     cost_reports:
       title: "Your Cost Reports XLS export"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/vi.yml b/modules/reporting/config/locales/crowdin/vi.yml
index 7a9b5ff2a4ba..b561f31aac02 100644
--- a/modules/reporting/config/locales/crowdin/vi.yml
+++ b/modules/reporting/config/locales/crowdin/vi.yml
@@ -86,6 +86,11 @@ vi:
   validation_failure_date: "không phải là một ngày hợp lệ"
   validation_failure_integer: "không phải là một số nguyên hợp lệ"
   export:
+    timesheet:
+      title: "Your PDF timesheet export"
+      button: "Export PDF timesheet"
+      timesheet: "Timesheet"
+      time: "Time"
     cost_reports:
       title: "Xuất báo cáo chi phí của bạn sang XLS"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/zh-CN.yml b/modules/reporting/config/locales/crowdin/zh-CN.yml
index 65a1822a5020..818a44fb11a1 100644
--- a/modules/reporting/config/locales/crowdin/zh-CN.yml
+++ b/modules/reporting/config/locales/crowdin/zh-CN.yml
@@ -86,6 +86,11 @@ zh-CN:
   validation_failure_date: "不是有效的日期"
   validation_failure_integer: "不是有效的整数"
   export:
+    timesheet:
+      title: "您的 PDF 时间表导出"
+      button: "导出 PDF 时间表"
+      timesheet: "时间表"
+      time: "时间"
     cost_reports:
       title: "您的成本报告 XLS 导出"
   reporting:
diff --git a/modules/reporting/config/locales/crowdin/zh-TW.yml b/modules/reporting/config/locales/crowdin/zh-TW.yml
index 0d72f44f944c..b3ecce8721ae 100644
--- a/modules/reporting/config/locales/crowdin/zh-TW.yml
+++ b/modules/reporting/config/locales/crowdin/zh-TW.yml
@@ -86,6 +86,11 @@ zh-TW:
   validation_failure_date: "不是一個有效日期"
   validation_failure_integer: "不是一個有效的整數"
   export:
+    timesheet:
+      title: "您的時間表PDF匯出"
+      button: "匯出 PDF 時間表"
+      timesheet: "時間表"
+      time: "時間"
     cost_reports:
       title: "您的成本報表(以XLS匯出)"
   reporting:
diff --git a/modules/reporting/config/locales/en.yml b/modules/reporting/config/locales/en.yml
index f028c008e55a..1b56799a2c02 100644
--- a/modules/reporting/config/locales/en.yml
+++ b/modules/reporting/config/locales/en.yml
@@ -105,6 +105,11 @@ en:
   validation_failure_integer: "is not a valid integer"
 
   export:
+    timesheet:
+      title: "Your PDF timesheet export"
+      button: "Export PDF timesheet"
+      timesheet: "Timesheet"
+      time: "Time"
     cost_reports:
       title: "Your Cost Reports XLS export"
 
diff --git a/modules/reporting/spec/features/export_timesheet_spec.rb b/modules/reporting/spec/features/export_timesheet_spec.rb
new file mode 100644
index 000000000000..35f552fc9611
--- /dev/null
+++ b/modules/reporting/spec/features/export_timesheet_spec.rb
@@ -0,0 +1,64 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require_relative "../spec_helper"
+require_relative "support/pages/cost_report_page"
+
+RSpec.describe "Timesheet PDF export", :js do
+  shared_let(:project) { create(:project) }
+  shared_let(:user) { create(:admin) }
+  shared_let(:cost_type) { create(:cost_type, name: "Post-war", unit: "cap", unit_plural: "caps") }
+  shared_let(:work_package) { create(:work_package, project:, subject: "Some task") }
+  shared_let(:cost_entry) { create(:cost_entry, user:, work_package:, project:, cost_type:) }
+  let(:report_page) { Pages::CostReportPage.new project }
+
+  subject { @download_list.refresh_from(page).latest_download.to_s } # rubocop:disable RSpec/InstanceVariable
+
+  before do
+    @download_list = DownloadList.new
+    login_as(user)
+  end
+
+  after do
+    DownloadList.clear
+  end
+
+  it "can download the PDF" do
+    report_page.visit!
+    click_on I18n.t("export.timesheet.button")
+
+    expect(page).to have_content I18n.t("job_status_dialog.generic_messages.in_queue"),
+                                 wait: 10
+    perform_enqueued_jobs
+
+    expect(page).to have_text(I18n.t("export.succeeded"),
+                              wait: 10)
+
+    expect(subject).to have_text(".pdf")
+  end
+end
diff --git a/modules/reporting/spec/workers/cost_query/pdf/export_timesheet_job_spec.rb b/modules/reporting/spec/workers/cost_query/pdf/export_timesheet_job_spec.rb
new file mode 100644
index 000000000000..3bafe2f2f073
--- /dev/null
+++ b/modules/reporting/spec/workers/cost_query/pdf/export_timesheet_job_spec.rb
@@ -0,0 +1,100 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+
+RSpec.describe CostQuery::PDF::ExportTimesheetJob do
+  let(:user) { build_stubbed(:user) }
+  let(:project) { build_stubbed(:project) }
+
+  let(:initial_filter_params) do
+    {
+      project_context: project.id,
+      operators: {
+        user_id: "=", spent_on: ">d", project_id: "="
+      },
+      values: {
+        user_id: ["me"], spent_on: ["2024-03-30", ""], project_id: [project.id.to_s]
+      }
+    }
+  end
+
+  before do
+    mock_permissions_for(user, &:allow_everything)
+  end
+
+  # Performs a cost export with the given extra filters.
+  #
+  # @param extra_filters [Hash] A hash of attribute names and operator/value
+  # pairs to add to the filter.
+  # Example: `{ custom_field_17: ["=", "value"], user_id: ["=", "me"]}`
+  def perform_cost_export(extra_filters: {})
+    query = initial_filter_params.deep_dup
+    extra_filters.each do |attribute_name, operator_and_value|
+      operator, value = operator_and_value
+      query[:operators][attribute_name] = operator
+      query[:values][attribute_name] = value
+    end
+    job = described_class.new(
+      export: CostQuery::Export.create,
+      user:,
+      mime_type: :pdf,
+      query:,
+      project:,
+      cost_types: [-1, 0]
+    )
+    job.perform_now
+    job
+  end
+
+  RSpec::Matchers.define :have_one_attachment_with_content_type do |expected_content_type|
+    def attachments(export_job)
+      export_job.status_reference.attachments
+    end
+
+    match do |export_job|
+      attachments_content_types = attachments(export_job).pluck(:content_type)
+      attachments_content_types == [expected_content_type]
+    end
+
+    failure_message do |export_job|
+      attachments_content_types = attachments(export_job).pluck(:content_type)
+      "expected that #{actual} would have one attachment with mime type #{expected.inspect}, " \
+        "got #{attachments_content_types.inspect} instead"
+    end
+  end
+
+  it "generates an PDF export successfully" do
+    job = perform_cost_export
+
+    expect(job.job_status).to be_success, job.job_status.message
+    expect(job).to have_one_attachment_with_content_type("application/pdf")
+  end
+end
diff --git a/modules/reporting/spec/workers/cost_query/pdf/timesheet_generator_spec.rb b/modules/reporting/spec/workers/cost_query/pdf/timesheet_generator_spec.rb
new file mode 100644
index 000000000000..094739b435d0
--- /dev/null
+++ b/modules/reporting/spec/workers/cost_query/pdf/timesheet_generator_spec.rb
@@ -0,0 +1,168 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+require "pdf/inspector"
+
+RSpec.describe CostQuery::PDF::TimesheetGenerator do
+  include Redmine::I18n
+  let(:query) { create(:cost_query) }
+  let(:user) { create(:user, firstname: "Export", lastname: "User") }
+  let(:time_entry_user) { create(:user, firstname: "TimeEntry", lastname: "User") }
+  let(:project) { create(:project) }
+  let(:generator) { described_class.new(query, project) }
+  let(:export_time) { DateTime.new(2024, 12, 4, 23, 59) }
+  let(:export_time_formatted) { format_time(export_time, include_date: true) }
+  let(:export_date_formatted) { format_date(export_time) }
+  let(:user_time_entry) do
+    create(:time_entry,
+           project:,
+           user: user,
+           spent_on: Date.new(2024, 12, 0o1),
+           start_time: 8 * 60,
+           time_zone: "UTC")
+  end
+  let(:time_entry) do
+    create(:time_entry,
+           project:,
+           user: time_entry_user,
+           spent_on: Date.new(2024, 12, 0o1),
+           start_time: 9 * 60,
+           time_zone: "UTC")
+  end
+  let(:other_time_entry) do
+    create(:time_entry,
+           project:,
+           user: time_entry_user,
+           spent_on: Date.new(2024, 12, 0o1),
+           start_time: 10 * 60,
+           time_zone: "UTC")
+  end
+  let(:time_entry_with_comment) do
+    create(:time_entry,
+           project:,
+           user: time_entry_user,
+           comments: "This is a comment",
+           spent_on: Date.new(2024, 12, 0o2))
+  end
+  let(:time_entry_without_time) do
+    create(:time_entry,
+           project:,
+           user: time_entry_user,
+           spent_on: Date.new(2024, 12, 0o3))
+  end
+  let(:time_entries) { [user_time_entry, time_entry, other_time_entry, time_entry_with_comment, time_entry_without_time] }
+
+  before do
+    User.current = user
+    allow(generator).to receive(:all_entries).and_return(time_entries)
+  end
+
+  subject(:pdf) do
+    content = Timecop.freeze(export_time) do
+      generator.generate!
+    end
+    # If you want to actually see the PDF for debugging, uncomment the following line
+    # File.binwrite("TimesheetGenerator-test-preview.pdf", content)
+    PDF::Inspector::Text.analyze(content).strings.join(" ")
+  end
+
+  def expected_cover_page
+    ["OpenProject", query.name,
+     time_entries.empty? ? nil : "#{format_date(time_entries.first.spent_on)} - #{format_date(time_entries.last.spent_on)}",
+     user.name, export_time_formatted].compact
+  end
+
+  def expected_first_page_content
+    [query.name]
+  end
+
+  def expected_table_header(with_times_column)
+    [
+      I18n.t(:"activerecord.attributes.time_entry.spent_on"),
+      I18n.t(:"activerecord.models.work_package"),
+      with_times_column ? I18n.t(:"export.timesheet.time") : nil,
+      I18n.t(:"activerecord.attributes.time_entry.hours"),
+      I18n.t(:"activerecord.attributes.time_entry.activity")
+    ].compact
+  end
+
+  def expected_page_footer(page_number)
+    [page_number, export_date_formatted, query.name]
+  end
+
+  def expected_entry_row(t_entry, with_times_column)
+    [format_date(t_entry.spent_on)].concat(expected_entry_columns(t_entry, with_times_column))
+  end
+
+  def expected_entry_columns(t_entry, with_times_column)
+    time_column = generator.format_spent_on_time(t_entry)
+    [
+      t_entry.work_package&.subject || "",
+      with_times_column && time_column.present? ? time_column : nil,
+      generator.format_hours(t_entry.hours),
+      t_entry.activity.name,
+      t_entry.comments
+    ].compact
+  end
+
+  def expected_document(with_times_column)
+    [
+      *expected_cover_page,
+      *expected_first_page_content,
+
+      user.name,
+      *expected_table_header(with_times_column),
+      *expected_entry_row(user_time_entry, with_times_column),
+
+      time_entry.user.name,
+      *expected_table_header(with_times_column),
+      format_date(time_entry.spent_on), # merged date rows
+      *expected_entry_columns(time_entry, with_times_column),
+      *expected_entry_columns(other_time_entry, with_times_column),
+      *expected_entry_row(time_entry_with_comment, with_times_column),
+      *expected_entry_row(time_entry_without_time, with_times_column),
+
+      *expected_page_footer("2/2")
+    ].join(" ")
+  end
+
+  context "with allow_tracking_start_and_end_times", with_settings: { allow_tracking_start_and_end_times: true } do
+    it "renders the expected document" do
+      expect(subject).to eq expected_document(true)
+    end
+  end
+
+  context "without allow_tracking_start_and_end_times", with_settings: { allow_tracking_start_and_end_times: false } do
+    it "renders the expected document" do
+      expect(subject).to eq expected_document(false)
+    end
+  end
+end
diff --git a/modules/reporting/spec/workers/cost_query/export_job_spec.rb b/modules/reporting/spec/workers/cost_query/xls/export_job_spec.rb
similarity index 99%
rename from modules/reporting/spec/workers/cost_query/export_job_spec.rb
rename to modules/reporting/spec/workers/cost_query/xls/export_job_spec.rb
index 9fd966b4dc1f..9591f99fa78e 100644
--- a/modules/reporting/spec/workers/cost_query/export_job_spec.rb
+++ b/modules/reporting/spec/workers/cost_query/xls/export_job_spec.rb
@@ -30,7 +30,7 @@
 
 require "spec_helper"
 
-RSpec.describe CostQuery::ExportJob do
+RSpec.describe CostQuery::XLS::ExportJob do
   let(:user) { build_stubbed(:user) }
   let(:project) { build_stubbed(:project) }
 
diff --git a/modules/storages/app/common/storages/peripherals/nextcloud_connection_validator.rb b/modules/storages/app/common/storages/peripherals/nextcloud_connection_validator.rb
index 371d24b18ccf..399f871d21a3 100644
--- a/modules/storages/app/common/storages/peripherals/nextcloud_connection_validator.rb
+++ b/modules/storages/app/common/storages/peripherals/nextcloud_connection_validator.rb
@@ -31,6 +31,7 @@
 module Storages
   module Peripherals
     class NextcloudConnectionValidator
+      include TaggedLogging
       include Dry::Monads[:maybe]
 
       using ServiceResultRefinements
@@ -40,13 +41,15 @@ def initialize(storage:)
       end
 
       def validate
-        maybe_is_not_configured
-          .or { has_base_configuration_error? }
-          .or { has_ampf_configuration_error? }
-          .value_or(ConnectionValidation.new(type: :healthy,
-                                             error_code: :none,
-                                             timestamp: Time.current,
-                                             description: nil))
+        with_tagged_logger do
+          maybe_is_not_configured
+            .or { has_base_configuration_error? }
+            .or { has_ampf_configuration_error? }
+            .value_or(ConnectionValidation.new(type: :healthy,
+                                               error_code: :none,
+                                               timestamp: Time.current,
+                                               description: nil))
+        end
       end
 
       private
@@ -194,6 +197,11 @@ def with_unexpected_content
         unexpected_files = files.result.files.reject { |file| expected_folder_ids.include?(file.id) }
         return None() if unexpected_files.empty?
 
+        file_representation = unexpected_files.map do |file|
+          "Name: #{file.name}, ID: #{file.id}, Location: #{file.location}"
+        end
+        warn "Unexpected files/folder found in group folder:\n\t#{file_representation.join("\n\t")}"
+
         Some(
           ConnectionValidation.new(
             type: :warning,
@@ -209,13 +217,11 @@ def with_unexpected_content
       def capabilities_request_failed_with_unknown_error
         return None() if capabilities.success?
 
-        Rails.logger.error(
-          "Connection validation failed with unknown error:\n\t" \
-          "storage: ##{@storage.id} #{@storage.name}\n\t" \
-          "request: Nextcloud capabilities\n\t" \
-          "status: #{capabilities.result}\n\t" \
-          "response: #{capabilities.error_payload}"
-        )
+        error "Connection validation failed with unknown error:\n\t" \
+              "storage: ##{@storage.id} #{@storage.name}\n\t" \
+              "request: Nextcloud capabilities\n\t" \
+              "status: #{capabilities.result}\n\t" \
+              "response: #{capabilities.error_payload}"
 
         Some(ConnectionValidation.new(type: :error,
                                       error_code: :err_unknown,
@@ -226,13 +232,11 @@ def capabilities_request_failed_with_unknown_error
       def files_request_failed_with_unknown_error
         return None() if files.success?
 
-        Rails.logger.error(
-          "Connection validation failed with unknown error:\n\t" \
-          "storage: ##{@storage.id} #{@storage.name}\n\t" \
-          "request: Group folder content\n\t" \
-          "status: #{files.result}\n\t" \
-          "response: #{files.error_payload}"
-        )
+        error "Connection validation failed with unknown error:\n\t" \
+              "storage: ##{@storage.id} #{@storage.name}\n\t" \
+              "request: Group folder content\n\t" \
+              "status: #{files.result}\n\t" \
+              "response: #{files.error_payload}"
 
         Some(ConnectionValidation.new(type: :error,
                                       error_code: :err_unknown,
diff --git a/modules/storages/app/common/storages/peripherals/one_drive_connection_validator.rb b/modules/storages/app/common/storages/peripherals/one_drive_connection_validator.rb
index 911f8280f51c..5c62084e37d7 100644
--- a/modules/storages/app/common/storages/peripherals/one_drive_connection_validator.rb
+++ b/modules/storages/app/common/storages/peripherals/one_drive_connection_validator.rb
@@ -31,6 +31,7 @@
 module Storages
   module Peripherals
     class OneDriveConnectionValidator
+      include TaggedLogging
       include Dry::Monads[:maybe]
 
       using ServiceResultRefinements
@@ -40,17 +41,19 @@ def initialize(storage:)
       end
 
       def validate
-        maybe_is_not_configured
-          .or { tenant_id_wrong }
-          .or { client_id_wrong }
-          .or { client_secret_wrong }
-          .or { drive_id_wrong }
-          .or { request_failed_with_unknown_error }
-          .or { drive_with_unexpected_content }
-          .value_or(ConnectionValidation.new(type: :healthy,
-                                             error_code: :none,
-                                             timestamp: Time.current,
-                                             description: nil))
+        with_tagged_logger do
+          maybe_is_not_configured
+            .or { tenant_id_wrong }
+            .or { client_id_wrong }
+            .or { client_secret_wrong }
+            .or { drive_id_wrong }
+            .or { request_failed_with_unknown_error }
+            .or { drive_with_unexpected_content }
+            .value_or(ConnectionValidation.new(type: :healthy,
+                                               error_code: :none,
+                                               timestamp: Time.current,
+                                               description: nil))
+        end
       end
 
       private
@@ -146,6 +149,11 @@ def drive_with_unexpected_content
         unexpected_files = query.result.files.reject { |file| expected_folder_ids.include?(file.id) }
         return None() if unexpected_files.empty?
 
+        file_representation = unexpected_files.map do |file|
+          "Name: #{file.name}, ID: #{file.id}, Location: #{file.location}"
+        end
+        warn "Unexpected files/folder found in group folder:\n\t#{file_representation.join("\n\t")}"
+
         Some(ConnectionValidation.new(type: :warning,
                                       error_code: :wrn_unexpected_content,
                                       timestamp: Time.current,
@@ -157,10 +165,10 @@ def drive_with_unexpected_content
       def request_failed_with_unknown_error
         return None() if query.success?
 
-        Rails.logger.error("Connection validation failed with unknown error:\n\t" \
-                           "storage: ##{@storage.id} #{@storage.name}\n\t" \
-                           "status: #{query.result}\n\t" \
-                           "response: #{query.error_payload}")
+        error "Connection validation failed with unknown error:\n\t" \
+              "storage: ##{@storage.id} #{@storage.name}\n\t" \
+              "status: #{query.result}\n\t" \
+              "response: #{query.error_payload}"
 
         Some(ConnectionValidation.new(type: :error,
                                       error_code: :err_unknown,
diff --git a/modules/storages/app/common/storages/peripherals/storage_interaction/nextcloud/create_folder_command.rb b/modules/storages/app/common/storages/peripherals/storage_interaction/nextcloud/create_folder_command.rb
index 8299f9f61d69..baca7d797c33 100644
--- a/modules/storages/app/common/storages/peripherals/storage_interaction/nextcloud/create_folder_command.rb
+++ b/modules/storages/app/common/storages/peripherals/storage_interaction/nextcloud/create_folder_command.rb
@@ -121,7 +121,9 @@ def storage_file(path_prefix, response)
             path = xml.xpath("//d:response/d:href/text()").to_s
             timestamp = xml.xpath("//d:response/d:propstat/d:prop/d:getlastmodified/text()").to_s
             creator = xml.xpath("//d:response/d:propstat/d:prop/oc:owner-display-name/text()").to_s
-            location = CGI.unescapeURIComponent(path.gsub(path_prefix, "")).delete_suffix("/")
+            location = CGI.unescapeURIComponent(
+              UrlBuilder.path(CGI.unescapeURIComponent(path)).gsub(path_prefix, "")
+            ).delete_suffix("/")
 
             StorageFile.new(
               id: xml.xpath("//d:response/d:propstat/d:prop/oc:fileid/text()").to_s,
diff --git a/modules/storages/app/common/storages/tagged_logging.rb b/modules/storages/app/common/storages/tagged_logging.rb
index 28d18c4884fd..2a5e353435e9 100644
--- a/modules/storages/app/common/storages/tagged_logging.rb
+++ b/modules/storages/app/common/storages/tagged_logging.rb
@@ -30,7 +30,7 @@
 
 module Storages
   module TaggedLogging
-    delegate :info, :error, to: :logger
+    delegate :info, :warn, :error, to: :logger
 
     # @param tag [Class, String, Array<Class, String>] the tag or list of tags to annotate the logs with
     # @yield [Logger]
diff --git a/modules/storages/app/components/storages/admin/general_info_component.html.erb b/modules/storages/app/components/storages/admin/general_info_component.html.erb
index 5b112178dd73..9ae186e91d6d 100644
--- a/modules/storages/app/components/storages/admin/general_info_component.html.erb
+++ b/modules/storages/app/components/storages/admin/general_info_component.html.erb
@@ -8,12 +8,11 @@
 
       grid.with_area(:description, tag: :div, color: :subtle, test_selector: 'storage-description') do
         concat(render(Primer::Beta::Text.new) { storage_description })
-
         if can_show_open_link?
           concat(render(Primer::Beta::Text.new) { " - " })
-          concat(render(Primer::Beta::Link.new(href: open_href, target: "_blank")) do
-            concat(render(Primer::Beta::Text.new) { "#{I18n.t('storages.buttons.open_storage')} " })
-            concat(render(Primer::Beta::Octicon.new(icon: "link-external", size: :small)))
+          concat(render(Primer::Beta::Link.new(href: open_href, target: "_blank")) do |link|
+            link.with_trailing_visual_icon(icon: "link-external", size: :small)
+            I18n.t('storages.buttons.open_storage')
           end)
         end
       end
diff --git a/modules/storages/app/components/storages/open_project_storage_modal_component.html.erb b/modules/storages/app/components/storages/open_project_storage_modal_component.html.erb
index 56feb9d121a8..baf796521fa0 100644
--- a/modules/storages/app/components/storages/open_project_storage_modal_component.html.erb
+++ b/modules/storages/app/components/storages/open_project_storage_modal_component.html.erb
@@ -1,7 +1,7 @@
 <%= render(
     Primer::Alpha::Dialog.new(id: self.class.dialog_id,
                               title: 'Open project folder modal',
-                              data: @data)
+                              data:)
 ) do |dialog| %>
     <% dialog.with_header(display: :none) %>
     <% dialog.with_body(id: self.class.dialog_body_id, p: 2) do %>
diff --git a/modules/storages/app/components/storages/open_project_storage_modal_component.rb b/modules/storages/app/components/storages/open_project_storage_modal_component.rb
index 7af3c0811d76..c864c2efaff6 100644
--- a/modules/storages/app/components/storages/open_project_storage_modal_component.rb
+++ b/modules/storages/app/components/storages/open_project_storage_modal_component.rb
@@ -29,15 +29,13 @@
 #++
 
 class Storages::OpenProjectStorageModalComponent < ViewComponent::Base
+  attr_reader :controller, :project_storage_open_url, :redirect_url, :state
+
   def initialize(project_storage_open_url:, redirect_url:, state:, **options)
     super
-    controller = "storages--open-project-storage-modal"
-    @data = {
-      controller:,
-      "application-target": "dynamic",
-      "#{controller}-project-storage-open-url-value": project_storage_open_url,
-      "#{controller}-redirect-url-value": redirect_url
-    }
+    @controller = "storages--open-project-storage-modal"
+    @project_storage_open_url = project_storage_open_url
+    @redirect_url = redirect_url
     @state = state
   end
 
@@ -48,4 +46,24 @@ def self.dialog_id
   def self.dialog_body_id
     "open-project-storage-modal-body-component"
   end
+
+  def data
+    @data ||= {
+      controller:,
+      "application-target": "dynamic",
+      "#{controller}-project-storage-open-url-value": project_storage_open_url,
+      "#{controller}-redirect-url-value": redirect_url,
+      "#{controller}-subtitle-timeout-text-value": subtitle_timeout_text
+    }
+  end
+
+  def subtitle_timeout_text
+    href = OpenProject::Static::Links[:storage_docs][:health_status][:href]
+    I18n.t(
+      "storages.open_project_storage_modal.timeout.subtitle",
+      storages_health_link: render(Primer::Beta::Link.new(href:, target: "_blank")) do
+        I18n.t("storages.open_project_storage_modal.timeout.link_text")
+      end
+    )
+  end
 end
diff --git a/modules/storages/app/components/storages/project_storages/destroy_confirmation_dialog_component.html.erb b/modules/storages/app/components/storages/project_storages/destroy_confirmation_dialog_component.html.erb
index cef571b12e07..43231f3549f6 100644
--- a/modules/storages/app/components/storages/project_storages/destroy_confirmation_dialog_component.html.erb
+++ b/modules/storages/app/components/storages/project_storages/destroy_confirmation_dialog_component.html.erb
@@ -50,7 +50,7 @@ See COPYRIGHT and LICENSE files for more details.
           message.with_description { text }
         end
 
-        dialog.with_additional_content do
+        dialog.with_additional_details do
           render(Primer::Alpha::CheckBox.new(
             name: "confirm_delete",
             label: confirmation_text,
diff --git a/modules/storages/app/models/storages/storage.rb b/modules/storages/app/models/storages/storage.rb
index a154bbebe322..b223c8ec3cb0 100644
--- a/modules/storages/app/models/storages/storage.rb
+++ b/modules/storages/app/models/storages/storage.rb
@@ -92,14 +92,12 @@ class Storage < ApplicationRecord
     }.freeze, _prefix: :health
 
     def self.shorten_provider_type(provider_type)
-      case /Storages::(?'provider_name'.*)Storage/.match(provider_type)
-      in provider_name:
-        provider_name.underscore
-      else
-        raise ArgumentError,
-              "Unknown provider_type! Given: #{provider_type}. " \
-              "Expected the following signature: Storages::{Name of the provider}Storage"
-      end
+      short, = PROVIDER_TYPE_SHORT_NAMES.find { |_, long| provider_type == long }
+      return short.to_s if short
+
+      raise ArgumentError,
+            "Unknown provider_type! Given: #{provider_type}. " \
+            "Known provider types are defined in Storages::Storage::PROVIDER_TYPE_SHORT_NAMES."
     end
 
     def self.one_drive_without_ee_token?(provider_type)
diff --git a/modules/storages/app/services/storages/create_folder_service.rb b/modules/storages/app/services/storages/create_folder_service.rb
new file mode 100644
index 000000000000..8c9f2ed1d352
--- /dev/null
+++ b/modules/storages/app/services/storages/create_folder_service.rb
@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module Storages
+  class CreateFolderService < BaseService
+    using Peripherals::ServiceResultRefinements
+
+    def self.call(storage:, user:, name:, parent_id:)
+      new.call(storage:, user:, name:, parent_id:)
+    end
+
+    def call(storage:, user:, name:, parent_id:)
+      auth_strategy = Peripherals::Registry.resolve("#{storage}.authentication.user_bound").call(user: user)
+
+      Peripherals::Registry
+        .resolve("#{storage}.commands.create_folder")
+        .call(
+          storage:,
+          auth_strategy:,
+          folder_name: name,
+          parent_location: parent_path(parent_id, storage, user)
+        )
+    end
+
+    private
+
+    def parent_path(parent_id, storage, user)
+      case storage.short_provider_type
+      when "nextcloud"
+        location_from_file_info(parent_id, storage, user)
+      when "one_drive"
+        Peripherals::ParentFolder.new(parent_id)
+      else
+        raise "Unknown Storage Type"
+      end
+    end
+
+    def location_from_file_info(parent_id, storage, user)
+      StorageFileService
+        .call(storage: storage, user: user, file_id: parent_id)
+        .match(
+          on_success: lambda { |folder_info|
+            path = URI.decode_uri_component(folder_info.location)
+            Peripherals::ParentFolder.new(path)
+          },
+          on_failure: ->(error) { raise error }
+        )
+    end
+  end
+end
diff --git a/modules/storages/app/views/storages/project_settings/attachments.html.erb b/modules/storages/app/views/storages/project_settings/attachments.html.erb
index 5c806915050e..fa590101bf80 100644
--- a/modules/storages/app/views/storages/project_settings/attachments.html.erb
+++ b/modules/storages/app/views/storages/project_settings/attachments.html.erb
@@ -31,7 +31,8 @@ See COPYRIGHT and LICENSE files for more details.
 
 <%= render(Primer::OpenProject::PageHeader.new(border_bottom: 0)) do |header|
   header.with_title { t("project_module_storages") }
-  header.with_breadcrumbs([{ href: project_settings_general_path, text: t("label_project_settings") },
+  header.with_breadcrumbs([{ href: project_overview_path(@project.id), text: @project.name },
+                            { href: project_settings_general_path, text: t("label_project_settings") },
                            t("project_module_storages")])
   header.with_action_button(tag: :a,
                             href: new_project_settings_project_storage_path,
diff --git a/modules/storages/app/views/storages/project_settings/destroy_info.html.erb b/modules/storages/app/views/storages/project_settings/destroy_info.html.erb
index 278015ab866c..fa90d482af4a 100644
--- a/modules/storages/app/views/storages/project_settings/destroy_info.html.erb
+++ b/modules/storages/app/views/storages/project_settings/destroy_info.html.erb
@@ -26,6 +26,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See COPYRIGHT and LICENSE files for more details.
 
 ++#%>
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { t('storages.page_titles.project_settings.delete') }
+    header.with_breadcrumbs([{ href: project_overview_path(@project.id), text: @project.name },
+                             { href: project_settings_general_path(@project.id), text: I18n.t("label_project_settings") },
+                             { href: external_file_storages_project_settings_project_storages_path(@project), text: t("project_module_storages") },
+                             t('storages.page_titles.project_settings.delete')])
+  end
+%>
+
 <%= styled_form_tag(project_settings_project_storage_path(project_id: @project_storage_to_destroy.project, id: @project_storage_to_destroy),
                     class: 'danger-zone',
                     method: :delete) do %>
diff --git a/modules/storages/app/views/storages/project_settings/edit.html.erb b/modules/storages/app/views/storages/project_settings/edit.html.erb
index 7e5696ea4a05..334ebd2e376f 100644
--- a/modules/storages/app/views/storages/project_settings/edit.html.erb
+++ b/modules/storages/app/views/storages/project_settings/edit.html.erb
@@ -28,8 +28,16 @@ See COPYRIGHT and LICENSE files for more details.
 ++#%>
 
 <% html_title t(:label_administration), t("project_module_storages"), t('label_edit_x', x: @object.storage.name) %>
-<% local_assigns[:additional_breadcrumb] = t('storages.label_edit_storage') %>
-<%= toolbar title: t("storages.page_titles.project_settings.edit") %>
+
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { t("storages.page_titles.project_settings.edit") }
+    header.with_breadcrumbs([{ href: project_overview_path(@project.id), text: @project.name },
+                             { href: project_settings_general_path(@project.id), text: I18n.t("label_project_settings") },
+                             { href: external_file_storages_project_settings_project_storages_path(@project), text: t("project_module_storages") },
+                             t("storages.page_titles.project_settings.edit")])
+  end
+%>
 
 <%= error_messages_for @project_storage %>
 
diff --git a/modules/storages/app/views/storages/project_settings/external_file_storages.html.erb b/modules/storages/app/views/storages/project_settings/external_file_storages.html.erb
index 4452b45e5bb7..6d00cc18724a 100644
--- a/modules/storages/app/views/storages/project_settings/external_file_storages.html.erb
+++ b/modules/storages/app/views/storages/project_settings/external_file_storages.html.erb
@@ -31,7 +31,8 @@ See COPYRIGHT and LICENSE files for more details.
 
 <%= render(Primer::OpenProject::PageHeader.new(border_bottom: 0)) do |header|
   header.with_title { t("project_module_storages") }
-  header.with_breadcrumbs([{ href: project_settings_general_path, text: t("label_project_settings") },
+  header.with_breadcrumbs([{ href: project_overview_path(@project.id), text: @project.name },
+                            { href: project_settings_general_path, text: t("label_project_settings") },
                            t("project_module_storages")])
   header.with_action_button(tag: :a,
                             href: new_project_settings_project_storage_path,
diff --git a/modules/storages/app/views/storages/project_settings/new.html.erb b/modules/storages/app/views/storages/project_settings/new.html.erb
index 1975edd5886d..9bbf6f04f606 100644
--- a/modules/storages/app/views/storages/project_settings/new.html.erb
+++ b/modules/storages/app/views/storages/project_settings/new.html.erb
@@ -28,8 +28,17 @@ See COPYRIGHT and LICENSE files for more details.
 ++#%>
 
 <% html_title t(:label_administration), t("project_module_storages") %>
-<% local_assigns[:additional_breadcrumb] = t('storages.label_new_storage') %>
-<%= toolbar title: t("storages.page_titles.project_settings.new") %>
+
+<%=
+  render Primer::OpenProject::PageHeader.new do |header|
+    header.with_title { t("storages.page_titles.project_settings.new") }
+    header.with_breadcrumbs([{ href: project_overview_path(@project.id), text: @project.name },
+                             { href: project_settings_general_path(@project.id), text: I18n.t("label_project_settings") },
+                             { href: external_file_storages_project_settings_project_storages_path(@project), text: t("project_module_storages") },
+                             t("storages.page_titles.project_settings.new")])
+  end
+%>
+
 
 <section class="form--section">
   <% if @available_storages.any? %>
diff --git a/modules/storages/app/views/storages/project_settings/project_storage_members/index.html.erb b/modules/storages/app/views/storages/project_settings/project_storage_members/index.html.erb
index 008ba8c8ed74..a10087e7a575 100644
--- a/modules/storages/app/views/storages/project_settings/project_storage_members/index.html.erb
+++ b/modules/storages/app/views/storages/project_settings/project_storage_members/index.html.erb
@@ -28,16 +28,17 @@ See COPYRIGHT and LICENSE files for more details.
 ++#%>
 <% html_title t(:label_administration), t("project_module_storages"), @storage.name %>
 
-<%
-    breadcrumb_paths(
-      ActionController::Base.helpers
-        .link_to(t("project_module_storages"), external_file_storages_project_settings_project_storages_path(@project)),
-      default_breadcrumb
-    )
+<%=
+    render Primer::OpenProject::PageHeader.new do |header|
+      header.with_title { t("storages.page_titles.project_storage_members.title") }
+      header.with_breadcrumbs([{ href: project_overview_path(@project.id), text: @project.name },
+                               { href: project_settings_general_path(@project.id), text: I18n.t("label_project_settings") },
+                               { href: external_file_storages_project_settings_project_storages_path(@project), text: t("project_module_storages") },
+                               I18n.t("menus.breadcrumb.nested_element", section_header:  @storage.name, title: t("storages.page_titles.project_storage_members.title")).html_safe],
+                              selected_item_font_weight: :normal)
+    end
 %>
 
-<%= toolbar title: t("storages.page_titles.project_storage_members.title") %>
-
 <%= content_tag(:p,
   t("storages.page_titles.project_storage_members.subtitle",
     storage_name_link: link_to(@storage.name, edit_admin_settings_storage_path(@storage))).html_safe
diff --git a/modules/storages/config/locales/crowdin/af.yml b/modules/storages/config/locales/crowdin/af.yml
index 24378828dc0d..3e470c92b8bd 100644
--- a/modules/storages/config/locales/crowdin/af.yml
+++ b/modules/storages/config/locales/crowdin/af.yml
@@ -114,7 +114,7 @@ af:
             hide_inactive_folders:
               permission_not_set: could not set permissions on %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
               conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
@@ -124,7 +124,7 @@ af:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
           insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
           not_allowed: Nextcloud block the request.
@@ -145,7 +145,7 @@ af:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
           unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
           user_does_not_exist: "%{user} does not exist in Nextcloud."
@@ -289,7 +289,6 @@ af:
     label_creation_time: Creation time
     label_creator: Creator
     label_delete_storage: Delete storage
-    label_edit_storage: Edit storage
     label_edit_storage_access_management: Edit storage access management
     label_edit_storage_automatically_managed_folders: Edit storage automatically managed folders
     label_edit_storage_host: Edit storage host
@@ -343,6 +342,9 @@ af:
       success:
         subtitle: You are being redirected
         title: Integration setup completed
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: One moment please, this might take some time...
         title: We are setting up your permissions on the project folder.
diff --git a/modules/storages/config/locales/crowdin/ar.yml b/modules/storages/config/locales/crowdin/ar.yml
index 928909ca070b..1757d6f83df3 100644
--- a/modules/storages/config/locales/crowdin/ar.yml
+++ b/modules/storages/config/locales/crowdin/ar.yml
@@ -114,7 +114,7 @@ ar:
             hide_inactive_folders:
               permission_not_set: could not set permissions on %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
               conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
@@ -124,7 +124,7 @@ ar:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
           insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
           not_allowed: Nextcloud block the request.
@@ -145,7 +145,7 @@ ar:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
           unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
           user_does_not_exist: "%{user} does not exist in Nextcloud."
@@ -289,7 +289,6 @@ ar:
     label_creation_time: Creation time
     label_creator: Creator
     label_delete_storage: Delete storage
-    label_edit_storage: Edit storage
     label_edit_storage_access_management: Edit storage access management
     label_edit_storage_automatically_managed_folders: Edit storage automatically managed folders
     label_edit_storage_host: Edit storage host
@@ -343,6 +342,9 @@ ar:
       success:
         subtitle: You are being redirected
         title: Integration setup completed
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: One moment please, this might take some time...
         title: We are setting up your permissions on the project folder.
diff --git a/modules/storages/config/locales/crowdin/az.yml b/modules/storages/config/locales/crowdin/az.yml
index 04ec559a2802..476a8be4e8e2 100644
--- a/modules/storages/config/locales/crowdin/az.yml
+++ b/modules/storages/config/locales/crowdin/az.yml
@@ -114,7 +114,7 @@ az:
             hide_inactive_folders:
               permission_not_set: could not set permissions on %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
               conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
@@ -124,7 +124,7 @@ az:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
           insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
           not_allowed: Nextcloud block the request.
@@ -145,7 +145,7 @@ az:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
           unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
           user_does_not_exist: "%{user} does not exist in Nextcloud."
@@ -289,7 +289,6 @@ az:
     label_creation_time: Creation time
     label_creator: Creator
     label_delete_storage: Delete storage
-    label_edit_storage: Edit storage
     label_edit_storage_access_management: Edit storage access management
     label_edit_storage_automatically_managed_folders: Edit storage automatically managed folders
     label_edit_storage_host: Edit storage host
@@ -343,6 +342,9 @@ az:
       success:
         subtitle: You are being redirected
         title: Integration setup completed
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: One moment please, this might take some time...
         title: We are setting up your permissions on the project folder.
diff --git a/modules/storages/config/locales/crowdin/be.yml b/modules/storages/config/locales/crowdin/be.yml
index ace876a794d0..6ffec4520eb5 100644
--- a/modules/storages/config/locales/crowdin/be.yml
+++ b/modules/storages/config/locales/crowdin/be.yml
@@ -114,7 +114,7 @@ be:
             hide_inactive_folders:
               permission_not_set: could not set permissions on %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
               conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
@@ -124,7 +124,7 @@ be:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
           insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
           not_allowed: Nextcloud block the request.
@@ -145,7 +145,7 @@ be:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
           unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
           user_does_not_exist: "%{user} does not exist in Nextcloud."
@@ -289,7 +289,6 @@ be:
     label_creation_time: Creation time
     label_creator: Стваральнік
     label_delete_storage: Delete storage
-    label_edit_storage: Edit storage
     label_edit_storage_access_management: Edit storage access management
     label_edit_storage_automatically_managed_folders: Edit storage automatically managed folders
     label_edit_storage_host: Edit storage host
@@ -343,6 +342,9 @@ be:
       success:
         subtitle: You are being redirected
         title: Integration setup completed
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: One moment please, this might take some time...
         title: We are setting up your permissions on the project folder.
diff --git a/modules/storages/config/locales/crowdin/bg.yml b/modules/storages/config/locales/crowdin/bg.yml
index 8e72e4191458..2e9b6e9665a3 100644
--- a/modules/storages/config/locales/crowdin/bg.yml
+++ b/modules/storages/config/locales/crowdin/bg.yml
@@ -114,7 +114,7 @@ bg:
             hide_inactive_folders:
               permission_not_set: could not set permissions on %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
               conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
@@ -124,7 +124,7 @@ bg:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
           insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
           not_allowed: Nextcloud block the request.
@@ -145,7 +145,7 @@ bg:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
           unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
           user_does_not_exist: "%{user} does not exist in Nextcloud."
@@ -289,7 +289,6 @@ bg:
     label_creation_time: Creation time
     label_creator: Създател
     label_delete_storage: Delete storage
-    label_edit_storage: Edit storage
     label_edit_storage_access_management: Edit storage access management
     label_edit_storage_automatically_managed_folders: Edit storage automatically managed folders
     label_edit_storage_host: Edit storage host
@@ -343,6 +342,9 @@ bg:
       success:
         subtitle: You are being redirected
         title: Integration setup completed
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: One moment please, this might take some time...
         title: We are setting up your permissions on the project folder.
diff --git a/modules/storages/config/locales/crowdin/ca.yml b/modules/storages/config/locales/crowdin/ca.yml
index cc25c5021b8a..793b084facd6 100644
--- a/modules/storages/config/locales/crowdin/ca.yml
+++ b/modules/storages/config/locales/crowdin/ca.yml
@@ -114,7 +114,7 @@ ca:
             hide_inactive_folders:
               permission_not_set: could not set permissions on %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
               conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
@@ -124,7 +124,7 @@ ca:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
           insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
           not_allowed: Nextcloud block the request.
@@ -145,7 +145,7 @@ ca:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
           unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
           user_does_not_exist: "%{user} does not exist in Nextcloud."
@@ -289,7 +289,6 @@ ca:
     label_creation_time: Creation time
     label_creator: Autor
     label_delete_storage: Delete storage
-    label_edit_storage: Edit storage
     label_edit_storage_access_management: Edit storage access management
     label_edit_storage_automatically_managed_folders: Edit storage automatically managed folders
     label_edit_storage_host: Edit storage host
@@ -343,6 +342,9 @@ ca:
       success:
         subtitle: You are being redirected
         title: Integration setup completed
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: One moment please, this might take some time...
         title: We are setting up your permissions on the project folder.
diff --git a/modules/storages/config/locales/crowdin/ckb-IR.yml b/modules/storages/config/locales/crowdin/ckb-IR.yml
index 2d85756fba15..dc142b1d361e 100644
--- a/modules/storages/config/locales/crowdin/ckb-IR.yml
+++ b/modules/storages/config/locales/crowdin/ckb-IR.yml
@@ -114,7 +114,7 @@ ckb-IR:
             hide_inactive_folders:
               permission_not_set: could not set permissions on %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
               conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
@@ -124,7 +124,7 @@ ckb-IR:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
           insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
           not_allowed: Nextcloud block the request.
@@ -145,7 +145,7 @@ ckb-IR:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
           unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
           user_does_not_exist: "%{user} does not exist in Nextcloud."
@@ -289,7 +289,6 @@ ckb-IR:
     label_creation_time: Creation time
     label_creator: Creator
     label_delete_storage: Delete storage
-    label_edit_storage: Edit storage
     label_edit_storage_access_management: Edit storage access management
     label_edit_storage_automatically_managed_folders: Edit storage automatically managed folders
     label_edit_storage_host: Edit storage host
@@ -343,6 +342,9 @@ ckb-IR:
       success:
         subtitle: You are being redirected
         title: Integration setup completed
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: One moment please, this might take some time...
         title: We are setting up your permissions on the project folder.
diff --git a/modules/storages/config/locales/crowdin/cs.yml b/modules/storages/config/locales/crowdin/cs.yml
index 3dae94aaf154..bc9ec0c58a3b 100644
--- a/modules/storages/config/locales/crowdin/cs.yml
+++ b/modules/storages/config/locales/crowdin/cs.yml
@@ -22,7 +22,7 @@ cs:
         storages/project_storage:
           attributes:
             project_folder_id:
-              blank: Please select a folder.
+              blank: Vyberte složku.
             project_folder_mode:
               mode_unavailable: není k dispozici pro toto úložiště.
             project_ids:
@@ -60,46 +60,46 @@ cs:
   project_module_storages: Soubory
   project_storages:
     edit_project_folder:
-      label: Edit project folder
+      label: Upravit složku projektu
     project_folder_mode:
       automatic: Automaticky spravované
       inactive: Žádná specifická složka
-      manual: Existing folder manually managed
+      manual: Ručně spravovaná stávající složka
     remove_project:
-      deletion_failure_flash: Failed to remove the project from the storage. %{error}
+      deletion_failure_flash: Nepodařilo se odstranit projekt z úložiště. %{error}
       dialog:
         automatically_managed_appendix: Also, in this case this storage has an automatically managed project folder, this and its files will be deleted forever.
         confirmation_text: Please, confirm you understand and want to remove this file storage from this project
-        heading_text: Remove project from %{storage}
+        heading_text: Odstranit projekt z %{storage}
         text: This action is irreversible and will remove all links from work packages of this project to files and folders of that storage.
       label: Odstranit projekt
   services:
     attributes:
       nextcloud_sync_service:
-        add_user_to_group: 'Add User to Group:'
+        add_user_to_group: 'Přidat uživatele do skupiny:'
         create_folder: 'Managed Project Folder Creation:'
         ensure_root_folder_permissions: 'Set Base Folder Permissions:'
         hide_inactive_folders: 'Hide Inactive Folders Step:'
         remote_folders: 'Read contents of the group folder:'
-        remove_user_from_group: 'Remove User from Group:'
+        remove_user_from_group: 'Odebrat uživatele ze skupiny:'
         rename_project_folder: 'Rename managed project Folder:'
       one_drive_sync_service:
         create_folder: 'Managed Project Folder Creation:'
         ensure_root_folder_permissions: 'Set Base Folder Permissions:'
         hide_inactive_folders: 'Hide Inactive Folders Step:'
         remote_folders: 'Read contents of the group folder:'
-        rename_project_folder: 'Rename managed project Folder:'
+        rename_project_folder: 'Přejmenovat spravovanou složku projektu:'
     errors:
       messages:
         error: An unexpected error occurred. Please check OpenProject logs for more information or contact an administrator
-        unauthorized: OpenProject could not authenticate with the Storage Provider. Please ensure that you have access to it.
+        unauthorized: OpenProject se nemohl autentizovat s poskytovatelem úložiště. Ujistěte se, že k němu máte přístup.
       models:
         copy_project_folders_service:
           conflict: The folder %{destination_path} already exists. Interrupting process to avoid overwrites.
           error: An unexpected error occurred. Please check OpenProject logs for more information or contact an administrator
           forbidden: OpenProject could not access the source folder. Please check your permissions configuration on the Storage Provider
           not_found: The source template location %{source_path} wasn't found.
-          unauthorized: OpenProject could not authenticate with the Storage Provider. Please check your storage configuration
+          unauthorized: OpenProject se nemohl ověřit u zprostředkovatele úložiště. Zkontrolujte prosím konfiguraci úložiště
         nextcloud_sync_service:
           attributes:
             add_user_to_group:
@@ -107,28 +107,28 @@ cs:
               failed_to_add: 'The user %{user} could not be added to the %{group} group for the following reason: %{reason}'
             create_folder:
               conflict: The %{folder_name} already exists on %{parent_location}.
-              not_found: "%{parent_location} wasn't found."
+              not_found: "%{parent_location} nebyl nalezen."
             ensure_root_folder_permissions:
               not_found: "%{group_folder} wasn't found. Please check your Nextcloud Group Folder setup."
               permission_not_set: could not set permissions on %{group_folder}.
             hide_inactive_folders:
               permission_not_set: could not set permissions on %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
               conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
               failed_to_remove: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
             rename_project_folder:
-              forbidden: OpenProject user does not have access to %{current_path} folder.
-              not_found: "%{current_path} wasn't found."
+              forbidden: Uživatel OpenProject nemá přístup do složky %{current_path} .
+              not_found: "%{current_path} nebyl nalezen."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
           insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
-          not_allowed: Nextcloud block the request.
-          unauthorized: OpenProject could not sync with Nextcloud. Please check your storage and Nextcloud configuration.
+          not_allowed: Nextcloud blokuje požadavek.
+          unauthorized: OpenProject nelze synchronizovat s Nextcloudem. Zkontrolujte prosím konfiguraci úložiště a Nextcloudu.
           user_does_not_exist: "%{user} does not exist in Nextcloud."
         one_drive_sync_service:
           attributes:
@@ -138,17 +138,17 @@ cs:
             hide_inactive_folders:
               permission_not_set: could not set permissions on %{path}.
             remote_folders:
-              request_error: OpenProject could not access your drive %{drive_id}. Please check if your storage configuration is correct.
+              request_error: OpenProject nemůže přistupovat k vašemu disku %{drive_id}. Zkontrolujte, zda je vaše konfigurace úložiště správná.
             rename_project_folder:
-              conflict: OpenProject could not rename the folder %{current_path} to %{project_folder_name} as a folder with the same name already exists
+              conflict: OpenProject nemůže přejmenovat složku %{current_path} na %{project_folder_name} jako složku se stejným názvem již existuje
               forbidden: OpenProject does not have access to %{current_path} in order to rename it.
-              not_found: "%{current_path} wasn't found."
+              not_found: "%{current_path} nebyl nalezen."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
-          unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
-          user_does_not_exist: "%{user} does not exist in Nextcloud."
+          unauthorized: OpenProject se nepodařilo synchronizovat s OneDrive. Zkontrolujte prosím konfiguraci úložiště a aplikace Azure
+          user_does_not_exist: "%{user} neexistuje v Nextcloudu."
         upload_link_service:
           not_found: The destination folder %{folder} could not be found on %{storage_name}.
   storages:
@@ -156,7 +156,7 @@ cs:
       complete_without_setup: Dokončit bez něj
       done_complete_setup: Hotovo, kompletní nastavení
       done_continue: Hotovo, pokračovat
-      open_storage: Open file storage
+      open_storage: Otevřít soubor v úložišti
       replace_oauth_application: Nahradit OpenProject OAuth
       replace_oauth_client: Nahradit %{provider_type} OAuth
       save_and_continue: Uložit a pokračovat
@@ -181,11 +181,11 @@ cs:
       storage_delete_result_3: V případě, že toto úložiště automaticky spravuje složky projektů, budou tyto a jejich obsažené soubory navždy smazány.
     dependencies:
       nextcloud:
-        group_folders_app: Group folders
-        integration_app: Integration OpenProject
+        group_folders_app: Seskupené složky
+        integration_app: Integrace OpenProject
     enabled_in_projects:
       setup_incomplete_description: This storage has an incomplete setup. Please, complete the setup before enabling it in multiple projects.
-      setup_incomplete_header: Storage setup incomplete
+      setup_incomplete_header: Nastavení úložiště je neúplné
     error_invalid_provider_type: Vyberte prosím platného poskytovatele úložiště.
     file_storage_view:
       access_management:
@@ -219,14 +219,14 @@ cs:
         host_not_found: No Nextcloud server found at the configured host url. Please check the configuration.
         missing_dependencies: 'A required dependency is missing on the file storage. Please add the following dependency: %{dependency}.'
         not_configured: The connection could not be validated. Please finish configuration first.
-        placeholder: Check your connection against the server.
-        subtitle: Connection validation
+        placeholder: Zkontrolujte připojení k serveru.
+        subtitle: Ověřování připojení
         tenant_id_wrong: The configured directory (tenant) id is invalid. Please check the configuration.
         unexpected_content:
           nextcloud: Unexpected content found in the managed group folder.
           one_drive: Unexpected content found in the drive.
         unknown_error: The connection could not be validated. An unknown error occurred. Please check the server logs for further information.
-        userless_access_denied: The configured app password is invalid.
+        userless_access_denied: Nakonfigurované heslo aplikace je neplatné.
       label_error: Chyba
       label_healthy: Zdravé
       label_pending: Nevyřízeno
@@ -289,7 +289,6 @@ cs:
     label_creation_time:
     label_creator: Vytvořil
     label_delete_storage: Smazat úložiště
-    label_edit_storage:
     label_edit_storage_access_management: Upravit správu přístupu k úložišti
     label_edit_storage_automatically_managed_folders: Upravit automaticky spravované složky úložiště
     label_edit_storage_host: Upravit host úložiště
@@ -322,17 +321,17 @@ cs:
     members_no_results: Žádní členové k zobrazení.
     no_results: Zatím nejsou nastaveny žádné úložiště.
     oauth_access_granted_modal:
-      access_granted: Access granted
+      access_granted: Přístup udělen
       project_settings:
         access_granted_screen_reader: Access granted. You are now ready to use %{storage}
-        storage_ready: You are now ready to use %{storage}
+        storage_ready: Nyní jste připraveni použít %{storage}
       storage_admin:
         access_granted_screen_reader: Access granted. You are now ready to add projects to %{storage}
-        storage_ready: You are now ready to add projects to %{storage}
+        storage_ready: Nyní jste připraveni přidat projekty do %{storage}
     oauth_grant_nudge_modal:
       cancel_button_label: Udělám to později
       heading: Login to %{provider_type} required
-      login_button_aria_label: Login to %{storage}
+      login_button_aria_label: Přihlásit se do %{storage}
       login_button_label: "%{provider_type} log in"
       project_settings:
         description: To get access to the project folder you need to login to %{storage}.
@@ -343,6 +342,9 @@ cs:
       success:
         subtitle: Nyní jste přesměrováváni
         title: Nastavení integrace dokončeno
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: Prosím vydržte, chvilku to může chvíli trvat...
         title: Nastavujeme vaše oprávnění do složky projektu.
@@ -382,7 +384,7 @@ cs:
     storage_list_blank_slate:
       description: Přidejte úložiště, abyste je viděli zde.
       heading: Zatím nemáte žádné úložiště.
-    successful_storage_connection: Storage connected successfully! Remember to activate the storage in the Projects tab for each desired project to use it.
+    successful_storage_connection: Úložiště bylo úspěšně připojeno! Nezapomeňte aktivovat úložiště v záložce Projekty pro každý požadovaný projekt.
     upsale:
       description: |-
         Integrujte OneDrive/SharePoint jako úložiště souborů s OpenProject. Nahrávejte soubory a propojte je přímo s pracovními balíčky v projektu.
diff --git a/modules/storages/config/locales/crowdin/da.yml b/modules/storages/config/locales/crowdin/da.yml
index d5af1ac54aaa..4e1994f430b2 100644
--- a/modules/storages/config/locales/crowdin/da.yml
+++ b/modules/storages/config/locales/crowdin/da.yml
@@ -114,7 +114,7 @@ da:
             hide_inactive_folders:
               permission_not_set: could not set permissions on %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
               conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
@@ -124,7 +124,7 @@ da:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
           insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
           not_allowed: Nextcloud block the request.
@@ -145,7 +145,7 @@ da:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
           unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
           user_does_not_exist: "%{user} does not exist in Nextcloud."
@@ -289,7 +289,6 @@ da:
     label_creation_time: Creation time
     label_creator: Creator
     label_delete_storage: Delete storage
-    label_edit_storage: Edit storage
     label_edit_storage_access_management: Edit storage access management
     label_edit_storage_automatically_managed_folders: Edit storage automatically managed folders
     label_edit_storage_host: Edit storage host
@@ -343,6 +342,9 @@ da:
       success:
         subtitle: You are being redirected
         title: Integration setup completed
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: One moment please, this might take some time...
         title: We are setting up your permissions on the project folder.
diff --git a/modules/storages/config/locales/crowdin/de.yml b/modules/storages/config/locales/crowdin/de.yml
index e296afe2425f..5ff36729b77a 100644
--- a/modules/storages/config/locales/crowdin/de.yml
+++ b/modules/storages/config/locales/crowdin/de.yml
@@ -124,7 +124,7 @@ de:
               not_found: "%{current_path} wurde nicht gefunden."
             set_folders_permissions:
               permission_not_set: konnte keine Berechtigungen auf %{path} setzen.
-          error: Ein unerwarteter Fehler ist aufgetreten. Bitte stellen Sie sicher, dass Ihre Nextcloud Instanz erreichbar ist und überprüfen Sie die OpenProject Worker Logs auf weitere Informationen
+          error: Ein unerwarteter Fehler ist aufgetreten. Bitte stellen Sie sicher, dass Ihre Nextcloud-Instanz erreichbar ist und überprüfen Sie die Protokolle von OpenProject Worker für weitere Informationen
           group_does_not_exist: "%{group} existiert nicht. Überprüfen Sie Ihre Nextcloud Instanz-Konfiguration."
           insufficient_privileges: OpenProject hat nicht genügend Rechte, um %{user} zu %{group} hinzuzufügen. Überprüfen Sie Ihre Gruppeneinstellungen in Nextcloud.
           not_allowed: Nextcloud blockiert die Anfrage.
@@ -145,7 +145,7 @@ de:
               not_found: "%{current_path} wurde nicht gefunden."
             set_folders_permissions:
               permission_not_set: konnte keine Berechtigungen auf %{path} setzen.
-          error: Ein unerwarteter Fehler ist aufgetreten. Bitte stellen Sie sicher, dass Ihre Nextcloud Instanz erreichbar ist und überprüfen Sie die OpenProject Worker Logs auf weitere Informationen
+          error: Ein unerwarteter Fehler ist aufgetreten. Bitte stellen Sie sicher, dass OneDrive/SharePoint erreichbar ist und überprüfen Sie die Protokolle von OpenProject Worker für weitere Informationen
           not_allowed: OpenProject konnte nicht auf dein OneDrive-Laufwerk zugreifen. Bitte überprüfe die Berechtigungen der Azure Anwendung.
           unauthorized: OpenProject konnte nicht mit OneDrive synchronisieren. Bitte überprüfen Sie Ihren Speicher und die Konfiguration der Azure Anwendung.
           user_does_not_exist: "%{user} existiert nicht in Nextcloud."
@@ -289,7 +289,6 @@ de:
     label_creation_time: Erstellungszeit
     label_creator: Ersteller
     label_delete_storage: Dateispeicher löschen
-    label_edit_storage: Dateispeicher bearbeiten
     label_edit_storage_access_management: Speicherzugriffsverwaltung bearbeiten
     label_edit_storage_automatically_managed_folders: Automatisch verwaltete Projektordner des Dateispeichers bearbeiten
     label_edit_storage_host: Dateispeicher-Host bearbeiten
@@ -343,6 +342,9 @@ de:
       success:
         subtitle: Sie werden weitergeleitet
         title: Einrichtung der Integration abgeschlossen
+      timeout:
+        link_text: Status des Dateispeicher-Setups
+        subtitle: OpenProject konnte Ihnen den Zugriff auf den Projektordner nicht innerhalb der erwarteten Zeitspanne ermöglichen. Versuchen Sie es bitte noch einmal.<br><br> Wenn dieses Problem weiterhin besteht, wenden Sie sich bitte an Ihren OpenProject-Administrator, um %{storages_health_link} zu überprüfen.
       waiting:
         subtitle: Einen Moment bitte, dies könnte etwas dauern...
         title: Wir richten Ihre Berechtigungen für den Projektordner ein.
diff --git a/modules/storages/config/locales/crowdin/el.yml b/modules/storages/config/locales/crowdin/el.yml
index bc5374be3c5a..e54f47af001a 100644
--- a/modules/storages/config/locales/crowdin/el.yml
+++ b/modules/storages/config/locales/crowdin/el.yml
@@ -114,7 +114,7 @@ el:
             hide_inactive_folders:
               permission_not_set: could not set permissions on %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
               conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
@@ -124,7 +124,7 @@ el:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
           insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
           not_allowed: Nextcloud block the request.
@@ -145,7 +145,7 @@ el:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
           unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
           user_does_not_exist: "%{user} does not exist in Nextcloud."
@@ -289,7 +289,6 @@ el:
     label_creation_time: Creation time
     label_creator: Δημιουργός
     label_delete_storage: Delete storage
-    label_edit_storage: Edit storage
     label_edit_storage_access_management: Edit storage access management
     label_edit_storage_automatically_managed_folders: Edit storage automatically managed folders
     label_edit_storage_host: Edit storage host
@@ -343,6 +342,9 @@ el:
       success:
         subtitle: You are being redirected
         title: Integration setup completed
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: One moment please, this might take some time...
         title: We are setting up your permissions on the project folder.
diff --git a/modules/storages/config/locales/crowdin/eo.yml b/modules/storages/config/locales/crowdin/eo.yml
index 8537766e403e..67dc4edb6344 100644
--- a/modules/storages/config/locales/crowdin/eo.yml
+++ b/modules/storages/config/locales/crowdin/eo.yml
@@ -114,7 +114,7 @@ eo:
             hide_inactive_folders:
               permission_not_set: could not set permissions on %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
               conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
@@ -124,7 +124,7 @@ eo:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
           insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
           not_allowed: Nextcloud block the request.
@@ -145,7 +145,7 @@ eo:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
           unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
           user_does_not_exist: "%{user} does not exist in Nextcloud."
@@ -289,7 +289,6 @@ eo:
     label_creation_time: Creation time
     label_creator: Creator
     label_delete_storage: Delete storage
-    label_edit_storage: Edit storage
     label_edit_storage_access_management: Edit storage access management
     label_edit_storage_automatically_managed_folders: Edit storage automatically managed folders
     label_edit_storage_host: Edit storage host
@@ -343,6 +342,9 @@ eo:
       success:
         subtitle: You are being redirected
         title: Integration setup completed
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: One moment please, this might take some time...
         title: We are setting up your permissions on the project folder.
diff --git a/modules/storages/config/locales/crowdin/es.yml b/modules/storages/config/locales/crowdin/es.yml
index 8e02a483aae5..108e7a84fe59 100644
--- a/modules/storages/config/locales/crowdin/es.yml
+++ b/modules/storages/config/locales/crowdin/es.yml
@@ -114,7 +114,7 @@ es:
             hide_inactive_folders:
               permission_not_set: no se han podido establecer permisos en %{path}.
             remote_folders:
-              not_allowed: '%{username} no tiene acceso a la carpeta %{group_folder}. Compruebe los permisos de la carpeta en Nextcloud.'
+              not_allowed: El %{username} no tiene acceso a la carpeta %{group_folder}. Compruebe los permisos de la carpeta en Nextcloud.
               not_found: "No se ha encontrado la carpeta %{group_folder}. Compruebe su configuración de Nextcloud."
             remove_user_from_group:
               conflict: 'El usuario %{user} no se ha podido eliminar del grupo %{group} por la siguiente razón: %{reason}'
@@ -124,7 +124,7 @@ es:
               not_found: "No se encontró %{current_path}."
             set_folders_permissions:
               permission_not_set: no se han podido establecer permisos en %{path}.
-          error: Se ha producido un error inesperado. Asegúrese de que su instancia de Nextcloud es accesible y compruebe los registros de los trabajadores de OpenProject para obtener más información.
+          error: Se ha producido un error inesperado. Asegúrese de que su instancia de Nextcloud es accesible y compruebe los registros de los trabajadores de OpenProject para obtener más información
           group_does_not_exist: "%{group} no existe. Compruebe la configuración de su instancia de Nextcloud."
           insufficient_privileges: OpenProject no tiene suficientes privilegios para añadir a %{user} a %{group}. Compruebe la configuración de su grupo en Nextcloud.
           not_allowed: Nextcloud bloquea la solicitud.
@@ -145,7 +145,7 @@ es:
               not_found: "No se encontró %{current_path}."
             set_folders_permissions:
               permission_not_set: no se han podido establecer permisos en %{path}.
-          error: Se ha producido un error inesperado. Asegúrese de que su instancia de Nextcloud es accesible y compruebe los registros de los trabajadores de OpenProject para obtener más información.
+          error: Se ha producido un error inesperado. Asegúrese de que se puede acceder a OneDrive/SharePoint y compruebe los registros del trabajador de OpenProject para obtener más información
           not_allowed: OpenProject no tenía permiso para acceder a su unidad OneDrive. Compruebe los permisos establecidos en la aplicación Azure.
           unauthorized: OpenProject no pudo sincronizarse con OneDrive. Compruebe su almacenamiento y la configuración de la aplicación Azure.
           user_does_not_exist: "%{user} no existe en Nextcloud."
@@ -289,7 +289,6 @@ es:
     label_creation_time: Tiempo de creación
     label_creator: Autor
     label_delete_storage: Eliminar almacenamiento
-    label_edit_storage: Editar almacenamiento
     label_edit_storage_access_management: Editar la gestión de acceso al almacenamiento
     label_edit_storage_automatically_managed_folders: Editar carpetas gestionadas automáticamente
     label_edit_storage_host: Editar host del almacenamiento
@@ -343,6 +342,9 @@ es:
       success:
         subtitle: Se te está redirigiendo
         title: Configuración de integración completada
+      timeout:
+        link_text: estado de salud de la configuración de almacenamiento de archivos
+        subtitle: OpenProject no ha podido proporcionarle acceso a la carpeta del proyecto en el plazo previsto. Inténtelo de nuevo.<br><br> Si el problema persiste, contacte con su administrador de OpenProject para comprobar %{storages_health_link}.
       waiting:
         subtitle: Un momento, por favor, esto puede llevar algún tiempo...
         title: Estamos configurando tus permisos en la carpeta del proyecto.
diff --git a/modules/storages/config/locales/crowdin/et.yml b/modules/storages/config/locales/crowdin/et.yml
index af19ed8a8d0a..22a1c99c7073 100644
--- a/modules/storages/config/locales/crowdin/et.yml
+++ b/modules/storages/config/locales/crowdin/et.yml
@@ -114,7 +114,7 @@ et:
             hide_inactive_folders:
               permission_not_set: could not set permissions on %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
               conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
@@ -124,7 +124,7 @@ et:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
           insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
           not_allowed: Nextcloud block the request.
@@ -145,7 +145,7 @@ et:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
           unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
           user_does_not_exist: "%{user} does not exist in Nextcloud."
@@ -289,7 +289,6 @@ et:
     label_creation_time: Creation time
     label_creator: Creator
     label_delete_storage: Delete storage
-    label_edit_storage: Edit storage
     label_edit_storage_access_management: Edit storage access management
     label_edit_storage_automatically_managed_folders: Edit storage automatically managed folders
     label_edit_storage_host: Edit storage host
@@ -343,6 +342,9 @@ et:
       success:
         subtitle: You are being redirected
         title: Integration setup completed
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: One moment please, this might take some time...
         title: We are setting up your permissions on the project folder.
diff --git a/modules/storages/config/locales/crowdin/eu.yml b/modules/storages/config/locales/crowdin/eu.yml
index 4943799e4c5c..3096aee08bc4 100644
--- a/modules/storages/config/locales/crowdin/eu.yml
+++ b/modules/storages/config/locales/crowdin/eu.yml
@@ -114,7 +114,7 @@ eu:
             hide_inactive_folders:
               permission_not_set: could not set permissions on %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
               conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
@@ -124,7 +124,7 @@ eu:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
           insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
           not_allowed: Nextcloud block the request.
@@ -145,7 +145,7 @@ eu:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
           unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
           user_does_not_exist: "%{user} does not exist in Nextcloud."
@@ -289,7 +289,6 @@ eu:
     label_creation_time: Creation time
     label_creator: Creator
     label_delete_storage: Delete storage
-    label_edit_storage: Edit storage
     label_edit_storage_access_management: Edit storage access management
     label_edit_storage_automatically_managed_folders: Edit storage automatically managed folders
     label_edit_storage_host: Edit storage host
@@ -343,6 +342,9 @@ eu:
       success:
         subtitle: You are being redirected
         title: Integration setup completed
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: One moment please, this might take some time...
         title: We are setting up your permissions on the project folder.
diff --git a/modules/storages/config/locales/crowdin/fa.yml b/modules/storages/config/locales/crowdin/fa.yml
index 40109097eeec..e16bb90da87c 100644
--- a/modules/storages/config/locales/crowdin/fa.yml
+++ b/modules/storages/config/locales/crowdin/fa.yml
@@ -114,7 +114,7 @@ fa:
             hide_inactive_folders:
               permission_not_set: could not set permissions on %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
               conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
@@ -124,7 +124,7 @@ fa:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
           insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
           not_allowed: Nextcloud block the request.
@@ -145,7 +145,7 @@ fa:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
           unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
           user_does_not_exist: "%{user} does not exist in Nextcloud."
@@ -289,7 +289,6 @@ fa:
     label_creation_time: Creation time
     label_creator: Creator
     label_delete_storage: Delete storage
-    label_edit_storage: Edit storage
     label_edit_storage_access_management: Edit storage access management
     label_edit_storage_automatically_managed_folders: Edit storage automatically managed folders
     label_edit_storage_host: Edit storage host
@@ -343,6 +342,9 @@ fa:
       success:
         subtitle: You are being redirected
         title: Integration setup completed
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: One moment please, this might take some time...
         title: We are setting up your permissions on the project folder.
diff --git a/modules/storages/config/locales/crowdin/fi.yml b/modules/storages/config/locales/crowdin/fi.yml
index 5ecce54f89dd..64982d851cfe 100644
--- a/modules/storages/config/locales/crowdin/fi.yml
+++ b/modules/storages/config/locales/crowdin/fi.yml
@@ -114,7 +114,7 @@ fi:
             hide_inactive_folders:
               permission_not_set: could not set permissions on %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
               conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
@@ -124,7 +124,7 @@ fi:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
           insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
           not_allowed: Nextcloud block the request.
@@ -145,7 +145,7 @@ fi:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
           unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
           user_does_not_exist: "%{user} does not exist in Nextcloud."
@@ -289,7 +289,6 @@ fi:
     label_creation_time: Creation time
     label_creator: Creator
     label_delete_storage: Delete storage
-    label_edit_storage: Edit storage
     label_edit_storage_access_management: Edit storage access management
     label_edit_storage_automatically_managed_folders: Edit storage automatically managed folders
     label_edit_storage_host: Edit storage host
@@ -343,6 +342,9 @@ fi:
       success:
         subtitle: You are being redirected
         title: Integration setup completed
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: One moment please, this might take some time...
         title: We are setting up your permissions on the project folder.
diff --git a/modules/storages/config/locales/crowdin/fil.yml b/modules/storages/config/locales/crowdin/fil.yml
index fd1c5aa4c9af..74fd58e602fa 100644
--- a/modules/storages/config/locales/crowdin/fil.yml
+++ b/modules/storages/config/locales/crowdin/fil.yml
@@ -114,7 +114,7 @@ fil:
             hide_inactive_folders:
               permission_not_set: could not set permissions on %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
               conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
@@ -124,7 +124,7 @@ fil:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
           insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
           not_allowed: Nextcloud block the request.
@@ -145,7 +145,7 @@ fil:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
           unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
           user_does_not_exist: "%{user} does not exist in Nextcloud."
@@ -289,7 +289,6 @@ fil:
     label_creation_time: Creation time
     label_creator: Creator
     label_delete_storage: Delete storage
-    label_edit_storage: Edit storage
     label_edit_storage_access_management: Edit storage access management
     label_edit_storage_automatically_managed_folders: Edit storage automatically managed folders
     label_edit_storage_host: Edit storage host
@@ -343,6 +342,9 @@ fil:
       success:
         subtitle: You are being redirected
         title: Integration setup completed
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: One moment please, this might take some time...
         title: We are setting up your permissions on the project folder.
diff --git a/modules/storages/config/locales/crowdin/fr.yml b/modules/storages/config/locales/crowdin/fr.yml
index 7cb9c1885620..9807cddf1c81 100644
--- a/modules/storages/config/locales/crowdin/fr.yml
+++ b/modules/storages/config/locales/crowdin/fr.yml
@@ -114,7 +114,7 @@ fr:
             hide_inactive_folders:
               permission_not_set: n'a pas pu définir les autorisations sur %{path}.
             remote_folders:
-              not_allowed: '%{username} n''a pas accès au dossier %{group_folder}. Veuillez vérifier les autorisations du dossier sur Nextcloud.'
+              not_allowed: L'utilisateur %{username} n'a pas accès au dossier %{group_folder}. Veuillez vérifier les autorisations du dossier sur Nextcloud.
               not_found: "Le dossier %{group_folder} est introuvable. Veuillez vérifier votre configuration Nextcloud."
             remove_user_from_group:
               conflict: 'L''utilisateur %{user} n''a pas pu être retiré du groupe %{group} pour la raison suivante : %{reason}'
@@ -124,7 +124,7 @@ fr:
               not_found: "%{current_path} n'a pas été trouvé."
             set_folders_permissions:
               permission_not_set: n'a pas pu définir les autorisations sur %{path}.
-          error: Une erreur inattendue s'est produite. Veuillez vous assurer que votre instance Nextcloud est joignable et vérifiez les journaux des processus OpenProject pour obtenir plus d'informations.
+          error: Une erreur inattendue s'est produite. Veuillez vous assurer que votre instance Nextcloud est joignable et vérifiez les journaux des processus OpenProject pour obtenir plus d'informations
           group_does_not_exist: "%{group} n'existe pas. Vérifiez la configuration de votre instance Nextcloud."
           insufficient_privileges: OpenProject n'a pas assez de privilèges pour ajouter %{user} au groupe %{group}. Vérifiez les paramètres de votre groupe dans Nextcloud.
           not_allowed: Nextcloud bloque la demande.
@@ -145,7 +145,7 @@ fr:
               not_found: "%{current_path} n'a pas été trouvé."
             set_folders_permissions:
               permission_not_set: n'a pas pu définir les autorisations sur %{path}.
-          error: Une erreur inattendue s'est produite. Veuillez vous assurer que votre instance Nextcloud est joignable et vérifiez les journaux des processus OpenProject pour obtenir plus d'informations.
+          error: Une erreur inattendue s'est produite. Veuillez vous assurer que OneDrive/SharePoint est joignable et vérifiez les journaux des processus OpenProject pour obtenir plus d'informations
           not_allowed: L'application OpenProject n'a pas été autorisée à accéder à votre lecteur OneDrive. Veuillez vérifier les autorisations définies dans l'application Azure.
           unauthorized: OpenProject n'a pas pu se synchroniser avec OneDrive. Veuillez vérifier votre espace de stockage et la configuration de l'application Azure.
           user_does_not_exist: "%{user} n'existe pas dans Nextcloud."
@@ -289,7 +289,6 @@ fr:
     label_creation_time: Heure de création
     label_creator: Créateur
     label_delete_storage: Supprimer le stockage
-    label_edit_storage: Modifier le stockage
     label_edit_storage_access_management: Modifier la gestion de l'accès à l'espace de stockage
     label_edit_storage_automatically_managed_folders: Modifier les dossiers automatiquement gérés
     label_edit_storage_host: Modifier l'hôte de stockage
@@ -343,6 +342,9 @@ fr:
       success:
         subtitle: Vous allez être redirigé
         title: Configuration de l'intégration terminée
+      timeout:
+        link_text: état de santé de la configuration de stockage de fichiers
+        subtitle: OpenProject n'a pas pu vous donner accès au dossier du projet dans le délai imparti. Veuillez réessayer.<br><br> Si ce problème persiste, veuillez contacter votre administrateur OpenProject pour vérifier %{storages_health_link}.
       waiting:
         subtitle: Un instant, s'il vous plaît, cela peut prendre un peu de temps...
         title: Nous configurons vos permissions sur le dossier du projet.
@@ -363,7 +365,7 @@ fr:
       project_storage_members:
         subtitle: Vérifiez l'état de la connexion pour l'espace de stockage %{storage_name_link} de tous les membres du projet.
         title: Statut de connexion des membres
-    permission_header_explanation: 'Les droits d''accès aux fichiers sur les supports de stockage externes ne sont appliqués qu''aux dossiers et aux fichiers contenus dans les dossiers de projet gérés automatiquement. Notez que toutes les droits sur les fichiers ne sont pas pris en charge par tous les fournisseurs de stockage. Veuillez consulter la documentation sur <a target=''_blank'' href=''https://www.openproject.org/fr/docs/system-admin-guide/users-permissions/roles-permissions/''>les autorisations de stockage de fichiers</a> pour plus d''informations.'
+    permission_header_explanation: Les droits d'accès aux fichiers sur les supports de stockage externes ne sont appliqués qu'aux dossiers et aux fichiers contenus dans les dossiers de projet gérés automatiquement. Notez que toutes les droits sur les fichiers ne sont pas pris en charge par tous les fournisseurs de stockage. Veuillez consulter la documentation sur <a target='_blank' href='https://www.openproject.org/fr/docs/system-admin-guide/users-permissions/roles-permissions/'>les autorisations de stockage de fichiers</a> pour plus d'informations.
     provider_types:
       label: Type de fournisseur
       nextcloud:
diff --git a/modules/storages/config/locales/crowdin/he.yml b/modules/storages/config/locales/crowdin/he.yml
index 73a079d69e8b..e9a4f7108f9f 100644
--- a/modules/storages/config/locales/crowdin/he.yml
+++ b/modules/storages/config/locales/crowdin/he.yml
@@ -114,7 +114,7 @@ he:
             hide_inactive_folders:
               permission_not_set: could not set permissions on %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
               conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
@@ -124,7 +124,7 @@ he:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
           insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
           not_allowed: Nextcloud block the request.
@@ -145,7 +145,7 @@ he:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
           unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
           user_does_not_exist: "%{user} does not exist in Nextcloud."
@@ -289,7 +289,6 @@ he:
     label_creation_time: Creation time
     label_creator: Creator
     label_delete_storage: Delete storage
-    label_edit_storage: Edit storage
     label_edit_storage_access_management: Edit storage access management
     label_edit_storage_automatically_managed_folders: Edit storage automatically managed folders
     label_edit_storage_host: Edit storage host
@@ -343,6 +342,9 @@ he:
       success:
         subtitle: You are being redirected
         title: Integration setup completed
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: One moment please, this might take some time...
         title: We are setting up your permissions on the project folder.
diff --git a/modules/storages/config/locales/crowdin/hi.yml b/modules/storages/config/locales/crowdin/hi.yml
index c470c774795a..2bdbfc21ed8f 100644
--- a/modules/storages/config/locales/crowdin/hi.yml
+++ b/modules/storages/config/locales/crowdin/hi.yml
@@ -114,7 +114,7 @@ hi:
             hide_inactive_folders:
               permission_not_set: could not set permissions on %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
               conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
@@ -124,7 +124,7 @@ hi:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
           insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
           not_allowed: Nextcloud block the request.
@@ -145,7 +145,7 @@ hi:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
           unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
           user_does_not_exist: "%{user} does not exist in Nextcloud."
@@ -289,7 +289,6 @@ hi:
     label_creation_time: Creation time
     label_creator: Creator
     label_delete_storage: Delete storage
-    label_edit_storage: Edit storage
     label_edit_storage_access_management: Edit storage access management
     label_edit_storage_automatically_managed_folders: Edit storage automatically managed folders
     label_edit_storage_host: Edit storage host
@@ -343,6 +342,9 @@ hi:
       success:
         subtitle: You are being redirected
         title: Integration setup completed
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: One moment please, this might take some time...
         title: We are setting up your permissions on the project folder.
diff --git a/modules/storages/config/locales/crowdin/hr.yml b/modules/storages/config/locales/crowdin/hr.yml
index 68999d48526c..9145d9211aaa 100644
--- a/modules/storages/config/locales/crowdin/hr.yml
+++ b/modules/storages/config/locales/crowdin/hr.yml
@@ -114,7 +114,7 @@ hr:
             hide_inactive_folders:
               permission_not_set: could not set permissions on %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
               conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
@@ -124,7 +124,7 @@ hr:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
           insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
           not_allowed: Nextcloud block the request.
@@ -145,7 +145,7 @@ hr:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
           unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
           user_does_not_exist: "%{user} does not exist in Nextcloud."
@@ -289,7 +289,6 @@ hr:
     label_creation_time: Creation time
     label_creator: Creator
     label_delete_storage: Delete storage
-    label_edit_storage: Edit storage
     label_edit_storage_access_management: Edit storage access management
     label_edit_storage_automatically_managed_folders: Edit storage automatically managed folders
     label_edit_storage_host: Edit storage host
@@ -343,6 +342,9 @@ hr:
       success:
         subtitle: You are being redirected
         title: Integration setup completed
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: One moment please, this might take some time...
         title: We are setting up your permissions on the project folder.
diff --git a/modules/storages/config/locales/crowdin/hu.yml b/modules/storages/config/locales/crowdin/hu.yml
index dce2b92a2ca3..6b0125d68d67 100644
--- a/modules/storages/config/locales/crowdin/hu.yml
+++ b/modules/storages/config/locales/crowdin/hu.yml
@@ -114,7 +114,7 @@ hu:
             hide_inactive_folders:
               permission_not_set: could not set permissions on %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
               conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
@@ -124,7 +124,7 @@ hu:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
           insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
           not_allowed: Nextcloud block the request.
@@ -145,7 +145,7 @@ hu:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
           unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
           user_does_not_exist: "%{user} does not exist in Nextcloud."
@@ -289,7 +289,6 @@ hu:
     label_creation_time: Creation time
     label_creator: Készítő
     label_delete_storage: Delete storage
-    label_edit_storage: Edit storage
     label_edit_storage_access_management: Edit storage access management
     label_edit_storage_automatically_managed_folders: Edit storage automatically managed folders
     label_edit_storage_host: Edit storage host
@@ -343,6 +342,9 @@ hu:
       success:
         subtitle: You are being redirected
         title: Integration setup completed
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: One moment please, this might take some time...
         title: We are setting up your permissions on the project folder.
diff --git a/modules/storages/config/locales/crowdin/id.yml b/modules/storages/config/locales/crowdin/id.yml
index e5ab1988442b..a217547f55e0 100644
--- a/modules/storages/config/locales/crowdin/id.yml
+++ b/modules/storages/config/locales/crowdin/id.yml
@@ -114,7 +114,7 @@ id:
             hide_inactive_folders:
               permission_not_set: could not set permissions on %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
               conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
@@ -124,7 +124,7 @@ id:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
           insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
           not_allowed: Nextcloud block the request.
@@ -145,7 +145,7 @@ id:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
           unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
           user_does_not_exist: "%{user} does not exist in Nextcloud."
@@ -289,7 +289,6 @@ id:
     label_creation_time: Creation time
     label_creator: Pembuat
     label_delete_storage: Delete storage
-    label_edit_storage: Edit storage
     label_edit_storage_access_management: Edit storage access management
     label_edit_storage_automatically_managed_folders: Edit storage automatically managed folders
     label_edit_storage_host: Edit storage host
@@ -343,6 +342,9 @@ id:
       success:
         subtitle: You are being redirected
         title: Integration setup completed
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: One moment please, this might take some time...
         title: We are setting up your permissions on the project folder.
diff --git a/modules/storages/config/locales/crowdin/it.yml b/modules/storages/config/locales/crowdin/it.yml
index 9141c772ba25..ee604ed7ba52 100644
--- a/modules/storages/config/locales/crowdin/it.yml
+++ b/modules/storages/config/locales/crowdin/it.yml
@@ -145,7 +145,7 @@ it:
               not_found: "Impossibile trovare %{current_path}."
             set_folders_permissions:
               permission_not_set: impossibile impostare i permessi su %{path}.
-          error: Si è verificato un errore imprevisto. Assicurati che la tua istanza Nextcloud sia raggiungibile e controlla i log dei worker di OpenProject per ulteriori informazioni
+          error: Si è verificato un errore imprevisto. Assicurati che OneDrive/SharePoint sia raggiungibile e controlla i log dei worker di OpenProject per ulteriori informazioni
           not_allowed: OpenProject non è stato autorizzato ad accedere al tuo drive OneDrive. Verifica le autorizzazioni impostate sull'applicazione Azure.
           unauthorized: OpenProject non è riuscito a sincronizzarsi con OneDrive. Verifica la configurazione dell'archiviazione e dell'applicazione Azure.
           user_does_not_exist: "%{user} non esiste in Nextcloud."
@@ -289,7 +289,6 @@ it:
     label_creation_time: Data di creazione
     label_creator: Autore
     label_delete_storage: Elimina archivio
-    label_edit_storage: Modifica archivio
     label_edit_storage_access_management: Modifica gestione degli accessi all'archivio
     label_edit_storage_automatically_managed_folders: Modifica cartelle gestite automaticamente dall'archivio
     label_edit_storage_host: Modifica host dell'archivio
@@ -343,6 +342,9 @@ it:
       success:
         subtitle: Stai per essere reindirizzato
         title: Configurazione dell'integrazione completata
+      timeout:
+        link_text: stato di salute dell'impostazione di archiviazione dei file
+        subtitle: OpenProject non è stato in grado di darti accesso alla cartella del progetto entro il tempo previsto. Prova di nuovo.<br><br> Se il problema persiste contatta il tuo amministratore OpenProject per controllare lo %{storages_health_link}.
       waiting:
         subtitle: Aspetta un attimo, potrebbe volerci un po' di tempo...
         title: Stiamo configurando le tue autorizzazioni sulla cartella del progetto.
diff --git a/modules/storages/config/locales/crowdin/ja.yml b/modules/storages/config/locales/crowdin/ja.yml
index 8d36a7616090..acbbf97d4c39 100644
--- a/modules/storages/config/locales/crowdin/ja.yml
+++ b/modules/storages/config/locales/crowdin/ja.yml
@@ -114,7 +114,7 @@ ja:
             hide_inactive_folders:
               permission_not_set: could not set permissions on %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
               conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
@@ -124,7 +124,7 @@ ja:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
           insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
           not_allowed: Nextcloud block the request.
@@ -145,7 +145,7 @@ ja:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
           unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
           user_does_not_exist: "%{user} does not exist in Nextcloud."
@@ -289,7 +289,6 @@ ja:
     label_creation_time: Creation time
     label_creator: Creator
     label_delete_storage: Delete storage
-    label_edit_storage: Edit storage
     label_edit_storage_access_management: Edit storage access management
     label_edit_storage_automatically_managed_folders: Edit storage automatically managed folders
     label_edit_storage_host: Edit storage host
@@ -343,6 +342,9 @@ ja:
       success:
         subtitle: You are being redirected
         title: Integration setup completed
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: One moment please, this might take some time...
         title: We are setting up your permissions on the project folder.
diff --git a/modules/storages/config/locales/crowdin/js-af.yml b/modules/storages/config/locales/crowdin/js-af.yml
index 61d6241dca14..b9600eec10f3 100644
--- a/modules/storages/config/locales/crowdin/js-af.yml
+++ b/modules/storages/config/locales/crowdin/js-af.yml
@@ -13,6 +13,7 @@ af:
       open_storage: "Open %{storageType}"
       select_location: "Select location"
       choose_location: "Choose location"
+      new_folder: "New folder"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ af:
           The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again.
         managed_project_folder_no_access: >
           You have no access yet to the managed project folder. Please wait a bit and try again.
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols.
         upload_keep_both: "Keep both"
         upload_replace: "Replace"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-ar.yml b/modules/storages/config/locales/crowdin/js-ar.yml
index 753712a78207..2bd108aef2f7 100644
--- a/modules/storages/config/locales/crowdin/js-ar.yml
+++ b/modules/storages/config/locales/crowdin/js-ar.yml
@@ -13,6 +13,7 @@ ar:
       open_storage: "Open %{storageType}"
       select_location: "Select location"
       choose_location: "Choose location"
+      new_folder: "New folder"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ ar:
           The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again.
         managed_project_folder_no_access: >
           You have no access yet to the managed project folder. Please wait a bit and try again.
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols.
         upload_keep_both: "Keep both"
         upload_replace: "Replace"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-az.yml b/modules/storages/config/locales/crowdin/js-az.yml
index 39c2e7e32802..b10921ef30bb 100644
--- a/modules/storages/config/locales/crowdin/js-az.yml
+++ b/modules/storages/config/locales/crowdin/js-az.yml
@@ -13,6 +13,7 @@ az:
       open_storage: "Open %{storageType}"
       select_location: "Select location"
       choose_location: "Choose location"
+      new_folder: "New folder"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ az:
           The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again.
         managed_project_folder_no_access: >
           You have no access yet to the managed project folder. Please wait a bit and try again.
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols.
         upload_keep_both: "Keep both"
         upload_replace: "Replace"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-be.yml b/modules/storages/config/locales/crowdin/js-be.yml
index c6f6fb3ac06e..08f33f7199d6 100644
--- a/modules/storages/config/locales/crowdin/js-be.yml
+++ b/modules/storages/config/locales/crowdin/js-be.yml
@@ -13,6 +13,7 @@ be:
       open_storage: "Open %{storageType}"
       select_location: "Select location"
       choose_location: "Choose location"
+      new_folder: "New folder"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ be:
           The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again.
         managed_project_folder_no_access: >
           You have no access yet to the managed project folder. Please wait a bit and try again.
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols.
         upload_keep_both: "Keep both"
         upload_replace: "Replace"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-bg.yml b/modules/storages/config/locales/crowdin/js-bg.yml
index 6f5ccb9ee4d4..65a76a0be055 100644
--- a/modules/storages/config/locales/crowdin/js-bg.yml
+++ b/modules/storages/config/locales/crowdin/js-bg.yml
@@ -13,6 +13,7 @@ bg:
       open_storage: "Open %{storageType}"
       select_location: "Select location"
       choose_location: "Choose location"
+      new_folder: "New folder"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ bg:
           The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again.
         managed_project_folder_no_access: >
           You have no access yet to the managed project folder. Please wait a bit and try again.
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols.
         upload_keep_both: "Keep both"
         upload_replace: "Замени"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-ca.yml b/modules/storages/config/locales/crowdin/js-ca.yml
index 82869dde8eab..d9f04f4e202e 100644
--- a/modules/storages/config/locales/crowdin/js-ca.yml
+++ b/modules/storages/config/locales/crowdin/js-ca.yml
@@ -13,6 +13,7 @@ ca:
       open_storage: "Obre %{storageType}"
       select_location: "Selecciona ubicació"
       choose_location: "Tria ubicació"
+      new_folder: "New folder"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ ca:
           Les carpetes gestionades automàticament no s'ha trobat encara. Si us plau, espera una mica i recarrega la pàgina per obtenir les dades més recents i prova-ho de nou.
         managed_project_folder_no_access: >
           Encara no tens access a la carpeta de projecte gestionada. Si us plau, espera un moment i prova-ho de nou.
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols.
         upload_keep_both: "Conserva els dos"
         upload_replace: "Substitueix"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-ckb-IR.yml b/modules/storages/config/locales/crowdin/js-ckb-IR.yml
index 425bc4063533..f1d70f7f8a8a 100644
--- a/modules/storages/config/locales/crowdin/js-ckb-IR.yml
+++ b/modules/storages/config/locales/crowdin/js-ckb-IR.yml
@@ -13,6 +13,7 @@ ckb-IR:
       open_storage: "Open %{storageType}"
       select_location: "Select location"
       choose_location: "Choose location"
+      new_folder: "New folder"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ ckb-IR:
           The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again.
         managed_project_folder_no_access: >
           You have no access yet to the managed project folder. Please wait a bit and try again.
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols.
         upload_keep_both: "Keep both"
         upload_replace: "Replace"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-cs.yml b/modules/storages/config/locales/crowdin/js-cs.yml
index e3b9fde1bb1b..c2ffd44480bc 100644
--- a/modules/storages/config/locales/crowdin/js-cs.yml
+++ b/modules/storages/config/locales/crowdin/js-cs.yml
@@ -13,6 +13,7 @@ cs:
       open_storage: "Otevřít %{storageType}"
       select_location: "Vyberte lokalitu"
       choose_location: "Vyberte lokalitu"
+      new_folder: "Nová složka"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ cs:
           Automaticky spravovaná složka projektu nebyla nalezena. Počkejte, prosím, znovu načtěte stránku pro načtení nejnovějších dat a zkuste to znovu.
         managed_project_folder_no_access: >
           Zatím nemáte přístup ke složce spravovaného projektu. Počkejte prosím trochu a zkuste to znovu.
+        cannot_create_folder: Nepodařilo se vytvořit složku. Nepoužívejte speciální znaky a symboly.
         upload_keep_both: "Zachovat obojí"
         upload_replace: "Nahradit"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-da.yml b/modules/storages/config/locales/crowdin/js-da.yml
index 0d7484ac01ef..e6ed1760e6e6 100644
--- a/modules/storages/config/locales/crowdin/js-da.yml
+++ b/modules/storages/config/locales/crowdin/js-da.yml
@@ -13,6 +13,7 @@ da:
       open_storage: "Open %{storageType}"
       select_location: "Select location"
       choose_location: "Choose location"
+      new_folder: "New folder"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ da:
           The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again.
         managed_project_folder_no_access: >
           You have no access yet to the managed project folder. Please wait a bit and try again.
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols.
         upload_keep_both: "Keep both"
         upload_replace: "Replace"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-de.yml b/modules/storages/config/locales/crowdin/js-de.yml
index 69ac832e077c..ef5a015edc9e 100644
--- a/modules/storages/config/locales/crowdin/js-de.yml
+++ b/modules/storages/config/locales/crowdin/js-de.yml
@@ -13,6 +13,7 @@ de:
       open_storage: "Öffne %{storageType}"
       select_location: "Speicherort auswählen"
       choose_location: "Speicherort wählen"
+      new_folder: "Neuer Ordner"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ de:
           Der automatisch verwaltete Projektordner wurde noch nicht gefunden. Bitte warten Sie, laden Sie die Seite neu, um die neuesten Daten abzurufen und versuchen Sie es erneut.
         managed_project_folder_no_access: >
           Sie haben noch keinen Zugriff auf den verwalteten Projektordner. Bitte warten Sie ein wenig und versuchen Sie es erneut.
+        cannot_create_folder: Der Ordner konnte nicht erstellt werden. Vermeiden Sie die Verwendung von Sonderzeichen und Symbolen.
         upload_keep_both: "Beide behalten"
         upload_replace: "Ersetzen"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-el.yml b/modules/storages/config/locales/crowdin/js-el.yml
index 3cddf3dfd89f..8628860ed229 100644
--- a/modules/storages/config/locales/crowdin/js-el.yml
+++ b/modules/storages/config/locales/crowdin/js-el.yml
@@ -13,6 +13,7 @@ el:
       open_storage: "Open %{storageType}"
       select_location: "Select location"
       choose_location: "Choose location"
+      new_folder: "New folder"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ el:
           The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again.
         managed_project_folder_no_access: >
           You have no access yet to the managed project folder. Please wait a bit and try again.
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols.
         upload_keep_both: "Keep both"
         upload_replace: "Αντικατάσταση"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-eo.yml b/modules/storages/config/locales/crowdin/js-eo.yml
index a4c7b90e9834..1d9c594f52fe 100644
--- a/modules/storages/config/locales/crowdin/js-eo.yml
+++ b/modules/storages/config/locales/crowdin/js-eo.yml
@@ -13,6 +13,7 @@ eo:
       open_storage: "Open %{storageType}"
       select_location: "Select location"
       choose_location: "Choose location"
+      new_folder: "New folder"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ eo:
           The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again.
         managed_project_folder_no_access: >
           You have no access yet to the managed project folder. Please wait a bit and try again.
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols.
         upload_keep_both: "Keep both"
         upload_replace: "Anstataŭigi"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-es.yml b/modules/storages/config/locales/crowdin/js-es.yml
index f31309379cdd..1d0475f66d52 100644
--- a/modules/storages/config/locales/crowdin/js-es.yml
+++ b/modules/storages/config/locales/crowdin/js-es.yml
@@ -13,6 +13,7 @@ es:
       open_storage: "Abrir %{storageType}"
       select_location: "Seleccionar ubicación"
       choose_location: "Seleccionar ubicación"
+      new_folder: "Nueva carpeta"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/Sharepoint"
@@ -42,6 +43,7 @@ es:
           Todavía no se ha encontrado la carpeta de proyecto administrada automáticamente. Espere un poco, vuelva a cargar la página para obtener los datos más recientes e inténtelo de nuevo.
         managed_project_folder_no_access: >
           Aún no tiene acceso a la carpeta del proyecto administrada. Espere un poco e inténtalo de nuevo.
+        cannot_create_folder: Error al crear la carpeta. Evite utilizar caracteres especiales y símbolos.
         upload_keep_both: "Mantener ambos"
         upload_replace: "Sustituir"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-et.yml b/modules/storages/config/locales/crowdin/js-et.yml
index a335045ba47e..ba1c4196aa29 100644
--- a/modules/storages/config/locales/crowdin/js-et.yml
+++ b/modules/storages/config/locales/crowdin/js-et.yml
@@ -13,6 +13,7 @@ et:
       open_storage: "Open %{storageType}"
       select_location: "Select location"
       choose_location: "Choose location"
+      new_folder: "New folder"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ et:
           The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again.
         managed_project_folder_no_access: >
           You have no access yet to the managed project folder. Please wait a bit and try again.
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols.
         upload_keep_both: "Keep both"
         upload_replace: "Asenda"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-eu.yml b/modules/storages/config/locales/crowdin/js-eu.yml
index d1b5a5be6d98..438e54fa13bf 100644
--- a/modules/storages/config/locales/crowdin/js-eu.yml
+++ b/modules/storages/config/locales/crowdin/js-eu.yml
@@ -13,6 +13,7 @@ eu:
       open_storage: "Open %{storageType}"
       select_location: "Select location"
       choose_location: "Choose location"
+      new_folder: "New folder"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ eu:
           The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again.
         managed_project_folder_no_access: >
           You have no access yet to the managed project folder. Please wait a bit and try again.
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols.
         upload_keep_both: "Keep both"
         upload_replace: "Replace"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-fa.yml b/modules/storages/config/locales/crowdin/js-fa.yml
index bdd7603c876f..e64437e31660 100644
--- a/modules/storages/config/locales/crowdin/js-fa.yml
+++ b/modules/storages/config/locales/crowdin/js-fa.yml
@@ -13,6 +13,7 @@ fa:
       open_storage: "Open %{storageType}"
       select_location: "Select location"
       choose_location: "Choose location"
+      new_folder: "New folder"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ fa:
           The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again.
         managed_project_folder_no_access: >
           You have no access yet to the managed project folder. Please wait a bit and try again.
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols.
         upload_keep_both: "Keep both"
         upload_replace: "Replace"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-fi.yml b/modules/storages/config/locales/crowdin/js-fi.yml
index f3f11b1ed4b3..8b471ac16f54 100644
--- a/modules/storages/config/locales/crowdin/js-fi.yml
+++ b/modules/storages/config/locales/crowdin/js-fi.yml
@@ -13,6 +13,7 @@ fi:
       open_storage: "Open %{storageType}"
       select_location: "Select location"
       choose_location: "Choose location"
+      new_folder: "New folder"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ fi:
           The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again.
         managed_project_folder_no_access: >
           You have no access yet to the managed project folder. Please wait a bit and try again.
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols.
         upload_keep_both: "Keep both"
         upload_replace: "Korvaa"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-fil.yml b/modules/storages/config/locales/crowdin/js-fil.yml
index 9d3067a3b1f8..06cf96d7fc61 100644
--- a/modules/storages/config/locales/crowdin/js-fil.yml
+++ b/modules/storages/config/locales/crowdin/js-fil.yml
@@ -13,6 +13,7 @@ fil:
       open_storage: "Open %{storageType}"
       select_location: "Select location"
       choose_location: "Choose location"
+      new_folder: "New folder"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ fil:
           The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again.
         managed_project_folder_no_access: >
           You have no access yet to the managed project folder. Please wait a bit and try again.
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols.
         upload_keep_both: "Keep both"
         upload_replace: "Palitan"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-fr.yml b/modules/storages/config/locales/crowdin/js-fr.yml
index 488bd23401a8..1d11ab018fec 100644
--- a/modules/storages/config/locales/crowdin/js-fr.yml
+++ b/modules/storages/config/locales/crowdin/js-fr.yml
@@ -13,6 +13,7 @@ fr:
       open_storage: "Ouvrir %{storageType}"
       select_location: "Sélectionnez l'emplacement"
       choose_location: "Choisir emplacement"
+      new_folder: "Nouveau dossier"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ fr:
           Le dossier de projet géré automatiquement n'a pas encore été trouvé. Veuillez patienter, rechargez la page pour récupérer les données les plus récentes, puis réessayez.
         managed_project_folder_no_access: >
           Vous n'avez pas encore accès au dossier de projet géré. Veuillez patienter un peu avant de réessayer.
+        cannot_create_folder: Échec de la création du dossier. Évitez d'utiliser des caractères spéciaux et des symboles.
         upload_keep_both: "Garder les deux"
         upload_replace: "Remplacer"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-he.yml b/modules/storages/config/locales/crowdin/js-he.yml
index f7653dd2b676..7d56e25b4411 100644
--- a/modules/storages/config/locales/crowdin/js-he.yml
+++ b/modules/storages/config/locales/crowdin/js-he.yml
@@ -13,6 +13,7 @@ he:
       open_storage: "Open %{storageType}"
       select_location: "Select location"
       choose_location: "Choose location"
+      new_folder: "New folder"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ he:
           The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again.
         managed_project_folder_no_access: >
           You have no access yet to the managed project folder. Please wait a bit and try again.
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols.
         upload_keep_both: "Keep both"
         upload_replace: "Replace"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-hi.yml b/modules/storages/config/locales/crowdin/js-hi.yml
index e5572717e609..d0092b39653b 100644
--- a/modules/storages/config/locales/crowdin/js-hi.yml
+++ b/modules/storages/config/locales/crowdin/js-hi.yml
@@ -13,6 +13,7 @@ hi:
       open_storage: "Open %{storageType}"
       select_location: "Select location"
       choose_location: "Choose location"
+      new_folder: "New folder"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ hi:
           The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again.
         managed_project_folder_no_access: >
           You have no access yet to the managed project folder. Please wait a bit and try again.
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols.
         upload_keep_both: "Keep both"
         upload_replace: "Replace"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-hr.yml b/modules/storages/config/locales/crowdin/js-hr.yml
index 5a9ae058be64..586edbf07adb 100644
--- a/modules/storages/config/locales/crowdin/js-hr.yml
+++ b/modules/storages/config/locales/crowdin/js-hr.yml
@@ -13,6 +13,7 @@ hr:
       open_storage: "Open %{storageType}"
       select_location: "Select location"
       choose_location: "Choose location"
+      new_folder: "New folder"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ hr:
           The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again.
         managed_project_folder_no_access: >
           You have no access yet to the managed project folder. Please wait a bit and try again.
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols.
         upload_keep_both: "Keep both"
         upload_replace: "Zamijeni"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-hu.yml b/modules/storages/config/locales/crowdin/js-hu.yml
index 7d91107d5d95..d218b8b588da 100644
--- a/modules/storages/config/locales/crowdin/js-hu.yml
+++ b/modules/storages/config/locales/crowdin/js-hu.yml
@@ -13,6 +13,7 @@ hu:
       open_storage: "Open %{storageType}"
       select_location: "Select location"
       choose_location: "Choose location"
+      new_folder: "New folder"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ hu:
           The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again.
         managed_project_folder_no_access: >
           You have no access yet to the managed project folder. Please wait a bit and try again.
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols.
         upload_keep_both: "Keep both"
         upload_replace: "Csere"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-id.yml b/modules/storages/config/locales/crowdin/js-id.yml
index b4d7600f78ff..42a711d704dd 100644
--- a/modules/storages/config/locales/crowdin/js-id.yml
+++ b/modules/storages/config/locales/crowdin/js-id.yml
@@ -13,6 +13,7 @@ id:
       open_storage: "Open %{storageType}"
       select_location: "Select location"
       choose_location: "Choose location"
+      new_folder: "New folder"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ id:
           The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again.
         managed_project_folder_no_access: >
           You have no access yet to the managed project folder. Please wait a bit and try again.
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols.
         upload_keep_both: "Keep both"
         upload_replace: "Ganti"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-it.yml b/modules/storages/config/locales/crowdin/js-it.yml
index 8205c90e51e1..07afc48d27ea 100644
--- a/modules/storages/config/locales/crowdin/js-it.yml
+++ b/modules/storages/config/locales/crowdin/js-it.yml
@@ -13,6 +13,7 @@ it:
       open_storage: "Apri %{storageType}"
       select_location: "Seleziona Posizione"
       choose_location: "Scegli posizione"
+      new_folder: "Nuova cartella"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ it:
           La cartella del progetto gestita automaticamente non è stata ancora trovata. Attendi un po', ricarica la pagina per recuperare i dati più recenti e riprova.
         managed_project_folder_no_access: >
           Non hai ancora accesso alla cartella del progetto gestito. Aspetta un po' e riprova.
+        cannot_create_folder: Impossibile creare la cartella. Evita di usare caratteri e simboli speciali.
         upload_keep_both: "Mantieni entrambi"
         upload_replace: "Sostituisci"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-ja.yml b/modules/storages/config/locales/crowdin/js-ja.yml
index 9c8113120d87..626ac1f79271 100644
--- a/modules/storages/config/locales/crowdin/js-ja.yml
+++ b/modules/storages/config/locales/crowdin/js-ja.yml
@@ -13,6 +13,7 @@ ja:
       open_storage: "Open %{storageType}"
       select_location: "Select location"
       choose_location: "Choose location"
+      new_folder: "New folder"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ ja:
           The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again.
         managed_project_folder_no_access: >
           You have no access yet to the managed project folder. Please wait a bit and try again.
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols.
         upload_keep_both: "Keep both"
         upload_replace: "置き換え"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-ka.yml b/modules/storages/config/locales/crowdin/js-ka.yml
index 7da4409d009b..3da3b72b1705 100644
--- a/modules/storages/config/locales/crowdin/js-ka.yml
+++ b/modules/storages/config/locales/crowdin/js-ka.yml
@@ -13,6 +13,7 @@ ka:
       open_storage: "Open %{storageType}"
       select_location: "Select location"
       choose_location: "Choose location"
+      new_folder: "New folder"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ ka:
           The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again.
         managed_project_folder_no_access: >
           You have no access yet to the managed project folder. Please wait a bit and try again.
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols.
         upload_keep_both: "ორივეს შენარჩუნება"
         upload_replace: "ჩანაცვლება"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-kk.yml b/modules/storages/config/locales/crowdin/js-kk.yml
index ae07f753fb16..f7526ee51bef 100644
--- a/modules/storages/config/locales/crowdin/js-kk.yml
+++ b/modules/storages/config/locales/crowdin/js-kk.yml
@@ -13,6 +13,7 @@ kk:
       open_storage: "Open %{storageType}"
       select_location: "Select location"
       choose_location: "Choose location"
+      new_folder: "New folder"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ kk:
           The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again.
         managed_project_folder_no_access: >
           You have no access yet to the managed project folder. Please wait a bit and try again.
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols.
         upload_keep_both: "Keep both"
         upload_replace: "Replace"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-ko.yml b/modules/storages/config/locales/crowdin/js-ko.yml
index 2ca3741d23a3..79ac637b5f58 100644
--- a/modules/storages/config/locales/crowdin/js-ko.yml
+++ b/modules/storages/config/locales/crowdin/js-ko.yml
@@ -13,6 +13,7 @@ ko:
       open_storage: "%{storageType} 열기"
       select_location: "위치 선택"
       choose_location: "위치 선택"
+      new_folder: "새 폴더"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ ko:
           자동으로 관리되는 프로젝트 폴더를 아직 찾지 못했습니다. 잠시 기다렸다가 페이지를 다시 로드하고 최신 데이터를 가져온 후에 다시 시도하세요.
         managed_project_folder_no_access: >
           관리되는 프로젝트 폴더에 대한 액세스 권한이 아직 없습니다. 잠시 후 다시 시도하세요.
+        cannot_create_folder: 폴더를 만들지 못했습니다. 특수 문자 및 기호를 사용하지 마세요.
         upload_keep_both: "모두 유지"
         upload_replace: "바꾸기"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-lt.yml b/modules/storages/config/locales/crowdin/js-lt.yml
index 4630498f5c0f..883be4cb7b07 100644
--- a/modules/storages/config/locales/crowdin/js-lt.yml
+++ b/modules/storages/config/locales/crowdin/js-lt.yml
@@ -13,6 +13,7 @@ lt:
       open_storage: "Atverti %{storageType}"
       select_location: "Pažymėti vietą"
       choose_location: "Parinkite vietą"
+      new_folder: "New folder"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ lt:
           Automatiškai tvarkomas projekto aplankas dar nerastas. Prašome truputį palaukti, iš naujo įkelti puslapį, kad atsisiųstumėte naujausius duomenis, ir pabandyti dar kartą.
         managed_project_folder_no_access: >
           Jūs dar neturite prieigos prie tvarkomo projekto aplanko. Prašome truputį palaukti ir bandyti dar kartą.
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols.
         upload_keep_both: "Pasilikti abu"
         upload_replace: "Pakeisti"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-lv.yml b/modules/storages/config/locales/crowdin/js-lv.yml
index 0b460f3461a2..9706581d6202 100644
--- a/modules/storages/config/locales/crowdin/js-lv.yml
+++ b/modules/storages/config/locales/crowdin/js-lv.yml
@@ -13,6 +13,7 @@ lv:
       open_storage: "Open %{storageType}"
       select_location: "Select location"
       choose_location: "Choose location"
+      new_folder: "New folder"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ lv:
           The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again.
         managed_project_folder_no_access: >
           You have no access yet to the managed project folder. Please wait a bit and try again.
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols.
         upload_keep_both: "Keep both"
         upload_replace: "Replace"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-mn.yml b/modules/storages/config/locales/crowdin/js-mn.yml
index aa9eed2a0441..37ab76676d78 100644
--- a/modules/storages/config/locales/crowdin/js-mn.yml
+++ b/modules/storages/config/locales/crowdin/js-mn.yml
@@ -13,6 +13,7 @@ mn:
       open_storage: "Open %{storageType}"
       select_location: "Select location"
       choose_location: "Choose location"
+      new_folder: "New folder"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ mn:
           The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again.
         managed_project_folder_no_access: >
           You have no access yet to the managed project folder. Please wait a bit and try again.
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols.
         upload_keep_both: "Keep both"
         upload_replace: "Replace"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-ms.yml b/modules/storages/config/locales/crowdin/js-ms.yml
index 6d7e6a668bee..3441573f54d1 100644
--- a/modules/storages/config/locales/crowdin/js-ms.yml
+++ b/modules/storages/config/locales/crowdin/js-ms.yml
@@ -13,6 +13,7 @@ ms:
       open_storage: "Buka %{storageType}"
       select_location: "Pilih lokasi"
       choose_location: "Pilih lokasi"
+      new_folder: "Folder baru"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ ms:
           Folder yang dikendalikan secara automatik masih belum ditemui. Sila tunggu sebentar, muat semula halaman untuk dapatkan data terkini, dan cuba lagi.
         managed_project_folder_no_access: >
           Anda masih belum mempunyai akses ke folder projek yang dikendalikan. Sila tunggu sebentar dan cuba lagi.
+        cannot_create_folder: Gagal membuat folder. Elakkan menggunakan aksara dan simbol khas.
         upload_keep_both: "Simpan kedua-duanya"
         upload_replace: "Gantikan"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-ne.yml b/modules/storages/config/locales/crowdin/js-ne.yml
index 6b2e62fc823f..fdd7b3609ce3 100644
--- a/modules/storages/config/locales/crowdin/js-ne.yml
+++ b/modules/storages/config/locales/crowdin/js-ne.yml
@@ -13,6 +13,7 @@ ne:
       open_storage: "Open %{storageType}"
       select_location: "Select location"
       choose_location: "Choose location"
+      new_folder: "New folder"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ ne:
           The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again.
         managed_project_folder_no_access: >
           You have no access yet to the managed project folder. Please wait a bit and try again.
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols.
         upload_keep_both: "Keep both"
         upload_replace: "Replace"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-nl.yml b/modules/storages/config/locales/crowdin/js-nl.yml
index 83e405fa43fa..0be26c12ff78 100644
--- a/modules/storages/config/locales/crowdin/js-nl.yml
+++ b/modules/storages/config/locales/crowdin/js-nl.yml
@@ -13,6 +13,7 @@ nl:
       open_storage: "%{storageType} openen"
       select_location: "Selecteer locatie"
       choose_location: "Kies locatie"
+      new_folder: "New folder"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ nl:
           The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again.
         managed_project_folder_no_access: >
           U hebt nog geen toegang tot de beheerde projectmap. Wacht even en probeer het opnieuw.
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols.
         upload_keep_both: "Beide behouden"
         upload_replace: "Vervang"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-no.yml b/modules/storages/config/locales/crowdin/js-no.yml
index ee69dff9f8de..eeb3e59d4976 100644
--- a/modules/storages/config/locales/crowdin/js-no.yml
+++ b/modules/storages/config/locales/crowdin/js-no.yml
@@ -13,6 +13,7 @@
       open_storage: "Åpne %{storageType}"
       select_location: "Velg plassering"
       choose_location: "Velg plassering"
+      new_folder: "New folder"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@
           Den automatisk administrerte prosjektmappen ble ikke funnet ennå. Vent litt, last siden på nytt for å hente nyeste data, og prøv på nytt.
         managed_project_folder_no_access: >
           Du har ikke tilgang til den administrerte prosjektmappen. Vennligst vent litt og prøv igjen.
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols.
         upload_keep_both: "Behold begge"
         upload_replace: "Erstatt"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-pl.yml b/modules/storages/config/locales/crowdin/js-pl.yml
index 9afae4e8245f..b125132a277b 100644
--- a/modules/storages/config/locales/crowdin/js-pl.yml
+++ b/modules/storages/config/locales/crowdin/js-pl.yml
@@ -13,6 +13,7 @@ pl:
       open_storage: "Otwórz %{storageType}"
       select_location: "Zaznacz lokalizację"
       choose_location: "Wybierz lokalizację"
+      new_folder: "Nowy folder"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ pl:
           Jeszcze nie znaleziono automatycznie zarządzanego folderu projektu. Zaczekaj chwilę, odśwież stronę, aby pobrać najnowsze dane i spróbuj ponownie.
         managed_project_folder_no_access: >
           Nie masz jeszcze dostępu do zarządzanego folderu projektu. Poczekaj chwilę i spróbuj ponownie.
+        cannot_create_folder: Nie udało się utworzyć folderu. Unikaj używania znaków specjalnych i symboli.
         upload_keep_both: "Zachowaj oba"
         upload_replace: "Zastąp"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-pt-BR.yml b/modules/storages/config/locales/crowdin/js-pt-BR.yml
index f862d4913e59..86c9894fc48f 100644
--- a/modules/storages/config/locales/crowdin/js-pt-BR.yml
+++ b/modules/storages/config/locales/crowdin/js-pt-BR.yml
@@ -13,6 +13,7 @@ pt-BR:
       open_storage: "Abrir %{storageType}"
       select_location: "Selecionar localização"
       choose_location: "Escolher localização"
+      new_folder: "Nova pasta"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ pt-BR:
           A pasta do projeto gerenciado automaticamente ainda não foi encontrada. Aguarde um pouco, recarregue a página para obter os dados mais recentes e tente novamente.
         managed_project_folder_no_access: >
           Você ainda não possui acesso à pasta do projeto gerenciado. Aguarde um pouco e tente novamente.
+        cannot_create_folder: Falha ao criar a pasta. Evite usar caracteres especiais e símbolos.
         upload_keep_both: "Manter ambos"
         upload_replace: "Substituir"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-pt-PT.yml b/modules/storages/config/locales/crowdin/js-pt-PT.yml
index 3afdd9bc6d84..9e85845713c4 100644
--- a/modules/storages/config/locales/crowdin/js-pt-PT.yml
+++ b/modules/storages/config/locales/crowdin/js-pt-PT.yml
@@ -13,6 +13,7 @@ pt-PT:
       open_storage: "Abrir %{storageType}"
       select_location: "Selecionar localização"
       choose_location: "Escolher localização"
+      new_folder: "Nova pasta"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ pt-PT:
           A pasta do projeto gerido automaticamente ainda não foi encontrada. Aguarde um pouco, recarregue a página para obter os dados mais recentes e tente novamente.
         managed_project_folder_no_access: >
           Ainda não tem acesso à pasta do projeto gerido. Aguarde um pouco e tente novamente.
+        cannot_create_folder: Não foi possível criar a pasta. Evite utilizar caracteres especiais e símbolos.
         upload_keep_both: "Manter ambos"
         upload_replace: "Substituir"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-ro.yml b/modules/storages/config/locales/crowdin/js-ro.yml
index d75f93896cac..d0a24b05183a 100644
--- a/modules/storages/config/locales/crowdin/js-ro.yml
+++ b/modules/storages/config/locales/crowdin/js-ro.yml
@@ -13,6 +13,7 @@ ro:
       open_storage: "Deschide %{storageType}"
       select_location: "Selectează locația"
       choose_location: "Alege Locația"
+      new_folder: "New folder"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ ro:
           The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again.
         managed_project_folder_no_access: >
           You have no access yet to the managed project folder. Please wait a bit and try again.
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols.
         upload_keep_both: "Păstrați ambele"
         upload_replace: "Înlocuiește"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-ru.yml b/modules/storages/config/locales/crowdin/js-ru.yml
index 8de667094030..bcd70bace482 100644
--- a/modules/storages/config/locales/crowdin/js-ru.yml
+++ b/modules/storages/config/locales/crowdin/js-ru.yml
@@ -13,6 +13,7 @@ ru:
       open_storage: "Открыть %{storageType}"
       select_location: "Выберите местоположение"
       choose_location: "Выберите местоположение"
+      new_folder: "Новая папка"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ ru:
           Автоматически управляемая папка проекта еще не найдена.  Подождите немного, перезагрузите страницу, чтобы получить последние данные, и повторите попытку.
         managed_project_folder_no_access: >
           У вас пока нет доступа к управляемой папке проекта. Пожалуйста, подождите немного и повторите попытку.
+        cannot_create_folder: Не удалось создать папку. Избегайте использования специальных символов и знаков.
         upload_keep_both: "Оставить оба"
         upload_replace: "Заменить"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-rw.yml b/modules/storages/config/locales/crowdin/js-rw.yml
index c4eb7947ecb9..547d6f62d3d9 100644
--- a/modules/storages/config/locales/crowdin/js-rw.yml
+++ b/modules/storages/config/locales/crowdin/js-rw.yml
@@ -13,6 +13,7 @@ rw:
       open_storage: "Open %{storageType}"
       select_location: "Select location"
       choose_location: "Choose location"
+      new_folder: "New folder"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ rw:
           The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again.
         managed_project_folder_no_access: >
           You have no access yet to the managed project folder. Please wait a bit and try again.
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols.
         upload_keep_both: "Keep both"
         upload_replace: "Replace"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-si.yml b/modules/storages/config/locales/crowdin/js-si.yml
index bd319fd98280..0784ff950467 100644
--- a/modules/storages/config/locales/crowdin/js-si.yml
+++ b/modules/storages/config/locales/crowdin/js-si.yml
@@ -13,6 +13,7 @@ si:
       open_storage: "Open %{storageType}"
       select_location: "Select location"
       choose_location: "Choose location"
+      new_folder: "New folder"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ si:
           The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again.
         managed_project_folder_no_access: >
           You have no access yet to the managed project folder. Please wait a bit and try again.
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols.
         upload_keep_both: "Keep both"
         upload_replace: "ප්රතිස්ථාපනය කරන්න"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-sk.yml b/modules/storages/config/locales/crowdin/js-sk.yml
index b08e6005470d..4a1635e449ce 100644
--- a/modules/storages/config/locales/crowdin/js-sk.yml
+++ b/modules/storages/config/locales/crowdin/js-sk.yml
@@ -13,6 +13,7 @@ sk:
       open_storage: "Open %{storageType}"
       select_location: "Select location"
       choose_location: "Choose location"
+      new_folder: "New folder"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ sk:
           The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again.
         managed_project_folder_no_access: >
           You have no access yet to the managed project folder. Please wait a bit and try again.
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols.
         upload_keep_both: "Keep both"
         upload_replace: "Nahradiť"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-sl.yml b/modules/storages/config/locales/crowdin/js-sl.yml
index ef349ea69985..1dd98afadbfb 100644
--- a/modules/storages/config/locales/crowdin/js-sl.yml
+++ b/modules/storages/config/locales/crowdin/js-sl.yml
@@ -13,6 +13,7 @@ sl:
       open_storage: "Open %{storageType}"
       select_location: "Select location"
       choose_location: "Choose location"
+      new_folder: "New folder"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ sl:
           The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again.
         managed_project_folder_no_access: >
           You have no access yet to the managed project folder. Please wait a bit and try again.
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols.
         upload_keep_both: "Keep both"
         upload_replace: "Zamenjaj"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-sr.yml b/modules/storages/config/locales/crowdin/js-sr.yml
index 0214cb56b03c..6dd193e5a860 100644
--- a/modules/storages/config/locales/crowdin/js-sr.yml
+++ b/modules/storages/config/locales/crowdin/js-sr.yml
@@ -13,6 +13,7 @@ sr:
       open_storage: "Open %{storageType}"
       select_location: "Select location"
       choose_location: "Choose location"
+      new_folder: "New folder"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ sr:
           The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again.
         managed_project_folder_no_access: >
           You have no access yet to the managed project folder. Please wait a bit and try again.
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols.
         upload_keep_both: "Keep both"
         upload_replace: "Replace"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-sv.yml b/modules/storages/config/locales/crowdin/js-sv.yml
index ccdb98e51e61..a58bef8f44ec 100644
--- a/modules/storages/config/locales/crowdin/js-sv.yml
+++ b/modules/storages/config/locales/crowdin/js-sv.yml
@@ -13,6 +13,7 @@ sv:
       open_storage: "Open %{storageType}"
       select_location: "Select location"
       choose_location: "Choose location"
+      new_folder: "New folder"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ sv:
           The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again.
         managed_project_folder_no_access: >
           You have no access yet to the managed project folder. Please wait a bit and try again.
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols.
         upload_keep_both: "Keep both"
         upload_replace: "Ersätt"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-th.yml b/modules/storages/config/locales/crowdin/js-th.yml
index 864e3defa8a4..1455922c6d23 100644
--- a/modules/storages/config/locales/crowdin/js-th.yml
+++ b/modules/storages/config/locales/crowdin/js-th.yml
@@ -13,6 +13,7 @@ th:
       open_storage: "Open %{storageType}"
       select_location: "Select location"
       choose_location: "Choose location"
+      new_folder: "New folder"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ th:
           The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again.
         managed_project_folder_no_access: >
           You have no access yet to the managed project folder. Please wait a bit and try again.
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols.
         upload_keep_both: "Keep both"
         upload_replace: "Replace"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-tr.yml b/modules/storages/config/locales/crowdin/js-tr.yml
index 2bca62466cd1..9014ab2d9eec 100644
--- a/modules/storages/config/locales/crowdin/js-tr.yml
+++ b/modules/storages/config/locales/crowdin/js-tr.yml
@@ -13,6 +13,7 @@ tr:
       open_storage: "%{storageType}'ı açın"
       select_location: "Konum seç"
       choose_location: "Konum seç"
+      new_folder: "New folder"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ tr:
           The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again.
         managed_project_folder_no_access: >
           You have no access yet to the managed project folder. Please wait a bit and try again.
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols.
         upload_keep_both: "Keep both"
         upload_replace: "Değiştir"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-uk.yml b/modules/storages/config/locales/crowdin/js-uk.yml
index 402d01badd56..e4224ac2a320 100644
--- a/modules/storages/config/locales/crowdin/js-uk.yml
+++ b/modules/storages/config/locales/crowdin/js-uk.yml
@@ -13,6 +13,7 @@ uk:
       open_storage: "Відкрити сховище %{storageType}"
       select_location: "Укажіть папку"
       choose_location: "Виберіть папку"
+      new_folder: "Нова папка"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive / SharePoint"
@@ -42,6 +43,7 @@ uk:
           Папку проєкту з автоматичним керуванням поки не знайдено. Трохи зачекайте, перезапустіть сторінку, отримайте найновіші дані й повторіть спробу.
         managed_project_folder_no_access: >
           У вас немає доступу до керованої папки проєкту. Трохи зачекайте й повторіть спробу.
+        cannot_create_folder: Не вдалося створити папку. Не використовуйте спеціальні знаки й символи.
         upload_keep_both: "Зберегти обидва"
         upload_replace: "Замінити"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-uz.yml b/modules/storages/config/locales/crowdin/js-uz.yml
index ef3336e431c9..e9e3200512f9 100644
--- a/modules/storages/config/locales/crowdin/js-uz.yml
+++ b/modules/storages/config/locales/crowdin/js-uz.yml
@@ -13,6 +13,7 @@ uz:
       open_storage: "Open %{storageType}"
       select_location: "Select location"
       choose_location: "Choose location"
+      new_folder: "New folder"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ uz:
           The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again.
         managed_project_folder_no_access: >
           You have no access yet to the managed project folder. Please wait a bit and try again.
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols.
         upload_keep_both: "Keep both"
         upload_replace: "Replace"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-vi.yml b/modules/storages/config/locales/crowdin/js-vi.yml
index a36be0c5ca02..7137fe23e2f6 100644
--- a/modules/storages/config/locales/crowdin/js-vi.yml
+++ b/modules/storages/config/locales/crowdin/js-vi.yml
@@ -13,6 +13,7 @@ vi:
       open_storage: "Mở %{storageType}"
       select_location: "Chọn vị trí"
       choose_location: "Chọn vị trí"
+      new_folder: "New folder"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ vi:
           Thư mục dự án được quản lý tự động chưa được tìm thấy. Vui lòng đợi một chút, tải lại trang để lấy dữ liệu mới nhất, và thử lại.
         managed_project_folder_no_access: >
           Bạn chưa có quyền truy cập vào thư mục dự án được quản lý. Vui lòng đợi một chút và thử lại.
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols.
         upload_keep_both: "Giữ cả hai"
         upload_replace: "Thay thế"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-zh-CN.yml b/modules/storages/config/locales/crowdin/js-zh-CN.yml
index ff44ba9cc732..b7558789c439 100644
--- a/modules/storages/config/locales/crowdin/js-zh-CN.yml
+++ b/modules/storages/config/locales/crowdin/js-zh-CN.yml
@@ -13,6 +13,7 @@ zh-CN:
       open_storage: "打开 %{storageType}"
       select_location: "选择位置"
       choose_location: "选择地点"
+      new_folder: "新文件夹"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ zh-CN:
           尚未找到自动托管的项目文件夹。请稍等片刻，重新加载页面以获取最新数据，然后重试。
         managed_project_folder_no_access: >
           您目前还无法访问托管项目文件夹。请稍等片刻，然后重试。
+        cannot_create_folder: 创建文件夹失败。请避免使用特殊字符和符号。
         upload_keep_both: "保留两者"
         upload_replace: "替换"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/js-zh-TW.yml b/modules/storages/config/locales/crowdin/js-zh-TW.yml
index bcee1b450583..f3ad9f93e42d 100644
--- a/modules/storages/config/locales/crowdin/js-zh-TW.yml
+++ b/modules/storages/config/locales/crowdin/js-zh-TW.yml
@@ -13,6 +13,7 @@ zh-TW:
       open_storage: "開啟 %{storageType}"
       select_location: "選擇位置"
       choose_location: "選擇位置"
+      new_folder: "新增資料夾"
       types:
         nextcloud: "Nextcloud"
         one_drive: "OneDrive/SharePoint"
@@ -42,6 +43,7 @@ zh-TW:
           尚未找到自動管理的專案資料夾。 請稍等一下，重新加載頁面以獲取最新數據，然後重試。
         managed_project_folder_no_access: >
           您尚無權存取託管專案資料夾。 請稍等一下，然後重試。
+        cannot_create_folder: 建立資料夾失敗。避免使用特殊字符和符號。
         upload_keep_both: "兩者都保留"
         upload_replace: "取代"
       file_links:
diff --git a/modules/storages/config/locales/crowdin/ka.yml b/modules/storages/config/locales/crowdin/ka.yml
index dacbda606356..e3aa93a52b45 100644
--- a/modules/storages/config/locales/crowdin/ka.yml
+++ b/modules/storages/config/locales/crowdin/ka.yml
@@ -114,7 +114,7 @@ ka:
             hide_inactive_folders:
               permission_not_set: could not set permissions on %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
               conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
@@ -124,7 +124,7 @@ ka:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
           insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
           not_allowed: Nextcloud block the request.
@@ -145,7 +145,7 @@ ka:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
           unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
           user_does_not_exist: "%{user} does not exist in Nextcloud."
@@ -289,7 +289,6 @@ ka:
     label_creation_time: შექმნის დრო
     label_creator: შემქმნელი
     label_delete_storage: Delete storage
-    label_edit_storage: საცავის ჩასწორება
     label_edit_storage_access_management: Edit storage access management
     label_edit_storage_automatically_managed_folders: Edit storage automatically managed folders
     label_edit_storage_host: Edit storage host
@@ -343,6 +342,9 @@ ka:
       success:
         subtitle: You are being redirected
         title: Integration setup completed
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: One moment please, this might take some time...
         title: We are setting up your permissions on the project folder.
diff --git a/modules/storages/config/locales/crowdin/kk.yml b/modules/storages/config/locales/crowdin/kk.yml
index 9664b29bb04f..8a276ffad9e6 100644
--- a/modules/storages/config/locales/crowdin/kk.yml
+++ b/modules/storages/config/locales/crowdin/kk.yml
@@ -114,7 +114,7 @@ kk:
             hide_inactive_folders:
               permission_not_set: could not set permissions on %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
               conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
@@ -124,7 +124,7 @@ kk:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
           insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
           not_allowed: Nextcloud block the request.
@@ -145,7 +145,7 @@ kk:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
           unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
           user_does_not_exist: "%{user} does not exist in Nextcloud."
@@ -289,7 +289,6 @@ kk:
     label_creation_time: Creation time
     label_creator: Creator
     label_delete_storage: Delete storage
-    label_edit_storage: Edit storage
     label_edit_storage_access_management: Edit storage access management
     label_edit_storage_automatically_managed_folders: Edit storage automatically managed folders
     label_edit_storage_host: Edit storage host
@@ -343,6 +342,9 @@ kk:
       success:
         subtitle: You are being redirected
         title: Integration setup completed
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: One moment please, this might take some time...
         title: We are setting up your permissions on the project folder.
diff --git a/modules/storages/config/locales/crowdin/ko.yml b/modules/storages/config/locales/crowdin/ko.yml
index 0f905157a220..cea4e3b36611 100644
--- a/modules/storages/config/locales/crowdin/ko.yml
+++ b/modules/storages/config/locales/crowdin/ko.yml
@@ -145,7 +145,7 @@ ko:
               not_found: "%{current_path}을(를) 찾을 수 없습니다."
             set_folders_permissions:
               permission_not_set: '- %{path}에 대한 권한을 설정할 수 없습니다.'
-          error: 예기치 않은 오류가 발생했습니다. Nextcloud 인스턴스에 연결할 수 있는지 확인하고 OpenProject 작업자 로그에서 자세한 내용을 확인하세요
+          error: 예기치 않은 오류가 발생했습니다. OneDrive/SharePoint에 연결할 수 있는지 확인하고 OpenProject 작업자 로그에서 자세한 내용을 확인하세요
           not_allowed: OpenProject가 OneDrive 드라이브에 액세스하도록 허용되지 않았습니다. Azure 애플리케이션에 설정된 권한을 확인하세요.
           unauthorized: OpenProject가 OneDrive와 동기화할 수 없습니다. 저장소 및 Azure 애플리케이션 구성을 확인하세요.
           user_does_not_exist: "%{user}이(가) Nextcloud에 없습니다."
@@ -289,7 +289,6 @@ ko:
     label_creation_time: 생성 시간
     label_creator: 생성자
     label_delete_storage: 저장소 삭제
-    label_edit_storage: 저장소 편집
     label_edit_storage_access_management: 저장소 액세스 관리 편집
     label_edit_storage_automatically_managed_folders: 저장소 자동 관리 폴더 편집
     label_edit_storage_host: 저장소 호스트 편집
@@ -343,6 +342,9 @@ ko:
       success:
         subtitle: 리디렉션 중입니다
         title: 통합 설정 완료됨
+      timeout:
+        link_text: 파일 저장소 설정 상태
+        subtitle: 예상 시간 내에 OpenProject에서 프로젝트 폴더에 대한 액세스를 제공하지 못했습니다. 다시 한번 시도해 보세요.<br><br> 문제가 지속되면 OpenProject 관리자에게 문의하여 %{storages_health_link}를 확인하세요.
       waiting:
         subtitle: 잠시 기다려 주세요. 시간이 좀 걸릴 수 있습니다.
         title: 프로젝트 폴더에 대한 권한을 설정하는 중입니다.
diff --git a/modules/storages/config/locales/crowdin/lt.yml b/modules/storages/config/locales/crowdin/lt.yml
index a0aac07c6952..7d5c9668b7b2 100644
--- a/modules/storages/config/locales/crowdin/lt.yml
+++ b/modules/storages/config/locales/crowdin/lt.yml
@@ -114,7 +114,7 @@ lt:
             hide_inactive_folders:
               permission_not_set: could not set permissions on %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
               conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
@@ -124,7 +124,7 @@ lt:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
           insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
           not_allowed: Nextcloud block the request.
@@ -145,7 +145,7 @@ lt:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
           unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
           user_does_not_exist: "%{user} does not exist in Nextcloud."
@@ -289,7 +289,6 @@ lt:
     label_creation_time: Sukūrimo laikas
     label_creator: Kūrėjas
     label_delete_storage: Trinti saugyklą
-    label_edit_storage: Keisti saugyklą
     label_edit_storage_access_management: Keisti saugyklos prieigos valdymą
     label_edit_storage_automatically_managed_folders: Keisti saugyklos automatiškai tvarkomus aplankus
     label_edit_storage_host: Keisti saugyklos adresą
@@ -343,6 +342,9 @@ lt:
       success:
         subtitle: Jūs peradresuojami
         title: Integracijos nustatymas baigtas
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: Minutėlę, tai gali užtrukti šiek tiek laiko...
         title: Mes nustatome jūsų teises projekto aplankui.
diff --git a/modules/storages/config/locales/crowdin/lv.yml b/modules/storages/config/locales/crowdin/lv.yml
index 9bdd1b5dc788..8962dd4e6d8e 100644
--- a/modules/storages/config/locales/crowdin/lv.yml
+++ b/modules/storages/config/locales/crowdin/lv.yml
@@ -114,7 +114,7 @@ lv:
             hide_inactive_folders:
               permission_not_set: could not set permissions on %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
               conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
@@ -124,7 +124,7 @@ lv:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
           insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
           not_allowed: Nextcloud block the request.
@@ -145,7 +145,7 @@ lv:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
           unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
           user_does_not_exist: "%{user} does not exist in Nextcloud."
@@ -289,7 +289,6 @@ lv:
     label_creation_time: Creation time
     label_creator: Creator
     label_delete_storage: Delete storage
-    label_edit_storage: Edit storage
     label_edit_storage_access_management: Edit storage access management
     label_edit_storage_automatically_managed_folders: Edit storage automatically managed folders
     label_edit_storage_host: Edit storage host
@@ -343,6 +342,9 @@ lv:
       success:
         subtitle: You are being redirected
         title: Integration setup completed
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: One moment please, this might take some time...
         title: We are setting up your permissions on the project folder.
diff --git a/modules/storages/config/locales/crowdin/mn.yml b/modules/storages/config/locales/crowdin/mn.yml
index 635c3ceda2e4..c112e58f222c 100644
--- a/modules/storages/config/locales/crowdin/mn.yml
+++ b/modules/storages/config/locales/crowdin/mn.yml
@@ -114,7 +114,7 @@ mn:
             hide_inactive_folders:
               permission_not_set: could not set permissions on %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
               conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
@@ -124,7 +124,7 @@ mn:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
           insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
           not_allowed: Nextcloud block the request.
@@ -145,7 +145,7 @@ mn:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
           unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
           user_does_not_exist: "%{user} does not exist in Nextcloud."
@@ -289,7 +289,6 @@ mn:
     label_creation_time: Creation time
     label_creator: Creator
     label_delete_storage: Delete storage
-    label_edit_storage: Edit storage
     label_edit_storage_access_management: Edit storage access management
     label_edit_storage_automatically_managed_folders: Edit storage automatically managed folders
     label_edit_storage_host: Edit storage host
@@ -343,6 +342,9 @@ mn:
       success:
         subtitle: You are being redirected
         title: Integration setup completed
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: One moment please, this might take some time...
         title: We are setting up your permissions on the project folder.
diff --git a/modules/storages/config/locales/crowdin/ms.yml b/modules/storages/config/locales/crowdin/ms.yml
index 9281fa26217f..41ca17540ddb 100644
--- a/modules/storages/config/locales/crowdin/ms.yml
+++ b/modules/storages/config/locales/crowdin/ms.yml
@@ -22,7 +22,7 @@ ms:
         storages/project_storage:
           attributes:
             project_folder_id:
-              blank: Please select a folder.
+              blank: Sila pilih folder.
             project_folder_mode:
               mode_unavailable: tidak tersedia untuk storan ini.
             project_ids:
@@ -31,7 +31,7 @@ ms:
           attributes:
             host:
               authorization_header_missing: belum disediakan sepenuhnya. Contoh Nextcloud tidak menerima pengepala "Dibenarkan" yang diperlukan untuk token Bearer berdasarkan kebenaran permintaan API. Sila periksa dua kali server konfigurasi HTTP anda dengan teliti.
-              cannot_be_connected_to: could not be reached. Please ensure the host is reachable and the OpenProject integration app is installed.
+              cannot_be_connected_to: tidak dapat dihubungi. Sila pastikan hos boleh dihubungi dan apl penyepaduan OpenProject dipasang.
               minimal_nextcloud_version_unmet: tidak memenuhi keperluan versi minimum (haruslah Nextcloud 23 atau lebih tinggi)
               not_nextcloud_server: ialah bukan server Nextcloud
               op_application_not_installed: kelihatan tidak mempunyai aplikasi "Integrasi OpenProject" yang terpasang. Sila pasangkannya terlebih dahulu dan cuba sekali lagi.
@@ -60,103 +60,103 @@ ms:
   project_module_storages: Fail-fail
   project_storages:
     edit_project_folder:
-      label: Edit project folder
+      label: Edit folder projek
     project_folder_mode:
       automatic: Dikendalikan secara automatik
       inactive: Tiada folder khusus
       manual: Folder yang tersedia dikendalikan secara manual
     remove_project:
-      deletion_failure_flash: Failed to remove the project from the storage. %{error}
+      deletion_failure_flash: Gagal mengalih keluar projek daripada storan. %{error}
       dialog:
         automatically_managed_appendix: Dalam kes ini juga, storan ini mempunyai folder projek yang diuruskan secara automatik, dan fail yang termasuk akan dipadam selamanya.
         confirmation_text: Sila sahkan bahawa anda faham dan ingin memadam storan fail ini daripada projek ini
-        heading_text: Remove project from %{storage}
+        heading_text: Alih keluar projek daripada %{storage}
         text: Aksi ini tidak dapat dipulihkan dan akan padamkan semua pautan daripada pakej kerja projek ini ke fail dan folder storan itu.
       label: Keluarkan projek
   services:
     attributes:
       nextcloud_sync_service:
         add_user_to_group: 'Tambah Pengguna ke Kumpulan:'
-        create_folder: 'Managed Project Folder Creation:'
-        ensure_root_folder_permissions: 'Set Base Folder Permissions:'
-        hide_inactive_folders: 'Hide Inactive Folders Step:'
-        remote_folders: 'Read contents of the group folder:'
+        create_folder: 'Penciptaan Folder Projek Terurus:'
+        ensure_root_folder_permissions: 'Tetapkan Kebenaran Folder Pangkalan:'
+        hide_inactive_folders: 'Langkah Sembunyikan Folder Tidak Aktif:'
+        remote_folders: 'Baca kandungan folder kumpulan:'
         remove_user_from_group: 'Keluarkan Pengguna daripada Kumpulan:'
         rename_project_folder: 'Namakan semula Folder projek yang telah diuruskan:'
       one_drive_sync_service:
-        create_folder: 'Managed Project Folder Creation:'
-        ensure_root_folder_permissions: 'Set Base Folder Permissions:'
-        hide_inactive_folders: 'Hide Inactive Folders Step:'
-        remote_folders: 'Read contents of the group folder:'
+        create_folder: 'Penciptaan Folder Projek Terurus:'
+        ensure_root_folder_permissions: 'Tetapkan Kebenaran Folder Pangkalan:'
+        hide_inactive_folders: 'Langkah Sembunyikan Folder Tidak Aktif:'
+        remote_folders: 'Baca kandungan folder kumpulan:'
         rename_project_folder: 'Namakan semula Folder projek yang telah diuruskan:'
     errors:
       messages:
-        error: An unexpected error occurred. Please check OpenProject logs for more information or contact an administrator
-        unauthorized: OpenProject could not authenticate with the Storage Provider. Please ensure that you have access to it.
+        error: Ralat yang tidak dijangka berlaku. Sila semak log OpenProject untuk mendapatkan maklumat lanjut atau hubungi pentadbir
+        unauthorized: OpenProject tidak dapat mengesahkan dengan Pembekal Storan. Sila pastikan anda mempunyai akses kepadanya.
       models:
         copy_project_folders_service:
-          conflict: The folder %{destination_path} already exists. Interrupting process to avoid overwrites.
-          error: An unexpected error occurred. Please check OpenProject logs for more information or contact an administrator
-          forbidden: OpenProject could not access the source folder. Please check your permissions configuration on the Storage Provider
-          not_found: The source template location %{source_path} wasn't found.
-          unauthorized: OpenProject could not authenticate with the Storage Provider. Please check your storage configuration
+          conflict: Folder %{destination_path} sudah wujud. Mengganggu proses untuk mengelakkan penulisan ganti.
+          error: Ralat yang tidak dijangka berlaku. Sila semak log OpenProject untuk mendapatkan maklumat lanjut atau hubungi pentadbir
+          forbidden: OpenProject tidak dapat mengakses folder sumber. Sila semak konfigurasi kebenaran anda pada Pembekal Storan
+          not_found: Lokasi templat sumber %{source_path} tidak ditemui.
+          unauthorized: OpenProject tidak dapat mengesahkan dengan Pembekal Storan. Sila semak konfigurasi storan anda
         nextcloud_sync_service:
           attributes:
             add_user_to_group:
               conflict: 'Pengguna %{user} tidak boleh ditambah ke kumpulan %{group} atas sebab: %{reason}'
               failed_to_add: 'Pengguna %{user} tidak boleh ditambah ke kumpulan %{group} atas sebab: %{reason}'
             create_folder:
-              conflict: The %{folder_name} already exists on %{parent_location}.
-              not_found: "%{parent_location} wasn't found."
+              conflict: '%{folder_name} sudah wujud di %{parent_location}.'
+              not_found: "%{parent_location} tidak ditemui."
             ensure_root_folder_permissions:
-              not_found: "%{group_folder} wasn't found. Please check your Nextcloud Group Folder setup."
-              permission_not_set: could not set permissions on %{group_folder}.
+              not_found: "%{group_folder} tidak ditemui. Sila semak persediaan Folder Kumpulan Nextcloud anda."
+              permission_not_set: tidak dapat menetapkan kebenaran pada %{group_folder}.
             hide_inactive_folders:
-              permission_not_set: could not set permissions on %{path}.
+              permission_not_set: tidak dapat menetapkan kebenaran pada %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
-              not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
+              not_allowed: '%{username} tidak mempunyai akses kepada folder %{group_folder}. Sila semak kebenaran folder pada Nextcloud.'
+              not_found: "%{group_folder} folder tidak ditemui. Sila semak persediaan Nextcloud anda."
             remove_user_from_group:
-              conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
-              failed_to_remove: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
+              conflict: 'Pengguna %{user} tidak dapat dialih keluar daripada kumpulan %{group} atas sebab berikut: %{reason}'
+              failed_to_remove: 'Pengguna %{user} tidak dapat dialih keluar daripada kumpulan %{group} atas sebab berikut: %{reason}'
             rename_project_folder:
-              forbidden: OpenProject user does not have access to %{current_path} folder.
-              not_found: "%{current_path} wasn't found."
+              forbidden: Pengguna OpenProject tidak mempunyai akses kepada folder %{current_path}.
+              not_found: "%{current_path} tidak ditemui."
             set_folders_permissions:
-              permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
-          group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
-          insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
-          not_allowed: Nextcloud block the request.
-          unauthorized: OpenProject could not sync with Nextcloud. Please check your storage and Nextcloud configuration.
-          user_does_not_exist: "%{user} does not exist in Nextcloud."
+              permission_not_set: tidak dapat menetapkan kebenaran pada %{path}.
+          error: Ralat yang tidak dijangka berlaku. Sila pastikan bahawa contoh Nextcloud anda boleh dicapai dan semak log pekerja OpenProject untuk mendapatkan maklumat lanjut
+          group_does_not_exist: "%{group} tidak wujud. Semak konfigurasi contoh Nextcloud anda."
+          insufficient_privileges: OpenProject tidak mempunyai keistimewaan yang mencukupi untuk menambah %{user} kepada %{group}. Semak tetapan kumpulan anda dalam Nextcloud.
+          not_allowed: Nextcloud menyekat permintaan itu.
+          unauthorized: OpenProject tidak dapat disegerakkan dengan Nextcloud. Sila semak storan dan konfigurasi Nextcloud anda.
+          user_does_not_exist: "%{user} tidak wujud dalam Nextcloud."
         one_drive_sync_service:
           attributes:
             create_folder:
-              conflict: The %{folder_name} already exists on %{parent_location}.
-              not_found: "%{parent_location} wasn't found."
+              conflict: '%{folder_name} sudah wujud di %{parent_location}.'
+              not_found: "%{parent_location} tidak ditemui."
             hide_inactive_folders:
-              permission_not_set: could not set permissions on %{path}.
+              permission_not_set: tidak dapat menetapkan kebenaran pada %{path}.
             remote_folders:
-              request_error: OpenProject could not access your drive %{drive_id}. Please check if your storage configuration is correct.
+              request_error: OpenProject tidak dapat mengakses pemacu anda %{drive_id}. Sila semak sama ada konfigurasi storan anda betul.
             rename_project_folder:
-              conflict: OpenProject could not rename the folder %{current_path} to %{project_folder_name} as a folder with the same name already exists
-              forbidden: OpenProject does not have access to %{current_path} in order to rename it.
-              not_found: "%{current_path} wasn't found."
+              conflict: OpenProject tidak dapat menamakan semula folder %{current_path} kepada %{project_folder_name} kerana folder dengan nama yang sama sudah wujud
+              forbidden: OpenProject tidak mempunyai akses kepada %{current_path} untuk menamakan semula.
+              not_found: "%{current_path} tidak ditemui."
             set_folders_permissions:
-              permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
-          not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
-          unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
-          user_does_not_exist: "%{user} does not exist in Nextcloud."
+              permission_not_set: tidak dapat menetapkan kebenaran pada %{path}.
+          error: Ralat yang tidak dijangka berlaku. Sila pastikan bahawa OneDrive/SharePoint boleh dicapai dan semak log pekerja OpenProject untuk mendapatkan maklumat lanjut
+          not_allowed: OpenProject tidak dibenarkan mengakses pemacu OneDrive anda. Sila semak kebenaran yang ditetapkan pada Aplikasi Azure.
+          unauthorized: OpenProject tidak dapat disegerakkan dengan OneDrive. Sila semak storan dan konfigurasi Aplikasi Azure anda.
+          user_does_not_exist: "%{user} tidak wujud dalam Nextcloud."
         upload_link_service:
-          not_found: The destination folder %{folder} could not be found on %{storage_name}.
+          not_found: Folder destinasi %{folder} tidak dapat ditemui pada %{storage_name}.
   storages:
     buttons:
       complete_without_setup: Lengkap tanpanya
       done_complete_setup: Selesai, penyediaan lengkap
       done_continue: Selesai, teruskan
-      open_storage: Open file storage
+      open_storage: Buka storan fail
       replace_oauth_application: Ganti OpenProject OAuth
       replace_oauth_client: Ganti %{provider_type} OAuth
       save_and_continue: Simpan dan teruskan
@@ -181,11 +181,11 @@ ms:
       storage_delete_result_3: Sekiranya storan ini mempunyai folder projek yang dikendalikan secara automatik, folder tersebut serta fail yang terkandung akan dipadamkan selamanya.
     dependencies:
       nextcloud:
-        group_folders_app: Group folders
-        integration_app: Integration OpenProject
+        group_folders_app: Folder kumpulan
+        integration_app: Integrasi OpenProject
     enabled_in_projects:
-      setup_incomplete_description: This storage has an incomplete setup. Please, complete the setup before enabling it in multiple projects.
-      setup_incomplete_header: Storage setup incomplete
+      setup_incomplete_description: Storan ini mempunyai persediaan yang tidak lengkap. Sila lengkapkan persediaan sebelum mendayakannya dalam berbilang projek.
+      setup_incomplete_header: Persediaan storan tidak lengkap
     error_invalid_provider_type: Sila pilih penyedia storan yang sah.
     file_storage_view:
       access_management:
@@ -209,24 +209,24 @@ ms:
     health:
       checked: Terakhir disemak %{datetime}
       connection_validation:
-        action: Recheck connection
-        app_version_mismatch: The Integration OpenProject app version is not supported. Please update your Nextcloud server.
-        client_id_wrong: The configured OAuth 2 client id is invalid. Please check the configuration.
-        client_secret_wrong: The configured OAuth 2 client secret is invalid. Please check the configuration.
-        drive_id_wrong: The configured drive id could not be found. Please check the configuration.
-        group_folder_not_found: The group folder could not be found.
-        group_folder_version_mismatch: The Group Folder version is not supported. Please update your Nextcloud server.
-        host_not_found: No Nextcloud server found at the configured host url. Please check the configuration.
-        missing_dependencies: 'A required dependency is missing on the file storage. Please add the following dependency: %{dependency}.'
-        not_configured: The connection could not be validated. Please finish configuration first.
-        placeholder: Check your connection against the server.
-        subtitle: Connection validation
-        tenant_id_wrong: The configured directory (tenant) id is invalid. Please check the configuration.
+        action: Semak semula sambungan
+        app_version_mismatch: Versi apl Integration OpenProject tidak disokong. Sila kemas kini pelayan Nextcloud anda.
+        client_id_wrong: Id klien OAuth 2 yang dikonfigurasikan adalah tidak sah. Sila semak konfigurasi.
+        client_secret_wrong: Rahsia pelanggan OAuth 2 yang dikonfigurasikan adalah tidak sah. Sila semak konfigurasi.
+        drive_id_wrong: Id pemacu yang dikonfigurasikan tidak dapat ditemui. Sila semak konfigurasi.
+        group_folder_not_found: Folder kumpulan tidak ditemui.
+        group_folder_version_mismatch: Versi Folder Kumpulan tidak disokong. Sila kemas kini pelayan Nextcloud anda.
+        host_not_found: Tiada pelayan Nextcloud ditemui pada url hos yang dikonfigurasikan. Sila semak konfigurasi.
+        missing_dependencies: 'Kebergantungan yang diperlukan tiada pada storan fail. Sila tambahkan kebergantungan berikut: %{dependency}.'
+        not_configured: Sambungan tidak dapat disahkan. Sila selesaikan konfigurasi dahulu.
+        placeholder: Semak sambungan anda terhadap pelayan.
+        subtitle: Pengesahan sambungan
+        tenant_id_wrong: Id direktori (penyewa) yang dikonfigurasikan adalah tidak sah. Sila semak konfigurasi.
         unexpected_content:
-          nextcloud: Unexpected content found in the managed group folder.
-          one_drive: Unexpected content found in the drive.
-        unknown_error: The connection could not be validated. An unknown error occurred. Please check the server logs for further information.
-        userless_access_denied: The configured app password is invalid.
+          nextcloud: Kandungan yang tidak dijangka ditemui dalam folder kumpulan terurus.
+          one_drive: Kandungan yang tidak dijangka ditemui dalam pemacu.
+        unknown_error: Sambungan tidak dapat disahkan. Ralat tidak diketahui berlaku. Sila semak log pelayan untuk maklumat lanjut.
+        userless_access_denied: Kata laluan apl yang dikonfigurasikan adalah tidak sah.
       label_error: Ralat
       label_healthy: Sihat
       label_pending: Dalam proses
@@ -244,7 +244,7 @@ ms:
       unsubscribe: Berhenti langganan
     help_texts:
       project_folder: Folder projek ialah folder asal untuk muat naik fail bagi projek ini. Pengguna masih boleh muat naik fail ke lokasi lain.
-      project_folder_bulk: The project folder is the default folder for file uploads for all the projects selected. You can modify this individually in each project settings. Users can nevertheless still upload files to other locations.
+      project_folder_bulk: Folder projek ialah folder lalai untuk muat naik fail untuk semua projek yang dipilih. Anda boleh mengubah suai ini secara individu dalam setiap tetapan projek. Pengguna masih boleh memuat naik fail ke lokasi lain.
     instructions:
       all_available_storages_already_added: Semua storan yang tersedia sudah ditambah ke projek ini.
       automatic_folder: Ini akan mencipta folder pangkal untuk projek ini dan kendalikan akses kebenaran kepada setiap ahli projek secara automatik.
@@ -289,7 +289,6 @@ ms:
     label_creation_time: Masa penciptaan
     label_creator: Pencipta
     label_delete_storage: Padamkan storan
-    label_edit_storage: Edit storan
     label_edit_storage_access_management: Edit pengurusan akses storan
     label_edit_storage_automatically_managed_folders: Edit storan folder yang dikendalikan secara automatik
     label_edit_storage_host: Edit hos storan
@@ -322,27 +321,30 @@ ms:
     members_no_results: Tiada ahli untuk dipaparkan.
     no_results: Masih belum ada storan yang disediakan lagi.
     oauth_access_granted_modal:
-      access_granted: Access granted
+      access_granted: Akses diberikan
       project_settings:
-        access_granted_screen_reader: Access granted. You are now ready to use %{storage}
-        storage_ready: You are now ready to use %{storage}
+        access_granted_screen_reader: Akses diberikan. Anda kini bersedia untuk menggunakan %{storage}
+        storage_ready: Anda kini bersedia untuk menggunakan %{storage}
       storage_admin:
-        access_granted_screen_reader: Access granted. You are now ready to add projects to %{storage}
-        storage_ready: You are now ready to add projects to %{storage}
+        access_granted_screen_reader: Akses diberikan. Anda kini bersedia untuk menambah projek pada %{storage}
+        storage_ready: Anda kini bersedia untuk menambah projek pada %{storage}
     oauth_grant_nudge_modal:
       cancel_button_label: Saya akan lakukannya sebentar lagi
-      heading: Login to %{provider_type} required
-      login_button_aria_label: Login to %{storage}
-      login_button_label: "%{provider_type} log in"
+      heading: Log masuk ke %{provider_type} diperlukan
+      login_button_aria_label: Log masuk ke %{storage}
+      login_button_label: "%{provider_type} log masuk"
       project_settings:
-        description: To get access to the project folder you need to login to %{storage}.
+        description: Untuk mendapatkan akses kepada folder projek anda perlu log masuk ke %{storage}.
       requesting_access_to: Sedang meminta akses ke %{storage}
       storage_admin:
-        description: In order to add projects to this storage you need to be logged into %{provider_type}. Please, log in and try again.
+        description: Untuk menambah projek pada storan ini, anda perlu log masuk ke %{provider_type}. Sila log masuk dan cuba lagi.
     open_project_storage_modal:
       success:
         subtitle: Anda sedang diubah hala
         title: Penyediaan integrasi selesai
+      timeout:
+        link_text: status kesihatan persediaan storan fail
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: Sila tunggu sebentar, ini mungkin akan mengambil sedikit masa...
         title: Kami sedang menyediakan kebenaran anda di folder projek.
@@ -383,7 +385,7 @@ ms:
     storage_list_blank_slate:
       description: Tambah storan untuk melihatnya di sini.
       heading: Anda masih belum ada sebarang storan.
-    successful_storage_connection: Storage connected successfully! Remember to activate the storage in the Projects tab for each desired project to use it.
+    successful_storage_connection: Storan berjaya disambungkan! Ingat untuk mengaktifkan storan dalam tab Projek untuk setiap projek yang diingini untuk menggunakannya.
     upsale:
       description: |-
         Integrasikan OneDrive/SharePoint anda sebagai storan fail dengan OpenProject. Muat naik fail dan pautkan terus ke
diff --git a/modules/storages/config/locales/crowdin/ne.yml b/modules/storages/config/locales/crowdin/ne.yml
index a6ca390e59ee..02e788678b48 100644
--- a/modules/storages/config/locales/crowdin/ne.yml
+++ b/modules/storages/config/locales/crowdin/ne.yml
@@ -114,7 +114,7 @@ ne:
             hide_inactive_folders:
               permission_not_set: could not set permissions on %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
               conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
@@ -124,7 +124,7 @@ ne:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
           insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
           not_allowed: Nextcloud block the request.
@@ -145,7 +145,7 @@ ne:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
           unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
           user_does_not_exist: "%{user} does not exist in Nextcloud."
@@ -289,7 +289,6 @@ ne:
     label_creation_time: Creation time
     label_creator: Creator
     label_delete_storage: Delete storage
-    label_edit_storage: Edit storage
     label_edit_storage_access_management: Edit storage access management
     label_edit_storage_automatically_managed_folders: Edit storage automatically managed folders
     label_edit_storage_host: Edit storage host
@@ -343,6 +342,9 @@ ne:
       success:
         subtitle: You are being redirected
         title: Integration setup completed
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: One moment please, this might take some time...
         title: We are setting up your permissions on the project folder.
diff --git a/modules/storages/config/locales/crowdin/nl.yml b/modules/storages/config/locales/crowdin/nl.yml
index 0ce5af0deaf4..6aca5c545d7c 100644
--- a/modules/storages/config/locales/crowdin/nl.yml
+++ b/modules/storages/config/locales/crowdin/nl.yml
@@ -114,7 +114,7 @@ nl:
             hide_inactive_folders:
               permission_not_set: Kan machtigingen niet instellen op %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
               conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
@@ -124,7 +124,7 @@ nl:
               not_found: "%{current_path} is niet gevonden."
             set_folders_permissions:
               permission_not_set: Kan machtigingen niet instellen op %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
           insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
           not_allowed: Nextcloud block the request.
@@ -145,7 +145,7 @@ nl:
               not_found: "%{current_path} is niet gevonden."
             set_folders_permissions:
               permission_not_set: Kan machtigingen niet instellen op %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
           unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
           user_does_not_exist: "%{user} bestaat niet in Nextcloud."
@@ -289,7 +289,6 @@ nl:
     label_creation_time: Aanmaaktijd
     label_creator: Maker
     label_delete_storage: Opslag verwijderen
-    label_edit_storage: Opslag bewerken
     label_edit_storage_access_management: Beheer van toegang tot opslag bewerken
     label_edit_storage_automatically_managed_folders: Bewerk automatisch beheerde opslagmappen
     label_edit_storage_host: Edit storage host
@@ -343,6 +342,9 @@ nl:
       success:
         subtitle: Je wordt omgeleid
         title: Integration setup completed
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: One moment please, this might take some time...
         title: We are setting up your permissions on the project folder.
diff --git a/modules/storages/config/locales/crowdin/no.yml b/modules/storages/config/locales/crowdin/no.yml
index f0795af80ea8..3dc2cc7e5b78 100644
--- a/modules/storages/config/locales/crowdin/no.yml
+++ b/modules/storages/config/locales/crowdin/no.yml
@@ -114,7 +114,7 @@
             hide_inactive_folders:
               permission_not_set: kunne ikke sette tillatelser på %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
               conflict: 'Brukeren %{user} kunne ikke fjernes fra %{group} gruppen av følgende årsak: %{reason}'
@@ -124,7 +124,7 @@
               not_found: "%{current_path} ble ikke funnet."
             set_folders_permissions:
               permission_not_set: kunne ikke sette tillatelser på %{path}.
-          error: Det oppstod en uventet feil. Sørg for at din Nextcloud forekomst er tilgjengelig og sjekk OpenProject logger for mer informasjon
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
           insufficient_privileges: OpenProject har ikke nok rettigheter til å legge til %{user} til %{group}. Sjekk gruppeinnstillinger i Nextcloud.
           not_allowed: Nextcloud blokkerer forespørselen.
@@ -145,7 +145,7 @@
               not_found: "%{current_path} ble ikke funnet."
             set_folders_permissions:
               permission_not_set: kunne ikke sette tillatelser på %{path}.
-          error: Det oppstod en uventet feil. Sørg for at din Nextcloud forekomst er tilgjengelig og sjekk OpenProject logger for mer informasjon
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject har ikke fått tilgang til din OneDrive stasjon. Vennligst sjekk tillatelsene som er angitt i Azure appen.
           unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
           user_does_not_exist: "%{user} finnes ikke i Nextcloud."
@@ -289,7 +289,6 @@
     label_creation_time: Opprettingstidspunkt
     label_creator: Skaper
     label_delete_storage: Slett fillagring
-    label_edit_storage: Redigere fillagring
     label_edit_storage_access_management: Redigere administrasjon for lagringstilgang
     label_edit_storage_automatically_managed_folders: Rediger automatisk administrerte mapper
     label_edit_storage_host: Redigere lagringsvert
@@ -343,6 +342,9 @@
       success:
         subtitle: Du blir omdirigert
         title: Integrasjonsoppsettet er fullført
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: Ett øyeblikk, dette kan ta litt tid ...
         title: Vi setter opp dine tillatelser på prosjektmappen.
diff --git a/modules/storages/config/locales/crowdin/pl.yml b/modules/storages/config/locales/crowdin/pl.yml
index 03cb907a9777..7bb4f973e9cc 100644
--- a/modules/storages/config/locales/crowdin/pl.yml
+++ b/modules/storages/config/locales/crowdin/pl.yml
@@ -114,7 +114,7 @@ pl:
             hide_inactive_folders:
               permission_not_set: nie można ustawić uprawnień do lokalizacji %{path}.
             remote_folders:
-              not_allowed: 'Użytkownik %{username} nie ma dostępu do folderu %{group_folder}. Sprawdź uprawnienia do folderu w Nextcloud.'
+              not_allowed: Użytkownik %{username} nie ma dostępu do folderu %{group_folder}. Sprawdź uprawnienia do folderu w Nextcloud.
               not_found: "Nie znaleziono folderu %{group_folder}. Sprawdź konfigurację Nextcloud."
             remove_user_from_group:
               conflict: 'Użytkownika %{user} nie można było usunąć z grupy %{group} z następującego powodu: %{reason}'
@@ -124,7 +124,7 @@ pl:
               not_found: "Nie znaleziono lokalizacji %{current_path}."
             set_folders_permissions:
               permission_not_set: nie można ustawić uprawnień do lokalizacji %{path}.
-          error: Wystąpił nieoczekiwany błąd. Upewnij się, że wystąpienie Nextcloud jest osiągalne i sprawdź dzienniki pracowników OpenProject, aby uzyskać więcej informacji
+          error: Wystąpił nieoczekiwany błąd. Upewnij się, że Twoje wystąpienie Nextcloud jest osiągalne i sprawdź dzienniki pracowników OpenProject, aby uzyskać więcej informacji
           group_does_not_exist: "%{group} nie istnieje. Sprawdź konfigurację wystąpienia Nextcloud."
           insufficient_privileges: OpenProject nie ma wystarczających uprawnień, aby dodać użytkownika %{user} do grupy %{group}. Sprawdź ustawienia grupy w Nextcloud.
           not_allowed: Nextcloud blokuje żądanie.
@@ -145,7 +145,7 @@ pl:
               not_found: "Nie znaleziono lokalizacji %{current_path}."
             set_folders_permissions:
               permission_not_set: nie można ustawić uprawnień do lokalizacji %{path}.
-          error: Wystąpił nieoczekiwany błąd. Upewnij się, że wystąpienie Nextcloud jest osiągalne i sprawdź dzienniki pracowników OpenProject, aby uzyskać więcej informacji
+          error: Wystąpił nieoczekiwany błąd. Upewnij się, że usługa OneDrive/SharePoint jest osiągalna i sprawdź dzienniki pracowników OpenProject, aby uzyskać więcej informacji
           not_allowed: OpenProject nie mógł uzyskać dostępu do Twojego dysku w usłudze OneDrive. Sprawdź uprawnienia ustawione w aplikacji Azure.
           unauthorized: OpenProject nie może zsynchronizować się z OneDrive. Sprawdź konfigurację magazynu i aplikacji Azure.
           user_does_not_exist: "Użytkownik %{user} nie istnieje w Nextcloud."
@@ -289,7 +289,6 @@ pl:
     label_creation_time: Czas utworzenia
     label_creator: Twórca
     label_delete_storage: Usuń magazyn
-    label_edit_storage: Edytuj magazyn
     label_edit_storage_access_management: Edytuj zarządzania dostępem do magazynu
     label_edit_storage_automatically_managed_folders: Edytuj automatycznie zarządzane foldery magazynu
     label_edit_storage_host: Edytuj hosta magazynu
@@ -343,6 +342,9 @@ pl:
       success:
         subtitle: Następuje przekierowanie
         title: Ukończono konfigurację integracji
+      timeout:
+        link_text: stan konfiguracji magazynu plików
+        subtitle: OpenProject nie mógł Ci zapewnić dostępu do folderu projektu w oczekiwanym czasie. Spróbuj ponownie.<br><br> Jeśli problem nie ustąpi, skontaktuj się z administratorem OpenProject w celu sprawdzenia %{storages_health_link}.
       waiting:
         subtitle: Chwileczkę, to może zająć trochę czasu...
         title: Konfigurujemy Twoje uprawnienia do folderu projektu.
diff --git a/modules/storages/config/locales/crowdin/pt-BR.yml b/modules/storages/config/locales/crowdin/pt-BR.yml
index ced23d526acd..5a4c3fc6473f 100644
--- a/modules/storages/config/locales/crowdin/pt-BR.yml
+++ b/modules/storages/config/locales/crowdin/pt-BR.yml
@@ -114,7 +114,7 @@ pt-BR:
             hide_inactive_folders:
               permission_not_set: não foi possível definir permissões em %{path}.
             remote_folders:
-              not_allowed: '%{username} não tem acesso à pasta %{group_folder}. Verifique as permissões da pasta no Nextcloud.'
+              not_allowed: O %{username} não tem acesso ao %{group_folder}. Verifique as permissões da pasta no Nextcloud.
               not_found: "A pasta %{group_folder} não foi encontrada. Verifique a configuração do Nextcloud."
             remove_user_from_group:
               conflict: 'O usuário %{user} não pôde ser removido do grupo %{group} pelo seguinte motivo: %{reason}'
@@ -145,7 +145,7 @@ pt-BR:
               not_found: "%{current_path} não foi encontrado."
             set_folders_permissions:
               permission_not_set: não foi possível definir permissões em %{path}.
-          error: Ocorreu um erro inesperado. Verifique se sua instância do Nextcloud está acessível e confira os registros do OpenProject para obter mais detalhes
+          error: Ocorreu um erro inesperado. Verifique se seu OneDrive/SharePoint está acessível e confira os registros do OpenProject para obter mais detalhes
           not_allowed: OpenProject não conseguiu acessar seu OneDrive. Verifique as permissões definidas no Aplicativo Azure.
           unauthorized: O OpenProject não conseguiu sincronizar com o OneDrive. Verifique as configurações de armazenamento e do aplicativo Azure.
           user_does_not_exist: "%{user} não existe no Nextcloud."
@@ -289,7 +289,6 @@ pt-BR:
     label_creation_time: Hora de criação
     label_creator: Criador
     label_delete_storage: Excluir armazenamento
-    label_edit_storage: Editar armazenamento
     label_edit_storage_access_management: Editar gerenciamento de acesso ao armazenamento
     label_edit_storage_automatically_managed_folders: Editar pastas gerencias automaticamente de armazenamento
     label_edit_storage_host: Editar host de armazenamento
@@ -343,6 +342,9 @@ pt-BR:
       success:
         subtitle: Você está sendo redirecionado
         title: Configuração de integração concluída
+      timeout:
+        link_text: status de saúde da configuração de armazenamento de arquivos
+        subtitle: Não foi possível acessar a pasta do projeto no OpenProject dentro do prazo esperado. Tente novamente.<br><br> Se o problema persistir, entre em contato com seu administrador OpenProject para verificar o %{storages_health_link}.
       waiting:
         subtitle: Aguarde um momento, esta ação pode demorar um pouco...
         title: Estamos definindo suas permissões na pasta do projeto.
diff --git a/modules/storages/config/locales/crowdin/pt-PT.yml b/modules/storages/config/locales/crowdin/pt-PT.yml
index 0d3b17659f1a..fb28d997f01c 100644
--- a/modules/storages/config/locales/crowdin/pt-PT.yml
+++ b/modules/storages/config/locales/crowdin/pt-PT.yml
@@ -114,7 +114,7 @@ pt-PT:
             hide_inactive_folders:
               permission_not_set: não foi possível definir permissões em %{path}.
             remote_folders:
-              not_allowed: 'O utilizador %{username} não tem acesso à pasta %{group_folder}. Verifique as permissões de pasta no Nextcloud.'
+              not_allowed: O utilizador %{username} não tem acesso à pasta %{group_folder}. Verifique as permissões de pasta no Nextcloud.
               not_found: "A pasta %{group_folder} não foi encontrada. Verifique a configuração do Nextcloud."
             remove_user_from_group:
               conflict: 'Não foi possível remover o utilizador %{user} do grupo %{group} pelo seguinte motivo: %{reason}'
@@ -145,7 +145,7 @@ pt-PT:
               not_found: "%{current_path} não foi encontrado."
             set_folders_permissions:
               permission_not_set: não foi possível definir permissões em %{path}.
-          error: Ocorreu um erro inesperado. Certifique-se de que a sua instância do Nextcloud está acessível e verifique os registos de trabalho do OpenProject para obter mais informações
+          error: Ocorreu um erro inesperado. Certifique-se de que o seu OneDrive/SharePoin está acessível e verifique os registos de trabalho do OpenProject para obter mais informações
           not_allowed: O OpenProject não tinha permissão para aceder à sua unidade do OneDrive. Verifique as permissões definidas na aplicação do Azure.
           unauthorized: Não foi possível sincronizar o OpenProject com o OneDrive. Verifique o seu armazenamento e a configuração da aplicação do Azure.
           user_does_not_exist: "%{user} não existe no Nextcloud."
@@ -289,7 +289,6 @@ pt-PT:
     label_creation_time: Hora de criação
     label_creator: Criador
     label_delete_storage: Eliminar armazenamento
-    label_edit_storage: Editar armazenamento
     label_edit_storage_access_management: Editar a gestão do acesso ao armazenamento
     label_edit_storage_automatically_managed_folders: Editar o armazenamento pastas geridas automaticamente
     label_edit_storage_host: Editar anfitrião de armazenamento
@@ -343,6 +342,9 @@ pt-PT:
       success:
         subtitle: Está a ser redirecionado
         title: Configuração de integração concluída
+      timeout:
+        link_text: estado de saúde da configuração do armazenamento de ficheiros
+        subtitle: O OpenProject não pôde fornecer acesso à pasta do projeto dentro do período esperado de tempo, tente novamente.<br><br> Se esse problema continuar, entre em contacto com o administrador do OpenProject para verificar o %{storages_health_link}.
       waiting:
         subtitle: Aguarde um momento, esta ação pode demorar algum tempo...
         title: Estamos a definir as suas permissões na pasta do projeto.
diff --git a/modules/storages/config/locales/crowdin/ro.yml b/modules/storages/config/locales/crowdin/ro.yml
index fa0eb8f31825..560a8cb77459 100644
--- a/modules/storages/config/locales/crowdin/ro.yml
+++ b/modules/storages/config/locales/crowdin/ro.yml
@@ -114,7 +114,7 @@ ro:
             hide_inactive_folders:
               permission_not_set: could not set permissions on %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
               conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
@@ -124,7 +124,7 @@ ro:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
           insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
           not_allowed: Nextcloud block the request.
@@ -145,7 +145,7 @@ ro:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
           unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
           user_does_not_exist: "%{user} does not exist in Nextcloud."
@@ -289,7 +289,6 @@ ro:
     label_creation_time: Creation time
     label_creator: Creator
     label_delete_storage: Delete storage
-    label_edit_storage: Edit storage
     label_edit_storage_access_management: Edit storage access management
     label_edit_storage_automatically_managed_folders: Edit storage automatically managed folders
     label_edit_storage_host: Edit storage host
@@ -343,6 +342,9 @@ ro:
       success:
         subtitle: You are being redirected
         title: Integration setup completed
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: One moment please, this might take some time...
         title: We are setting up your permissions on the project folder.
diff --git a/modules/storages/config/locales/crowdin/ru.yml b/modules/storages/config/locales/crowdin/ru.yml
index f31db1501f5f..a5cdc12fc493 100644
--- a/modules/storages/config/locales/crowdin/ru.yml
+++ b/modules/storages/config/locales/crowdin/ru.yml
@@ -145,7 +145,7 @@ ru:
               not_found: "%{current_path} не найден."
             set_folders_permissions:
               permission_not_set: не удалось установить разрешения на %{path}.
-          error: Произошла непредвиденная ошибка. Пожалуйста, убедитесь, что Nextcloud доступен и проверьте журналы работы OpenProject для дополнительной информации
+          error: Произошла непредвиденная ошибка. Пожалуйста, убедитесь, что OneDrive/SharePoint доступен и проверьте журналы работы OpenProject для дополнительной информации
           not_allowed: OpenProject не был разрешен доступ к OneDrive. Пожалуйста, проверьте разрешения, установленные в приложении Azure.
           unauthorized: OpenProject не удалось синхронизировать с OneDrive. Пожалуйста, проверьте конфигурацию хранилища и приложения Azure.
           user_does_not_exist: "%{user} не существует в Nextcloud."
@@ -289,7 +289,6 @@ ru:
     label_creation_time: Время создания
     label_creator: Создатель
     label_delete_storage: Удалить хранилище
-    label_edit_storage: Редактировать хранилище
     label_edit_storage_access_management: Редактировать управление доступом к хранилищу
     label_edit_storage_automatically_managed_folders: Редактирование хранилища автоматически управляемых папок
     label_edit_storage_host: Изменить узел хранения
@@ -343,6 +342,9 @@ ru:
       success:
         subtitle: Вы будете перенаправлены
         title: Установка интеграции завершена
+      timeout:
+        link_text: статус файлового хранилища
+        subtitle: OpenProject не смог предоставить вам доступ к папке проекта в течение ожидаемого периода времени. Пожалуйста, попробуйте еще раз.<br><br> Если эта проблема не исчезнет, обратитесь к администратору OpenProject для проверки %{storages_health_link}.
       waiting:
         subtitle: Одну минутку, пожалуйста, это может занять некоторое время...
         title: Мы настраиваем ваши права доступа к папке проекта.
diff --git a/modules/storages/config/locales/crowdin/rw.yml b/modules/storages/config/locales/crowdin/rw.yml
index 0936ba9ca64a..bff1b259b695 100644
--- a/modules/storages/config/locales/crowdin/rw.yml
+++ b/modules/storages/config/locales/crowdin/rw.yml
@@ -114,7 +114,7 @@ rw:
             hide_inactive_folders:
               permission_not_set: could not set permissions on %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
               conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
@@ -124,7 +124,7 @@ rw:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
           insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
           not_allowed: Nextcloud block the request.
@@ -145,7 +145,7 @@ rw:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
           unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
           user_does_not_exist: "%{user} does not exist in Nextcloud."
@@ -289,7 +289,6 @@ rw:
     label_creation_time: Creation time
     label_creator: Creator
     label_delete_storage: Delete storage
-    label_edit_storage: Edit storage
     label_edit_storage_access_management: Edit storage access management
     label_edit_storage_automatically_managed_folders: Edit storage automatically managed folders
     label_edit_storage_host: Edit storage host
@@ -343,6 +342,9 @@ rw:
       success:
         subtitle: You are being redirected
         title: Integration setup completed
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: One moment please, this might take some time...
         title: We are setting up your permissions on the project folder.
diff --git a/modules/storages/config/locales/crowdin/si.yml b/modules/storages/config/locales/crowdin/si.yml
index ca88a30287fd..c54c64840158 100644
--- a/modules/storages/config/locales/crowdin/si.yml
+++ b/modules/storages/config/locales/crowdin/si.yml
@@ -114,7 +114,7 @@ si:
             hide_inactive_folders:
               permission_not_set: could not set permissions on %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
               conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
@@ -124,7 +124,7 @@ si:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
           insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
           not_allowed: Nextcloud block the request.
@@ -145,7 +145,7 @@ si:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
           unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
           user_does_not_exist: "%{user} does not exist in Nextcloud."
@@ -289,7 +289,6 @@ si:
     label_creation_time: Creation time
     label_creator: Creator
     label_delete_storage: Delete storage
-    label_edit_storage: Edit storage
     label_edit_storage_access_management: Edit storage access management
     label_edit_storage_automatically_managed_folders: Edit storage automatically managed folders
     label_edit_storage_host: Edit storage host
@@ -343,6 +342,9 @@ si:
       success:
         subtitle: You are being redirected
         title: Integration setup completed
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: One moment please, this might take some time...
         title: We are setting up your permissions on the project folder.
diff --git a/modules/storages/config/locales/crowdin/sk.yml b/modules/storages/config/locales/crowdin/sk.yml
index de1eac21f4bc..5f1aac3427ba 100644
--- a/modules/storages/config/locales/crowdin/sk.yml
+++ b/modules/storages/config/locales/crowdin/sk.yml
@@ -114,7 +114,7 @@ sk:
             hide_inactive_folders:
               permission_not_set: could not set permissions on %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
               conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
@@ -124,7 +124,7 @@ sk:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
           insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
           not_allowed: Nextcloud block the request.
@@ -145,7 +145,7 @@ sk:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
           unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
           user_does_not_exist: "%{user} does not exist in Nextcloud."
@@ -289,7 +289,6 @@ sk:
     label_creation_time: Creation time
     label_creator: Creator
     label_delete_storage: Delete storage
-    label_edit_storage: Edit storage
     label_edit_storage_access_management: Edit storage access management
     label_edit_storage_automatically_managed_folders: Edit storage automatically managed folders
     label_edit_storage_host: Edit storage host
@@ -343,6 +342,9 @@ sk:
       success:
         subtitle: You are being redirected
         title: Integration setup completed
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: One moment please, this might take some time...
         title: We are setting up your permissions on the project folder.
diff --git a/modules/storages/config/locales/crowdin/sl.yml b/modules/storages/config/locales/crowdin/sl.yml
index 42bedbb6201b..dd2d385c4753 100644
--- a/modules/storages/config/locales/crowdin/sl.yml
+++ b/modules/storages/config/locales/crowdin/sl.yml
@@ -114,7 +114,7 @@ sl:
             hide_inactive_folders:
               permission_not_set: could not set permissions on %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
               conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
@@ -124,7 +124,7 @@ sl:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
           insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
           not_allowed: Nextcloud block the request.
@@ -145,7 +145,7 @@ sl:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
           unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
           user_does_not_exist: "%{user} does not exist in Nextcloud."
@@ -289,7 +289,6 @@ sl:
     label_creation_time: Creation time
     label_creator: Creator
     label_delete_storage: Delete storage
-    label_edit_storage: Edit storage
     label_edit_storage_access_management: Edit storage access management
     label_edit_storage_automatically_managed_folders: Edit storage automatically managed folders
     label_edit_storage_host: Edit storage host
@@ -343,6 +342,9 @@ sl:
       success:
         subtitle: You are being redirected
         title: Integration setup completed
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: One moment please, this might take some time...
         title: We are setting up your permissions on the project folder.
diff --git a/modules/storages/config/locales/crowdin/sr.yml b/modules/storages/config/locales/crowdin/sr.yml
index c9caad751fc4..84d047a95a86 100644
--- a/modules/storages/config/locales/crowdin/sr.yml
+++ b/modules/storages/config/locales/crowdin/sr.yml
@@ -114,7 +114,7 @@ sr:
             hide_inactive_folders:
               permission_not_set: could not set permissions on %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
               conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
@@ -124,7 +124,7 @@ sr:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
           insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
           not_allowed: Nextcloud block the request.
@@ -145,7 +145,7 @@ sr:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
           unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
           user_does_not_exist: "%{user} does not exist in Nextcloud."
@@ -289,7 +289,6 @@ sr:
     label_creation_time: Creation time
     label_creator: Creator
     label_delete_storage: Delete storage
-    label_edit_storage: Edit storage
     label_edit_storage_access_management: Edit storage access management
     label_edit_storage_automatically_managed_folders: Edit storage automatically managed folders
     label_edit_storage_host: Edit storage host
@@ -343,6 +342,9 @@ sr:
       success:
         subtitle: You are being redirected
         title: Integration setup completed
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: One moment please, this might take some time...
         title: We are setting up your permissions on the project folder.
diff --git a/modules/storages/config/locales/crowdin/sv.yml b/modules/storages/config/locales/crowdin/sv.yml
index 6d029c19a40a..48dd76254a6e 100644
--- a/modules/storages/config/locales/crowdin/sv.yml
+++ b/modules/storages/config/locales/crowdin/sv.yml
@@ -114,7 +114,7 @@ sv:
             hide_inactive_folders:
               permission_not_set: could not set permissions on %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
               conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
@@ -124,7 +124,7 @@ sv:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
           insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
           not_allowed: Nextcloud block the request.
@@ -145,7 +145,7 @@ sv:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
           unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
           user_does_not_exist: "%{user} does not exist in Nextcloud."
@@ -289,7 +289,6 @@ sv:
     label_creation_time: Creation time
     label_creator: Creator
     label_delete_storage: Delete storage
-    label_edit_storage: Edit storage
     label_edit_storage_access_management: Edit storage access management
     label_edit_storage_automatically_managed_folders: Edit storage automatically managed folders
     label_edit_storage_host: Edit storage host
@@ -343,6 +342,9 @@ sv:
       success:
         subtitle: You are being redirected
         title: Integration setup completed
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: One moment please, this might take some time...
         title: We are setting up your permissions on the project folder.
diff --git a/modules/storages/config/locales/crowdin/th.yml b/modules/storages/config/locales/crowdin/th.yml
index 70d7d8dcce49..6fb5b764ff8b 100644
--- a/modules/storages/config/locales/crowdin/th.yml
+++ b/modules/storages/config/locales/crowdin/th.yml
@@ -114,7 +114,7 @@ th:
             hide_inactive_folders:
               permission_not_set: could not set permissions on %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
               conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
@@ -124,7 +124,7 @@ th:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
           insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
           not_allowed: Nextcloud block the request.
@@ -145,7 +145,7 @@ th:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
           unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
           user_does_not_exist: "%{user} does not exist in Nextcloud."
@@ -289,7 +289,6 @@ th:
     label_creation_time: Creation time
     label_creator: Creator
     label_delete_storage: Delete storage
-    label_edit_storage: Edit storage
     label_edit_storage_access_management: Edit storage access management
     label_edit_storage_automatically_managed_folders: Edit storage automatically managed folders
     label_edit_storage_host: Edit storage host
@@ -343,6 +342,9 @@ th:
       success:
         subtitle: You are being redirected
         title: Integration setup completed
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: One moment please, this might take some time...
         title: We are setting up your permissions on the project folder.
diff --git a/modules/storages/config/locales/crowdin/tr.yml b/modules/storages/config/locales/crowdin/tr.yml
index 410ff8f34b18..0690e7ae0c5b 100644
--- a/modules/storages/config/locales/crowdin/tr.yml
+++ b/modules/storages/config/locales/crowdin/tr.yml
@@ -114,7 +114,7 @@ tr:
             hide_inactive_folders:
               permission_not_set: could not set permissions on %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
               conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
@@ -124,7 +124,7 @@ tr:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
           insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
           not_allowed: Nextcloud block the request.
@@ -145,7 +145,7 @@ tr:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
           unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
           user_does_not_exist: "%{user} does not exist in Nextcloud."
@@ -289,7 +289,6 @@ tr:
     label_creation_time: Creation time
     label_creator: Oluşturan
     label_delete_storage: Delete storage
-    label_edit_storage: Edit storage
     label_edit_storage_access_management: Edit storage access management
     label_edit_storage_automatically_managed_folders: Edit storage automatically managed folders
     label_edit_storage_host: Edit storage host
@@ -343,6 +342,9 @@ tr:
       success:
         subtitle: You are being redirected
         title: Integration setup completed
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: One moment please, this might take some time...
         title: We are setting up your permissions on the project folder.
diff --git a/modules/storages/config/locales/crowdin/uk.yml b/modules/storages/config/locales/crowdin/uk.yml
index 5be96ecb8a61..94bb7f31df4a 100644
--- a/modules/storages/config/locales/crowdin/uk.yml
+++ b/modules/storages/config/locales/crowdin/uk.yml
@@ -145,7 +145,7 @@ uk:
               not_found: "%{current_path} не знайдено."
             set_folders_permissions:
               permission_not_set: не вдалося встановити дозволи за шляхом %{path}.
-          error: Сталася неочікувана помилка. Щоб дізнатися більше, переконайтеся, що маєте доступ до свого екземпляра Nextcloud, і перевірте журнали працівників OpenProject.
+          error: Сталася неочікувана помилка. Щоб дізнатися більше, переконайтеся, що маєте доступ до свого сховища OneDrive / SharePoint, і перевірте журнали працівників OpenProject.
           not_allowed: OpenProject не має дозволу на доступ до вашого диска OneDrive. Перевірте дозволи, установлені в програмі Azure.
           unauthorized: Не вдалося синхронізувати OpenProject із OneDrive. Перевірте конфігурацію свого сховища й додатку Azure.
           user_does_not_exist: "%{user} не існує в Nextcloud."
@@ -289,7 +289,6 @@ uk:
     label_creation_time: Час створення
     label_creator: Автор
     label_delete_storage: Видалити сховище
-    label_edit_storage: Редагувати сховище
     label_edit_storage_access_management: Змінити керування доступом до сховища
     label_edit_storage_automatically_managed_folders: Редагувати папки сховища з автоматичним керуванням
     label_edit_storage_host: Редагувати хост сховища
@@ -343,6 +342,9 @@ uk:
       success:
         subtitle: Виконується переспрямування
         title: Налаштування інтеграції завершено
+      timeout:
+        link_text: стан справності конфігурації файлового сховища
+        subtitle: Додатку OpenProject не вдалося надати вам доступ до папки проєкту протягом очікуваного періоду. Повторіть спробу.<br><br> Якщо ця проблема не зникне, зверніться до адміністратора OpenProject і попросіть його перевірити %{storages_health_link}.
       waiting:
         subtitle: Трохи зачекайте. Це може зайняти деякий час...
         title: Ми налаштовуємо ваші дозволи для папки проєкту.
diff --git a/modules/storages/config/locales/crowdin/uz.yml b/modules/storages/config/locales/crowdin/uz.yml
index 689db830b2ce..3ed2c9d7b791 100644
--- a/modules/storages/config/locales/crowdin/uz.yml
+++ b/modules/storages/config/locales/crowdin/uz.yml
@@ -114,7 +114,7 @@ uz:
             hide_inactive_folders:
               permission_not_set: could not set permissions on %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
               conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
@@ -124,7 +124,7 @@ uz:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
           insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
           not_allowed: Nextcloud block the request.
@@ -145,7 +145,7 @@ uz:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
           unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
           user_does_not_exist: "%{user} does not exist in Nextcloud."
@@ -289,7 +289,6 @@ uz:
     label_creation_time: Creation time
     label_creator: Creator
     label_delete_storage: Delete storage
-    label_edit_storage: Edit storage
     label_edit_storage_access_management: Edit storage access management
     label_edit_storage_automatically_managed_folders: Edit storage automatically managed folders
     label_edit_storage_host: Edit storage host
@@ -343,6 +342,9 @@ uz:
       success:
         subtitle: You are being redirected
         title: Integration setup completed
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: One moment please, this might take some time...
         title: We are setting up your permissions on the project folder.
diff --git a/modules/storages/config/locales/crowdin/vi.yml b/modules/storages/config/locales/crowdin/vi.yml
index ec61349ecb61..9512a1372b83 100644
--- a/modules/storages/config/locales/crowdin/vi.yml
+++ b/modules/storages/config/locales/crowdin/vi.yml
@@ -114,7 +114,7 @@ vi:
             hide_inactive_folders:
               permission_not_set: không thể thiết lập quyền trên %{path}.
             remote_folders:
-              not_allowed: '%{username} doesn''t have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.'
+              not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
               conflict: 'Không thể xóa người dùng %{user} khỏi nhóm %{group} vì lý do sau: %{reason}'
@@ -124,7 +124,7 @@ vi:
               not_found: "Không tìm thấy %{current_path}."
             set_folders_permissions:
               permission_not_set: không thể thiết lập quyền trên %{path}.
-          error: Đã xảy ra lỗi không mong muốn. Vui lòng đảm bảo rằng phiên bản Nextcloud của bạn có thể truy cập được và kiểm tra nhật ký công nhân OpenProject để biết thêm thông tin
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} không tồn tại. Kiểm tra cấu hình phiên bản Nextcloud của bạn."
           insufficient_privileges: OpenProject không có đủ quyền để thêm %{user} vào %{group}. Kiểm tra cài đặt nhóm của bạn trong Nextcloud.
           not_allowed: Nextcloud chặn yêu cầu.
@@ -145,7 +145,7 @@ vi:
               not_found: "Không tìm thấy %{current_path}."
             set_folders_permissions:
               permission_not_set: không thể thiết lập quyền trên %{path}.
-          error: Đã xảy ra lỗi không mong muốn. Vui lòng đảm bảo rằng phiên bản Nextcloud của bạn có thể truy cập được và kiểm tra nhật ký công nhân OpenProject để biết thêm thông tin
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject không được phép truy cập ổ đĩa OneDrive của bạn. Vui lòng kiểm tra các quyền được thiết lập trên Ứng dụng Azure.
           unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
           user_does_not_exist: "%{user} không tồn tại trong Nextcloud."
@@ -289,7 +289,6 @@ vi:
     label_creation_time: Thời gian tạo
     label_creator: Người tạo
     label_delete_storage: Xóa lưu trữ
-    label_edit_storage: Chỉnh sửa lưu trữ
     label_edit_storage_access_management: Chỉnh sửa quản lý quyền truy cập lưu trữ
     label_edit_storage_automatically_managed_folders: Chỉnh sửa thư mục được quản lý tự động của lưu trữ
     label_edit_storage_host: Chỉnh sửa máy chủ lưu trữ
@@ -343,6 +342,9 @@ vi:
       success:
         subtitle: Bạn đang được chuyển hướng
         title: Cấu hình tích hợp đã hoàn tất
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: Một chút thời gian, điều này có thể mất một chút thời gian...
         title: Chúng tôi đang thiết lập quyền của bạn trên thư mục dự án.
diff --git a/modules/storages/config/locales/crowdin/zh-CN.yml b/modules/storages/config/locales/crowdin/zh-CN.yml
index 301895ee3fa3..a4e7e6885bce 100644
--- a/modules/storages/config/locales/crowdin/zh-CN.yml
+++ b/modules/storages/config/locales/crowdin/zh-CN.yml
@@ -145,7 +145,7 @@ zh-CN:
               not_found: "%{current_path} 没有找到。"
             set_folders_permissions:
               permission_not_set: 无法设置 %{path} 上的权限。
-          error: 发生了意外错误。请确保您的 Nextcloud 实例可访问，并检查 OpenProject 工作日志以获取更多信息。
+          error: 发生了意外错误。请确保OneDrive/SharePoint可以访问并检查 OpenProject 工人日志以获取更多信息
           not_allowed: OpenProject 未被允许访问您的 OneDrive 驱动器。请检查 Azure 应用程序上设置的权限。
           unauthorized: OpenProject 无法与 Nextcloud 同步。请检查您的存储设备和 Nextcloud 配置。
           user_does_not_exist: "在 Nextcloud 中不存在 %{user}  。"
@@ -289,7 +289,6 @@ zh-CN:
     label_creation_time: 创建时间
     label_creator: 创建者
     label_delete_storage: 删除存储
-    label_edit_storage: 编辑存储
     label_edit_storage_access_management: 编辑存储访问管理
     label_edit_storage_automatically_managed_folders: 编辑存储自动管理的文件夹
     label_edit_storage_host: 编辑存储主机
@@ -343,6 +342,9 @@ zh-CN:
       success:
         subtitle: 正在将您重定向
         title: 集成设置已完成
+      timeout:
+        link_text: 文件存储设置的健康状态
+        subtitle: OpenProject 无法让您在预期时间内访问项目文件夹。请再试一次。<br><br> 如果问题仍然存在，请联系 OpenProject 管理员 %{storages_health_link}。
       waiting:
         subtitle: 请稍候，此操作可能需要一些时间…
         title: 我们正在设置您对项目文件夹的权限。
diff --git a/modules/storages/config/locales/crowdin/zh-TW.yml b/modules/storages/config/locales/crowdin/zh-TW.yml
index b9cba1e439c3..aee1ddfa02b6 100644
--- a/modules/storages/config/locales/crowdin/zh-TW.yml
+++ b/modules/storages/config/locales/crowdin/zh-TW.yml
@@ -124,7 +124,7 @@ zh-TW:
               not_found: "%{current_path} 沒有找到。"
             set_folders_permissions:
               permission_not_set: 無法在 %{path} 上設定權限。
-          error: 發生意外錯誤。請確保您的 Nextcloud 實例可以連線，並檢查 OpenProject Worker 日誌以取得更多資訊。
+          error: 發生意外錯誤。請確保您的 Nextcloud 可以連線，並檢查 OpenProject 日誌以取得更多資訊。
           group_does_not_exist: "%{group} 不存在。請檢查您的 Nextcloud 實例配置。"
           insufficient_privileges: OpenProject 沒有足夠的權限將 %{user} 加入 %{group}。請檢查 Nextcloud 中的群組設定。
           not_allowed: Nextcloud 封鎖該請求。
@@ -145,7 +145,7 @@ zh-TW:
               not_found: "%{current_path} 沒有找到。"
             set_folders_permissions:
               permission_not_set: 無法在 %{path} 上設定權限。
-          error: 發生意外錯誤。請確保您的 Nextcloud 可以連線，並檢查 OpenProject 日誌以取得更多資訊。
+          error: 發生意外錯誤。請確保 OneDrive/SharePoint 可以存取，並檢查 OpenProject Worker 日誌以取得更多資訊。
           not_allowed: OpenProject 不允許存取您的 OneDrive 磁碟機。請檢查 Azure 應用程式上設定的權限。
           unauthorized: OpenProject 無法與 OneDrive 同步。請檢查您的儲存空間和 Azure 應用程式設定。
           user_does_not_exist: "%{user} 在 Nextcloud 中不存在。"
@@ -289,7 +289,6 @@ zh-TW:
     label_creation_time: 建立時間
     label_creator: 建立者
     label_delete_storage: 刪除儲存區
-    label_edit_storage: 編輯儲存
     label_edit_storage_access_management: 編輯儲存存取管理
     label_edit_storage_automatically_managed_folders: 編輯自動管理的儲存資料夾
     label_edit_storage_host: 編輯儲存主機
@@ -343,6 +342,9 @@ zh-TW:
       success:
         subtitle: 您正被重新導向
         title: 整合設定完成
+      timeout:
+        link_text: 檔案儲存之健康狀態
+        subtitle: OpenProject 無法讓您在預期時間內存取專案資料夾。請再試一次。<br><br> 如果問題仍然存在，請聯絡您的 OpenProject 管理員檢查 %{storages_health_link}。
       waiting:
         subtitle: 請稍候，這可能需要一些時間...
         title: 我們正在設定您在專案資料夾上的權限。
diff --git a/modules/storages/config/locales/en.yml b/modules/storages/config/locales/en.yml
index 216d8ee4e368..ceb25c753efb 100644
--- a/modules/storages/config/locales/en.yml
+++ b/modules/storages/config/locales/en.yml
@@ -125,7 +125,7 @@ en:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that your Nextcloud instance is reachable and check OpenProject worker logs for more information
           group_does_not_exist: "%{group} does not exist. Check your Nextcloud instance configuration."
           insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud.
           not_allowed: Nextcloud block the request.
@@ -146,7 +146,7 @@ en:
               not_found: "%{current_path} wasn't found."
             set_folders_permissions:
               permission_not_set: could not set permissions on %{path}.
-          error: An unexpected error occurred. Please ensure that you Nextcloud instance is reachable and check OpenProject worker logs for more information
+          error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information
           not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application.
           unauthorized: OpenProject could not sync with OneDrive. Please check your storage and Azure Application configuration.
           user_does_not_exist: "%{user} does not exist in Nextcloud."
@@ -290,7 +290,6 @@ en:
     label_creation_time: Creation time
     label_creator: Creator
     label_delete_storage: Delete storage
-    label_edit_storage: Edit storage
     label_edit_storage_access_management: Edit storage access management
     label_edit_storage_automatically_managed_folders: Edit storage automatically managed folders
     label_edit_storage_host: Edit storage host
@@ -344,6 +343,9 @@ en:
       success:
         subtitle: You are being redirected
         title: Integration setup completed
+      timeout:
+        link_text: health status of the file storage setup
+        subtitle: OpenProject could not provide you access to the project folder within the expected period of time. Please, try once again.<br><br> If that problem persists please contact your OpenProject administrator to check %{storages_health_link}.
       waiting:
         subtitle: One moment please, this might take some time...
         title: We are setting up your permissions on the project folder.
diff --git a/modules/storages/config/locales/js-en.yml b/modules/storages/config/locales/js-en.yml
index ac9733c3f2d6..8d82b0ef9d33 100644
--- a/modules/storages/config/locales/js-en.yml
+++ b/modules/storages/config/locales/js-en.yml
@@ -13,6 +13,7 @@ en:
       open_storage: "Open %{storageType}"
       select_location: "Select location"
       choose_location: "Choose location"
+      new_folder: "New folder"
 
       types:
         nextcloud: "Nextcloud"
@@ -49,6 +50,7 @@ en:
           newest data, and try again.
         managed_project_folder_no_access: >
           You have no access yet to the managed project folder. Please wait a bit and try again.
+        cannot_create_folder: Failed to create folder. Avoid using special characters and symbols.
         upload_keep_both: "Keep both"
         upload_replace: "Replace"
 
diff --git a/modules/storages/lib/api/v3/file_links/file_link_relation_representer.rb b/modules/storages/lib/api/v3/file_links/file_link_relation_representer.rb
index f373be81cdda..58b725ad70eb 100644
--- a/modules/storages/lib/api/v3/file_links/file_link_relation_representer.rb
+++ b/modules/storages/lib/api/v3/file_links/file_link_relation_representer.rb
@@ -45,18 +45,6 @@ module FileLinkRelationRepresenter
               method: :post
             }
           end
-
-          property :file_links,
-                   embedded: true,
-                   exec_context: :decorator,
-                   if: ->(*) { embed_links && current_user.allowed_in_project?(:view_file_links, represented.project) },
-                   uncacheable: true
-
-          def file_links
-            ::API::V3::FileLinks::FileLinkCollectionRepresenter.new(represented.file_links,
-                                                                    self_link: api_v3_paths.file_links(represented.id),
-                                                                    current_user:)
-          end
         end
       end
     end
diff --git a/modules/storages/lib/api/v3/storage_files/storage_folders_api.rb b/modules/storages/lib/api/v3/storage_files/storage_folders_api.rb
new file mode 100644
index 000000000000..9766923a5e05
--- /dev/null
+++ b/modules/storages/lib/api/v3/storage_files/storage_folders_api.rb
@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module API
+  module V3
+    module StorageFiles
+      class StorageFoldersAPI < ::API::OpenProjectAPI
+        using ::Storages::Peripherals::ServiceResultRefinements
+
+        helpers ::Storages::Peripherals::StorageErrorHelper
+
+        resources :folders do
+          params do
+            requires :name, type: String, desc: "Folder name"
+            requires :parent_id, type: String, desc: "Id of the parent folder"
+          end
+
+          post do
+            ::Storages::CreateFolderService.call(
+              storage: @storage,
+              user: current_user,
+              name: params["name"],
+              parent_id: params["parent_id"]
+            ).match(
+              on_success: lambda { |storage_folder|
+                API::V3::StorageFiles::StorageFileRepresenter.new(
+                  storage_folder,
+                  @storage,
+                  current_user:
+                )
+              },
+              on_failure: ->(error) { raise_error(error) }
+            )
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/modules/storages/lib/api/v3/storages/storages_api.rb b/modules/storages/lib/api/v3/storages/storages_api.rb
index b5dedbcd20e7..f77b67fa4d24 100644
--- a/modules/storages/lib/api/v3/storages/storages_api.rb
+++ b/modules/storages/lib/api/v3/storages/storages_api.rb
@@ -50,6 +50,7 @@ class API::V3::Storages::StoragesAPI < API::OpenProjectAPI
       mount API::V3::StorageFiles::StorageFilesAPI
       mount API::V3::OAuthClient::OAuthClientCredentialsAPI
       mount API::V3::Storages::StorageOpenAPI
+      mount API::V3::StorageFiles::StorageFoldersAPI
     end
   end
 end
diff --git a/modules/storages/lib/open_project/storages/engine.rb b/modules/storages/lib/open_project/storages/engine.rb
index 1a40a918da0b..c98483d74a86 100644
--- a/modules/storages/lib/open_project/storages/engine.rb
+++ b/modules/storages/lib/open_project/storages/engine.rb
@@ -240,8 +240,6 @@ def self.external_file_permissions
       end
     end
 
-    patch_with_namespace :Principals, :ReplaceReferencesService
-
     # This hook is executed when the module is loaded.
     config.to_prepare do
       # Allow the browser to connect to external servers for direct file uploads.
@@ -312,6 +310,10 @@ def self.external_file_permissions
       "#{storage_files(storage_id)}/#{file_id}"
     end
 
+    add_api_path :storage_folders do |storage_id|
+      "#{storage(storage_id)}/folders"
+    end
+
     add_api_path :prepare_upload do |storage_id|
       "#{storage(storage_id)}/files/prepare_upload"
     end
@@ -360,5 +362,9 @@ def self.external_file_permissions
         }
       }
     end
+
+    replace_principal_reference("::Storages::Storage", :creator_id)
+    replace_principal_reference("::Storages::ProjectStorage", :creator_id)
+    replace_principal_reference("::Storages::FileLink", :creator_id)
   end
 end
diff --git a/modules/storages/lib/open_project/storages/patches/replace_references_service_patch.rb b/modules/storages/lib/open_project/storages/patches/replace_references_service_patch.rb
deleted file mode 100644
index 4e4889495100..000000000000
--- a/modules/storages/lib/open_project/storages/patches/replace_references_service_patch.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-module OpenProject::Storages::Patches::ReplaceReferencesServicePatch
-  def self.included(base) # :nodoc:
-    base.prepend InstanceMethods
-  end
-
-  module InstanceMethods
-    private
-
-    def rewrite_creator(from, to)
-      super
-
-      [::Storages::Storage,
-       ::Storages::ProjectStorage,
-       ::Storages::FileLink].each do |klass|
-        klass.where(creator_id: from.id).update_all(creator_id: to.id)
-      end
-    end
-  end
-end
diff --git a/modules/storages/spec/common/storages/peripherals/storage_interaction/nextcloud/create_folder_command_spec.rb b/modules/storages/spec/common/storages/peripherals/storage_interaction/nextcloud/create_folder_command_spec.rb
index df8cc09383b1..97682714a105 100644
--- a/modules/storages/spec/common/storages/peripherals/storage_interaction/nextcloud/create_folder_command_spec.rb
+++ b/modules/storages/spec/common/storages/peripherals/storage_interaction/nextcloud/create_folder_command_spec.rb
@@ -32,46 +32,74 @@
 require_module_spec_helper
 
 RSpec.describe Storages::Peripherals::StorageInteraction::Nextcloud::CreateFolderCommand, :webmock do
-  let(:user) { create(:user) }
-  let(:storage) do
-    create(:nextcloud_storage_with_local_connection, :as_not_automatically_managed, oauth_client_token_user: user)
-  end
-  let(:auth_strategy) do
-    Storages::Peripherals::StorageInteraction::AuthenticationStrategies::OAuthUserToken.strategy.with_user(user)
-  end
+  describe "admin user" do
+    let(:user) { create(:user) }
+    let(:storage) do
+      create(:nextcloud_storage_with_local_connection, :as_not_automatically_managed, oauth_client_token_user: user)
+    end
+    let(:auth_strategy) do
+      Storages::Peripherals::StorageInteraction::AuthenticationStrategies::OAuthUserToken.strategy.with_user(user)
+    end
 
-  it_behaves_like "create_folder_command: basic command setup"
+    it_behaves_like "create_folder_command: basic command setup"
 
-  context "when creating a folder in the root", vcr: "nextcloud/create_folder_root" do
-    let(:folder_name) { "Földer CreatedBy Çommand" }
-    let(:parent_location) { Storages::Peripherals::ParentFolder.new("/") }
-    let(:path) { "/#{folder_name}" }
+    context "when creating a folder in the root", vcr: "nextcloud/create_folder_root" do
+      let(:folder_name) { "Földer CreatedBy Çommand" }
+      let(:parent_location) { Storages::Peripherals::ParentFolder.new("/") }
+      let(:path) { "/#{folder_name}" }
 
-    it_behaves_like "create_folder_command: successful folder creation"
-  end
+      it_behaves_like "create_folder_command: successful folder creation"
+    end
 
-  context "when creating a folder in a parent folder", vcr: "nextcloud/create_folder_parent" do
-    let(:folder_name) { "Földer CreatedBy Çommand" }
-    let(:parent_location) { Storages::Peripherals::ParentFolder.new("/Folder") }
-    let(:path) { "/Folder/#{folder_name}" }
+    context "when creating a folder in a parent folder", vcr: "nextcloud/create_folder_parent" do
+      let(:folder_name) { "Földer CreatedBy Çommand" }
+      let(:parent_location) { Storages::Peripherals::ParentFolder.new("/Folder") }
+      let(:path) { "/Folder/#{folder_name}" }
 
-    it_behaves_like "create_folder_command: successful folder creation"
-  end
+      it_behaves_like "create_folder_command: successful folder creation"
+    end
 
-  context "when creating a folder in a non-existing parent folder", vcr: "nextcloud/create_folder_parent_not_found" do
-    let(:folder_name) { "New Folder" }
-    let(:parent_location) { Storages::Peripherals::ParentFolder.new("/DeathStar3") }
-    let(:error_source) { described_class }
+    context "when creating a folder in a non-existing parent folder", vcr: "nextcloud/create_folder_parent_not_found" do
+      let(:folder_name) { "New Folder" }
+      let(:parent_location) { Storages::Peripherals::ParentFolder.new("/DeathStar3") }
+      let(:error_source) { described_class }
 
-    it_behaves_like "create_folder_command: parent not found"
+      it_behaves_like "create_folder_command: parent not found"
+    end
+
+    context "when folder already exists", vcr: "nextcloud/create_folder_already_exists" do
+      let(:folder_name) { "Folder" }
+      let(:parent_location) { Storages::Peripherals::ParentFolder.new("/") }
+      let(:error_source) { described_class }
+
+      it_behaves_like "create_folder_command: folder already exists"
+    end
   end
 
-  context "when folder already exists", vcr: "nextcloud/create_folder_already_exists" do
-    let(:folder_name) { "Folder" }
-    let(:parent_location) { Storages::Peripherals::ParentFolder.new("/") }
-    let(:error_source) { described_class }
+  # For the VCR tests in this block it's necessary to
+  # create a user in NextCloud with the account name `member@example1`
+  # and use it's oauth access & refresh tokens on .env.test.local
+  describe "user with custom origin name" do
+    let(:user) { create(:user) }
+    let(:storage) do
+      create(
+        :nextcloud_storage_with_local_connection,
+        :as_not_automatically_managed,
+        origin_user_id: "member@example1",
+        oauth_client_token_user: user
+      )
+    end
+    let(:auth_strategy) do
+      Storages::Peripherals::StorageInteraction::AuthenticationStrategies::OAuthUserToken.strategy.with_user(user)
+    end
+
+    context "when creating a folder as a non admin user", vcr: "nextcloud/create_folder_member" do
+      let(:folder_name) { "Földer CreatedBy Çommand" }
+      let(:parent_location) { Storages::Peripherals::ParentFolder.new("/") }
+      let(:path) { "/#{folder_name}" }
 
-    it_behaves_like "create_folder_command: folder already exists"
+      it_behaves_like "create_folder_command: successful folder creation"
+    end
   end
 
   private
diff --git a/modules/storages/spec/common/storages/peripherals/storage_interaction/nextcloud/remove_user_from_group_command_spec.rb b/modules/storages/spec/common/storages/peripherals/storage_interaction/nextcloud/remove_user_from_group_command_spec.rb
index 993d769f68d6..498de7cca273 100644
--- a/modules/storages/spec/common/storages/peripherals/storage_interaction/nextcloud/remove_user_from_group_command_spec.rb
+++ b/modules/storages/spec/common/storages/peripherals/storage_interaction/nextcloud/remove_user_from_group_command_spec.rb
@@ -72,16 +72,10 @@
     before do
       create_group(auth, storage, group)
       add_user_to_group(user, group)
-
-      # There is a bug in the group folder API that does not allow to remove a user from a group,
-      # if this is its last group
-      create_group(auth, storage, "Sith Assassins Backup")
-      add_user_to_group(user, "Sith Assassins Backup")
     end
 
     after do
       remove_group(auth, storage, group)
-      remove_group(auth, storage, "Sith Assassins Backup")
     end
 
     it "returns a success" do
diff --git a/modules/storages/spec/common/storages/peripherals/storage_interaction/one_drive/set_permissions_command_spec.rb b/modules/storages/spec/common/storages/peripherals/storage_interaction/one_drive/set_permissions_command_spec.rb
index bdf81455e020..c80c457f3033 100644
--- a/modules/storages/spec/common/storages/peripherals/storage_interaction/one_drive/set_permissions_command_spec.rb
+++ b/modules/storages/spec/common/storages/peripherals/storage_interaction/one_drive/set_permissions_command_spec.rb
@@ -137,7 +137,7 @@ def current_remote_permissions
               .with(
                 error_code: :error,
                 message: nil,
-                data: %r{/lib/httpx/response.rb:260:in `full_message': timed out while waiting on select \(HTTPX::ConnectTimeoutError\)\n$}
+                data: %r{/lib/httpx/response.rb:262:in `full_message': timed out while waiting on select \(HTTPX::ConnectTimeoutError\)\n$}
               ).once
       # rubocop:enable Layout/LineLength
     end
diff --git a/modules/storages/spec/models/storages/shared_base_storage_spec.rb b/modules/storages/spec/models/storages/shared_base_storage_spec.rb
index e0dc9e75878b..795143404ede 100644
--- a/modules/storages/spec/models/storages/shared_base_storage_spec.rb
+++ b/modules/storages/spec/models/storages/shared_base_storage_spec.rb
@@ -49,20 +49,24 @@
       end
     end
 
-    context "when provider_type does not match the signature" do
+    context "when provider_type is unknown" do
       it "raises an error", :aggregate_failures do
         expect do
           described_class.shorten_provider_type("Storages::Nextcloud")
         end.to raise_error("Unknown provider_type! Given: Storages::Nextcloud. " \
-                           "Expected the following signature: Storages::{Name of the provider}Storage")
+                           "Known provider types are defined in Storages::Storage::PROVIDER_TYPE_SHORT_NAMES.")
         expect do
           described_class.shorten_provider_type("Storages:NextcloudStorage")
         end.to raise_error("Unknown provider_type! Given: Storages:NextcloudStorage. " \
-                           "Expected the following signature: Storages::{Name of the provider}Storage")
+                           "Known provider types are defined in Storages::Storage::PROVIDER_TYPE_SHORT_NAMES.")
         expect do
           described_class.shorten_provider_type("Storages::NextcloudStorag")
         end.to raise_error("Unknown provider_type! Given: Storages::NextcloudStorag. " \
-                           "Expected the following signature: Storages::{Name of the provider}Storage")
+                           "Known provider types are defined in Storages::Storage::PROVIDER_TYPE_SHORT_NAMES.")
+        expect do
+          described_class.shorten_provider_type("Storages::UnknownStorage")
+        end.to raise_error("Unknown provider_type! Given: Storages::UnknownStorage. " \
+                           "Known provider types are defined in Storages::Storage::PROVIDER_TYPE_SHORT_NAMES.")
       end
     end
   end
diff --git a/modules/storages/spec/requests/api/v3/storages/storage_folders_api_spec.rb b/modules/storages/spec/requests/api/v3/storages/storage_folders_api_spec.rb
new file mode 100644
index 000000000000..fddfa2a9bdcb
--- /dev/null
+++ b/modules/storages/spec/requests/api/v3/storages/storage_folders_api_spec.rb
@@ -0,0 +1,144 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+require_module_spec_helper
+
+RSpec.describe "API v3 storage folders", :webmock, content_type: :json do
+  include API::V3::Utilities::PathHelper
+  include StorageServerHelpers
+
+  let(:permissions) { %i(view_work_packages view_file_links manage_file_links) }
+  let(:project) { create(:project) }
+
+  let(:current_user) do
+    create(:user, member_with_permissions: { project => permissions })
+  end
+
+  let(:oauth_application) { create(:oauth_application) }
+  let(:storage) { create(:nextcloud_storage_configured, creator: current_user, oauth_application:) }
+  let(:oauth_token) { create(:oauth_client_token, user: current_user, oauth_client: storage.oauth_client) }
+  let(:project_storage) { create(:project_storage, project:, storage:) }
+
+  subject(:last_response) { post(path, body) }
+
+  before do
+    oauth_application
+    project_storage
+    login_as current_user
+  end
+
+  describe "POST /api/v3/storages/:storage_id/folders" do
+    let(:path) { api_v3_paths.storage_folders(storage.id) }
+    let(:body) { { parent_id: file_info.id, name: folder_name }.to_json }
+    let(:folder_name) { "TestFolder" }
+
+    let(:response) do
+      Storages::StorageFile.new(
+        id: 1,
+        name: folder_name,
+        size: 128,
+        mime_type: "application/x-op-directory",
+        created_at: DateTime.now,
+        last_modified_at: DateTime.now,
+        created_by_name: "Obi-Wan Kenobi",
+        last_modified_by_name: "Obi-Wan Kenobi",
+        location: "/",
+        permissions: %i[readable]
+      )
+    end
+
+    let(:file_info) do
+      Storages::StorageFileInfo.new(
+        status: "OK",
+        status_code: 200,
+        id: SecureRandom.hex,
+        name: "/",
+        location: "/"
+      )
+    end
+
+    before do
+      file_info_mock = class_double(Storages::Peripherals::StorageInteraction::Nextcloud::FileInfoQuery)
+      allow(file_info_mock).to receive(:call).with(
+        storage: storage,
+        auth_strategy: instance_of(Storages::Peripherals::StorageInteraction::AuthenticationStrategies::Strategy),
+        file_id: file_info.id
+      ).and_return(ServiceResult.success(result: file_info))
+      Storages::Peripherals::Registry.stub("nextcloud.queries.file_info", file_info_mock)
+    end
+
+    context "with successful response" do
+      subject { last_response.body }
+
+      before do
+        create_folder_mock = class_double(Storages::Peripherals::StorageInteraction::Nextcloud::CreateFolderCommand)
+        allow(create_folder_mock).to receive(:call).with(
+          storage: storage,
+          auth_strategy: instance_of(Storages::Peripherals::StorageInteraction::AuthenticationStrategies::Strategy),
+          folder_name:,
+          parent_location: instance_of(Storages::Peripherals::ParentFolder)
+        ).and_return(ServiceResult.success(result: response))
+        Storages::Peripherals::Registry.stub("nextcloud.commands.create_folder", create_folder_mock)
+      end
+
+      it "responds with appropriate JSON" do
+        expect(subject).to be_json_eql(response.id.to_json).at_path("id")
+        expect(subject).to be_json_eql(response.name.to_json).at_path("name")
+        expect(subject).to be_json_eql(response.permissions.to_json).at_path("permissions")
+      end
+    end
+
+    context "with query failed" do
+      before do
+        create_folder_mock = class_double(Storages::Peripherals::StorageInteraction::Nextcloud::CreateFolderCommand)
+        allow(create_folder_mock).to receive(:call).with(
+          storage: storage,
+          auth_strategy: instance_of(Storages::Peripherals::StorageInteraction::AuthenticationStrategies::Strategy),
+          folder_name:,
+          parent_location: instance_of(Storages::Peripherals::ParentFolder)
+        ).and_return(ServiceResult.failure(result: error, errors: Storages::StorageError.new(code: error)))
+        Storages::Peripherals::Registry.stub("nextcloud.commands.create_folder", create_folder_mock)
+      end
+
+      context "with authorization failure" do
+        let(:error) { :unauthorized }
+
+        it { expect(last_response).to have_http_status(:internal_server_error) }
+      end
+
+      context "with internal error" do
+        let(:error) { :error }
+
+        it { expect(last_response).to have_http_status(:internal_server_error) }
+      end
+    end
+  end
+end
diff --git a/modules/storages/spec/services/storages/create_folder_service_spec.rb b/modules/storages/spec/services/storages/create_folder_service_spec.rb
new file mode 100644
index 000000000000..d4c6a96ce2d0
--- /dev/null
+++ b/modules/storages/spec/services/storages/create_folder_service_spec.rb
@@ -0,0 +1,112 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+require_module_spec_helper
+
+RSpec.describe Storages::CreateFolderService do
+  subject(:service) { described_class.call(storage:, user:, name:, parent_id:) }
+
+  let(:user) { create(:admin) }
+  let(:name) { "TestFolderName" }
+
+  context "when storage is nextcloud" do
+    let(:storage) { create(:nextcloud_storage) }
+    let(:parent_id) { file_info.id }
+
+    let(:file_info) do
+      Storages::StorageFileInfo.new(
+        status: "OK",
+        status_code: 200,
+        id: SecureRandom.hex,
+        name: "/",
+        location: "/Path/To/Parent/Next"
+      )
+    end
+
+    let(:create_folder_command) { class_double(Storages::Peripherals::StorageInteraction::Nextcloud::CreateFolderCommand) }
+
+    before do
+      file_info_mock = class_double(Storages::Peripherals::StorageInteraction::Nextcloud::FileInfoQuery)
+      allow(file_info_mock).to receive(:call).with(
+        storage: storage,
+        auth_strategy: instance_of(Storages::Peripherals::StorageInteraction::AuthenticationStrategies::Strategy),
+        file_id: file_info.id
+      ).and_return(ServiceResult.success(result: file_info))
+      Storages::Peripherals::Registry.stub("nextcloud.queries.file_info", file_info_mock)
+
+      allow(create_folder_command).to receive(:call).and_return(ServiceResult.success)
+      Storages::Peripherals::Registry.stub("nextcloud.commands.create_folder", create_folder_command)
+    end
+
+    it "calls the appropriate command with the expected parameters" do
+      service
+
+      expect(create_folder_command).to have_received(:call).with(
+        storage:,
+        auth_strategy: instance_of(Storages::Peripherals::StorageInteraction::AuthenticationStrategies::Strategy),
+        folder_name: name,
+        parent_location: Storages::Peripherals::ParentFolder.new(file_info.location)
+      ).once
+    end
+  end
+
+  context "when storage is one_drive" do
+    let(:storage) { create(:one_drive_storage) }
+    let(:parent_id) { file_info.id }
+
+    let(:file_info) do
+      Storages::StorageFileInfo.new(
+        status: "OK",
+        status_code: 200,
+        id: "/Path/To/Parent/One",
+        name: "/"
+      )
+    end
+
+    let(:create_folder_command) { class_double(Storages::Peripherals::StorageInteraction::Nextcloud::CreateFolderCommand) }
+
+    before do
+      allow(create_folder_command).to receive(:call).and_return(ServiceResult.success)
+      Storages::Peripherals::Registry.stub("one_drive.commands.create_folder", create_folder_command)
+    end
+
+    it "calls the appropriate command with the expected parameters" do
+      service
+
+      expect(create_folder_command).to have_received(:call).with(
+        storage:,
+        auth_strategy: instance_of(Storages::Peripherals::StorageInteraction::AuthenticationStrategies::Strategy),
+        folder_name: name,
+        parent_location: Storages::Peripherals::ParentFolder.new(file_info.id)
+      ).once
+    end
+  end
+end
diff --git a/modules/storages/spec/support/fixtures/vcr_cassettes/nextcloud/create_folder_member.yml b/modules/storages/spec/support/fixtures/vcr_cassettes/nextcloud/create_folder_member.yml
new file mode 100644
index 000000000000..ebaafbd908c7
--- /dev/null
+++ b/modules/storages/spec/support/fixtures/vcr_cassettes/nextcloud/create_folder_member.yml
@@ -0,0 +1,226 @@
+---
+http_interactions:
+- request:
+    method: mkcol
+    uri: https://nextcloud.local/remote.php/dav/files/member@example1/F%C3%B6lder%20CreatedBy%20%C3%87ommand
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Authorization:
+      - Bearer <BEARER TOKEN>
+      User-Agent:
+      - httpx.rb/1.4.0
+      Accept:
+      - "*/*"
+      Accept-Encoding:
+      - gzip, deflate
+  response:
+    status:
+      code: 201
+      message: Created
+    headers:
+      Content-Security-Policy:
+      - default-src 'none';
+      Content-Type:
+      - text/html; charset=UTF-8
+      Date:
+      - Mon, 30 Dec 2024 17:19:25 GMT
+      Oc-Fileid:
+      - '00001038ocrelj7f1ehp'
+      Referrer-Policy:
+      - no-referrer
+      Server:
+      - Apache/2.4.62 (Debian)
+      Set-Cookie:
+      - ocrelj7f1ehp=435fa78f7f7a92fa157083c5951f7d54; path=/; secure; HttpOnly; SameSite=Lax,
+        oc_sessionPassphrase=tOCafBXJbdd933ZWBijp6x7t%2FsEle61%2BmngIwMNyiMkuoanpmfbGwvgmVMLuHZ6WSuSywHHs3e1%2Bl%2FbzyukbdSCfymef3lMBife9nVkIm89k3nITqUr8hm2c2qU5wme2;
+        path=/; secure; HttpOnly; SameSite=Lax, ocrelj7f1ehp=435fa78f7f7a92fa157083c5951f7d54;
+        path=/; secure; HttpOnly; SameSite=Lax, __Host-nc_sameSiteCookielax=true;
+        path=/; httponly;secure; expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=lax,
+        __Host-nc_sameSiteCookiestrict=true; path=/; httponly;secure; expires=Fri,
+        31-Dec-2100 23:59:59 GMT; SameSite=strict, ocrelj7f1ehp=435fa78f7f7a92fa157083c5951f7d54;
+        path=/; secure; HttpOnly; SameSite=Lax, ocrelj7f1ehp=435fa78f7f7a92fa157083c5951f7d54;
+        path=/; secure; HttpOnly; SameSite=Lax, ocrelj7f1ehp=435fa78f7f7a92fa157083c5951f7d54;
+        path=/; secure; HttpOnly; SameSite=Lax, ocrelj7f1ehp=435fa78f7f7a92fa157083c5951f7d54;
+        path=/; secure; HttpOnly; SameSite=Lax, ocrelj7f1ehp=435fa78f7f7a92fa157083c5951f7d54;
+        path=/; secure; HttpOnly; SameSite=Lax, ocrelj7f1ehp=435fa78f7f7a92fa157083c5951f7d54;
+        path=/; secure; HttpOnly; SameSite=Lax, ocrelj7f1ehp=435fa78f7f7a92fa157083c5951f7d54;
+        path=/; secure; HttpOnly; SameSite=Lax
+      X-Content-Type-Options:
+      - nosniff
+      X-Debug-Token:
+      - qpCi61FusdE5nbxl64ek
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Permitted-Cross-Domain-Policies:
+      - none
+      X-Powered-By:
+      - PHP/8.2.26
+      X-Request-Id:
+      - qpCi61FusdE5nbxl64ek
+      X-Robots-Tag:
+      - noindex, nofollow
+      X-Xss-Protection:
+      - 1; mode=block
+      Content-Length:
+      - '0'
+    body:
+      encoding: UTF-8
+      string: ''
+  recorded_at: Mon, 30 Dec 2024 17:19:25 GMT
+- request:
+    method: propfind
+    uri: https://nextcloud.local/remote.php/dav/files/member@example1/F%C3%B6lder%20CreatedBy%20%C3%87ommand
+    body:
+      encoding: UTF-8
+      string: |
+        <?xml version="1.0"?>
+        <d:propfind xmlns:d="DAV:" xmlns:oc="http://owncloud.org/ns">
+          <d:prop>
+            <oc:fileid/>
+            <oc:size/>
+            <d:getlastmodified/>
+            <oc:owner-display-name/>
+          </d:prop>
+        </d:propfind>
+    headers:
+      Authorization:
+      - Bearer <BEARER TOKEN>
+      Depth:
+      - '1'
+      User-Agent:
+      - httpx.rb/1.4.0
+      Accept:
+      - "*/*"
+      Accept-Encoding:
+      - gzip, deflate
+      Content-Type:
+      - application/xml; charset=utf-8
+      Content-Length:
+      - '207'
+  response:
+    status:
+      code: 207
+      message: Multi-Status
+    headers:
+      Content-Encoding:
+      - gzip
+      Content-Security-Policy:
+      - default-src 'none';
+      Content-Type:
+      - application/xml; charset=utf-8
+      Date:
+      - Mon, 30 Dec 2024 17:19:25 GMT
+      Dav:
+      - 1, 3, extended-mkcol, access-control, calendarserver-principal-property-search,
+        nextcloud-checksum-update, nc-calendar-search, nc-enable-birthday-calendar
+      Referrer-Policy:
+      - no-referrer
+      Server:
+      - Apache/2.4.62 (Debian)
+      Set-Cookie:
+      - ocrelj7f1ehp=e2c3c01af49af2c6b5007a9dbd054531; path=/; secure; HttpOnly; SameSite=Lax,
+        oc_sessionPassphrase=5005hcLC2K9NuRNu8X3B%2FfUzfkXV%2FKwx0ACJiE1X5AFCmUq1gY3BQGGVL6LfBt%2FvI%2BmXg9BKtOTQ5AfPcPGwsy%2B%2FzZxTYTNJfJsaGY9N3fWiBZrem0tAZU%2B9H7FGrjJI;
+        path=/; secure; HttpOnly; SameSite=Lax, ocrelj7f1ehp=e2c3c01af49af2c6b5007a9dbd054531;
+        path=/; secure; HttpOnly; SameSite=Lax, __Host-nc_sameSiteCookielax=true;
+        path=/; httponly;secure; expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=lax,
+        __Host-nc_sameSiteCookiestrict=true; path=/; httponly;secure; expires=Fri,
+        31-Dec-2100 23:59:59 GMT; SameSite=strict, ocrelj7f1ehp=e2c3c01af49af2c6b5007a9dbd054531;
+        path=/; secure; HttpOnly; SameSite=Lax, ocrelj7f1ehp=e2c3c01af49af2c6b5007a9dbd054531;
+        path=/; secure; HttpOnly; SameSite=Lax, ocrelj7f1ehp=e2c3c01af49af2c6b5007a9dbd054531;
+        path=/; secure; HttpOnly; SameSite=Lax, ocrelj7f1ehp=e2c3c01af49af2c6b5007a9dbd054531;
+        path=/; secure; HttpOnly; SameSite=Lax, ocrelj7f1ehp=e2c3c01af49af2c6b5007a9dbd054531;
+        path=/; secure; HttpOnly; SameSite=Lax, ocrelj7f1ehp=e2c3c01af49af2c6b5007a9dbd054531;
+        path=/; secure; HttpOnly; SameSite=Lax, ocrelj7f1ehp=e2c3c01af49af2c6b5007a9dbd054531;
+        path=/; secure; HttpOnly; SameSite=Lax
+      Vary:
+      - Brief,Prefer
+      X-Content-Type-Options:
+      - nosniff
+      X-Debug-Token:
+      - DRC2J6C4h4bVvAbet8uT
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Permitted-Cross-Domain-Policies:
+      - none
+      X-Powered-By:
+      - PHP/8.2.26
+      X-Request-Id:
+      - DRC2J6C4h4bVvAbet8uT
+      X-Robots-Tag:
+      - noindex, nofollow
+      X-Xss-Protection:
+      - 1; mode=block
+      Content-Length:
+      - '330'
+    body:
+      encoding: UTF-8
+      string: |
+        <?xml version="1.0"?>
+        <d:multistatus xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns" xmlns:oc="http://owncloud.org/ns" xmlns:nc="http://nextcloud.org/ns"><d:response><d:href>/remote.php/dav/files/member@example1/F%c3%b6lder%20CreatedBy%20%c3%87ommand/</d:href><d:propstat><d:prop><oc:fileid>1038</oc:fileid><oc:size>0</oc:size><d:getlastmodified>Mon, 30 Dec 2024 17:19:25 GMT</d:getlastmodified><oc:owner-display-name>member@example1</oc:owner-display-name></d:prop><d:status>HTTP/1.1 200 OK</d:status></d:propstat></d:response></d:multistatus>
+  recorded_at: Mon, 30 Dec 2024 17:19:25 GMT
+- request:
+    method: delete
+    uri: https://nextcloud.local/remote.php/dav/files/member@example1/F%C3%B6lder%20CreatedBy%20%C3%87ommand
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Authorization:
+      - Bearer <BEARER TOKEN>
+      User-Agent:
+      - httpx.rb/1.4.0
+      Accept:
+      - "*/*"
+      Accept-Encoding:
+      - gzip, deflate
+  response:
+    status:
+      code: 204
+      message: No Content
+    headers:
+      Content-Security-Policy:
+      - default-src 'none';
+      Date:
+      - Mon, 30 Dec 2024 17:19:25 GMT
+      Referrer-Policy:
+      - no-referrer
+      Server:
+      - Apache/2.4.62 (Debian)
+      Set-Cookie:
+      - ocrelj7f1ehp=cc8d345558b493aa564492f3a4dd0fcb; path=/; secure; HttpOnly; SameSite=Lax,
+        oc_sessionPassphrase=5Nezz5nwQaMjO5dr2gWwBOXB2ob2QEiDBYrU%2BphvQZoWVcgqFv%2F9dZJOH%2FLn64lQmD6k5MYCa%2FIggULRVIrwm%2FW56d2GFLvsrOa5NzNGu%2FpJgMfk0bfz%2F2uq2hMcFyTp;
+        path=/; secure; HttpOnly; SameSite=Lax, ocrelj7f1ehp=cc8d345558b493aa564492f3a4dd0fcb;
+        path=/; secure; HttpOnly; SameSite=Lax, __Host-nc_sameSiteCookielax=true;
+        path=/; httponly;secure; expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=lax,
+        __Host-nc_sameSiteCookiestrict=true; path=/; httponly;secure; expires=Fri,
+        31-Dec-2100 23:59:59 GMT; SameSite=strict, ocrelj7f1ehp=cc8d345558b493aa564492f3a4dd0fcb;
+        path=/; secure; HttpOnly; SameSite=Lax, ocrelj7f1ehp=cc8d345558b493aa564492f3a4dd0fcb;
+        path=/; secure; HttpOnly; SameSite=Lax, ocrelj7f1ehp=cc8d345558b493aa564492f3a4dd0fcb;
+        path=/; secure; HttpOnly; SameSite=Lax, ocrelj7f1ehp=cc8d345558b493aa564492f3a4dd0fcb;
+        path=/; secure; HttpOnly; SameSite=Lax, ocrelj7f1ehp=cc8d345558b493aa564492f3a4dd0fcb;
+        path=/; secure; HttpOnly; SameSite=Lax, ocrelj7f1ehp=cc8d345558b493aa564492f3a4dd0fcb;
+        path=/; secure; HttpOnly; SameSite=Lax, ocrelj7f1ehp=cc8d345558b493aa564492f3a4dd0fcb;
+        path=/; secure; HttpOnly; SameSite=Lax
+      X-Content-Type-Options:
+      - nosniff
+      X-Debug-Token:
+      - UhonUynePgi4EBPEKFRQ
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Permitted-Cross-Domain-Policies:
+      - none
+      X-Powered-By:
+      - PHP/8.2.26
+      X-Request-Id:
+      - UhonUynePgi4EBPEKFRQ
+      X-Robots-Tag:
+      - noindex, nofollow
+      X-Xss-Protection:
+      - 1; mode=block
+    body:
+      encoding: UTF-8
+      string: ''
+  recorded_at: Mon, 30 Dec 2024 17:19:25 GMT
+recorded_with: VCR 6.3.1
diff --git a/modules/storages/spec/support/fixtures/vcr_cassettes/nextcloud/remove_user_from_group_success.yml b/modules/storages/spec/support/fixtures/vcr_cassettes/nextcloud/remove_user_from_group_success.yml
index 3622540470ff..9f567bfdc12b 100644
--- a/modules/storages/spec/support/fixtures/vcr_cassettes/nextcloud/remove_user_from_group_success.yml
+++ b/modules/storages/spec/support/fixtures/vcr_cassettes/nextcloud/remove_user_from_group_success.yml
@@ -12,7 +12,7 @@ http_interactions:
       Ocs-Apirequest:
       - 'true'
       User-Agent:
-      - httpx.rb/1.3.1
+      - httpx.rb/1.3.3
       Accept:
       - "*/*"
       Accept-Encoding:
@@ -35,30 +35,26 @@ http_interactions:
       Content-Type:
       - application/xml; charset=utf-8
       Date:
-      - Wed, 02 Oct 2024 08:50:34 GMT
-      Expires:
-      - Thu, 19 Nov 1981 08:52:00 GMT
+      - Thu, 28 Nov 2024 14:30:01 GMT
       Feature-Policy:
       - autoplay 'none';camera 'none';fullscreen 'none';geolocation 'none';microphone
         'none';payment 'none'
-      Pragma:
-      - no-cache
       Referrer-Policy:
       - no-referrer
       Server:
-      - Apache/2.4.59 (Debian)
+      - Apache/2.4.62 (Debian)
       Set-Cookie:
-      - oc07ul6b4oaw=9762849c349fec419d4d915242d15e12; path=/; secure; HttpOnly; SameSite=Lax,
-        oc_sessionPassphrase=DZ6L8GHmQgY2z%2B3foy2pUqmyeMgyiphLjNdRgVJ730AI27UtJHnhpTapN6kiLCTtskMoKUaXrPc15eL3LtZwYfw4Eve42BLZMzJG8s2unmeF%2B4cqZz%2FvWFGsYrDU4gj3;
-        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=9762849c349fec419d4d915242d15e12;
+      - oc07ul6b4oaw=21c9dc077368b09dd0ccef059539746a; path=/; secure; HttpOnly; SameSite=Lax,
+        oc_sessionPassphrase=9emV%2BdNp8kCMiTlMOsInpolUEx1yOWHm5HiBNoUBCxec5k%2BktQuDYj4aO38QEtHfO3zTck5ACGzgZ3PV4xJZom77Ac6qy9%2BABSxeAxMqtE4ta4dpp2jBrk3r%2Fzhwb0mE;
+        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=21c9dc077368b09dd0ccef059539746a;
         path=/; secure; HttpOnly; SameSite=Lax, __Host-nc_sameSiteCookielax=true;
         path=/; httponly;secure; expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=lax,
         __Host-nc_sameSiteCookiestrict=true; path=/; httponly;secure; expires=Fri,
-        31-Dec-2100 23:59:59 GMT; SameSite=strict, oc07ul6b4oaw=9762849c349fec419d4d915242d15e12;
-        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=9762849c349fec419d4d915242d15e12;
-        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=1e76183d834700018922edb625e879e2;
-        path=/; secure; HttpOnly; SameSite=Lax, cookie_test=test; expires=Wed, 02
-        Oct 2024 09:50:35 GMT; Max-Age=3600
+        31-Dec-2100 23:59:59 GMT; SameSite=strict, oc07ul6b4oaw=21c9dc077368b09dd0ccef059539746a;
+        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=21c9dc077368b09dd0ccef059539746a;
+        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=311d0429cc20407278845a667f6d80ad;
+        path=/; secure; HttpOnly; SameSite=Lax, cookie_test=test; expires=Thu, 28
+        Nov 2024 15:30:01 GMT; Max-Age=3600
       X-Content-Type-Options:
       - nosniff
       X-Frame-Options:
@@ -66,9 +62,9 @@ http_interactions:
       X-Permitted-Cross-Domain-Policies:
       - none
       X-Powered-By:
-      - PHP/8.2.21
+      - PHP/8.2.26
       X-Request-Id:
-      - TBw85AYaMZcZNiY5oEru
+      - q3Y1SCVKkQfEiwzGjVCW
       X-Robots-Tag:
       - noindex, nofollow
       X-Xss-Protection:
@@ -89,7 +85,7 @@ http_interactions:
          </meta>
          <data/>
         </ocs>
-  recorded_at: Wed, 02 Oct 2024 08:50:35 GMT
+  recorded_at: Thu, 28 Nov 2024 14:30:01 GMT
 - request:
     method: post
     uri: https://nextcloud.local/ocs/v1.php/cloud/users/m.jade@death.star/groups
@@ -102,7 +98,7 @@ http_interactions:
       Ocs-Apirequest:
       - 'true'
       User-Agent:
-      - httpx.rb/1.3.1
+      - httpx.rb/1.3.3
       Accept:
       - "*/*"
       Accept-Encoding:
@@ -125,30 +121,26 @@ http_interactions:
       Content-Type:
       - application/xml; charset=utf-8
       Date:
-      - Wed, 02 Oct 2024 08:50:35 GMT
-      Expires:
-      - Thu, 19 Nov 1981 08:52:00 GMT
+      - Thu, 28 Nov 2024 14:30:01 GMT
       Feature-Policy:
       - autoplay 'none';camera 'none';fullscreen 'none';geolocation 'none';microphone
         'none';payment 'none'
-      Pragma:
-      - no-cache
       Referrer-Policy:
       - no-referrer
       Server:
-      - Apache/2.4.59 (Debian)
+      - Apache/2.4.62 (Debian)
       Set-Cookie:
-      - oc07ul6b4oaw=6cc4b771ce27bb97b8f3238e7653da31; path=/; secure; HttpOnly; SameSite=Lax,
-        oc_sessionPassphrase=B2I0t1BGIs1gvjZeGy7jqq8c%2FIxKtkypUxnIhP5m2lJhvyGp5k8CDf%2F1Cqn4YtKlIkIH3nT%2Fm5WD3ShkVPf5pnCupGYQqyWEp3GCkGuQXt5i6QhhP3XNfD%2FU4VtGxUgf;
-        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=6cc4b771ce27bb97b8f3238e7653da31;
+      - oc07ul6b4oaw=3a9639c066a5fa86a27273fc0dc3581a; path=/; secure; HttpOnly; SameSite=Lax,
+        oc_sessionPassphrase=P2uApN%2FWNxMYjUzW%2FkwSEqI7ux9QUNzTnHWuHmzBE%2B2PZrv2PQPK4gVsz6jc7Y8FvfZOfVv%2B%2FX%2FOX5PyVW%2BZ9JpNIFxVFRibrRzGnIMvKGAJ%2BASlkF0MWBgrY3M0qeEg;
+        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=3a9639c066a5fa86a27273fc0dc3581a;
         path=/; secure; HttpOnly; SameSite=Lax, __Host-nc_sameSiteCookielax=true;
         path=/; httponly;secure; expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=lax,
         __Host-nc_sameSiteCookiestrict=true; path=/; httponly;secure; expires=Fri,
-        31-Dec-2100 23:59:59 GMT; SameSite=strict, oc07ul6b4oaw=6cc4b771ce27bb97b8f3238e7653da31;
-        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=6cc4b771ce27bb97b8f3238e7653da31;
-        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=de374ccc4540ad2b501264cf9d57d7b0;
-        path=/; secure; HttpOnly; SameSite=Lax, cookie_test=test; expires=Wed, 02
-        Oct 2024 09:50:35 GMT; Max-Age=3600
+        31-Dec-2100 23:59:59 GMT; SameSite=strict, oc07ul6b4oaw=3a9639c066a5fa86a27273fc0dc3581a;
+        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=3a9639c066a5fa86a27273fc0dc3581a;
+        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=9a493de5794ac6c0ab0ec728d82afc07;
+        path=/; secure; HttpOnly; SameSite=Lax, cookie_test=test; expires=Thu, 28
+        Nov 2024 15:30:02 GMT; Max-Age=3600
       X-Content-Type-Options:
       - nosniff
       X-Frame-Options:
@@ -156,9 +148,9 @@ http_interactions:
       X-Permitted-Cross-Domain-Policies:
       - none
       X-Powered-By:
-      - PHP/8.2.21
+      - PHP/8.2.26
       X-Request-Id:
-      - 2OHmy14Z2uyX80wetXYp
+      - PyoqZuyOeHHxNYg0IqiT
       X-Robots-Tag:
       - noindex, nofollow
       X-Xss-Protection:
@@ -179,187 +171,7 @@ http_interactions:
          </meta>
          <data/>
         </ocs>
-  recorded_at: Wed, 02 Oct 2024 08:50:36 GMT
-- request:
-    method: post
-    uri: https://nextcloud.local/ocs/v1.php/cloud/groups
-    body:
-      encoding: ASCII-8BIT
-      string: groupid=Sith+Assassins+Backup
-    headers:
-      Authorization:
-      - Basic <BASIC_AUTH>
-      Ocs-Apirequest:
-      - 'true'
-      User-Agent:
-      - httpx.rb/1.3.1
-      Accept:
-      - "*/*"
-      Accept-Encoding:
-      - gzip, deflate
-      Content-Type:
-      - application/x-www-form-urlencoded
-      Content-Length:
-      - '29'
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      Cache-Control:
-      - no-cache, no-store, must-revalidate
-      Content-Encoding:
-      - gzip
-      Content-Security-Policy:
-      - default-src 'none';base-uri 'none';manifest-src 'self';frame-ancestors 'none'
-      Content-Type:
-      - application/xml; charset=utf-8
-      Date:
-      - Wed, 02 Oct 2024 08:50:36 GMT
-      Expires:
-      - Thu, 19 Nov 1981 08:52:00 GMT
-      Feature-Policy:
-      - autoplay 'none';camera 'none';fullscreen 'none';geolocation 'none';microphone
-        'none';payment 'none'
-      Pragma:
-      - no-cache
-      Referrer-Policy:
-      - no-referrer
-      Server:
-      - Apache/2.4.59 (Debian)
-      Set-Cookie:
-      - oc07ul6b4oaw=a59820aa38fc321b9f172ac4176c1d55; path=/; secure; HttpOnly; SameSite=Lax,
-        oc_sessionPassphrase=tOAFguNR0Jp%2FxNtxIOqXQ%2F6DNz%2FxwIkdRbte7S0BC8lnDIib3RD3DxuoFtc0FxIsQEim0fze6h0sofcgU%2BhLps1nghETPItFWjqn75oa1BdUTk9lacQyzV3IlPGH6fEG;
-        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=a59820aa38fc321b9f172ac4176c1d55;
-        path=/; secure; HttpOnly; SameSite=Lax, __Host-nc_sameSiteCookielax=true;
-        path=/; httponly;secure; expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=lax,
-        __Host-nc_sameSiteCookiestrict=true; path=/; httponly;secure; expires=Fri,
-        31-Dec-2100 23:59:59 GMT; SameSite=strict, oc07ul6b4oaw=a59820aa38fc321b9f172ac4176c1d55;
-        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=a59820aa38fc321b9f172ac4176c1d55;
-        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=b8539104cd9a4e13ad6a8bad9d1ac0e5;
-        path=/; secure; HttpOnly; SameSite=Lax, cookie_test=test; expires=Wed, 02
-        Oct 2024 09:50:36 GMT; Max-Age=3600
-      X-Content-Type-Options:
-      - nosniff
-      X-Frame-Options:
-      - SAMEORIGIN
-      X-Permitted-Cross-Domain-Policies:
-      - none
-      X-Powered-By:
-      - PHP/8.2.21
-      X-Request-Id:
-      - Rhr2ktjrVgX7DNPKUMQ0
-      X-Robots-Tag:
-      - noindex, nofollow
-      X-Xss-Protection:
-      - 1; mode=block
-      Content-Length:
-      - '140'
-    body:
-      encoding: UTF-8
-      string: |
-        <?xml version="1.0"?>
-        <ocs>
-         <meta>
-          <status>ok</status>
-          <statuscode>100</statuscode>
-          <message>OK</message>
-          <totalitems></totalitems>
-          <itemsperpage></itemsperpage>
-         </meta>
-         <data/>
-        </ocs>
-  recorded_at: Wed, 02 Oct 2024 08:50:36 GMT
-- request:
-    method: post
-    uri: https://nextcloud.local/ocs/v1.php/cloud/users/m.jade@death.star/groups
-    body:
-      encoding: ASCII-8BIT
-      string: groupid=Sith+Assassins+Backup
-    headers:
-      Authorization:
-      - Basic <BASIC_AUTH>
-      Ocs-Apirequest:
-      - 'true'
-      User-Agent:
-      - httpx.rb/1.3.1
-      Accept:
-      - "*/*"
-      Accept-Encoding:
-      - gzip, deflate
-      Content-Type:
-      - application/x-www-form-urlencoded
-      Content-Length:
-      - '29'
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      Cache-Control:
-      - no-cache, no-store, must-revalidate
-      Content-Encoding:
-      - gzip
-      Content-Security-Policy:
-      - default-src 'none';base-uri 'none';manifest-src 'self';frame-ancestors 'none'
-      Content-Type:
-      - application/xml; charset=utf-8
-      Date:
-      - Wed, 02 Oct 2024 08:50:36 GMT
-      Expires:
-      - Thu, 19 Nov 1981 08:52:00 GMT
-      Feature-Policy:
-      - autoplay 'none';camera 'none';fullscreen 'none';geolocation 'none';microphone
-        'none';payment 'none'
-      Pragma:
-      - no-cache
-      Referrer-Policy:
-      - no-referrer
-      Server:
-      - Apache/2.4.59 (Debian)
-      Set-Cookie:
-      - oc07ul6b4oaw=c1b3c3f4214d9d8966f07f16711725ed; path=/; secure; HttpOnly; SameSite=Lax,
-        oc_sessionPassphrase=Y9itI1jA1U7ht32uGGWcKURt1KGYrNnp2bG2uJPZ3y9Te7JXG4vcw5ZBf6ZrZTLKv9dLwEnmABA0OlKdh10jEyMxWVJXYRgXrsdLiDlaTAFHC9%2FMz4bQ7Cy%2BoQ71jekj;
-        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=c1b3c3f4214d9d8966f07f16711725ed;
-        path=/; secure; HttpOnly; SameSite=Lax, __Host-nc_sameSiteCookielax=true;
-        path=/; httponly;secure; expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=lax,
-        __Host-nc_sameSiteCookiestrict=true; path=/; httponly;secure; expires=Fri,
-        31-Dec-2100 23:59:59 GMT; SameSite=strict, oc07ul6b4oaw=c1b3c3f4214d9d8966f07f16711725ed;
-        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=c1b3c3f4214d9d8966f07f16711725ed;
-        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=fb555d0ca125d098bfe72a357f752fb0;
-        path=/; secure; HttpOnly; SameSite=Lax, cookie_test=test; expires=Wed, 02
-        Oct 2024 09:50:37 GMT; Max-Age=3600
-      X-Content-Type-Options:
-      - nosniff
-      X-Frame-Options:
-      - SAMEORIGIN
-      X-Permitted-Cross-Domain-Policies:
-      - none
-      X-Powered-By:
-      - PHP/8.2.21
-      X-Request-Id:
-      - 0QVHV77irKMx1GSbQPVW
-      X-Robots-Tag:
-      - noindex, nofollow
-      X-Xss-Protection:
-      - 1; mode=block
-      Content-Length:
-      - '140'
-    body:
-      encoding: UTF-8
-      string: |
-        <?xml version="1.0"?>
-        <ocs>
-         <meta>
-          <status>ok</status>
-          <statuscode>100</statuscode>
-          <message>OK</message>
-          <totalitems></totalitems>
-          <itemsperpage></itemsperpage>
-         </meta>
-         <data/>
-        </ocs>
-  recorded_at: Wed, 02 Oct 2024 08:50:37 GMT
+  recorded_at: Thu, 28 Nov 2024 14:30:02 GMT
 - request:
     method: get
     uri: https://nextcloud.local/ocs/v1.php/cloud/groups/Sith%20Assassins
@@ -372,7 +184,7 @@ http_interactions:
       Ocs-Apirequest:
       - 'true'
       User-Agent:
-      - httpx.rb/1.3.1
+      - httpx.rb/1.3.3
       Accept:
       - "*/*"
       Accept-Encoding:
@@ -391,30 +203,26 @@ http_interactions:
       Content-Type:
       - application/xml; charset=utf-8
       Date:
-      - Wed, 02 Oct 2024 08:50:37 GMT
-      Expires:
-      - Thu, 19 Nov 1981 08:52:00 GMT
+      - Thu, 28 Nov 2024 14:30:02 GMT
       Feature-Policy:
       - autoplay 'none';camera 'none';fullscreen 'none';geolocation 'none';microphone
         'none';payment 'none'
-      Pragma:
-      - no-cache
       Referrer-Policy:
       - no-referrer
       Server:
-      - Apache/2.4.59 (Debian)
+      - Apache/2.4.62 (Debian)
       Set-Cookie:
-      - oc07ul6b4oaw=01da2b49d5abec2a8999bd0070130b04; path=/; secure; HttpOnly; SameSite=Lax,
-        oc_sessionPassphrase=LNjDQi4jb3HBPgwLDak3PZLcefxXWs1BL1%2FeQ0HB3ocStx7NYlMWsR6IrIfg8NqysVn%2BaDcibaS%2Bz72Go2OZw3kWyTF7hoEwPejH2nL3u7Pa%2FG708ecz3HUI%2FztROvZc;
-        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=01da2b49d5abec2a8999bd0070130b04;
+      - oc07ul6b4oaw=97730690484ff8d8bc16bf8fc836e192; path=/; secure; HttpOnly; SameSite=Lax,
+        oc_sessionPassphrase=3ydCf8F7NM%2F2VCcqBKJzCm01GTLiQCKt%2Fz91Z8O2gMhhGnKbHF7oCWjtdsRj3witWmPLU8mtODjXwpHzYQwxfTBmfYOuoCpQiLTGBJikmgriSmIoHBvA%2BE3DqeHYxRE%2F;
+        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=97730690484ff8d8bc16bf8fc836e192;
         path=/; secure; HttpOnly; SameSite=Lax, __Host-nc_sameSiteCookielax=true;
         path=/; httponly;secure; expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=lax,
         __Host-nc_sameSiteCookiestrict=true; path=/; httponly;secure; expires=Fri,
-        31-Dec-2100 23:59:59 GMT; SameSite=strict, oc07ul6b4oaw=01da2b49d5abec2a8999bd0070130b04;
-        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=01da2b49d5abec2a8999bd0070130b04;
-        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=615d677637cb137e351629b49d573d0c;
-        path=/; secure; HttpOnly; SameSite=Lax, cookie_test=test; expires=Wed, 02
-        Oct 2024 09:50:37 GMT; Max-Age=3600
+        31-Dec-2100 23:59:59 GMT; SameSite=strict, oc07ul6b4oaw=97730690484ff8d8bc16bf8fc836e192;
+        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=97730690484ff8d8bc16bf8fc836e192;
+        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=dd4c6a90f94ad0eb4f374f306a9664d1;
+        path=/; secure; HttpOnly; SameSite=Lax, cookie_test=test; expires=Thu, 28
+        Nov 2024 15:30:02 GMT; Max-Age=3600
       X-Content-Type-Options:
       - nosniff
       X-Frame-Options:
@@ -422,9 +230,9 @@ http_interactions:
       X-Permitted-Cross-Domain-Policies:
       - none
       X-Powered-By:
-      - PHP/8.2.21
+      - PHP/8.2.26
       X-Request-Id:
-      - dGJ5c48eHtcbGlNhi6fw
+      - bNfP3fO1q5cVdXC3LA6B
       X-Robots-Tag:
       - noindex, nofollow
       X-Xss-Protection:
@@ -449,7 +257,7 @@ http_interactions:
           </users>
          </data>
         </ocs>
-  recorded_at: Wed, 02 Oct 2024 08:50:37 GMT
+  recorded_at: Thu, 28 Nov 2024 14:30:02 GMT
 - request:
     method: delete
     uri: https://nextcloud.local/ocs/v1.php/cloud/users/m.jade@death.star/groups?groupid=Sith%20Assassins
@@ -462,7 +270,7 @@ http_interactions:
       Ocs-Apirequest:
       - 'true'
       User-Agent:
-      - httpx.rb/1.3.1
+      - httpx.rb/1.3.3
       Accept:
       - "*/*"
       Accept-Encoding:
@@ -481,30 +289,26 @@ http_interactions:
       Content-Type:
       - application/xml; charset=utf-8
       Date:
-      - Wed, 02 Oct 2024 08:50:37 GMT
-      Expires:
-      - Thu, 19 Nov 1981 08:52:00 GMT
+      - Thu, 28 Nov 2024 14:30:02 GMT
       Feature-Policy:
       - autoplay 'none';camera 'none';fullscreen 'none';geolocation 'none';microphone
         'none';payment 'none'
-      Pragma:
-      - no-cache
       Referrer-Policy:
       - no-referrer
       Server:
-      - Apache/2.4.59 (Debian)
+      - Apache/2.4.62 (Debian)
       Set-Cookie:
-      - oc07ul6b4oaw=85dfa52e03afb69fbe548d3053d08e15; path=/; secure; HttpOnly; SameSite=Lax,
-        oc_sessionPassphrase=kOE0o2v1ep7XtIKKVnmqy8ck7Rbukw9NitYKaRPsLSS9b8mWIW%2Bwuw2dCZtEDmQdBZzItzOHZdRZim0v%2Bu06yNhj8xeY7dU0xqXzLKez9Zj%2BrA2KKmZl1jw6c9Ubx4PX;
-        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=85dfa52e03afb69fbe548d3053d08e15;
+      - oc07ul6b4oaw=3c61a0db6149722cc6a95d3f42230f55; path=/; secure; HttpOnly; SameSite=Lax,
+        oc_sessionPassphrase=gw8mGeh8Fu0rKt%2BIzOD%2Brnwku6prDLtJC6DpOm5YTTp4Pbw7uETlDw3alKWSkn4%2BmMjjhOk5KkngEf527gY7b7ACVUFutHhvEdphAyYx5hSpQwulPU5R55wJDLQPCs52;
+        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=3c61a0db6149722cc6a95d3f42230f55;
         path=/; secure; HttpOnly; SameSite=Lax, __Host-nc_sameSiteCookielax=true;
         path=/; httponly;secure; expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=lax,
         __Host-nc_sameSiteCookiestrict=true; path=/; httponly;secure; expires=Fri,
-        31-Dec-2100 23:59:59 GMT; SameSite=strict, oc07ul6b4oaw=85dfa52e03afb69fbe548d3053d08e15;
-        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=85dfa52e03afb69fbe548d3053d08e15;
-        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=9f9f2207d2c10825f6ba2d6c07d2658b;
-        path=/; secure; HttpOnly; SameSite=Lax, cookie_test=test; expires=Wed, 02
-        Oct 2024 09:50:38 GMT; Max-Age=3600
+        31-Dec-2100 23:59:59 GMT; SameSite=strict, oc07ul6b4oaw=3c61a0db6149722cc6a95d3f42230f55;
+        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=3c61a0db6149722cc6a95d3f42230f55;
+        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=64e2322d4338def4292ea6fe248ecfd6;
+        path=/; secure; HttpOnly; SameSite=Lax, cookie_test=test; expires=Thu, 28
+        Nov 2024 15:30:03 GMT; Max-Age=3600
       X-Content-Type-Options:
       - nosniff
       X-Frame-Options:
@@ -512,9 +316,9 @@ http_interactions:
       X-Permitted-Cross-Domain-Policies:
       - none
       X-Powered-By:
-      - PHP/8.2.21
+      - PHP/8.2.26
       X-Request-Id:
-      - HL85t6eG92CsTVcZzlkl
+      - RfCII0YdCOpcI72nKP3u
       X-Robots-Tag:
       - noindex, nofollow
       X-Xss-Protection:
@@ -535,7 +339,7 @@ http_interactions:
          </meta>
          <data/>
         </ocs>
-  recorded_at: Wed, 02 Oct 2024 08:50:38 GMT
+  recorded_at: Thu, 28 Nov 2024 14:30:03 GMT
 - request:
     method: get
     uri: https://nextcloud.local/ocs/v1.php/cloud/groups/Sith%20Assassins
@@ -548,7 +352,7 @@ http_interactions:
       Ocs-Apirequest:
       - 'true'
       User-Agent:
-      - httpx.rb/1.3.1
+      - httpx.rb/1.3.3
       Accept:
       - "*/*"
       Accept-Encoding:
@@ -567,30 +371,26 @@ http_interactions:
       Content-Type:
       - application/xml; charset=utf-8
       Date:
-      - Wed, 02 Oct 2024 08:50:38 GMT
-      Expires:
-      - Thu, 19 Nov 1981 08:52:00 GMT
+      - Thu, 28 Nov 2024 14:30:03 GMT
       Feature-Policy:
       - autoplay 'none';camera 'none';fullscreen 'none';geolocation 'none';microphone
         'none';payment 'none'
-      Pragma:
-      - no-cache
       Referrer-Policy:
       - no-referrer
       Server:
-      - Apache/2.4.59 (Debian)
+      - Apache/2.4.62 (Debian)
       Set-Cookie:
-      - oc07ul6b4oaw=4311d7d8a7e8b3ba35b5d1fcff7d1b7a; path=/; secure; HttpOnly; SameSite=Lax,
-        oc_sessionPassphrase=GAzp%2FwJNf3dp%2BnY3U%2B4F4SXwmgC7f3Jqms%2FbwvIn2L7ztvCw3fPyMF8CAwno8o3xJ7O7Pbeu7IDG0ElNxKwl%2FBKviLvxlW4sa5woQEos5FRHFpMy93eMkNOsJjfBziTe;
-        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=4311d7d8a7e8b3ba35b5d1fcff7d1b7a;
+      - oc07ul6b4oaw=2bd34228d8722fb511ac830b7af8d150; path=/; secure; HttpOnly; SameSite=Lax,
+        oc_sessionPassphrase=qTfCH0VUr5Q4zNJInH3WreCzodbpF9Stp14DQEYJovF46QRnj9wSZEyMB6ztRQgTe2RAnjhM8kXzgacZlyDnOnqiweJNbxau%2B9qZ83SkqqGBMSbYULa1pVHaNZVZ3fnl;
+        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=2bd34228d8722fb511ac830b7af8d150;
         path=/; secure; HttpOnly; SameSite=Lax, __Host-nc_sameSiteCookielax=true;
         path=/; httponly;secure; expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=lax,
         __Host-nc_sameSiteCookiestrict=true; path=/; httponly;secure; expires=Fri,
-        31-Dec-2100 23:59:59 GMT; SameSite=strict, oc07ul6b4oaw=4311d7d8a7e8b3ba35b5d1fcff7d1b7a;
-        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=4311d7d8a7e8b3ba35b5d1fcff7d1b7a;
-        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=f7715138d243dc8627e3b3647a74b419;
-        path=/; secure; HttpOnly; SameSite=Lax, cookie_test=test; expires=Wed, 02
-        Oct 2024 09:50:38 GMT; Max-Age=3600
+        31-Dec-2100 23:59:59 GMT; SameSite=strict, oc07ul6b4oaw=2bd34228d8722fb511ac830b7af8d150;
+        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=2bd34228d8722fb511ac830b7af8d150;
+        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=df99da2ec87f19ccad9529158f642ec4;
+        path=/; secure; HttpOnly; SameSite=Lax, cookie_test=test; expires=Thu, 28
+        Nov 2024 15:30:04 GMT; Max-Age=3600
       X-Content-Type-Options:
       - nosniff
       X-Frame-Options:
@@ -598,9 +398,9 @@ http_interactions:
       X-Permitted-Cross-Domain-Policies:
       - none
       X-Powered-By:
-      - PHP/8.2.21
+      - PHP/8.2.26
       X-Request-Id:
-      - DaZNZ94HD5CWPkX9ZTgQ
+      - rEa0uC587txch3ofMyqm
       X-Robots-Tag:
       - noindex, nofollow
       X-Xss-Protection:
@@ -623,7 +423,7 @@ http_interactions:
           <users/>
          </data>
         </ocs>
-  recorded_at: Wed, 02 Oct 2024 08:50:38 GMT
+  recorded_at: Thu, 28 Nov 2024 14:30:04 GMT
 - request:
     method: delete
     uri: https://nextcloud.local/ocs/v1.php/cloud/groups/Sith%20Assassins
@@ -636,93 +436,7 @@ http_interactions:
       Ocs-Apirequest:
       - 'true'
       User-Agent:
-      - httpx.rb/1.3.1
-      Accept:
-      - "*/*"
-      Accept-Encoding:
-      - gzip, deflate
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      Cache-Control:
-      - no-cache, no-store, must-revalidate
-      Content-Encoding:
-      - gzip
-      Content-Security-Policy:
-      - default-src 'none';base-uri 'none';manifest-src 'self';frame-ancestors 'none'
-      Content-Type:
-      - application/xml; charset=utf-8
-      Date:
-      - Wed, 02 Oct 2024 08:50:38 GMT
-      Expires:
-      - Thu, 19 Nov 1981 08:52:00 GMT
-      Feature-Policy:
-      - autoplay 'none';camera 'none';fullscreen 'none';geolocation 'none';microphone
-        'none';payment 'none'
-      Pragma:
-      - no-cache
-      Referrer-Policy:
-      - no-referrer
-      Server:
-      - Apache/2.4.59 (Debian)
-      Set-Cookie:
-      - oc07ul6b4oaw=fd4ecbd33c8c4056f827d54926c7d7e1; path=/; secure; HttpOnly; SameSite=Lax,
-        oc_sessionPassphrase=dIlm6nPh4GMsA38cZj2SyDxlQhuyL1CP86iZATnMY6OqdehoRJUgPfH27xShrr1yg5Hd2tC7h79f9lzwPh8DMjnmy%2FzR5qpY%2BkPmvvFohO00pSSbkhgIRVuJBJygpAJm;
-        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=fd4ecbd33c8c4056f827d54926c7d7e1;
-        path=/; secure; HttpOnly; SameSite=Lax, __Host-nc_sameSiteCookielax=true;
-        path=/; httponly;secure; expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=lax,
-        __Host-nc_sameSiteCookiestrict=true; path=/; httponly;secure; expires=Fri,
-        31-Dec-2100 23:59:59 GMT; SameSite=strict, oc07ul6b4oaw=fd4ecbd33c8c4056f827d54926c7d7e1;
-        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=fd4ecbd33c8c4056f827d54926c7d7e1;
-        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=9fb44996d3f7d257f11f151473b7b955;
-        path=/; secure; HttpOnly; SameSite=Lax, cookie_test=test; expires=Wed, 02
-        Oct 2024 09:50:39 GMT; Max-Age=3600
-      X-Content-Type-Options:
-      - nosniff
-      X-Frame-Options:
-      - SAMEORIGIN
-      X-Permitted-Cross-Domain-Policies:
-      - none
-      X-Powered-By:
-      - PHP/8.2.21
-      X-Request-Id:
-      - 4EQLXfbKAVqZkKshqVYc
-      X-Robots-Tag:
-      - noindex, nofollow
-      X-Xss-Protection:
-      - 1; mode=block
-      Content-Length:
-      - '140'
-    body:
-      encoding: UTF-8
-      string: |
-        <?xml version="1.0"?>
-        <ocs>
-         <meta>
-          <status>ok</status>
-          <statuscode>100</statuscode>
-          <message>OK</message>
-          <totalitems></totalitems>
-          <itemsperpage></itemsperpage>
-         </meta>
-         <data/>
-        </ocs>
-  recorded_at: Wed, 02 Oct 2024 08:50:39 GMT
-- request:
-    method: delete
-    uri: https://nextcloud.local/ocs/v1.php/cloud/groups/Sith%20Assassins%20Backup
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Authorization:
-      - Basic <BASIC_AUTH>
-      Ocs-Apirequest:
-      - 'true'
-      User-Agent:
-      - httpx.rb/1.3.1
+      - httpx.rb/1.3.3
       Accept:
       - "*/*"
       Accept-Encoding:
@@ -741,30 +455,26 @@ http_interactions:
       Content-Type:
       - application/xml; charset=utf-8
       Date:
-      - Wed, 02 Oct 2024 08:50:39 GMT
-      Expires:
-      - Thu, 19 Nov 1981 08:52:00 GMT
+      - Thu, 28 Nov 2024 14:30:04 GMT
       Feature-Policy:
       - autoplay 'none';camera 'none';fullscreen 'none';geolocation 'none';microphone
         'none';payment 'none'
-      Pragma:
-      - no-cache
       Referrer-Policy:
       - no-referrer
       Server:
-      - Apache/2.4.59 (Debian)
+      - Apache/2.4.62 (Debian)
       Set-Cookie:
-      - oc07ul6b4oaw=38a807de0bfea4578a190796ea3679bf; path=/; secure; HttpOnly; SameSite=Lax,
-        oc_sessionPassphrase=ykYwdbn02mf%2B2FIYpFHhFhySmy5y1j4D9kX1We59HLdc50Otjzyj03S%2Fg11ZjBeD13%2BShKDXhMDDDQBf7K%2F%2B7cZjzB12b1LGlwjEIwGnIhBykM0QeIB2htLjvWZ1DdHw;
-        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=38a807de0bfea4578a190796ea3679bf;
+      - oc07ul6b4oaw=0067f072357c13bc15a002ee0f531c38; path=/; secure; HttpOnly; SameSite=Lax,
+        oc_sessionPassphrase=lF9u%2Bt37SHRU7rCTB0UOObOoFgF1nSi3576l1M%2BYHicFwsOWSy43n7IE8usNib8PnxalqewI6xAdAQR11GmbJASdh8ysogMD2l7JEJMEl%2Ff03xn9u%2BPKSe5uEWrT1tcV;
+        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=0067f072357c13bc15a002ee0f531c38;
         path=/; secure; HttpOnly; SameSite=Lax, __Host-nc_sameSiteCookielax=true;
         path=/; httponly;secure; expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=lax,
         __Host-nc_sameSiteCookiestrict=true; path=/; httponly;secure; expires=Fri,
-        31-Dec-2100 23:59:59 GMT; SameSite=strict, oc07ul6b4oaw=38a807de0bfea4578a190796ea3679bf;
-        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=38a807de0bfea4578a190796ea3679bf;
-        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=899b9aecb6d1dc7c35ef9a847d0e7bfc;
-        path=/; secure; HttpOnly; SameSite=Lax, cookie_test=test; expires=Wed, 02
-        Oct 2024 09:50:39 GMT; Max-Age=3600
+        31-Dec-2100 23:59:59 GMT; SameSite=strict, oc07ul6b4oaw=0067f072357c13bc15a002ee0f531c38;
+        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=0067f072357c13bc15a002ee0f531c38;
+        path=/; secure; HttpOnly; SameSite=Lax, oc07ul6b4oaw=3f7baf5f27c60be23f6465d9ee4b55e9;
+        path=/; secure; HttpOnly; SameSite=Lax, cookie_test=test; expires=Thu, 28
+        Nov 2024 15:30:04 GMT; Max-Age=3600
       X-Content-Type-Options:
       - nosniff
       X-Frame-Options:
@@ -772,9 +482,9 @@ http_interactions:
       X-Permitted-Cross-Domain-Policies:
       - none
       X-Powered-By:
-      - PHP/8.2.21
+      - PHP/8.2.26
       X-Request-Id:
-      - 52hU39z1usAaL575cnKp
+      - 1M6gPBPREUgx1DOsIdtJ
       X-Robots-Tag:
       - noindex, nofollow
       X-Xss-Protection:
@@ -795,5 +505,5 @@ http_interactions:
          </meta>
          <data/>
         </ocs>
-  recorded_at: Wed, 02 Oct 2024 08:50:39 GMT
+  recorded_at: Thu, 28 Nov 2024 14:30:04 GMT
 recorded_with: VCR 6.3.1
diff --git a/modules/team_planner/app/views/team_planner/team_planner/new.html.erb b/modules/team_planner/app/views/team_planner/team_planner/new.html.erb
index e323ef21246d..6864cc7f6558 100644
--- a/modules/team_planner/app/views/team_planner/team_planner/new.html.erb
+++ b/modules/team_planner/app/views/team_planner/team_planner/new.html.erb
@@ -28,7 +28,15 @@ See COPYRIGHT and LICENSE files for more details.
 ++#%>
 
 <% html_title t('team_planner.label_new_team_planner') %>
-<%= toolbar title: t('team_planner.label_new_team_planner') %>
+<%=
+  render(Primer::OpenProject::PageHeader.new) do |header|
+    header.with_title { t('team_planner.label_new_team_planner') }
+    header.with_breadcrumbs([*([ href: home_path, text: organization_name ] unless @project),
+                             *([ href: project_overview_path(@project.id), text: @project.name ] if @project),
+                             t('team_planner.label_new_team_planner')])
+  end
+%>
+
 <%= labelled_tabular_form_for @view, url: { controller: '/team_planner/team_planner', action: 'create' }, :html => {:id => 'team-planner-form'} do |f| -%>
   <%= render :partial => 'form', :locals => {:f => f} %>
   <%= styled_button_tag t(:button_create), class: '-primary' %>
diff --git a/modules/team_planner/config/locales/crowdin/js-ms.yml b/modules/team_planner/config/locales/crowdin/js-ms.yml
index 809b0c2231af..968a8b845d39 100644
--- a/modules/team_planner/config/locales/crowdin/js-ms.yml
+++ b/modules/team_planner/config/locales/crowdin/js-ms.yml
@@ -8,7 +8,7 @@ ms:
       create_title: 'Cipta perancang pasukan baharu'
       unsaved_title: 'Perancangan pasukan yang belum dinamakan'
       no_data: 'Tambah penerima tugasan untuk penyediaan perancang pasukan anda.'
-      add_assignee: 'Assignee'
+      add_assignee: 'Penerima tugasan'
       remove_assignee: 'Keluarkan penerima tugasan'
       two_weeks: '2-minggu'
       one_week: '1-minggu'
diff --git a/modules/two_factor_authentication/app/views/two_factor_authentication/two_factor_devices/new_type.html.erb b/modules/two_factor_authentication/app/views/two_factor_authentication/two_factor_devices/new_type.html.erb
index 64dc167e2c33..d6638f100596 100644
--- a/modules/two_factor_authentication/app/views/two_factor_authentication/two_factor_devices/new_type.html.erb
+++ b/modules/two_factor_authentication/app/views/two_factor_authentication/two_factor_devices/new_type.html.erb
@@ -7,7 +7,6 @@
                              t('two_factor_authentication.devices.add_new')])
   end
 %>
-<%= toolbar title: t('two_factor_authentication.devices.add_new') %>
 
 <div class="mobile-otp-new-devices">
   <% @available_devices.each do |key, device_class| %>
diff --git a/modules/two_factor_authentication/app/views/users/_two_factor_authentication_admin.html.erb b/modules/two_factor_authentication/app/views/users/_two_factor_authentication_admin.html.erb
index a1aa59dffc0d..de14ab84c7bd 100644
--- a/modules/two_factor_authentication/app/views/users/_two_factor_authentication_admin.html.erb
+++ b/modules/two_factor_authentication/app/views/users/_two_factor_authentication_admin.html.erb
@@ -25,28 +25,21 @@
 </section>
 
 <section class="admin--edit-section">
-  <%= toolbar title: t('two_factor_authentication.label_devices') do %>
-      <% unless devices.empty? %>
-        <li class="toolbar-item">
-          <%= link_to delete_all_user_2fa_devices_path(@user),
-                      method: :post,
-                      data: { confirm: t('two_factor_authentication.admin.delete_all_are_you_sure') },
-                      class: "button -danger" do %>
-            <%= op_icon 'button--icon icon-delete' %>
-            <span class="button--text"><%= t 'two_factor_authentication.admin.button_delete_all_devices' %></span>
-          <% end %>
-        </li>
-      <% end %>
-      <% if ::OpenProject::TwoFactorAuthentication::TokenStrategyManager.admin_register_sms_strategy.present? %>
-      <li class="toolbar-item">
-        <%= link_to new_user_2fa_device_path(@user, type: :sms), class: 'button -primary' do %>
-            <%= op_icon 'button--icon icon-add' %>
-            <span class="button--text"><%= t 'two_factor_authentication.admin.button_register_mobile_phone_for_user' %></span>
-        <% end %>
-      </li>
-      <% end %>
+  <% unless devices.empty? %>
+    <%= link_to delete_all_user_2fa_devices_path(@user),
+                method: :post,
+                data: { confirm: t('two_factor_authentication.admin.delete_all_are_you_sure') },
+                class: "button -danger" do %>
+      <%= op_icon 'button--icon icon-delete' %>
+      <span class="button--text"><%= t 'two_factor_authentication.admin.button_delete_all_devices' %></span>
+    <% end %>
+  <% end %>
+  <% if ::OpenProject::TwoFactorAuthentication::TokenStrategyManager.admin_register_sms_strategy.present? %>
+    <%= link_to new_user_2fa_device_path(@user, type: :sms), class: 'button -primary' do %>
+      <%= op_icon 'button--icon icon-add' %>
+      <span class="button--text"><%= t 'two_factor_authentication.admin.button_register_mobile_phone_for_user' %></span>
+    <% end %>
   <% end %>
 
   <%= render ::TwoFactorAuthentication::Devices::TableComponent.new(rows: devices, admin_table: true || @user != User.current) %>
-  </div>
 </section>
diff --git a/modules/two_factor_authentication/config/locales/crowdin/cs.yml b/modules/two_factor_authentication/config/locales/crowdin/cs.yml
index 288df8ef3ead..d193bfd20076 100644
--- a/modules/two_factor_authentication/config/locales/crowdin/cs.yml
+++ b/modules/two_factor_authentication/config/locales/crowdin/cs.yml
@@ -121,7 +121,7 @@ cs:
         description: Register a FIDO2 device (like YubiKey) or the secure encalve of your mobile device.
         further_steps: Po zvolení jména můžete kliknout na tlačítko Pokračovat. Váš prohlížeč vás vyzve, abyste prezentovali vaše WebAuthn zařízení. Až tak učiníte, jste zařízení zaregistrovali.
       totp:
-        title: "App-based authenticator"
+        title: "Autentifikátor založený na aplikaci"
         provisioning_uri: "Poskytování URI"
         secret_key: "Tajný klíč"
         time_based: "Na základě času"
diff --git a/modules/two_factor_authentication/config/locales/crowdin/ms.yml b/modules/two_factor_authentication/config/locales/crowdin/ms.yml
index bf0b3d795edf..453acc3c943e 100644
--- a/modules/two_factor_authentication/config/locales/crowdin/ms.yml
+++ b/modules/two_factor_authentication/config/locales/crowdin/ms.yml
@@ -26,7 +26,7 @@ ms:
       two_factor_authentication/device/webauthn: "WebAuthn"
   two_factor_authentication:
     error_2fa_disabled: "Penghantaran 2FA telah dimatikan."
-    notice_not_writable: "2FA Settings were provided through environment variables and cannot be overwritten."
+    notice_not_writable: "Tetapan 2FA telah disediakan melalui pembolehubah persekitaran dan tidak boleh ditimpa."
     error_no_device: "Tiada peranti 2FA berdaftar yang ditemui bagi pengguna ini, walaupun diperlukan untuk contoh ini."
     error_no_matching_strategy: "Tiada strategi 2FA yang sepadan tersedia bagi pengguna ini. Sila hubungi pentadbir anda."
     error_is_enforced_not_active: "Ralat konfigurasi: Pengesahan Dua Faktor telah dikuatkuasakan, tetapi masih belum ada strategi sedia ada yang aktif."
@@ -119,10 +119,10 @@ ms:
       2fa_from_webauthn: Sila sediakan peranti WebAuthn <strong>%{device_name}</strong>. Jika ia berdasarkan USB, sila pastikan untuk memasang dan menyentuhnya. Selepas itu, klik butang log masuk.
       webauthn:
         title: "WebAuthn"
-        description: Register a FIDO2 device (like YubiKey) or the secure encalve of your mobile device.
+        description: Daftarkan peranti FIDO2 (seperti YubiKey) atau sangkar selamat peranti mudah alih anda.
         further_steps: Setelah anda memilih nama, anda boleh klik butang Teruskan. Pelayar anda akan maklumkan kepada anda untuk mengemukakan peranti WebAuthn anda. Setelah berbuat demikian, pendaftaran peranti anda telah selesai.
       totp:
-        title: "App-based authenticator"
+        title: "Pengesah berasaskan aplikasi"
         provisioning_uri: "Peruntukan URI"
         secret_key: "Kekunci rahsia"
         time_based: "Berdasarkan masa"
@@ -135,13 +135,13 @@ ms:
         text_cannot_scan: |
           Jika anda tidak dapat mengimbas kod, anda boleh memasukkan entri secara manual dengan menggunakan butiran berikut:
         description: |
-          Use a one-time code generated by an authenticator like Authy or Google Authenticator.
+          Gunakan kod sekali sahaja yang dijana oleh pengesah seperti Authy atau Google Authenticator.
       sms:
-        title: "Mobile device"
+        title: "Peranti mudah alih"
         redacted_identifier: "Peranti mudah alih (%{redacted_number})"
         request_2fa_identifier: "%{redacted_identifier}, kami telah menghantarkan kod pengesahan melalui %{delivery_channel}"
         description: |
-          Receive 2FA code via a text message on your phone each time you log in.
+          Terima kod 2FA melalui mesej teks pada telefon anda setiap kali anda log masuk.
     sns:
       delivery_failed: "Penghantaran SNS gagal:"
     message_bird:
diff --git a/modules/two_factor_authentication/config/locales/crowdin/zh-TW.yml b/modules/two_factor_authentication/config/locales/crowdin/zh-TW.yml
index 82518fc71f35..71d56152b405 100644
--- a/modules/two_factor_authentication/config/locales/crowdin/zh-TW.yml
+++ b/modules/two_factor_authentication/config/locales/crowdin/zh-TW.yml
@@ -78,7 +78,7 @@ zh-TW:
       text_2fa_disabled: "使用者沒有透過「我的帳戶頁面」設定 2FA 裝置"
       only_sms_allowed: "只能為其他用戶設置短信發送。"
     upsale:
-      title: "雙重身分驗證"
+      title: "雙因素驗證"
       description: "向所有專案成員提供(或強制執行) 兩階段驗證，以加強 OpenProject 實例的安全性。"
     backup_codes:
       none_found: 這個帳戶沒有存在備份代碼
@@ -151,7 +151,7 @@ zh-TW:
       resdt: "SMS Rest API"
       webauthn: "WebAuthn"
     mobile_transmit_notification: "已將一次性密碼發送給您的手機。"
-    label_two_factor_authentication: "雙重身分驗證"
+    label_two_factor_authentication: "雙因素驗證"
     forced_registration:
       required_to_add_device: "活動安全性原則要求您啟用雙重身份驗證。請使用以下表格註冊設備。"
     remember:
diff --git a/modules/two_factor_authentication/openproject-two_factor_authentication.gemspec b/modules/two_factor_authentication/openproject-two_factor_authentication.gemspec
index 08ec023b31dc..c0cb74181ac2 100644
--- a/modules/two_factor_authentication/openproject-two_factor_authentication.gemspec
+++ b/modules/two_factor_authentication/openproject-two_factor_authentication.gemspec
@@ -14,6 +14,6 @@ Gem::Specification.new do |s|
   s.add_dependency "rotp", "~> 6.1"
   s.add_dependency "webauthn", "~> 3.0"
 
-  s.add_dependency "aws-sdk-sns", "~> 1.90.0"
+  s.add_dependency "aws-sdk-sns", "~> 1.92.0"
   s.metadata["rubygems_mfa_required"] = "true"
 end
diff --git a/public/.well-known/apple-app-site-association b/public/.well-known/apple-app-site-association
new file mode 100644
index 000000000000..85b06af0165b
--- /dev/null
+++ b/public/.well-known/apple-app-site-association
@@ -0,0 +1,16 @@
+{
+  "applinks": {
+    "apps": [],
+    "details": [
+      {
+        "appID": "3YGZQ7TQ78.org.openproject.app",
+        "paths": [ "*" ]
+      }
+    ]
+  },
+  "webcredentials": {
+    "apps": [
+      "3YGZQ7TQ78.org.openproject.app"
+    ]
+  }
+}
diff --git a/public/.well-known/assetlinks.json b/public/.well-known/assetlinks.json
new file mode 100644
index 000000000000..3ffb52fa31ad
--- /dev/null
+++ b/public/.well-known/assetlinks.json
@@ -0,0 +1,8 @@
+[{
+  "relation": ["delegate_permission/common.handle_all_urls"],
+  "target": {
+    "namespace": "android_app",
+    "package_name": "org.openproject.app",
+    "sha256_cert_fingerprints": ["45:FE:6C:9C:94:21:B8:E4:4A:69:BA:5E:C1:22:9C:3D:01:6B:6A:69:22:CF:25:F6:42:78:5E:20:7B:25:99:33"]
+  }
+}]
diff --git a/publiccode.yml b/publiccode.yml
new file mode 100644
index 000000000000..a78fc47fe74a
--- /dev/null
+++ b/publiccode.yml
@@ -0,0 +1,189 @@
+# This repository adheres to the publiccode.yml standard by including this
+# metadata file that makes public software easily discoverable.
+# More info at https://github.com/italia/publiccode.yml
+
+publiccodeYmlVersion: '0.2'
+name: OpenProject
+applicationSuite: openDesk
+url: 'https://github.com/opf/openproject'
+roadmap: 'https://www.openproject.org/roadmap'
+releaseDate: '2025-01-22'
+softwareVersion: '15.2.0'
+developmentStatus: stable
+softwareType: standalone/web
+platforms:
+  - web
+usedBy:
+  - ZenDiS GmbH
+  - Stadt Köln
+  - Stadt Stuttgart
+  - Landtag Brandenburg
+  - Europäische Kommission
+  - Deutsche Bahn
+  - FITKO
+  - Stadt Chemnitz
+categories:
+  - agile-project-management
+  - budgeting
+  - enterprise-project-management
+  - help-desk
+  - knowledge-management
+  - project-collaboration
+  - project-management
+  - task-management
+  - time-management
+  - time-tracking
+  - workflow-management
+dependsOn:
+  open:
+    - name: PostgreSQL
+      versionMin: '13'
+maintenance:
+  type: contract
+  contacts:
+    - name: OpenProject GmbH
+      email: sales@openproject.com
+      phone: '+4928877707'
+legal:
+  license: LGPL-3.0-or-later
+  mainCopyrightOwner: OpenProject GmbH
+  repoOwner: OpenProject GmbH
+localisation:
+  localisationReady: true
+  availableLanguages:
+    - af
+    - ar
+    - bg
+    - ca
+    - cs
+    - da
+    - de
+    - el
+    - en
+    - eo
+    - es
+    - et
+    - fa
+    - fi
+    - fil
+    - fr
+    - hr
+    - hu
+    - id
+    - it
+    - ja
+    - ko
+    - lt
+    - ms
+    - nl
+    - no
+    - pl
+    - pt-BR
+    - pt-PT
+    - ro
+    - ru
+    - si
+    - sk
+    - sl
+    - sv
+    - th
+    - tr
+    - uk
+    - vi
+    - zh-CN
+    - zh-TW
+description:
+  en:
+    localisedName: OpenProject
+    documentation: 'https://www.openproject.org/docs'
+    apiDocumentation: 'https://www.openproject.org/docs/api'
+    shortDescription: 'OpenProject is a web-based project management software'
+    screenshots:
+      - 'screenshots/opencode_openproject_file_storages.png'
+      - 'screenshots/opencode_openproject_gantt_chart.png'
+      - 'screenshots/opencode_openproject_gitlab-integration.png'
+      - 'screenshots/opencode_openproject_homepage.png'
+      - 'screenshots/opencode_openproject_meetings.png'
+      - 'screenshots/opencode_openproject_notifications_wp_reminder.png'
+      - 'screenshots/opencode_openproject_sharepoint_integration_details.png'
+      - 'screenshots/opencode_openproject_teamplanner.png'
+      - 'screenshots/opencode_openproject_work_package_detailed_view.png'
+    features:
+      - Project planning
+      - Task management
+      - Agile workflows
+      - Meeting management
+      - Time and Cost tracking
+      - Collaboration
+      - Gantt charts
+      - Agile boards
+      - Knowledge management
+      - Detailed reporting
+      - Customizable workflows
+      - Custom fields for projects, tasks, and more
+      - Baseline Comparison
+      - Integrations into Nextcloud and OneDrive/SharePoint
+      - Integrations into GitHub and GitLab
+    longDescription: >
+      OpenProject is the project management module of
+      [www.opendesk.eu](http://www.opendesk.eu/), an integrated office and
+      collaboration suite for the public sector.
+
+
+      OpenProject supports project planning, task management, Agile workflows,
+      time tracking, and collaboration. Key features like Gantt charts, Scrum
+      and Kanban boards, and detailed reporting make it suitable for a variety
+      of projects and industries.
+
+
+      OpenProject offers both cloud-based and self-hosted deployment options,
+      giving organizations flexibility in managing data security and operations.
+
+
+      The software complies with BSI IT Grundschutz standards for accessibility
+      and security, making it reliable for industries with strict requirements.
+
+
+      Its open-source nature ensures transparency and benefits from an active
+      community contributing to continuous improvement.
+  de:
+    localisedName: OpenProject
+    documentation: 'https://www.openproject.org/de/docs/'
+    apiDocumentation: 'https://www.openproject.org/de/docs/api'
+    shortDescription: 'OpenProject ist die führende Open Source Projektmanagement-Software'
+    screenshots:
+      - 'screenshots/opencode_openproject_file_storages.png'
+      - 'screenshots/opencode_openproject_gantt_chart.png'
+      - 'screenshots/opencode_openproject_gitlab-integration.png'
+      - 'screenshots/opencode_openproject_homepage.png'
+      - 'screenshots/opencode_openproject_meetings.png'
+      - 'screenshots/opencode_openproject_notifications_wp_reminder.png'
+      - 'screenshots/opencode_openproject_sharepoint_integration_details.png'
+      - 'screenshots/opencode_openproject_teamplanner.png'
+      - 'screenshots/opencode_openproject_work_package_detailed_view.png'
+    features:
+      - Projektplanung
+      - Aufgabenverwaltung
+      - Agile Workflows
+      - Besprechungsmanagement
+      - Zeit- und Kostenverfolgung
+      - Online-Zusammenarbeit
+      - Gantt-Diagramme
+      - Agile Boards
+      - Wissensmanagement
+      - Detaillierte Berichterstattung
+      - Anpassbare Workflows
+      - Selbstdefinierte Felder für Projekte, Aufgaben und mehr
+      - Grundlinie (Planungsvergleich)
+      - Integration in Nextcloud sowie in OneDrive/SharePoint
+      - Integration in GitHub und in GitLab
+    longDescription: >
+      OpenProject ist das Projektmanagement-Modul von [www.opendesk.eu](http://www.opendesk.eu), einer integrierten Office- und Collaboration-Suite für den öffentlichen Sektor.
+
+      OpenProject unterstützt Ihre Projektplanung, Aufgabenmanagement, agile Workflows, Zeiterfassung und teamübergreifende Zusammenarbeit. Dank wichtiger Funktionen wie Gantt-Diagrammen, Scrum- und Kanban-Boards sowie detaillierter Berichterstellung eignet sich das Tool für eine Vielzahl von Projekten und Branchen.
+
+      OpenProject bietet sowohl Cloud-basierte als auch selbst gehostete Bereitstellungsoptionen, wodurch Organisationen flexibel bei der Handhabung von Datensicherheit und -betrieb sind.
+
+      Die Software entspricht den BSI-IT-Grundschutz-Standards für Barrierefreiheit und Sicherheit und ist somit auch für Branchen mit besonders strengen Anforderungen geeignet.
+
+      Die Tatsache, dass es sich um eine Open Source Software handelt, sorgt für Transparenz und bietet den Vorteil einer aktiven Gemeinschaft, welche zur kontinuierlichen Produktverbesserung beiträgt.
diff --git a/screenshots/opencode_openproject_file_storages.png b/screenshots/opencode_openproject_file_storages.png
new file mode 100644
index 000000000000..0d7276abea58
Binary files /dev/null and b/screenshots/opencode_openproject_file_storages.png differ
diff --git a/screenshots/opencode_openproject_gantt_chart.png b/screenshots/opencode_openproject_gantt_chart.png
new file mode 100644
index 000000000000..1d7d33a02e8c
Binary files /dev/null and b/screenshots/opencode_openproject_gantt_chart.png differ
diff --git a/screenshots/opencode_openproject_gitlab-integration.png b/screenshots/opencode_openproject_gitlab-integration.png
new file mode 100644
index 000000000000..5bafd25c93a5
Binary files /dev/null and b/screenshots/opencode_openproject_gitlab-integration.png differ
diff --git a/screenshots/opencode_openproject_homepage.png b/screenshots/opencode_openproject_homepage.png
new file mode 100644
index 000000000000..535bc705eac0
Binary files /dev/null and b/screenshots/opencode_openproject_homepage.png differ
diff --git a/screenshots/opencode_openproject_meetings.png b/screenshots/opencode_openproject_meetings.png
new file mode 100644
index 000000000000..fa4f49ba030b
Binary files /dev/null and b/screenshots/opencode_openproject_meetings.png differ
diff --git a/screenshots/opencode_openproject_notifications_wp_reminder.png b/screenshots/opencode_openproject_notifications_wp_reminder.png
new file mode 100644
index 000000000000..bf0ed46bb300
Binary files /dev/null and b/screenshots/opencode_openproject_notifications_wp_reminder.png differ
diff --git a/screenshots/opencode_openproject_sharepoint_integration_details.png b/screenshots/opencode_openproject_sharepoint_integration_details.png
new file mode 100644
index 000000000000..c23b891e67ae
Binary files /dev/null and b/screenshots/opencode_openproject_sharepoint_integration_details.png differ
diff --git a/screenshots/opencode_openproject_teamplanner.png b/screenshots/opencode_openproject_teamplanner.png
new file mode 100644
index 000000000000..c8e5bba4c372
Binary files /dev/null and b/screenshots/opencode_openproject_teamplanner.png differ
diff --git a/screenshots/opencode_openproject_work_package_detailed_view.png b/screenshots/opencode_openproject_work_package_detailed_view.png
new file mode 100644
index 000000000000..e69f38387195
Binary files /dev/null and b/screenshots/opencode_openproject_work_package_detailed_view.png differ
diff --git a/script/anonymize-sql-dump b/script/anonymize-sql-dump
index fc1c6260fc0f..7ae83bbbdc0a 100755
--- a/script/anonymize-sql-dump
+++ b/script/anonymize-sql-dump
@@ -139,7 +139,8 @@ FOR table_name, column_name IN (
      'role_permissions',
      'enabled_modules',
      'two_factor_authentication_devices',
-     'tokens'
+     'tokens',
+     'job_statuses'
     )
   AND information_schema.columns.column_name NOT LIKE '%type%'
   AND NOT (information_schema.columns.table_name = 'grids' AND information_schema.columns.column_name = 'options')
diff --git a/spec/components/enterprise_edition/banner_component_spec.rb b/spec/components/enterprise_edition/banner_component_spec.rb
new file mode 100644
index 000000000000..4bdf58bb2692
--- /dev/null
+++ b/spec/components/enterprise_edition/banner_component_spec.rb
@@ -0,0 +1,197 @@
+# frozen_string_literal: true
+
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2010-2024 the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+# ++
+
+require "rails_helper"
+
+RSpec.describe EnterpriseEdition::BannerComponent, type: :component do
+  let(:title) { "Some title" }
+  let(:description) { "Some description" }
+  let(:href) { "https://www.example.org" }
+  let(:link_title) { "Get more information" }
+  let(:ee_show_banners) { true }
+  let(:enforce_available_locales) { I18n.config.enforce_available_locales }
+  let(:i18n_upsale) do
+    {
+      title:,
+      link_title:,
+      some_enterprise_feature: {
+        description:
+      }
+    }
+  end
+  let(:static_links) do
+    {
+      enterprise_docs: {
+        some_enterprise_feature: {
+          href:
+        }
+      }
+    }
+  end
+
+  let(:render_component) do
+    render_inline(described_class.new(:some_enterprise_feature))
+  end
+
+  let(:render_component_in_mo) do
+    I18n.with_locale :mo do
+      render_component
+    end
+  end
+
+  before do
+    allow(EnterpriseToken)
+      .to receive(:show_banners?)
+            .and_return(ee_show_banners)
+    allow(OpenProject::Static::Links)
+      .to receive(:links)
+            .and_return(static_links)
+
+    I18n.config.enforce_available_locales = !enforce_available_locales
+
+    I18n.backend.store_translations(
+      :mo,
+      {
+        ee: {
+          upsale: i18n_upsale
+        }
+      }
+    )
+  end
+
+  after do
+    I18n.backend.translations.delete(:mo)
+    I18n.config.enforce_available_locales = enforce_available_locales
+  end
+
+  shared_examples_for "renders the component" do
+    it "renders the component" do
+      render_component_in_mo
+
+      expect(page).to have_css ".op-ee-banner--title-container", text: title
+      expect(page).to have_css ".op-ee-banner--description-container", text: description
+      expect(page).to have_link link_title, href:
+    end
+  end
+
+  it_behaves_like "renders the component"
+
+  context "with a description_html in the i18n file" do
+    let(:i18n_upsale) do
+      {
+        title:,
+        link_title:,
+        some_enterprise_feature: {
+          description_html: description
+        }
+      }
+    end
+
+    it_behaves_like "renders the component"
+  end
+
+  context "with a more specific title in the i18n file" do
+    let(:i18n_upsale) do
+      {
+        title: "The general title",
+        link_title:,
+        some_enterprise_feature: {
+          title:,
+          description:
+        }
+      }
+    end
+
+    it_behaves_like "renders the component"
+  end
+
+  context "with a more specific link title in the i18n file" do
+    let(:i18n_upsale) do
+      {
+        title:,
+        link_title: "The general link title",
+        some_enterprise_feature: {
+          link_title:,
+          description:
+        }
+      }
+    end
+
+    it_behaves_like "renders the component"
+  end
+
+  context "without a description key in the i18n file" do
+    let(:i18n_upsale) do
+      {
+        title:,
+        link_title:,
+        some_enterprise_feature: {}
+      }
+    end
+
+    it "raises an error" do
+      expect { render_component_in_mo }.to raise_error(I18n::MissingTranslationData)
+    end
+  end
+
+  context "without a link key in the static_link file" do
+    let(:static_links) do
+      {
+        enterprise_docs: {
+          some_enterprise_feature: {}
+        }
+      }
+    end
+
+    it "raises an error" do
+      expect { render_component_in_mo }.to raise_error(RuntimeError)
+    end
+  end
+
+  context "if banners are hidden" do
+    let(:ee_show_banners) { false }
+
+    it "hides the component" do
+      render_component_in_mo
+
+      expect(page).to have_no_css ".op-ee-banner"
+    end
+  end
+
+  context "if banners are hidden but skip_render is overwritten" do
+    let(:ee_show_banners) { false }
+    let(:render_component) do
+      render_inline(described_class.new(:some_enterprise_feature,
+                                        skip_render: false))
+    end
+
+    it_behaves_like "renders the component"
+  end
+end
diff --git a/spec/components/users/hover_card_component_spec.rb b/spec/components/users/hover_card_component_spec.rb
new file mode 100644
index 000000000000..789823d3d86f
--- /dev/null
+++ b/spec/components/users/hover_card_component_spec.rb
@@ -0,0 +1,140 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "rails_helper"
+
+RSpec.describe Users::HoverCardComponent, type: :component do
+  include Rails.application.routes.url_helpers
+
+  let(:project) { create(:project) }
+  let(:user) { create(:user) }
+  let(:another_user) { create(:user, member_with_permissions: { project => [:manage_members] }) }
+  let(:current_user) { another_user }
+
+  let(:groups) { [] }
+
+  subject { described_class.new(id: user.id) }
+
+  before do
+    groups
+    login_as(current_user)
+    render_inline(subject)
+    page.extend TestSelectorFinders
+  end
+
+  it "renders successfully" do
+    page.find_test_selector("user-hover-card-name", text: user.name)
+  end
+
+  context "when the user does not exist" do
+    let(:user) { instance_double(User, id: 9000) }
+
+    it "renders a generic error message" do
+      expect(page).to have_text(I18n.t("http.response.unexpected"))
+    end
+  end
+
+  context "when displaying email addresses" do
+    it "hides the email address of a user" do
+      expect(page).not_to have_test_selector("user-hover-card-email")
+    end
+
+    context "with the rights to view email addresses" do
+      # Admin is allowed to see emails
+      let(:current_user) { build(:admin) }
+
+      it "shows the email address of a user" do
+        page.find_test_selector("user-hover-card-email", text: user.mail)
+      end
+    end
+  end
+
+  context "when showing the group summary" do
+    it "shows a no results text for users without group memberships" do
+      g = page.find_test_selector("user-hover-card-groups")
+      expect(g).to have_text(I18n.t("users.groups.no_results_title_text"))
+    end
+
+    context "with the user being member of some groups" do
+      let(:groups) do
+        Array.new(2) { create(:group, members: user) }
+      end
+
+      it "lists the group names for a user" do
+        g = page.find_test_selector("user-hover-card-groups")
+
+        expect(g).to have_text("Member of #{groups.first.lastname}, #{groups.last.lastname}.")
+      end
+
+      context "with no rights to manage members" do
+        # No manage_members permission:
+        let(:another_user) { create(:user) }
+
+        it "does not show groups" do
+          g = page.find_test_selector("user-hover-card-groups")
+
+          expect(g).to have_text(I18n.t("users.groups.no_results_title_text"))
+        end
+      end
+    end
+
+    context "with the user being member of many groups" do
+      let(:groups) do
+        Array.new(8) { create(:group, members: user) }
+      end
+
+      it "lists some group names with truncation" do
+        g = page.find_test_selector("user-hover-card-groups")
+
+        expect(g).to have_text("Member of #{groups.slice(0, 4).map(&:lastname).join(', ')} and 4 more.")
+      end
+    end
+  end
+
+  context "when clicking on the Open Profile button" do
+    it "leads to the users profile" do
+      b = page.find_test_selector("user-hover-card-profile-btn")
+
+      expect(b).to have_text(I18n.t("users.open_profile"))
+      expect(b["href"]).to eq(user_path(user))
+    end
+
+    context "with the right to manage users" do
+      let(:current_user) { build(:admin) }
+
+      it "leads to editing the users profile" do
+        b = page.find_test_selector("user-hover-card-profile-btn")
+
+        expect(b).to have_text(I18n.t("users.open_profile"))
+        expect(b["href"]).to eq(edit_user_path(user))
+      end
+    end
+  end
+end
diff --git a/spec/contracts/project_life_cycle_steps/base_contract_spec.rb b/spec/contracts/project_life_cycle_steps/base_contract_spec.rb
new file mode 100644
index 000000000000..e818921de7af
--- /dev/null
+++ b/spec/contracts/project_life_cycle_steps/base_contract_spec.rb
@@ -0,0 +1,229 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+require "contracts/shared/model_contract_shared_context"
+
+RSpec.describe ProjectLifeCycleSteps::BaseContract do
+  include_context "ModelContract shared context"
+
+  let(:contract) { described_class.new(project, user) }
+  let(:project) { build_stubbed(:project) }
+
+  context "with authorized user" do
+    let(:user) { build_stubbed(:user) }
+    let(:project) { build_stubbed(:project, available_life_cycle_steps: steps) }
+    let(:steps) { [] }
+
+    before do
+      mock_permissions_for(user) do |mock|
+        mock.allow_in_project(:edit_project_stages_and_gates, project:)
+      end
+    end
+
+    it_behaves_like "contract is valid"
+    include_examples "contract reuses the model errors"
+
+    describe "validations" do
+      describe "#consecutive_steps_have_increasing_dates" do
+        let(:gate1) { build_stubbed(:project_gate, start_date: Date.new(2024, 1, 1)) }
+        let(:stage2) { build_stubbed(:project_stage, start_date: Date.new(2024, 2, 1), end_date: Date.new(2024, 2, 28)) }
+        let(:gate3) { build_stubbed(:project_gate, start_date: Date.new(2024, 3, 1), end_date: Date.new(2024, 3, 15)) }
+        let(:steps) { [gate1, stage2, gate3] }
+
+        context "when no steps are present" do
+          let(:steps) { [] }
+
+          it_behaves_like "contract is valid"
+        end
+
+        context "when only one step is present" do
+          let(:steps) { [gate1] }
+
+          it_behaves_like "contract is valid"
+        end
+
+        context "when steps have valid and increasing dates" do
+          let(:steps) { [gate1, stage2] }
+
+          it_behaves_like "contract is valid"
+        end
+
+        context "when steps have decreasing dates" do
+          context "and the erroneous step is a Gate" do
+            let(:steps) { [gate3, gate1] }
+
+            it_behaves_like "contract is invalid",
+                            "available_life_cycle_steps.date": :non_continuous_dates
+
+            it "adds an error to the decreasing step" do
+              contract.validate
+              expect(gate1.errors.symbols_for(:date)).to include(:non_continuous_dates)
+            end
+          end
+
+          context "and the erroneous step is a Stage" do
+            let(:steps) { [gate3, stage2] }
+
+            it_behaves_like "contract is invalid",
+                            "available_life_cycle_steps.date_range": :non_continuous_dates
+
+            it "adds an error to the decreasing step" do
+              contract.validate
+              expect(stage2.errors.symbols_for(:date_range)).to include(:non_continuous_dates)
+            end
+          end
+        end
+
+        context "when steps with identical dates" do
+          let(:step4) { build_stubbed(:project_gate, start_date: Date.new(2024, 1, 1)) }
+          let(:steps) { [gate1, step4] }
+
+          it_behaves_like "contract is invalid",
+                          "available_life_cycle_steps.date": :non_continuous_dates
+        end
+
+        context "when steps have touching start and end dates" do
+          context "when 2 Stages are touching" do
+            let(:stage4) { build_stubbed(:project_stage, start_date: Date.new(2024, 2, 28), end_date: Date.new(2024, 3, 1)) }
+            let(:steps) { [stage2, stage4] }
+
+            it_behaves_like "contract is invalid",
+                            "available_life_cycle_steps.date_range": :non_continuous_dates
+
+            context "when having an empty step in between" do
+              let(:step_missing_dates) { build_stubbed(:project_stage, start_date: nil, end_date: nil) }
+              let(:steps) { [stage2, step_missing_dates, stage4] }
+
+              it_behaves_like "contract is invalid",
+                              "available_life_cycle_steps.date_range": :non_continuous_dates
+            end
+          end
+
+          context "when 2 Gates are touching" do
+            let(:gate4) { build_stubbed(:project_gate, start_date: Date.new(2024, 1, 1)) }
+            let(:steps) { [gate1, gate4] }
+
+            it_behaves_like "contract is invalid",
+                            "available_life_cycle_steps.date": :non_continuous_dates
+
+            context "when having an empty step in between" do
+              let(:step_missing_dates) { build_stubbed(:project_stage, start_date: nil, end_date: nil) }
+              let(:steps) { [gate1, step_missing_dates, gate4] }
+
+              it_behaves_like "contract is invalid",
+                              "available_life_cycle_steps.date": :non_continuous_dates
+            end
+          end
+
+          context "when a Stage and a Gate are touching on the start date" do
+            let(:gate4) { build_stubbed(:project_gate, start_date: Date.new(2024, 2, 28)) }
+            let(:steps) { [stage2, gate4] }
+
+            it_behaves_like "contract is valid"
+
+            context "when having an empty step in between" do
+              let(:step_missing_dates) { build_stubbed(:project_stage, start_date: nil, end_date: nil) }
+              let(:steps) { [stage2, step_missing_dates, gate4] }
+
+              it_behaves_like "contract is valid"
+            end
+          end
+
+          context "when a Stage and a Gate are touching on the end date" do
+            let(:stage4) { build_stubbed(:project_stage, start_date: Date.new(2023, 12, 30), end_date: Date.new(2024, 1, 1)) }
+            let(:steps) { [stage4, gate1] }
+
+            it_behaves_like "contract is valid"
+
+            context "when having an empty step in between" do
+              let(:step_missing_dates) { build_stubbed(:project_stage, start_date: nil, end_date: nil) }
+              let(:steps) { [stage4, step_missing_dates, gate1] }
+
+              it_behaves_like "contract is valid"
+            end
+          end
+
+          context "when a Stage, a Gate, and anothe Stage are touching" do
+            let(:gate4) { build_stubbed(:project_gate, start_date: Date.new(2024, 2, 28)) }
+            let(:stage5) { build_stubbed(:project_stage, start_date: Date.new(2024, 2, 28), end_date: Date.new(2024, 3, 1)) }
+            let(:steps) { [stage2, gate4, stage5] }
+
+            it_behaves_like "contract is valid"
+
+            context "when having an empty step in between" do
+              let(:step_missing_dates) { build_stubbed(:project_stage, start_date: nil, end_date: nil) }
+              let(:steps) { [stage2, gate4, step_missing_dates, stage5] }
+
+              it_behaves_like "contract is valid"
+            end
+          end
+        end
+
+        context "when a step has missing start dates" do
+          let(:step_missing_dates) { build_stubbed(:project_stage, start_date: nil, end_date: nil) }
+
+          context "and the other steps have increasing dates" do
+            let(:steps) { [gate1, step_missing_dates, stage2] }
+
+            it_behaves_like "contract is valid"
+          end
+
+          context "and the other steps have decreasing dates" do
+            let(:steps) { [stage2, step_missing_dates, gate1] }
+
+            it_behaves_like "contract is invalid",
+                            "available_life_cycle_steps.date": :non_continuous_dates
+
+            it "adds an error to the decreasing step" do
+              contract.validate
+              expect(gate1.errors.symbols_for(:date)).to include(:non_continuous_dates)
+            end
+          end
+        end
+      end
+
+      describe "triggering validations on the model" do
+        it "sets the :saving_life_cycle_steps validation context" do
+          allow(project).to receive(:valid?)
+
+          contract.validate
+          expect(project).to have_received(:valid?).with(:saving_life_cycle_steps)
+        end
+      end
+    end
+  end
+
+  context "with unauthorized user" do
+    let(:user) { build_stubbed(:user) }
+
+    it_behaves_like "contract user is unauthorized"
+  end
+end
diff --git a/spec/contracts/reminders/base_contract_spec.rb b/spec/contracts/reminders/base_contract_spec.rb
new file mode 100644
index 000000000000..0b5ea8dc87b3
--- /dev/null
+++ b/spec/contracts/reminders/base_contract_spec.rb
@@ -0,0 +1,163 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+require "contracts/shared/model_contract_shared_context"
+
+RSpec.describe Reminders::BaseContract do
+  include_context "ModelContract shared context"
+
+  let(:contract) { described_class.new(reminder, user) }
+  let(:user) { build_stubbed(:admin) }
+  let(:creator) { user }
+  let(:reminder) { build_stubbed(:reminder, creator:) }
+
+  before do
+    User.current = user
+    allow(User).to receive(:exists?).with(user.id).and_return(true)
+  end
+
+  describe "admin user" do
+    it_behaves_like "contract is valid"
+  end
+
+  describe "non-admin user" do
+    context "with valid permissions" do
+      let(:user) { build_stubbed(:user) }
+
+      before do
+        mock_permissions_for(user) do |mock|
+          mock.allow_in_project(:view_work_packages, project: reminder.remindable.project)
+        end
+      end
+
+      it_behaves_like "contract is valid"
+    end
+
+    context "without valid permissions" do
+      let(:user) { build_stubbed(:user) }
+
+      it_behaves_like "contract is invalid", base: :error_unauthorized
+    end
+  end
+
+  describe "anonymous user" do
+    let(:user) { build_stubbed(:anonymous) }
+
+    before do
+      mock_permissions_for(user) do |mock|
+        mock.allow_in_project(:view_work_packages, project: reminder.remindable.project)
+      end
+    end
+
+    it_behaves_like "contract is invalid", base: :error_unauthorized
+  end
+
+  describe "validate creator exists" do
+    context "when creator does not exist" do
+      before { allow(User).to receive(:exists?).with(user.id).and_return(false) }
+
+      it_behaves_like "contract is invalid", creator: :not_found
+    end
+  end
+
+  describe "validate acting user" do
+    context "when the current user is different from the remindable acting user" do
+      let(:different_user) { build_stubbed(:user) }
+
+      before do
+        allow(User).to receive(:exists?).with(different_user.id).and_return(true)
+        reminder.creator = different_user
+      end
+
+      it_behaves_like "contract is invalid", creator: :invalid
+    end
+  end
+
+  describe "validate remindable object" do
+    context "when remindable is blank" do
+      before { reminder.remindable = nil }
+
+      it_behaves_like "contract is invalid", remindable: :not_found
+    end
+
+    context "when remindable is a work package" do
+      let(:work_package) { build_stubbed(:work_package) }
+
+      before { reminder.remindable = work_package }
+
+      it_behaves_like "contract is valid"
+    end
+  end
+
+  describe "validate remind at is present" do
+    context "when remind at is blank" do
+      before { reminder.remind_at = nil }
+
+      it_behaves_like "contract is invalid", remind_at: :blank
+    end
+
+    context "when remind at is present" do
+      before { reminder.remind_at = 1.day.from_now }
+
+      it_behaves_like "contract is valid"
+    end
+  end
+
+  describe "validate remind at is in future" do
+    context "when remind at is in the past" do
+      before { reminder.remind_at = 1.day.ago }
+
+      it_behaves_like "contract is invalid", remind_at: :datetime_must_be_in_future
+    end
+
+    context "when remind at is in the future" do
+      before { reminder.remind_at = 1.day.from_now }
+
+      it_behaves_like "contract is valid"
+    end
+  end
+
+  describe "validate note length" do
+    context "when note is too long" do
+      before { reminder.note = "a" * (described_class::MAX_NOTE_CHARS_LENGTH + 1) }
+
+      it_behaves_like "contract is invalid", note: :too_long
+    end
+
+    context "when note is within the limit" do
+      before { reminder.note = "a" * described_class::MAX_NOTE_CHARS_LENGTH }
+
+      it_behaves_like "contract is valid"
+    end
+  end
+
+  include_examples "contract reuses the model errors"
+end
diff --git a/spec/contracts/reminders/delete_contract_spec.rb b/spec/contracts/reminders/delete_contract_spec.rb
new file mode 100644
index 000000000000..2d884059023b
--- /dev/null
+++ b/spec/contracts/reminders/delete_contract_spec.rb
@@ -0,0 +1,48 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+require "contracts/shared/model_contract_shared_context"
+
+RSpec.describe Reminders::DeleteContract do
+  include_context "ModelContract shared context"
+
+  let(:contract) { described_class.new(reminder, current_user) }
+  let(:current_user) { build_stubbed(:admin) }
+  let(:reminder) { build_stubbed(:reminder, creator: current_user) }
+
+  context "when user is different from the one that created the reminder" do
+    let(:another_user) { build_stubbed(:admin) }
+
+    before { reminder.creator = another_user }
+
+    it_behaves_like "contract user is unauthorized"
+  end
+
+  include_examples "contract reuses the model errors"
+end
diff --git a/spec/contracts/reminders/update_contract_spec.rb b/spec/contracts/reminders/update_contract_spec.rb
new file mode 100644
index 000000000000..3f58ed19b0d2
--- /dev/null
+++ b/spec/contracts/reminders/update_contract_spec.rb
@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+require "contracts/shared/model_contract_shared_context"
+
+RSpec.describe Reminders::UpdateContract do
+  include_context "ModelContract shared context"
+
+  let(:contract) { described_class.new(reminder, user) }
+  let(:user) { build_stubbed(:admin) }
+  let(:creator) { user }
+  let(:reminder) { build_stubbed(:reminder, creator:) }
+
+  before do
+    User.current = user
+    allow(User).to receive(:exists?).with(user.id).and_return(true)
+  end
+
+  describe "validate unchangeable attributes" do
+    context "when remindable changed" do
+      before do
+        reminder.remindable = build_stubbed(:work_package)
+      end
+
+      it_behaves_like "contract is invalid", base: :unchangeable
+    end
+
+    context "when creator_id changed" do
+      before do
+        new_creator = build_stubbed(:user)
+        reminder.creator = new_creator
+        allow(User).to receive(:exists?).with(new_creator.id).and_return(true)
+      end
+
+      it_behaves_like "contract is invalid", base: :unchangeable
+    end
+  end
+
+  include_examples "contract reuses the model errors"
+end
diff --git a/spec/controllers/concerns/authorization_spec.rb b/spec/controllers/concerns/authorization_spec.rb
index a0ffc7cb622a..60e4aa61807a 100644
--- a/spec/controllers/concerns/authorization_spec.rb
+++ b/spec/controllers/concerns/authorization_spec.rb
@@ -54,18 +54,18 @@ def other_before_action; end
 
   current_user { user }
 
-  shared_examples "succeeds" do
+  shared_examples "succeeds" do |action_name = :index|
     it "succeeds" do
-      get :index
+      get action_name
 
       expect(response)
         .to have_http_status :ok
     end
   end
 
-  shared_examples "is prevented" do
+  shared_examples "is prevented" do |action_name = :index|
     it "fails with a RuntimeError" do
-      expect { get :index }
+      expect { get action_name }
         .to raise_error RuntimeError
     end
   end
@@ -108,6 +108,123 @@ def other_before_action; end
     it_behaves_like "succeeds"
   end
 
+  context "with authorization checked with authorize_with_permission" do
+    controller do
+      include Accounts::Authorization
+      include controller_setup
+
+      authorize_with_permission :view_project
+
+      def do_authorize(*)
+        true
+      end
+    end
+
+    it_behaves_like "succeeds"
+
+    it "calls the authorization method" do
+      allow(controller).to receive(:do_authorize)
+
+      get :index
+
+      expect(controller).to have_received(:do_authorize).with(:view_project, global: false)
+    end
+  end
+
+  context "with authorization checked with authorize_with_permission on a single action" do
+    controller do
+      include Accounts::Authorization
+      include controller_setup
+
+      authorize_with_permission :view_project, only: %i[test]
+
+      def test
+        render plain: "OK"
+      end
+
+      def do_authorize(*)
+        true
+      end
+    end
+
+    before do
+      @routes.draw do # rubocop:disable RSpec/InstanceVariable
+        get "/anonymous/index"
+        get "/anonymous/test"
+      end
+    end
+
+    it "allows calling test" do
+      allow(controller).to receive(:do_authorize)
+
+      get :test
+
+      expect(controller).to have_received(:do_authorize).with(:view_project, global: false)
+    end
+
+    it_behaves_like "is prevented", :index
+  end
+
+  context "with authorization checked with load_and_authorize_with_permission_in_optional_project" do
+    controller do
+      include Accounts::Authorization
+      include controller_setup
+
+      load_and_authorize_with_permission_in_optional_project :view_project
+
+      def do_authorize(*)
+        true
+      end
+    end
+
+    it "loads the project if present" do
+      allow(controller).to receive(:do_authorize)
+      allow(Project).to receive(:find)
+
+      get :index, params: { project_id: "1" }
+
+      expect(Project).to have_received(:find).with("1")
+      expect(controller).to have_received(:do_authorize).with(:view_project, global: false)
+    end
+
+    it "uses the global call if not present" do
+      allow(controller).to receive(:do_authorize)
+      allow(Project).to receive(:find)
+
+      get :index
+
+      expect(Project).not_to have_received(:find)
+      expect(controller).to have_received(:do_authorize).with(:view_project, global: true)
+    end
+  end
+
+  context "with authorization checked on single action with load_and_authorize_with_permission_in_optional_project" do
+    controller do
+      include Accounts::Authorization
+      include controller_setup
+
+      load_and_authorize_with_permission_in_optional_project :view_project, only: %i[test]
+
+      def test
+        render plain: "OK"
+      end
+
+      def do_authorize(*)
+        true
+      end
+    end
+
+    before do
+      @routes.draw do # rubocop:disable RSpec/InstanceVariable
+        get "/anonymous/index"
+        get "/anonymous/test"
+      end
+    end
+
+    it_behaves_like "succeeds", :test
+    it_behaves_like "is prevented", :index
+  end
+
   context "with authorization checked with load_and_authorize_in_optional_project" do
     controller do
       before_action :load_and_authorize_in_optional_project
diff --git a/spec/controllers/news_controller_spec.rb b/spec/controllers/news_controller_spec.rb
index ba594072e1e1..f01cb08e942d 100644
--- a/spec/controllers/news_controller_spec.rb
+++ b/spec/controllers/news_controller_spec.rb
@@ -65,7 +65,7 @@
       expect(response).to be_successful
       expect(response).to render_template "show"
 
-      expect(response.body).to have_css("h2", text: news.title)
+      expect(response.body).to have_css("h1", text: news.title)
     end
 
     it "renders show with slug" do
@@ -74,7 +74,7 @@
       expect(response).to be_successful
       expect(response).to render_template "show"
 
-      expect(response.body).to have_css("h2", text: news.title)
+      expect(response.body).to have_css("h1", text: news.title)
     end
 
     it "renders error if news item is not found" do
diff --git a/spec/controllers/versions_controller_spec.rb b/spec/controllers/versions_controller_spec.rb
index 086eca8a86af..f092ff3521bd 100644
--- a/spec/controllers/versions_controller_spec.rb
+++ b/spec/controllers/versions_controller_spec.rb
@@ -230,7 +230,7 @@
 
     it { expect(response).to be_successful }
     it { expect(response).to render_template("show") }
-    it { assert_select "h2", content: version2.name }
+    it { assert_select "h1", content: version2.name }
 
     subject { assigns(:version) }
 
diff --git a/spec/controllers/work_package_relations_controller_spec.rb b/spec/controllers/work_package_relations_controller_spec.rb
index f6f8b36b2d84..ba571d56983b 100644
--- a/spec/controllers/work_package_relations_controller_spec.rb
+++ b/spec/controllers/work_package_relations_controller_spec.rb
@@ -117,7 +117,7 @@
       new_relation = Relation.last
 
       expect(WorkPackageRelationsTab::IndexComponent).to have_received(:new)
-        .with(work_package:, relations: [relation, new_relation], children:)
+        .with(work_package:, relations: [relation, new_relation], children:, relation_to_scroll_to: new_relation)
       expect(controller).to have_received(:replace_via_turbo_stream)
         .with(component: an_instance_of(WorkPackageRelationsTab::IndexComponent))
     end
diff --git a/spec/factories/project_life_cycle_step_factory.rb b/spec/factories/project_life_cycle_step_factory.rb
index cc64e09b02e7..465dd702bfc0 100644
--- a/spec/factories/project_life_cycle_step_factory.rb
+++ b/spec/factories/project_life_cycle_step_factory.rb
@@ -31,6 +31,10 @@
     project
     active { true }
 
+    trait :skip_validate do
+      to_create { |instance| instance.save(validate: false) }
+    end
+
     factory :project_stage, class: "Project::Stage" do
       definition factory: :project_stage_definition
       start_date { Date.current - 2.days }
diff --git a/spec/factories/reminders_factory.rb b/spec/factories/reminders_factory.rb
new file mode 100644
index 000000000000..0c195743a1e9
--- /dev/null
+++ b/spec/factories/reminders_factory.rb
@@ -0,0 +1,62 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+FactoryBot.define do
+  factory :reminder do
+    remindable factory: :work_package
+    creator factory: :user
+    remind_at { 1.day.from_now }
+    note { "This is a reminder" }
+
+    trait :scheduled do
+      job_id { SecureRandom.uuid }
+    end
+
+    trait :completed do
+      job_id { SecureRandom.uuid }
+      completed_at { Time.zone.now }
+    end
+
+    trait :with_unread_notifications do
+      after(:create) do |reminder|
+        create(:reminder_notification, reminder:, notification: create(:notification, read_ian: false))
+      end
+    end
+
+    trait :with_read_notifications do
+      after(:create) do |reminder|
+        create(:reminder_notification, reminder:, notification: create(:notification, read_ian: true))
+      end
+    end
+  end
+
+  factory :reminder_notification do
+    reminder
+    notification
+  end
+end
diff --git a/spec/features/admin/working_days_spec.rb b/spec/features/admin/working_days_spec.rb
index cfddfaad9ed1..d1e3627ce518 100644
--- a/spec/features/admin/working_days_spec.rb
+++ b/spec/features/admin/working_days_spec.rb
@@ -48,6 +48,8 @@
 
   before do
     visit admin_settings_working_days_and_hours_path
+    # wait for "holidays and closures" calendar to load
+    find(".fc-next-button")
   end
 
   describe "week days" do
diff --git a/spec/features/custom_fields/activate_in_project_spec.rb b/spec/features/custom_fields/activate_in_project_spec.rb
index 796b0eef3b81..ea6fc23de27a 100644
--- a/spec/features/custom_fields/activate_in_project_spec.rb
+++ b/spec/features/custom_fields/activate_in_project_spec.rb
@@ -35,13 +35,13 @@
   let(:for_all_cf) { create(:list_wp_custom_field, is_for_all: true) }
   let(:project_specific_cf) { create(:integer_wp_custom_field) }
   let(:work_package) do
-    wp = build(:work_package).tap do |wp|
+    build(:work_package) do |wp|
       wp.type.custom_fields = [for_all_cf, project_specific_cf]
       wp.save!
     end
   end
   let(:wp_page) { Pages::FullWorkPackage.new(work_package) }
-  let(:project_settings_page) { Pages::Projects::Settings.new(work_package.project) }
+  let(:project_settings_page) { Pages::Projects::Settings::WorkPackageCustomFields.new(work_package.project) }
 
   before do
     login_as user
@@ -53,9 +53,9 @@
     wp_page.expect_attributes "customField#{for_all_cf.id}": "-"
     wp_page.expect_no_attribute "customField#{project_specific_cf.id}"
 
-    project_settings_page.visit_tab!("custom_fields")
+    project_settings_page.visit!
 
-    project_settings_page.activate_wp_custom_field(project_specific_cf)
+    project_settings_page.activate(project_specific_cf)
 
     project_settings_page.save!
 
diff --git a/spec/features/forums/attachment_upload_spec.rb b/spec/features/forums/attachment_upload_spec.rb
index 0fb0fe9b9477..dfb2a7bd0bd5 100644
--- a/spec/features/forums/attachment_upload_spec.rb
+++ b/spec/features/forums/attachment_upload_spec.rb
@@ -68,9 +68,7 @@
     expect(page).to have_content("Image uploaded on creation")
     attachments_list.expect_attached("image.png")
 
-    within ".toolbar-items" do
-      click_on "Edit"
-    end
+    page.find_test_selector("message-edit-button").click
 
     retry_block do
       find(".op-uc-figure").click
@@ -115,9 +113,7 @@
     wait_for_network_idle
 
     attachments_list.expect_attached("image.png")
-    within ".toolbar-items" do
-      click_on "Edit"
-    end
+    page.find_test_selector("message-edit-button").click
     wait_for_network_idle
 
     retry_block do
diff --git a/spec/features/homescreen/index_spec.rb b/spec/features/homescreen/index_spec.rb
index af7e97e83c7c..b4d7a6397d67 100644
--- a/spec/features/homescreen/index_spec.rb
+++ b/spec/features/homescreen/index_spec.rb
@@ -33,6 +33,7 @@
   let(:user) { build_stubbed(:user) }
   let!(:project) { create(:public_project, identifier: "public-project") }
   let(:general_settings_page) { Pages::Admin::SystemSettings::General.new }
+  let(:global_html_title) { Components::HtmlTitle.new }
 
   it "is reachable by the global menu" do
     login_as user
diff --git a/spec/features/members/membership_spec.rb b/spec/features/members/membership_spec.rb
index 8e33149e5273..850125f8e771 100644
--- a/spec/features/members/membership_spec.rb
+++ b/spec/features/members/membership_spec.rb
@@ -138,6 +138,22 @@
       expect(members_page).not_to have_group group.name
     end
 
+    it "shows more information when hovering over an avatar" do
+      members_page.in_user_row(peter) do |row|
+        # Hover over the avatar of peter to open the hover card
+        row.find(".op-principal--avatar").hover
+      end
+
+      members_page.in_user_hover_card(peter) do
+        find_test_selector("user-hover-card-name", text: peter.name)
+        find_test_selector("user-hover-card-email", text: peter.mail)
+        find_test_selector("user-hover-card-groups", text: "Member of #{peter.groups.first.name}")
+
+        button = find_test_selector("user-hover-card-profile-btn", text: "Open profile")
+        expect(button["href"]).to eq(edit_user_url(peter))
+      end
+    end
+
     context "as a member" do
       current_user { peter }
 
diff --git a/spec/features/my/autologin_tokens_management_spec.rb b/spec/features/my/autologin_tokens_management_spec.rb
index 685e63fe4218..afd462c4463e 100644
--- a/spec/features/my/autologin_tokens_management_spec.rb
+++ b/spec/features/my/autologin_tokens_management_spec.rb
@@ -31,11 +31,12 @@
 RSpec.describe "My account autologin tokens management", :js, :with_cuprite do
   include Redmine::I18n
   shared_let(:user) { create(:user) }
-  shared_let(:old_token) { create(:autologin_token, user:, created_at: 1.year.ago) }
+  shared_let(:old_token) { create(:autologin_token, user:, created_at: 1.year.ago, expires_on: 1.year.ago + 1.day) }
   shared_let(:new_token) do
     create(:autologin_token,
            user:,
-           data: { browser: "Mozilla Firefox", browser_version: "12.3", platform: "Linux" })
+           data: { browser: "Mozilla Firefox", browser_version: "12.3", platform: "Linux" },
+           expires_on: 1.day.from_now)
   end
 
   before do
diff --git a/spec/features/news/creation_and_commenting_spec.rb b/spec/features/news/creation_and_commenting_spec.rb
index e99afdc2a61a..9b8959736cc8 100644
--- a/spec/features/news/creation_and_commenting_spec.rb
+++ b/spec/features/news/creation_and_commenting_spec.rb
@@ -37,6 +37,7 @@
              build(:notification_setting, news_added: true, news_commented: true)
            ])
   end
+  let(:global_html_title) { Components::HtmlTitle.new(project) }
 
   current_user do
     create(:user,
@@ -47,8 +48,9 @@
 
   it "allows creating new and commenting it all of which will result in notifications and mails" do
     visit project_news_index_path(project)
+    global_html_title.expect_first_segment "News"
 
-    find('[data-test-selector="add-news-button"]', text: "News").click
+    page.find_test_selector("add-news-button").click
 
     # Create the news
     fill_in "Title", with: "My new news"
diff --git a/spec/features/notifications/notification_center/notification_center_date_alert_mention_spec.rb b/spec/features/notifications/notification_center/notification_center_date_alert_mention_spec.rb
index 9c8d6881150c..542796ac27a0 100644
--- a/spec/features/notifications/notification_center/notification_center_date_alert_mention_spec.rb
+++ b/spec/features/notifications/notification_center/notification_center_date_alert_mention_spec.rb
@@ -39,8 +39,9 @@
   context "with date alerts ee", with_ee: %i[date_alerts] do
     it "shows only the date alert time, not the mentioned author" do
       center.within_item(notification_date_alert) do
-        expect(page).to have_text("Date alert, Mentioned")
-        expect(page).to have_no_text("Actor user")
+        expect(page).to have_text("##{work_package.id}\n- #{project.name} -\nDate alert, Mentioned")
+        expect(page).to have_no_text("Actor User")
+        expect(page).to have_text("Overdue since 1 day.")
       end
     end
   end
diff --git a/spec/features/notifications/notification_center/notification_center_date_alerts_spec.rb b/spec/features/notifications/notification_center/notification_center_date_alerts_spec.rb
index 92a8a53f3e1a..d0b324bf6d93 100644
--- a/spec/features/notifications/notification_center/notification_center_date_alerts_spec.rb
+++ b/spec/features/notifications/notification_center/notification_center_date_alerts_spec.rb
@@ -195,7 +195,7 @@ def run_create_date_alerts_notifications_job
     it "shows the upsale page" do
       side_menu.click_item "Date alert"
 
-      expect(page).to have_current_path /notifications\/date_alerts/
+      expect(page).to have_current_path(/notifications\/date_alerts/)
       expect(page).to have_text "Date alerts is an Enterprise"
       expect(page).to have_text "Please upgrade to a paid plan "
 
@@ -207,27 +207,27 @@ def run_create_date_alerts_notifications_job
 
   context "with date alerts ee", with_ee: %i[date_alerts] do
     it "shows the date alerts according to specification" do
-      center.expect_item(notification_wp_start_past, "Start date was 1 day ago")
-      center.expect_item(notification_wp_start_future, "Start date is in 7 days")
+      center.expect_item(notification_wp_start_past, "Start date was 1 day ago.")
+      center.expect_item(notification_wp_start_future, "Start date is in 7 days.")
 
-      center.expect_item(notification_wp_due_past, "Overdue since 3 days")
-      center.expect_item(notification_wp_due_future, "Finish date is in 3 days")
+      center.expect_item(notification_wp_due_past, "Overdue since 3 days.")
+      center.expect_item(notification_wp_due_future, "Finish date is in 3 days.")
 
-      center.expect_item(notification_milestone_past, "Overdue since 2 days")
-      center.expect_item(notification_milestone_future, "Milestone date is in 1 day")
+      center.expect_item(notification_milestone_past, "Overdue since 2 days.")
+      center.expect_item(notification_milestone_future, "Milestone date is in 1 day.")
 
-      center.expect_item(notification_wp_unset_date, "Finish date is deleted")
+      center.expect_item(notification_wp_unset_date, "Finish date is deleted.")
 
-      center.expect_item(notification_wp_due_today, "Finish date is today")
+      center.expect_item(notification_wp_due_today, "Finish date is today.")
 
       # Doesn't show the date alert for the mention, not the alert
-      center.expect_item(notification_wp_double_mention, /(seconds|minutes) ago by Anonymous/)
+      center.expect_item(notification_wp_double_mention, "Finish date is in 1 day.")
       center.expect_no_item(notification_wp_double_date_alert)
 
       # When switch to date alerts, it shows the alert, no longer the mention
       side_menu.click_item "Date alert"
       wait_for_network_idle
-      center.expect_item(notification_wp_double_date_alert, "Finish date is in 1 day")
+      center.expect_item(notification_wp_double_date_alert, "Finish date is in 1 day.")
       center.expect_no_item(notification_wp_double_mention)
 
       # Ensure that start is created later than due for implicit ID sorting
@@ -236,7 +236,7 @@ def run_create_date_alerts_notifications_job
 
       # We see that start is actually the newest ID, hence shown as the primary notification
       # but the date alert still shows the finish date
-      center.expect_item(double_alert_start, "Finish date is in 1 day")
+      center.expect_item(double_alert_start, "Finish date is in 1 day.")
       center.expect_no_item(double_alert_due)
 
       # Opening a date alert opens in overview
@@ -262,7 +262,7 @@ def run_create_date_alerts_notifications_job
       page.driver.refresh
       wait_for_reload
 
-      center.expect_item(notification_wp_double_date_alert, "Finish date is in 5 days")
+      center.expect_item(notification_wp_double_date_alert, "Finish date is in 5 days.")
       center.expect_no_item(notification_wp_double_mention)
     end
   end
diff --git a/spec/features/notifications/notification_center/notification_center_reminder_spec.rb b/spec/features/notifications/notification_center/notification_center_reminder_spec.rb
new file mode 100644
index 000000000000..ca000c92f740
--- /dev/null
+++ b/spec/features/notifications/notification_center/notification_center_reminder_spec.rb
@@ -0,0 +1,81 @@
+require "spec_helper"
+require "features/page_objects/notification"
+
+RSpec.describe "Notification center reminder, mention and date alert",
+               :js,
+               :with_cuprite,
+               with_ee: %i[date_alerts],
+               with_settings: { journal_aggregation_time_minutes: 0 } do
+  shared_let(:project) { create(:project) }
+  shared_let(:actor) { create(:user, firstname: "Actor", lastname: "User") }
+  shared_let(:user) do
+    create(:user,
+           member_with_permissions: { project => %w[view_work_packages] })
+  end
+  shared_let(:work_package) { create(:work_package, project:, due_date: 1.day.ago) }
+  shared_let(:work_package2) { create(:work_package, project:) }
+
+  shared_let(:notification_mentions) do
+    [create(:notification,
+            reason: :mentioned,
+            recipient: user,
+            resource: work_package,
+            actor:),
+     create(:notification,
+            reason: :mentioned,
+            recipient: user,
+            resource: work_package2,
+            actor: actor)]
+  end
+
+  shared_let(:notification_date_alert) do
+    create(:notification,
+           reason: :date_alert_due_date,
+           recipient: user,
+           resource: work_package)
+  end
+
+  shared_let(:notification_reminder) do
+    create_reminder_notification_for(work_package: work_package, user: user)
+  end
+
+  shared_let(:notification_reminder2) do
+    create_reminder_notification_for(work_package: work_package2, user: user)
+  end
+
+  let(:center) { Pages::Notifications::Center.new }
+
+  before do
+    login_as user
+    visit notifications_center_path
+    wait_for_reload
+  end
+
+  context "with a reminder, mention and date alert" do
+    it "shows the reminder alert within aggregation with date alert + reminder note" do
+      center.within_item(notification_reminder) do
+        expect(page).to have_text("##{work_package.id}\n- #{project.name} -\nDate alert, Mentioned, Reminder")
+        expect(page).to have_text("Overdue since 1 day.\nNote: “This is an important reminder”")
+      end
+    end
+  end
+
+  context "with a reminder and mention, no date alert" do
+    it "shows the reminder alert within aggregation with mention" do
+      center.within_item(notification_reminder2) do
+        expect(page).to have_text("##{work_package2.id}\n- #{project.name} -\nMentioned, Reminder")
+        expect(page).to have_text("a few seconds ago.\nNote: “This is an important reminder”")
+      end
+    end
+  end
+
+  def create_reminder_notification_for(work_package:, user:)
+    reminder = create(:reminder, remindable: work_package, creator: user, note: "This is an important reminder")
+    notification = create(:notification,
+                          reason: :reminder,
+                          recipient: user,
+                          resource: work_package)
+    create(:reminder_notification, reminder:, notification:)
+    notification
+  end
+end
diff --git a/spec/features/notifications/notification_center/notification_center_sidemenu_spec.rb b/spec/features/notifications/notification_center/notification_center_sidemenu_spec.rb
index faf5a6209aa5..c2cd4a832484 100644
--- a/spec/features/notifications/notification_center/notification_center_sidemenu_spec.rb
+++ b/spec/features/notifications/notification_center/notification_center_sidemenu_spec.rb
@@ -24,6 +24,7 @@
   shared_let(:work_package4) { create(:work_package, project: project3, author: other_user) }
   shared_let(:work_package5) { create(:work_package, :is_milestone, project: project3, author: other_user) }
   shared_let(:work_package6) { create(:work_package, :is_milestone, project: project3, author: other_user) }
+  shared_let(:work_package7) { create(:work_package, project: project3, author: other_user) }
 
   let(:notification_watched) do
     create(:notification,
@@ -67,9 +68,19 @@
            reason: :shared)
   end
 
+  let(:notification_reminder) do
+    reminder = create(:reminder, remindable: work_package7, creator: other_user, note: "This is an important reminder")
+    notification = create(:notification,
+                          recipient:,
+                          resource: work_package7,
+                          reason: :reminder)
+    create(:reminder_notification, reminder:, notification:)
+    notification
+  end
+
   let(:notifications) do
     [notification_watched, notification_assigned, notification_responsible, notification_mentioned, notification_date,
-     notification_shared]
+     notification_shared, notification_reminder]
   end
 
   let(:center) { Pages::Notifications::Center.new }
@@ -99,6 +110,7 @@
       side_menu.expect_item_with_no_count "Watcher"
       side_menu.expect_item_with_no_count "Date alert"
       side_menu.expect_item_with_no_count "Shared"
+      side_menu.expect_item_with_no_count "Reminder"
     end
   end
 
@@ -106,35 +118,37 @@
     side_menu.expect_open
 
     # Expect standard filters
-    side_menu.expect_item_with_count "Inbox", 6
+    side_menu.expect_item_with_count "Inbox", 7
     side_menu.expect_item_with_count "Assignee", 1
     side_menu.expect_item_with_count "Mentioned", 1
     side_menu.expect_item_with_count "Accountable", 1
     side_menu.expect_item_with_count "Watcher", 1
     side_menu.expect_item_with_count "Date alert", 1
     side_menu.expect_item_with_count "Shared", 1
+    side_menu.expect_item_with_count "Reminder", 1
 
     # Expect project filters
     side_menu.expect_item_with_count project.name, 1
     side_menu.expect_item_with_count project2.name, 1
-    side_menu.expect_item_with_count "... #{project3.name}", 4
+    side_menu.expect_item_with_count "... #{project3.name}", 5
 
     # Reading a notification...
     center.mark_notification_as_read notification_watched
 
     # ...  will change the filter counts
-    side_menu.expect_item_with_count "Inbox", 5
+    side_menu.expect_item_with_count "Inbox", 6
     side_menu.expect_item_with_count "Assignee", 1
     side_menu.expect_item_with_count "Mentioned", 1
     side_menu.expect_item_with_count "Accountable", 1
     side_menu.expect_item_with_count "Date alert", 1
     side_menu.expect_item_with_count "Shared", 1
+    side_menu.expect_item_with_count "Reminder", 1
     side_menu.expect_item_with_no_count "Watcher"
 
     # ... and show only those projects with a notification
     side_menu.expect_no_item project.name
     side_menu.expect_item_with_count project2.name, 1
-    side_menu.expect_item_with_count "... #{project3.name}", 4
+    side_menu.expect_item_with_count "... #{project3.name}", 5
 
     # Empty filter sets have a separate message
     side_menu.click_item "Watcher"
@@ -152,6 +166,7 @@
     side_menu.expect_item_with_no_count "Watcher"
     side_menu.expect_item_with_no_count "Date alert"
     side_menu.expect_item_with_no_count "Shared"
+    side_menu.expect_item_with_no_count "Reminder"
 
     side_menu.expect_no_item project.name
     side_menu.expect_no_item project2.name
@@ -160,66 +175,74 @@
 
   it "updates the content when a filter is clicked" do
     # All notifications are shown
-    center.expect_work_package_item *notifications
+    center.expect_work_package_item(*notifications)
 
     # Filter for "Watcher"
     side_menu.click_item "Watcher"
     side_menu.finished_loading
     center.expect_work_package_item notification_watched
     center.expect_no_item notification_assigned, notification_responsible, notification_mentioned, notification_date,
-                          notification_shared
+                          notification_shared, notification_reminder
 
     # Filter for "Assignee"
     side_menu.click_item "Assignee"
     side_menu.finished_loading
     center.expect_work_package_item notification_assigned
     center.expect_no_item notification_watched, notification_responsible, notification_mentioned, notification_date,
-                          notification_shared
+                          notification_shared, notification_reminder
 
     # Filter for "Accountable"
     side_menu.click_item "Accountable"
     side_menu.finished_loading
     center.expect_work_package_item notification_responsible
     center.expect_no_item notification_watched, notification_assigned, notification_mentioned, notification_date,
-                          notification_shared
+                          notification_shared, notification_reminder
 
     # Filter for "Mentioned"
     side_menu.click_item "Mentioned"
     side_menu.finished_loading
     center.expect_work_package_item notification_mentioned
     center.expect_no_item notification_watched, notification_assigned, notification_responsible, notification_date,
-                          notification_shared
+                          notification_shared, notification_reminder
 
     # Filter for "Date alert"
     side_menu.click_item "Date alert"
     side_menu.finished_loading
     center.expect_work_package_item notification_date
     center.expect_no_item notification_watched, notification_assigned, notification_responsible, notification_mentioned,
-                          notification_shared
+                          notification_shared, notification_reminder
 
     # Filter for "Shared"
     side_menu.click_item "Shared"
     side_menu.finished_loading
     center.expect_work_package_item notification_shared
     center.expect_no_item notification_watched, notification_assigned, notification_responsible, notification_mentioned,
-                          notification_date
+                          notification_date, notification_reminder
+
+    # Filter for "Reminder"
+    side_menu.click_item "Reminder"
+    side_menu.finished_loading
+    center.expect_work_package_item notification_reminder
+    center.expect_no_item notification_watched, notification_assigned, notification_responsible, notification_mentioned,
+                          notification_date, notification_shared
 
     # Filter for project1
     side_menu.click_item project.name
     side_menu.finished_loading
     center.expect_work_package_item notification_watched
     center.expect_no_item notification_assigned, notification_responsible, notification_mentioned, notification_date,
-                          notification_shared
+                          notification_shared, notification_reminder
 
     # Filter for project3
     side_menu.click_item "... #{project3.name}"
     side_menu.finished_loading
-    center.expect_work_package_item notification_responsible, notification_mentioned, notification_date, notification_shared
+    center.expect_work_package_item notification_responsible, notification_mentioned, notification_date, notification_shared,
+                                    notification_reminder
     center.expect_no_item notification_watched, notification_assigned
 
     # Reset by clicking on the Inbox
     side_menu.click_item "Inbox"
     side_menu.finished_loading
-    center.expect_work_package_item *notifications
+    center.expect_work_package_item(*notifications)
   end
 end
diff --git a/spec/features/notifications/notification_center/split_screen_spec.rb b/spec/features/notifications/notification_center/split_screen_spec.rb
index 1749a2e354d8..36d846d0ca4a 100644
--- a/spec/features/notifications/notification_center/split_screen_spec.rb
+++ b/spec/features/notifications/notification_center/split_screen_spec.rb
@@ -98,7 +98,7 @@
       center.click_item notification
       sleep 0.25 # Wait after the item has been clicked to not be interpreted as a double click
       center.mark_notification_as_read notification
-      global_html_title.expect_first_segment second_title
+      global_html_title.expect_first_segment "#{second_title} | Notifications"
 
       # After making all notifications as read, html title should show the base route
       center.mark_notification_as_read second_notification
diff --git a/spec/features/notifications/settings/immediate_reminder_spec.rb b/spec/features/notifications/settings/immediate_reminder_spec.rb
index 92d25c6165f6..3b2ba4aaffab 100644
--- a/spec/features/notifications/settings/immediate_reminder_spec.rb
+++ b/spec/features/notifications/settings/immediate_reminder_spec.rb
@@ -10,10 +10,15 @@
       reminders_settings_page.visit!
 
       # By default the immediate reminder is checked
-      expect(pref.immediate_reminders[:mentioned]).to be true
+      expect(pref.immediate_reminders[:mentioned]).to be(true)
       reminders_settings_page.expect_immediate_reminder :mentioned, true
 
+      # By default the personal reminder is checked
+      expect(pref.immediate_reminders[:personal_reminder]).to be(true)
+      reminders_settings_page.expect_immediate_reminder :personalReminder, true
+
       reminders_settings_page.set_immediate_reminder :mentioned, false
+      reminders_settings_page.set_immediate_reminder :personalReminder, false
 
       reminders_settings_page.save
 
@@ -22,8 +27,10 @@
       reminders_settings_page.reload!
 
       reminders_settings_page.expect_immediate_reminder :mentioned, false
+      reminders_settings_page.expect_immediate_reminder :personalReminder, false
 
-      expect(pref.reload.immediate_reminders[:mentioned]).to be false
+      expect(pref.reload.immediate_reminders[:mentioned]).to be(false)
+      expect(pref.reload.immediate_reminders[:personal_reminder]).to be(false)
     end
   end
 
diff --git a/spec/features/projects/copy_spec.rb b/spec/features/projects/copy_spec.rb
index 18253e9452a8..1c2ae9555aeb 100644
--- a/spec/features/projects/copy_spec.rb
+++ b/spec/features/projects/copy_spec.rb
@@ -164,10 +164,10 @@
 
     context "with correct project custom field activations" do
       before do
-        original_settings_page = Pages::Projects::Settings.new(project)
-        original_settings_page.visit!
+        Pages::Projects::Settings::General.new(project).visit!
 
-        find(".toolbar a", text: "Copy").click
+        page.find_test_selector("project-settings-more-menu").click
+        page.find_test_selector("project-settings--copy").click
 
         expect(page).to have_text "Copy project \"#{project.name}\""
 
@@ -229,10 +229,10 @@
           optional_project_custom_field_with_default.id
         )
 
-        original_settings_page = Pages::Projects::Settings.new(project)
-        original_settings_page.visit!
+        Pages::Projects::Settings::General.new(project).visit!
 
-        find(".toolbar a", text: "Copy").click
+        page.find_test_selector("project-settings-more-menu").click
+        page.find_test_selector("project-settings--copy").click
 
         expect(page).to have_text "Copy project \"#{project.name}\""
 
@@ -302,10 +302,10 @@
       end
 
       before do
-        original_settings_page = Pages::Projects::Settings.new(project)
-        original_settings_page.visit!
+        Pages::Projects::Settings::General.new(project).visit!
 
-        find(".toolbar a", text: "Copy").click
+        page.find_test_selector("project-settings-more-menu").click
+        page.find_test_selector("project-settings--copy").click
 
         expect(page).to have_text "Copy project \"#{project.name}\""
 
@@ -373,10 +373,10 @@
       end
 
       it "copies the project attributes" do
-        original_settings_page = Pages::Projects::Settings.new(project)
-        original_settings_page.visit!
+        Pages::Projects::Settings::General.new(project).visit!
 
-        find(".toolbar a", text: "Copy").click
+        page.find_test_selector("project-settings-more-menu").click
+        page.find_test_selector("project-settings--copy").click
 
         expect(page).to have_text "Copy project \"#{project.name}\""
 
@@ -391,7 +391,7 @@
         overview_page = Pages::Projects::Show.new(copied_project)
         overview_page.visit!
 
-        overview_page.within_async_loaded_sidebar do
+        overview_page.within_project_attributes_sidebar do
           # User has no permission to edit project attributes.
           expect(page).to have_no_css("[data-test-selector='project-custom-field-section-edit-button']")
           # The custom fields are still copied from the parent project.
@@ -406,10 +406,10 @@
     end
 
     it "copies projects and the associated objects" do
-      original_settings_page = Pages::Projects::Settings.new(project)
-      original_settings_page.visit!
+      Pages::Projects::Settings::General.new(project).visit!
 
-      find(".toolbar a", text: "Copy").click
+      page.find_test_selector("project-settings-more-menu").click
+      page.find_test_selector("project-settings--copy").click
 
       expect(page).to have_text "Copy project \"#{project.name}\""
 
@@ -433,8 +433,7 @@
       # Will redirect to the new project automatically once the copy process is done
       expect(page).to have_current_path(Regexp.new("#{project_path(copied_project)}/?"))
 
-      copied_settings_page = Pages::Projects::Settings.new(copied_project)
-      copied_settings_page.visit!
+      Pages::Projects::Settings::General.new(copied_project).visit!
 
       # has the parent of the original project
       parent_field.expect_selected parent_project.name
@@ -445,19 +444,21 @@
       editor.expect_value "some text cf"
 
       # has wp custom fields of original project active
-      copied_settings_page.visit_tab!("custom_fields")
+      copied_settings_wp_cf_page = Pages::Projects::Settings::WorkPackageCustomFields.new(copied_project)
+      copied_settings_wp_cf_page.visit!
 
-      copied_settings_page.expect_wp_custom_field_active(wp_custom_field)
-      copied_settings_page.expect_wp_custom_field_inactive(inactive_wp_custom_field)
+      copied_settings_wp_cf_page.expect_active(wp_custom_field)
+      copied_settings_wp_cf_page.expect_inactive(inactive_wp_custom_field)
 
       # has types of original project active
-      copied_settings_page.visit_tab!("types")
+      copied_settings_type_page = Pages::Projects::Settings::Type.new(copied_project)
+      copied_settings_type_page.visit!
 
       active_types.each do |type|
-        copied_settings_page.expect_type_active(type)
+        copied_settings_type_page.expect_type_active(type)
       end
 
-      copied_settings_page.expect_type_inactive(inactive_type)
+      copied_settings_type_page.expect_type_inactive(inactive_type)
 
       # Expect wiki was copied
       expect(copied_project.wiki.pages.count).to eq(project.wiki.pages.count)
@@ -540,10 +541,10 @@
       wp_table.expect_work_package_listed *order
       wp_table.expect_work_package_order *order
 
-      original_settings_page = Pages::Projects::Settings.new(project)
-      original_settings_page.visit!
+      Pages::Projects::Settings::General.new(project).visit!
 
-      find(".toolbar a", text: "Copy").click
+      page.find_test_selector("project-settings-more-menu").click
+      page.find_test_selector("project-settings--copy").click
 
       fill_in "Name", with: "Copied project"
 
diff --git a/spec/features/projects/life_cycle/active_in_project_spec.rb b/spec/features/projects/life_cycle/active_in_project_spec.rb
new file mode 100644
index 000000000000..c545b59004a4
--- /dev/null
+++ b/spec/features/projects/life_cycle/active_in_project_spec.rb
@@ -0,0 +1,148 @@
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2010-2024 the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+# ++
+
+require "spec_helper"
+
+RSpec.describe "Projects life cycle settings", :js, :with_cuprite, with_flag: { stages_and_gates: true } do
+  shared_let(:project) { create(:project) }
+
+  shared_let(:user_with_permission) do
+    create(:user,
+           member_with_permissions: {
+             project => %w[
+               select_project_life_cycle
+             ]
+           })
+  end
+  shared_let(:user_without_permission) do
+    create(:user,
+           member_with_permissions: {
+             project => %w[
+               edit_project
+             ]
+           })
+  end
+
+  shared_let(:initiating_stage) { create(:project_stage_definition, name: "Initiating") }
+  shared_let(:ready_to_execute_gate) { create(:project_gate_definition, name: "Ready to Execute") }
+  shared_let(:executing_stage) { create(:project_stage_definition, name: "Executing") }
+  shared_let(:ready_to_close_gate) { create(:project_gate_definition, name: "Ready to Close") }
+  shared_let(:closing_stage) { create(:project_stage_definition, name: "Closing") }
+
+  let(:project_life_cycle_page) { Pages::Projects::Settings::LifeCycle.new(project) }
+
+  context "with sufficient permissions" do
+    current_user { user_with_permission }
+
+    it "allows toggling the active/inactive state of lifecycle steps and filtering them" do
+      project_life_cycle_page.visit!
+
+      project_life_cycle_page.expect_listed(initiating_stage => false,
+                                            ready_to_execute_gate => false,
+                                            executing_stage => false,
+                                            ready_to_close_gate => false,
+                                            closing_stage => false)
+
+      # Activate the stages to be found within the project
+      project_life_cycle_page.toggle(initiating_stage)
+      project_life_cycle_page.toggle(ready_to_close_gate)
+      project_life_cycle_page.toggle(closing_stage)
+
+      project_life_cycle_page.expect_listed(initiating_stage => true,
+                                            ready_to_execute_gate => false,
+                                            executing_stage => false,
+                                            ready_to_close_gate => true,
+                                            closing_stage => true)
+
+      # Expect the activation state to be kept after a reload
+      project_life_cycle_page.reload_with_home_page_detour
+
+      project_life_cycle_page.expect_listed(initiating_stage => true,
+                                            ready_to_execute_gate => false,
+                                            executing_stage => false,
+                                            ready_to_close_gate => true,
+                                            closing_stage => true)
+
+      # Disable all stages at once
+      project_life_cycle_page.disable_all
+
+      project_life_cycle_page.expect_listed(initiating_stage => false,
+                                            ready_to_execute_gate => false,
+                                            executing_stage => false,
+                                            ready_to_close_gate => false,
+                                            closing_stage => false)
+
+      # Expect the activation state to be kept after a reload
+      project_life_cycle_page.reload_with_home_page_detour
+
+      project_life_cycle_page.expect_listed(initiating_stage => false,
+                                            ready_to_execute_gate => false,
+                                            executing_stage => false,
+                                            ready_to_close_gate => false,
+                                            closing_stage => false)
+
+      # Enable all stages at once
+      project_life_cycle_page.enable_all
+
+      project_life_cycle_page.expect_listed(initiating_stage => true,
+                                            ready_to_execute_gate => true,
+                                            executing_stage => true,
+                                            ready_to_close_gate => true,
+                                            closing_stage => true)
+
+      # Expect the activation state to be kept after a reload
+      project_life_cycle_page.reload_with_home_page_detour
+
+      project_life_cycle_page.expect_listed(initiating_stage => true,
+                                            ready_to_execute_gate => true,
+                                            executing_stage => true,
+                                            ready_to_close_gate => true,
+                                            closing_stage => true)
+
+      # The user can filter the life cycle steps
+      project_life_cycle_page.filter_by("ing")
+
+      project_life_cycle_page.expect_listed(initiating_stage => true,
+                                            executing_stage => true,
+                                            closing_stage => true)
+
+      project_life_cycle_page.expect_not_listed(ready_to_execute_gate,
+                                                ready_to_close_gate)
+    end
+  end
+
+  context "without sufficient permissions" do
+    current_user { user_without_permission }
+
+    it "does not allow the user to access the page" do
+      project_life_cycle_page.visit!
+
+      project_life_cycle_page.expect_flash(message: "You are not authorized to access this page", type: :error)
+    end
+  end
+end
diff --git a/spec/features/projects/life_cycle/overview_page/dialog/permission_spec.rb b/spec/features/projects/life_cycle/overview_page/dialog/permission_spec.rb
new file mode 100644
index 000000000000..debb041b9fbb
--- /dev/null
+++ b/spec/features/projects/life_cycle/overview_page/dialog/permission_spec.rb
@@ -0,0 +1,85 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+require_relative "../shared_context"
+
+RSpec.describe "Edit project stages and gates on project overview page", :js, :with_cuprite,
+               with_flag: { stages_and_gates: true } do
+  include_context "with seeded projects and stages and gates"
+  shared_let(:user) { create(:user) }
+  let(:overview_page) { Pages::Projects::Show.new(project) }
+  let(:permissions) { [] }
+
+  current_user { user }
+
+  before do
+    mock_permissions_for(user) do |mock|
+      mock.allow_in_project(*permissions, project:) # any project
+    end
+    overview_page.visit_page
+  end
+
+  describe "with insufficient View Stages and Gates permissions" do
+    let(:permissions) { %i[view_project] }
+
+    it "does not show the attributes sidebar" do
+      overview_page.expect_no_visible_sidebar
+    end
+  end
+
+  describe "with sufficient View Stages and Gates permissions" do
+    let(:permissions) { %i[view_project view_project_stages_and_gates] }
+
+    it "shows the attributes sidebar" do
+      overview_page.within_life_cycles_sidebar do
+        expect(page).to have_text("Project lifecycle")
+      end
+    end
+  end
+
+  describe "with Edit project permissions" do
+    let(:permissions) { %i[view_project view_project_stages_and_gates edit_project] }
+
+    it "does not show the edit buttons" do
+      overview_page.within_life_cycles_sidebar do
+        expect(page).to have_no_css("[data-test-selector='project-life-cycles-edit-button']")
+      end
+    end
+  end
+
+  describe "with sufficient Edit Stages and Gates permissions" do
+    let(:permissions) { %i[view_project view_project_stages_and_gates edit_project edit_project_stages_and_gates] }
+
+    it "shows the edit buttons" do
+      overview_page.within_life_cycles_sidebar do
+        expect(page).to have_css("[data-test-selector='project-life-cycles-edit-button']")
+      end
+    end
+  end
+end
diff --git a/spec/features/projects/life_cycle/overview_page/dialog/update_spec.rb b/spec/features/projects/life_cycle/overview_page/dialog/update_spec.rb
new file mode 100644
index 000000000000..32f433111b29
--- /dev/null
+++ b/spec/features/projects/life_cycle/overview_page/dialog/update_spec.rb
@@ -0,0 +1,159 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+require_relative "../shared_context"
+
+RSpec.describe "Edit project stages and gates on project overview page", :js, :with_cuprite,
+               with_flag: { stages_and_gates: true } do
+  include_context "with seeded projects and stages and gates"
+  shared_let(:overview) { create :overview, project: }
+
+  let(:overview_page) { Pages::Projects::Show.new(project) }
+
+  current_user { admin }
+
+  before do
+    overview_page.visit_page
+  end
+
+  describe "with the dialog open" do
+    context "when all LifeCycleSteps are blank" do
+      before do
+        Project::LifeCycleStep.update_all(start_date: nil, end_date: nil)
+      end
+
+      it "shows all the Project::LifeCycleSteps without a value" do
+        dialog = overview_page.open_edit_dialog_for_life_cycles
+
+        dialog.expect_input("Initiating", value: "", type: :stage, position: 1)
+        dialog.expect_input("Ready for Planning", value: "", type: :gate, position: 2)
+        dialog.expect_input("Planning", value: "", type: :stage, position: 3)
+        dialog.expect_input("Ready for Executing", value: "", type: :gate, position: 4)
+        dialog.expect_input("Executing", value: "", type: :stage, position: 5)
+        dialog.expect_input("Ready for Closing", value: "", type: :gate, position: 6)
+        dialog.expect_input("Closing", value: "", type: :stage, position: 7)
+
+        # Saving the dialog is successful
+        dialog.submit
+        dialog.expect_closed
+
+        # Sidebar displays the same empty values
+        project_life_cycles.each do |life_cycle|
+          overview_page.within_life_cycle_container(life_cycle) do
+            expect(page).to have_text "-"
+          end
+        end
+      end
+    end
+
+    context "when all LifeCycleSteps have a value" do
+      it "shows all the Project::LifeCycleSteps and updates them correctly" do
+        dialog = overview_page.open_edit_dialog_for_life_cycles
+
+        expect_angular_frontend_initialized
+
+        project.available_life_cycle_steps.each do |step|
+          dialog.expect_input_for(step)
+        end
+
+        initiating_dates = [start_date - 1.week, start_date]
+
+        retry_block do
+          # Retrying due to a race condition between filling the input vs submitting the form preview.
+          original_dates = [life_cycle_initiating.start_date, life_cycle_initiating.end_date]
+          dialog.set_date_for(life_cycle_initiating, value: original_dates)
+
+          page.driver.clear_network_traffic
+          dialog.set_date_for(life_cycle_initiating, value: initiating_dates)
+
+          dialog.expect_caption(life_cycle_initiating, text: "Duration: 8 working days")
+          # Ensure that only 1 ajax request is triggered after setting the date range.
+          expect(page.driver.browser.network.traffic.size).to eq(1)
+        end
+
+        ready_for_planning_date = start_date + 1.day
+        dialog.set_date_for(life_cycle_ready_for_planning, value: ready_for_planning_date)
+        dialog.expect_no_caption(life_cycle_ready_for_planning)
+
+        # Saving the dialog is successful
+        dialog.submit
+        dialog.expect_closed
+
+        # Sidebar is refreshed with the updated values
+        expected_date_range = initiating_dates.map { |date| date.strftime("%m/%d/%Y") }.join(" - ")
+        overview_page.within_life_cycle_container(life_cycle_initiating) do
+          expect(page).to have_text expected_date_range
+        end
+
+        overview_page.within_life_cycle_container(life_cycle_ready_for_planning) do
+          expect(page).to have_text ready_for_planning_date.strftime("%m/%d/%Y")
+        end
+      end
+
+      it "shows the validation errors" do
+        expect_angular_frontend_initialized
+        wait_for_network_idle
+
+        dialog = overview_page.open_edit_dialog_for_life_cycles
+
+        expected_text = "Date can't be earlier than the previous Stage's end date."
+
+        # Cycling is required so we always select a different date on the datepicker,
+        # making sure the change event is triggered.
+        cycled_days = [0, 1].cycle
+
+        # Retrying due to a race condition between filling the input vs submitting the form preview.
+        retry_block do
+          value = start_date + cycled_days.next.days
+          dialog.set_date_for(life_cycle_ready_for_planning, value:)
+
+          dialog.expect_validation_message(life_cycle_ready_for_planning, text: expected_text)
+        end
+
+        # Saving the dialog fails
+        dialog.submit
+        dialog.expect_open
+
+        # The validation message is kept after the unsuccessful save attempt
+        dialog.expect_validation_message(life_cycle_ready_for_planning, text: expected_text)
+
+        retry_block do
+          # The validation message is cleared when date is changed
+          value = start_date + 2.days + cycled_days.next.days
+          dialog.set_date_for(life_cycle_ready_for_planning, value:)
+          dialog.expect_no_validation_message(life_cycle_ready_for_planning)
+        end
+
+        # Saving the dialog is successful
+        dialog.submit
+        dialog.expect_closed
+      end
+    end
+  end
+end
diff --git a/spec/features/projects/life_cycle/overview_page/shared_context.rb b/spec/features/projects/life_cycle/overview_page/shared_context.rb
new file mode 100644
index 000000000000..67c480b13f80
--- /dev/null
+++ b/spec/features/projects/life_cycle/overview_page/shared_context.rb
@@ -0,0 +1,116 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+RSpec.shared_context "with seeded projects and stages and gates" do
+  shared_let(:project) { create(:project, name: "Foo project", identifier: "foo-project") }
+  shared_let(:standard) { create(:standard_global_role) }
+  shared_let(:admin) { create(:admin) }
+
+  shared_let(:life_cycle_initiating_definition) do
+    create :project_stage_definition, name: "Initiating"
+  end
+  shared_let(:life_cycle_ready_for_planning_definition) do
+    create :project_gate_definition, name: "Ready for Planning"
+  end
+  shared_let(:life_cycle_planning_definition) do
+    create :project_stage_definition, name: "Planning"
+  end
+  shared_let(:life_cycle_ready_for_executing_definition) do
+    create :project_gate_definition, name: "Ready for Executing"
+  end
+  shared_let(:life_cycle_executing_definition) do
+    create :project_stage_definition, name: "Executing"
+  end
+  shared_let(:life_cycle_ready_for_closing_definition) do
+    create :project_gate_definition, name: "Ready for Closing"
+  end
+  shared_let(:life_cycle_closing_definition) do
+    create :project_stage_definition, name: "Closing"
+  end
+
+  let(:start_date) { Time.zone.today.next_week }
+
+  let(:life_cycle_initiating) do
+    create :project_stage,
+           definition: life_cycle_initiating_definition,
+           start_date:,
+           end_date: start_date + 1.day,
+           project:
+  end
+  let(:life_cycle_ready_for_planning) do
+    create :project_gate,
+           definition: life_cycle_ready_for_planning_definition,
+           date: start_date + 2.days,
+           project:
+  end
+  let(:life_cycle_planning) do
+    create :project_stage,
+           definition: life_cycle_planning_definition,
+           start_date: start_date + 4.days,
+           end_date: start_date + 7.days,
+           project:
+  end
+  let(:life_cycle_ready_for_executing) do
+    create :project_gate,
+           definition: life_cycle_ready_for_executing_definition,
+           date: start_date + 8.days,
+           project:
+  end
+  let(:life_cycle_executing) do
+    create :project_stage,
+           definition: life_cycle_executing_definition,
+           start_date: start_date + 9.days,
+           end_date: start_date + 10.days,
+           project:
+  end
+  let(:life_cycle_ready_for_closing) do
+    create :project_gate,
+           definition: life_cycle_ready_for_closing_definition,
+           date: start_date + 11.days,
+           project:
+  end
+  let(:life_cycle_closing) do
+    create :project_stage,
+           definition: life_cycle_closing_definition,
+           start_date: start_date + 14.days,
+           end_date: start_date + 18.days,
+           project:
+  end
+
+  let!(:project_life_cycles) do
+    [
+      life_cycle_initiating,
+      life_cycle_ready_for_planning,
+      life_cycle_planning,
+      life_cycle_ready_for_executing,
+      life_cycle_executing,
+      life_cycle_ready_for_closing,
+      life_cycle_closing
+    ]
+  end
+end
diff --git a/spec/features/projects/life_cycle/overview_page/sidebar_spec.rb b/spec/features/projects/life_cycle/overview_page/sidebar_spec.rb
new file mode 100644
index 000000000000..66298f4b1c4a
--- /dev/null
+++ b/spec/features/projects/life_cycle/overview_page/sidebar_spec.rb
@@ -0,0 +1,151 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+require_relative "shared_context"
+
+RSpec.describe "Show project life cycles on project overview page", :js, :with_cuprite, with_flag: { stages_and_gates: true } do
+  include_context "with seeded projects and stages and gates"
+
+  let(:overview_page) { Pages::Projects::Show.new(project) }
+
+  current_user { admin }
+
+  it "does show the sidebar" do
+    overview_page.visit_page
+    overview_page.expect_visible_sidebar
+  end
+
+  context "when stages and gates are disabled", with_flag: { stages_and_gates: false } do
+    it "does not show the sidebar" do
+      overview_page.visit_page
+      overview_page.expect_no_visible_sidebar
+    end
+  end
+
+  context "when all stages and gates are disabled for this project" do
+    before do
+      project_life_cycles.each { |p| p.toggle!(:active) }
+    end
+
+    it "does not show the sidebar" do
+      overview_page.visit_page
+      overview_page.expect_no_visible_sidebar
+    end
+  end
+
+  describe "with correct order and scoping" do
+    it "shows the project stages and gates in the correct order" do
+      overview_page.visit_page
+
+      overview_page.within_life_cycles_sidebar do
+        expected_stages = [
+          "Initiating",
+          "Ready for Planning",
+          "Planning",
+          "Ready for Executing",
+          "Executing",
+          "Ready for Closing",
+          "Closing"
+        ]
+        fields = page.all(".op-project-life-cycle-container > div:first-child")
+        expect(fields.map(&:text)).to eq(expected_stages)
+      end
+
+      life_cycle_ready_for_executing_definition.move_to_bottom
+
+      overview_page.visit_page
+
+      overview_page.within_life_cycles_sidebar do
+        expected_stages = [
+          "Initiating",
+          "Ready for Planning",
+          "Planning",
+          "Executing",
+          "Ready for Closing",
+          "Closing",
+          "Ready for Executing"
+        ]
+        fields = page.all(".op-project-life-cycle-container > div:first-child")
+        expect(fields.map(&:text)).to eq(expected_stages)
+      end
+    end
+
+    it "does not show stages and gates not enabled for this project in a sidebar" do
+      life_cycle_ready_for_executing.toggle!(:active)
+
+      overview_page.visit_page
+
+      overview_page.within_life_cycles_sidebar do
+        expect(page).to have_no_text life_cycle_ready_for_executing.name
+      end
+    end
+  end
+
+  describe "with correct values" do
+    describe "with values set" do
+      it "shows the correct value for the project custom field if given" do
+        overview_page.visit_page
+
+        overview_page.within_life_cycles_sidebar do
+          project_life_cycles.each do |life_cycle|
+            overview_page.within_life_cycle_container(life_cycle) do
+              expected_date = if life_cycle.is_a? Project::Stage
+                                [
+                                  life_cycle.start_date.strftime("%m/%d/%Y"),
+                                  life_cycle.end_date.strftime("%m/%d/%Y")
+                                ].join(" - ")
+                              else
+                                life_cycle.start_date.strftime("%m/%d/%Y")
+                              end
+              expect(page).to have_text expected_date
+            end
+          end
+        end
+      end
+    end
+
+    describe "with no values" do
+      before do
+        Project::LifeCycleStep.update_all(start_date: nil, end_date: nil)
+      end
+
+      it "shows the correct value for the project custom field if given" do
+        overview_page.visit_page
+
+        overview_page.within_life_cycles_sidebar do
+          project_life_cycles.each do |life_cycle|
+            overview_page.within_life_cycle_container(life_cycle) do
+              expect(page).to have_text I18n.t("placeholders.default")
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/features/projects/lists/columns_spec.rb b/spec/features/projects/lists/columns_spec.rb
new file mode 100644
index 000000000000..2ec010d36b1d
--- /dev/null
+++ b/spec/features/projects/lists/columns_spec.rb
@@ -0,0 +1,402 @@
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2010-2024 the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+# ++
+
+require "spec_helper"
+
+RSpec.describe "Projects lists columns", :js, :with_cuprite, with_settings: { login_required?: false } do
+  shared_let(:admin) { create(:admin) }
+
+  shared_let(:manager)   { create(:project_role, name: "Manager") }
+  shared_let(:developer) { create(:project_role, name: "Developer") }
+
+  shared_let(:custom_field) { create(:text_project_custom_field) }
+  shared_let(:invisible_custom_field) { create(:project_custom_field, admin_only: true) }
+
+  shared_let(:project) { create(:project, name: "Plain project", identifier: "plain-project") }
+  shared_let(:public_project) do
+    create(:project, name: "Public Pr", identifier: "public-pr", public: true) do |project|
+      project.custom_field_values = { invisible_custom_field.id => "Secret CF" }
+    end
+  end
+  shared_let(:development_project) { create(:project, name: "Development project", identifier: "development-project") }
+
+  let(:news) { create(:news, project:) }
+  let(:projects_page) { Pages::Projects::Index.new }
+
+  include ProjectStatusHelper
+
+  describe "column selection", with_settings: { enabled_projects_columns: %w[name created_at] } do
+    # Will still receive the :view_project permission
+    shared_let(:user) do
+      create(:user, member_with_permissions: { project => %i(view_project_attributes),
+                                               development_project => %i(view_project_attributes) })
+    end
+
+    shared_let(:integer_custom_field) { create(:integer_project_custom_field) }
+
+    shared_let(:non_member) { create(:non_member, permissions: %i(view_project_attributes)) }
+
+    current_user { user }
+
+    before do
+      public_project.custom_field_values = { integer_custom_field.id => 1 }
+      public_project.save!
+      project.custom_field_values = { integer_custom_field.id => 2 }
+      project.save!
+      development_project.custom_field_values = { integer_custom_field.id => 3 }
+      development_project.save!
+
+      public_project.on_track!
+      project.off_track!
+      development_project.at_risk!
+    end
+
+    it "allows to select columns to be displayed" do
+      projects_page.visit!
+
+      projects_page.set_columns("Name", "Status", integer_custom_field.name)
+
+      projects_page.expect_no_columns("Public", "Description", "Project status description")
+
+      projects_page.within_row(project) do
+        expect(page)
+          .to have_css(".name", text: project.name)
+        expect(page)
+          .to have_css(".cf_#{integer_custom_field.id}", text: 2)
+        expect(page)
+          .to have_css(".project_status", text: "OFF TRACK")
+        expect(page)
+          .to have_no_css(".created_at ")
+      end
+
+      projects_page.within_row(public_project) do
+        expect(page)
+          .to have_css(".name", text: public_project.name)
+        expect(page)
+          .to have_css(".cf_#{integer_custom_field.id}", text: 1)
+        expect(page)
+          .to have_css(".project_status", text: "ON TRACK")
+        expect(page)
+          .to have_no_css(".created_at ")
+      end
+
+      projects_page.within_row(development_project) do
+        expect(page)
+          .to have_css(".name", text: development_project.name)
+        expect(page)
+          .to have_css(".cf_#{integer_custom_field.id}", text: 3)
+        expect(page)
+          .to have_css(".project_status", text: "AT RISK")
+        expect(page)
+          .to have_no_css(".created_at ")
+      end
+    end
+  end
+
+  context "when using the action menu", with_settings: { enabled_projects_columns: %w[created_at name project_status] } do
+    before do
+      login_as(admin)
+      visit projects_path
+    end
+
+    describe "moving a column" do
+      it "moves the selected column one place to the left and right" do
+        projects_page.expect_columns_in_order("Created on", "Name", "Status")
+
+        # Move "Name" column to the left
+        projects_page.click_table_header_to_open_action_menu("Name")
+        projects_page.move_column_via_action_menu("Name", direction: :left)
+        wait_for_reload
+
+        # Name was moved left?
+        projects_page.expect_columns_in_order("Name", "Created on", "Status")
+
+        # Now move it back to the right once
+        projects_page.click_table_header_to_open_action_menu("Name")
+        projects_page.move_column_via_action_menu("Name", direction: :right)
+        wait_for_reload
+
+        # Original position should have been restored
+        projects_page.expect_columns_in_order("Created on", "Name", "Status")
+
+        # Looking at the leftmost column
+        projects_page.click_table_header_to_open_action_menu("created_at")
+        projects_page.within("#menu-created_at-overlay") do
+          # It should allow us to move the column right
+          expect(page)
+            .to have_css("a[data-test-selector='created_at-move-col-right']", text: I18n.t(:label_move_column_right))
+
+          # It should not allow us to move the column further left
+          expect(page)
+            .to have_no_css("a[data-test-selector='created_at-move-col-left']", text: I18n.t(:label_move_column_left))
+        end
+
+        # Looking at the rightmost column
+        projects_page.click_table_header_to_open_action_menu("project_status")
+        projects_page.within("#menu-project_status-overlay") do
+          # It should allow us to move the column further left
+          expect(page)
+            .to have_css("a[data-test-selector='project_status-move-col-left']", text: I18n.t(:label_move_column_left))
+
+          # It should not allow us to move the column right
+          expect(page)
+            .to have_no_css("a[data-test-selector='project_status-move-col-right']", text: I18n.t(:label_move_column_right))
+        end
+      end
+    end
+
+    describe "sorting a column",
+             with_settings: { enabled_projects_columns: %w[created_at name project_status description] } do
+      it "does not offer the sorting options for columns that are not sortable" do
+        projects_page.expect_columns_in_order("Created on", "Name", "Status", "Description")
+
+        projects_page.click_table_header_to_open_action_menu("Description")
+        projects_page.expect_no_sorting_option_in_action_menu("Description")
+      end
+    end
+
+    describe "removing a column" do
+      it "removes the column from the table view" do
+        projects_page.expect_columns_in_order("Created on", "Name", "Status")
+
+        # Remove "Name" column
+        projects_page.click_table_header_to_open_action_menu("Name")
+        projects_page.remove_column_via_action_menu("Name")
+        wait_for_reload
+
+        # Name was removed
+        projects_page.expect_columns_in_order("Created on", "Status")
+
+        # Remove "Status" column, too
+        projects_page.click_table_header_to_open_action_menu("project_status")
+        projects_page.remove_column_via_action_menu("project_status")
+        wait_for_reload
+
+        # It was removed
+        projects_page.expect_columns_in_order("Created on")
+      end
+    end
+
+    describe "adding a column" do
+      it "opens the configure view dialog" do
+        projects_page.click_table_header_to_open_action_menu("Name")
+        projects_page.click_add_column_in_action_menu("Name")
+
+        # Configure view dialog was opened
+        expect(page).to have_css("#op-project-list-configure-dialog")
+      end
+    end
+
+    describe "filtering by column",
+             with_settings: { enabled_projects_columns: %w[created_at identifier project_status] } do
+      it "adds the filter for a selected column" do
+        projects_page.click_table_header_to_open_action_menu("created_at")
+        projects_page.expect_filter_option_in_action_menu("created_at")
+        projects_page.filter_by_column_via_action_menu("created_at")
+
+        # Filter component is visible
+        expect(page).to have_select("add_filter_select")
+        # Filter for column is visible and can now be specified by the user
+        expect(page).to have_css(".advanced-filters--filter-name[for='created_at']")
+
+        # The correct filter input field has focus
+        expect(page.has_focus_on?(".advanced-filters--filter-value input#created_at_value")).to be(true)
+      end
+
+      it "adds the filter for a selected column that has a different filter mapped to its column" do
+        projects_page.click_table_header_to_open_action_menu("project_status")
+        projects_page.expect_filter_option_in_action_menu("project_status")
+        projects_page.filter_by_column_via_action_menu("project_status")
+
+        # Filter component is visible
+        expect(page).to have_select("add_filter_select")
+        # Filter for column is visible. Note that the filter name is different from the column attribute!
+        expect(page).to have_css(".advanced-filters--filter-name[for='project_status_code']")
+      end
+
+      it "does not offer to filter if the column has no associated filter" do
+        # There is no filter mapping for the identifier column: we should not get the option to filter by it
+        projects_page.click_table_header_to_open_action_menu("identifier")
+        projects_page.expect_no_filter_option_in_action_menu("identifier")
+
+        # Filters have not been activated and are therefore not visible
+        expect(page).to have_no_select("add_filter_select")
+      end
+    end
+  end
+
+  context "with life cycle columns" do
+    shared_let(:life_cycle_gate) { create(:project_gate, project:, date: Date.new(2024, 12, 13)) }
+    shared_let(:life_cycle_stage) do
+      create(:project_stage,
+             project: development_project,
+             start_date: Date.new(2024, 12, 1),
+             end_date: Date.new(2024, 12, 13))
+    end
+    shared_let(:inactive_life_cycle_gate) { create(:project_gate, project:, active: false) }
+    shared_let(:inactive_life_cycle_stage) { create(:project_stage, project: development_project, active: false) }
+
+    context "with the feature flag disabled", with_flag: { stages_and_gates: false } do
+      specify "life cycle columns cannot be configured to show up" do
+        login_as(admin)
+        projects_page.visit!
+
+        element_selector = "#columns-select_autocompleter ng-select.op-draggable-autocomplete--input"
+        results_selector = "#columns-select_autocompleter ng-dropdown-panel .ng-dropdown-panel-items"
+        projects_page.expect_no_config_columns(life_cycle_gate.name,
+                                               life_cycle_stage.name,
+                                               inactive_life_cycle_gate.name,
+                                               inactive_life_cycle_stage.name,
+                                               element_selector:,
+                                               results_selector:)
+      end
+    end
+
+    context "with the feature flag enabled", with_flag: { stages_and_gates: true } do
+      context "with an admin" do
+        before do
+          login_as(admin)
+          projects_page.visit!
+        end
+
+        specify "configuring life cycle column display" do
+          # life cycle columns do not show up by default
+          expect(page).to have_no_text(life_cycle_gate.name.upcase)
+          expect(page).to have_no_text(life_cycle_stage.name.upcase)
+          expect(page).to have_no_text(inactive_life_cycle_gate.name.upcase)
+          expect(page).to have_no_text(inactive_life_cycle_stage.name.upcase)
+
+          # life cycle columns show up when configured to do so
+          projects_page.expect_columns("Name")
+          projects_page.set_columns(life_cycle_gate.name)
+
+          expect(page).to have_text(life_cycle_gate.name.upcase)
+        end
+
+        specify "inactive life cycle columns have no cell content" do
+          col_names = [life_cycle_gate, life_cycle_stage,
+                       inactive_life_cycle_gate,
+                       inactive_life_cycle_stage].collect(&:name)
+
+          projects_page.set_columns(*col_names)
+          # Inactive columns are still displayed in the header:
+          projects_page.expect_columns("Name", *col_names)
+
+          gate_project = life_cycle_gate.project
+          projects_page.within_row(gate_project) do
+            expect(page).to have_css(".name", text: gate_project.name)
+            expect(page).to have_css(".lcsd_#{life_cycle_gate.definition_id}", text: "12/13/2024")
+            # life cycle assigned to other project, no text here
+            expect(page).to have_css(".lcsd_#{life_cycle_stage.definition_id}", text: "")
+            # inactive life cycles, no text here
+            expect(page).to have_css(".lcsd_#{inactive_life_cycle_stage.definition_id}", text: "")
+            expect(page).to have_css(".lcsd_#{inactive_life_cycle_gate.definition_id}", text: "")
+          end
+
+          stage_project = life_cycle_stage.project
+          projects_page.within_row(stage_project) do
+            expect(page).to have_css(".name", text: stage_project.name)
+            expect(page).to have_css(".lcsd_#{life_cycle_stage.definition_id}", text: "12/01/2024 - 12/13/2024")
+            # life cycle assigned to other project, no text here
+            expect(page).to have_css(".lcsd_#{life_cycle_gate.definition_id}", text: "")
+          end
+
+          # Inactive life cycle steps never show their date values
+          other_proj = inactive_life_cycle_stage.project
+          projects_page.within_row(other_proj) do
+            expect(page).to have_css(".lcsd_#{inactive_life_cycle_stage.definition_id}", text: "")
+          end
+        end
+      end
+
+      context "with a user" do
+        let(:permissions) { %i(view_project) }
+        let(:user) do
+          create(:user, member_with_permissions: { project => permissions,
+                                                   development_project => %i(view_project) })
+        end
+
+        before do
+          login_as(user)
+          projects_page.visit!
+        end
+
+        context "for users without view_project_stages_and_gates permission" do
+          specify "life cycle columns cannot be configured to show up" do
+            element_selector = "#columns-select_autocompleter ng-select.op-draggable-autocomplete--input"
+            results_selector = "#columns-select_autocompleter ng-dropdown-panel .ng-dropdown-panel-items"
+            projects_page.expect_no_config_columns(life_cycle_gate.name,
+                                                   life_cycle_stage.name,
+                                                   inactive_life_cycle_gate.name,
+                                                   inactive_life_cycle_stage.name,
+                                                   element_selector:,
+                                                   results_selector:)
+          end
+        end
+
+        context "for users with view_project_stages_and_gates permission" do
+          let(:permissions) { %i(view_project view_project_stages_and_gates) }
+
+          specify "life cycle columns show up when configured to do so" do
+            projects_page.expect_columns("Name")
+            projects_page.set_columns(life_cycle_gate.name)
+
+            expect(page).to have_text(life_cycle_gate.name.upcase)
+          end
+
+          specify "not permitted life cycle columns have no cell content" do
+            col_names = [life_cycle_gate, life_cycle_stage,
+                         inactive_life_cycle_gate,
+                         inactive_life_cycle_stage].collect(&:name)
+
+            projects_page.set_columns(*col_names)
+            # Inactive columns are still displayed in the header:
+            projects_page.expect_columns("Name", *col_names)
+
+            permitted_project = project
+            projects_page.within_row(permitted_project) do
+              expect(page).to have_css(".name", text: permitted_project.name)
+              expect(page).to have_css(".lcsd_#{life_cycle_gate.definition_id}", text: "12/13/2024")
+              # life cycle assigned to other project, no text here
+              expect(page).to have_css(".lcsd_#{life_cycle_stage.definition_id}", text: "")
+              # inactive life cycles, no text here
+              expect(page).to have_css(".lcsd_#{inactive_life_cycle_stage.definition_id}", text: "")
+              expect(page).to have_css(".lcsd_#{inactive_life_cycle_gate.definition_id}", text: "")
+            end
+
+            # Not permitted life cycle steps never show their date values
+            not_permitted_project = development_project
+            projects_page.within_row(not_permitted_project) do
+              expect(page).to have_css(".lcsd_#{life_cycle_stage.definition_id}", text: "")
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/features/projects/lists/filters_spec.rb b/spec/features/projects/lists/filters_spec.rb
new file mode 100644
index 000000000000..d1541573593f
--- /dev/null
+++ b/spec/features/projects/lists/filters_spec.rb
@@ -0,0 +1,635 @@
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2010-2024 the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+# ++
+
+require "spec_helper"
+
+RSpec.describe "Projects list filters", :js, :with_cuprite, with_settings: { login_required?: false } do
+  shared_let(:admin) { create(:admin) }
+
+  shared_let(:manager)   { create(:project_role, name: "Manager") }
+  shared_let(:developer) { create(:project_role, name: "Developer") }
+
+  shared_let(:custom_field) { create(:text_project_custom_field) }
+  shared_let(:invisible_custom_field) { create(:project_custom_field, admin_only: true) }
+
+  shared_let(:project) { create(:project, name: "Plain project", identifier: "plain-project") }
+  shared_let(:public_project) do
+    create(:project, name: "Public Pr", identifier: "public-pr", public: true) do |project|
+      project.custom_field_values = { invisible_custom_field.id => "Secret CF" }
+    end
+  end
+  shared_let(:development_project) { create(:project, name: "Development project", identifier: "development-project") }
+
+  let(:news) { create(:news, project:) }
+  let(:projects_page) { Pages::Projects::Index.new }
+
+  def load_and_open_filters(user)
+    login_as(user)
+    projects_page.visit!
+    projects_page.open_filters
+  end
+
+  context "with a filter set" do
+    it "only shows the matching projects and filters" do
+      load_and_open_filters admin
+
+      projects_page.filter_by_name_and_identifier("Plain")
+
+      # Filter is applied: Only the project that contains the the word "Plain" gets listed
+      projects_page.expect_projects_listed(project)
+      projects_page.expect_projects_not_listed(public_project)
+      # Filter form is visible and the filter is still set.
+      expect(page).to have_field("name_and_identifier", with: "Plain")
+    end
+  end
+
+  context "when filter of type" do
+    specify "Name and identifier gives results in both, name and identifier" do
+      load_and_open_filters admin
+
+      # Filter on model attribute 'name'
+      projects_page.filter_by_name_and_identifier("Plain")
+      wait_for_reload
+
+      projects_page.expect_projects_listed(project)
+      projects_page.expect_projects_not_listed(development_project, public_project)
+
+      projects_page.remove_filter("name_and_identifier")
+      projects_page.expect_projects_listed(project, development_project, public_project)
+
+      # Filter on model attribute 'name' triggered by keyboard input event instead of change
+      projects_page.filter_by_name_and_identifier("Plain", send_keys: true)
+      wait_for_reload
+
+      projects_page.expect_projects_listed(project)
+      projects_page.expect_projects_not_listed(development_project, public_project)
+
+      projects_page.remove_filter("name_and_identifier")
+      projects_page.expect_projects_listed(project, development_project, public_project)
+
+      # Filter on model attribute 'identifier'
+      projects_page.filter_by_name_and_identifier("plain-project")
+      wait_for_reload
+
+      projects_page.expect_projects_listed(project)
+      projects_page.expect_projects_not_listed(development_project, public_project)
+    end
+
+    describe "Active or archived" do
+      shared_let(:parent_project) do
+        create(:project,
+               name: "Parent project",
+               identifier: "parent-project")
+      end
+      shared_let(:child_project) do
+        create(:project,
+               name: "Child project",
+               identifier: "child-project",
+               parent: parent_project)
+      end
+
+      specify 'filter on "status", archive and unarchive' do
+        load_and_open_filters admin
+
+        # value selection defaults to "active"'
+        expect(page).to have_css('li[data-filter-name="active"]')
+
+        projects_page.expect_projects_listed(parent_project,
+                                             child_project,
+                                             project,
+                                             development_project,
+                                             public_project)
+
+        accept_alert do
+          projects_page.click_menu_item_of("Archive", parent_project)
+        end
+        wait_for_reload
+
+        projects_page.expect_projects_not_listed(parent_project,
+                                                 child_project) # The child project gets archived automatically
+
+        projects_page.expect_projects_listed(project, development_project, public_project)
+
+        visit project_overview_path(parent_project)
+        expect(page).to have_text("The project you're trying to access has been archived.")
+
+        # The child project gets archived automatically
+        visit project_overview_path(child_project)
+        expect(page).to have_text("The project you're trying to access has been archived.")
+
+        load_and_open_filters admin
+
+        projects_page.filter_by_active("no")
+
+        projects_page.expect_projects_listed(parent_project, child_project, archived: true)
+
+        # Test visibility of 'more' menu list items
+        projects_page.activate_menu_of(parent_project) do |menu|
+          expect(menu).to have_text("Add to favorites")
+          expect(menu).to have_text("Unarchive")
+          expect(menu).to have_text("Delete")
+          expect(menu).to have_no_text("Archive")
+          expect(menu).to have_no_text("Copy")
+          expect(menu).to have_no_text("Settings")
+          expect(menu).to have_no_text("New subproject")
+
+          click_link_or_button("Unarchive")
+        end
+
+        # The child project does not get unarchived automatically
+        visit project_path(child_project)
+        expect(page).to have_text("The project you're trying to access has been archived.")
+
+        visit project_path(parent_project)
+        expect(page).to have_text(parent_project.name)
+
+        load_and_open_filters admin
+
+        projects_page.filter_by_active("yes")
+
+        projects_page.expect_projects_listed(parent_project,
+                                             project,
+                                             development_project,
+                                             public_project)
+        projects_page.expect_projects_not_listed(child_project)
+      end
+    end
+
+    describe "I am member or not" do
+      shared_let(:member) { create(:user, member_with_permissions: { project => %i[view_work_packages edit_work_packages] }) }
+
+      it "filters for projects I'm a member on and those where I'm not" do
+        ProjectRole.non_member
+        load_and_open_filters member
+
+        projects_page.expect_projects_listed(project, public_project)
+
+        projects_page.filter_by_membership("yes")
+        wait_for_reload
+
+        projects_page.expect_projects_listed(project)
+        projects_page.expect_projects_not_listed(public_project, development_project)
+
+        projects_page.filter_by_membership("no")
+        wait_for_reload
+
+        projects_page.expect_projects_listed(public_project)
+        projects_page.expect_projects_not_listed(project, development_project)
+      end
+    end
+
+    describe "project status filter" do
+      shared_let(:no_status_project) do
+        # A project that doesn't have a status code set
+        create(:project,
+               name: "No status project")
+      end
+
+      shared_let(:green_project) do
+        # A project that has a status code set
+        create(:project,
+               status_code: "on_track",
+               name: "Green project")
+      end
+
+      it "sorts and filters on project status" do
+        login_as(admin)
+        projects_page.visit!
+
+        projects_page.click_table_header_to_open_action_menu("project_status")
+        projects_page.sort_via_action_menu("project_status", direction: :asc)
+
+        projects_page.expect_project_at_place(green_project, 1)
+        expect(page).to have_text("(1 - 5/5)")
+
+        projects_page.click_table_header_to_open_action_menu("project_status")
+        projects_page.sort_via_action_menu("project_status", direction: :desc)
+
+        projects_page.expect_project_at_place(green_project, 5)
+        expect(page).to have_text("(1 - 5/5)")
+
+        projects_page.open_filters
+
+        projects_page.set_filter("project_status_code",
+                                 "Project status",
+                                 "is (OR)",
+                                 ["On track"])
+        wait_for_reload
+
+        expect(page).to have_text(green_project.name)
+        expect(page).to have_no_text(no_status_project.name)
+
+        projects_page.set_filter("project_status_code",
+                                 "Project status",
+                                 "is not empty",
+                                 [])
+        wait_for_reload
+
+        expect(page).to have_text(green_project.name)
+        expect(page).to have_no_text(no_status_project.name)
+
+        projects_page.set_filter("project_status_code",
+                                 "Project status",
+                                 "is empty",
+                                 [])
+        wait_for_reload
+
+        expect(page).to have_no_text(green_project.name)
+        expect(page).to have_text(no_status_project.name)
+
+        projects_page.set_filter("project_status_code",
+                                 "Project status",
+                                 "is not",
+                                 ["On track"])
+        wait_for_reload
+
+        expect(page).to have_no_text(green_project.name)
+        expect(page).to have_text(no_status_project.name)
+      end
+    end
+
+    describe "other filter types" do
+      context "for admins" do
+        shared_let(:list_custom_field) { create(:list_project_custom_field) }
+        shared_let(:date_custom_field) { create(:date_project_custom_field) }
+        shared_let(:datetime_of_this_week) do
+          today = Date.current
+          # Ensure that the date is not today but still in the middle of the week to not run into week-start-issues here.
+          date_of_this_week = today + ((today.wday % 7) > 2 ? -1 : 1)
+          DateTime.parse("#{date_of_this_week}T11:11:11+00:00")
+        end
+        shared_let(:fixed_datetime) { DateTime.parse("2017-11-11T11:11:11+00:00") }
+
+        shared_let(:project_created_on_today) do
+          freeze_time
+          project = create(:project,
+                           name: "Created today project")
+          project.custom_field_values = { list_custom_field.id => list_custom_field.possible_values[2],
+                                          date_custom_field.id => "2011-11-11" }
+          project.save!
+          project
+        ensure
+          travel_back
+        end
+        shared_let(:project_created_on_this_week) do
+          travel_to(datetime_of_this_week)
+          create(:project,
+                 name: "Created on this week project")
+        ensure
+          travel_back
+        end
+        shared_let(:project_created_on_six_days_ago) do
+          travel_to(DateTime.now - 6.days)
+          create(:project,
+                 name: "Created on six days ago project")
+        ensure
+          travel_back
+        end
+        shared_let(:project_created_on_fixed_date) do
+          travel_to(fixed_datetime)
+          create(:project,
+                 name: "Created on fixed date project")
+        ensure
+          travel_back
+        end
+        shared_let(:todays_wp) do
+          # This WP should trigger a change to the project's 'latest activity at' DateTime
+          create(:work_package,
+                 updated_at: DateTime.now,
+                 project: project_created_on_today)
+        end
+
+        before do
+          project_created_on_today
+          load_and_open_filters admin
+        end
+
+        specify "selecting operator" do
+          # created on 'today' shows projects that were created today
+          projects_page.set_filter("created_at",
+                                   "Created on",
+                                   "today")
+          wait_for_reload
+          expect(page).to have_no_text(project_created_on_this_week.name)
+          expect(page).to have_text(project_created_on_today.name)
+          expect(page).to have_no_text(project_created_on_fixed_date.name)
+
+          # created on 'this week' shows projects that were created within the last seven days
+          projects_page.remove_filter("created_at")
+
+          projects_page.set_filter("created_at",
+                                   "Created on",
+                                   "this week")
+          wait_for_reload
+
+          expect(page).to have_no_text(project_created_on_fixed_date.name)
+          expect(page).to have_text(project_created_on_today.name)
+          expect(page).to have_text(project_created_on_this_week.name)
+
+          # created on 'on' shows projects that were created within the last seven days
+          projects_page.remove_filter("created_at")
+
+          projects_page.set_filter("created_at",
+                                   "Created on",
+                                   "on",
+                                   ["2017-11-11"])
+          wait_for_reload
+
+          expect(page).to have_text(project_created_on_fixed_date.name)
+          expect(page).to have_no_text(project_created_on_today.name)
+          expect(page).to have_no_text(project_created_on_this_week.name)
+
+          # created on 'less than days ago'
+          projects_page.remove_filter("created_at")
+
+          projects_page.set_filter("created_at",
+                                   "Created on",
+                                   "less than days ago",
+                                   ["1"])
+          wait_for_reload
+
+          expect(page).to have_text(project_created_on_today.name)
+          expect(page).to have_no_text(project_created_on_fixed_date.name)
+
+          # created on 'less than days ago' triggered by an input event
+          projects_page.remove_filter("created_at")
+          projects_page.set_filter("created_at",
+                                   "Created on",
+                                   "less than days ago",
+                                   ["1"],
+                                   send_keys: true)
+          wait_for_reload
+
+          expect(page).to have_text(project_created_on_today.name)
+          expect(page).to have_no_text(project_created_on_fixed_date.name)
+
+          # created on 'more than days ago'
+          projects_page.remove_filter("created_at")
+
+          projects_page.set_filter("created_at",
+                                   "Created on",
+                                   "more than days ago",
+                                   ["1"])
+          wait_for_reload
+
+          expect(page).to have_text(project_created_on_fixed_date.name)
+          expect(page).to have_no_text(project_created_on_today.name)
+
+          # created on 'more than days ago'
+          projects_page.remove_filter("created_at")
+
+          projects_page.set_filter("created_at",
+                                   "Created on",
+                                   "more than days ago",
+                                   ["1"],
+                                   send_keys: true)
+          wait_for_reload
+
+          expect(page).to have_text(project_created_on_fixed_date.name)
+          expect(page).to have_no_text(project_created_on_today.name)
+
+          # created on 'between'
+          projects_page.remove_filter("created_at")
+
+          projects_page.set_filter("created_at",
+                                   "Created on",
+                                   "between",
+                                   ["2017-11-10", "2017-11-12"])
+          wait_for_reload
+
+          expect(page).to have_text(project_created_on_fixed_date.name)
+          expect(page).to have_no_text(project_created_on_today.name)
+
+          # Latest activity at 'today'. This spot check would fail if the data does not get collected from multiple tables
+          projects_page.remove_filter("created_at")
+
+          projects_page.set_filter("latest_activity_at",
+                                   "Latest activity at",
+                                   "today")
+          wait_for_reload
+
+          expect(page).to have_no_text(project_created_on_fixed_date.name)
+          expect(page).to have_text(project_created_on_today.name)
+
+          # CF List
+          projects_page.remove_filter("latest_activity_at")
+
+          projects_page.set_filter(list_custom_field.column_name,
+                                   list_custom_field.name,
+                                   "is (OR)",
+                                   [list_custom_field.possible_values[2].value])
+          wait_for_reload
+
+          expect(page).to have_no_text(project_created_on_fixed_date.name)
+          expect(page).to have_text(project_created_on_today.name)
+
+          # switching to multiselect keeps the current selection
+          cf_filter = page.find("li[data-filter-name='#{list_custom_field.column_name}']")
+
+          select_value_id = "#{list_custom_field.column_name}_value"
+
+          within(cf_filter) do
+            # Initial filter is a 'single select'
+            expect(cf_filter.find(:select, select_value_id)).not_to be_multiple
+            click_on "Toggle multiselect"
+            # switching to multiselect keeps the current selection
+            expect(cf_filter.find(:select, select_value_id)).to be_multiple
+            expect(cf_filter).to have_select(select_value_id, selected: list_custom_field.possible_values[2].value)
+
+            select list_custom_field.possible_values[3].value, from: select_value_id
+          end
+          wait_for_reload
+
+          cf_filter = page.find("li[data-filter-name='#{list_custom_field.column_name}']")
+          within(cf_filter) do
+            # Query has two values for that filter, so it should show a 'multi select'.
+            expect(cf_filter.find(:select, select_value_id)).to be_multiple
+            expect(cf_filter)
+              .to have_select(select_value_id,
+                              selected: [list_custom_field.possible_values[2].value,
+                                         list_custom_field.possible_values[3].value])
+
+            # switching to single select keeps the first selection
+            select list_custom_field.possible_values[1].value, from: select_value_id
+            unselect list_custom_field.possible_values[2].value, from: select_value_id
+
+            click_on "Toggle multiselect"
+            expect(cf_filter.find(:select, select_value_id)).not_to be_multiple
+            expect(cf_filter).to have_select(select_value_id, selected: list_custom_field.possible_values[1].value)
+            expect(cf_filter).to have_no_select(select_value_id, selected: list_custom_field.possible_values[3].value)
+          end
+          wait_for_reload
+
+          cf_filter = page.find("li[data-filter-name='#{list_custom_field.column_name}']")
+          within(cf_filter) do
+            # Query has one value for that filter, so it should show a 'single select'.
+            expect(cf_filter.find(:select, select_value_id)).not_to be_multiple
+          end
+
+          # CF date filter work (at least for one operator)
+          projects_page.remove_filter(list_custom_field.column_name)
+
+          projects_page.set_filter(date_custom_field.column_name,
+                                   date_custom_field.name,
+                                   "on",
+                                   ["2011-11-11"])
+          wait_for_reload
+
+          expect(page).to have_no_text(project_created_on_fixed_date.name)
+          expect(page).to have_text(project_created_on_today.name)
+
+          # Disabling a CF in the project should remove the project from results
+
+          project_created_on_today.project_custom_field_project_mappings.destroy_all
+
+          # refresh the page
+          page.driver.refresh
+          wait_for_reload
+
+          expect(page).to have_no_text(project_created_on_today.name)
+          expect(page).to have_no_text(project_created_on_fixed_date.name)
+        end
+      end
+
+      context "for non-admins" do
+        let(:user) do
+          create(:user,
+                 member_with_roles: {
+                   development_project => create(:existing_project_role, permissions:),
+                   project => create(:existing_project_role)
+                 })
+        end
+
+        let!(:list_custom_field) do
+          create(:list_project_custom_field,
+                 multi_value: true,
+                 possible_values: ["Option 1", "Option 2", "Option 3"]).tap do |cf|
+            development_project.update(custom_field_values: { cf.id => [cf.value_of("Option 1")] })
+            project.update(custom_field_values: { cf.id => [cf.value_of("Option 1")] })
+          end
+        end
+
+        context "with view_project_attributes permission" do
+          let(:permissions) { %i(view_project_attributes) }
+
+          it "can find projects filtered by the project attribute" do
+            load_and_open_filters user
+
+            projects_page.set_filter(list_custom_field.column_name,
+                                     list_custom_field.name,
+                                     "is (OR)",
+                                     ["Option 1"])
+
+            # Filter is applied: Only projects with view_project_attributes permission are returned
+            projects_page.expect_projects_listed(development_project)
+            projects_page.expect_projects_not_listed(project)
+            # Filter form is visible and the filter is still set.
+            expect(page).to have_css("li[data-filter-name=\"#{list_custom_field.column_name}\"]")
+          end
+        end
+      end
+    end
+
+    describe "public filter" do
+      it 'filters on "public" status' do
+        load_and_open_filters admin
+
+        projects_page.expect_projects_listed(project, public_project)
+
+        projects_page.filter_by_public("no")
+        wait_for_reload
+
+        projects_page.expect_projects_listed(project)
+        projects_page.expect_projects_not_listed(public_project)
+
+        load_and_open_filters admin
+
+        projects_page.filter_by_public("yes")
+        wait_for_reload
+
+        projects_page.expect_projects_listed(public_project)
+        projects_page.expect_projects_not_listed(project)
+      end
+    end
+
+    describe "user cf filter" do
+      let(:some_user) { create(:user, member_with_roles: { project => [developer] }) }
+      let!(:user_cf) do
+        create(:user_project_custom_field,
+               name: "A user CF",
+               projects: [project, development_project]).tap do |cf|
+          project.update(custom_field_values: { cf.id => [some_user.id] })
+        end
+      end
+
+      it "filters for the project that has the corresponding value" do
+        load_and_open_filters admin
+
+        projects_page.set_filter(user_cf.column_name, user_cf.name, "is (OR)", [some_user.name])
+
+        projects_page.expect_projects_listed(project)
+      end
+    end
+  end
+
+  describe "blocked filter" do
+    it "is not visible" do
+      load_and_open_filters admin
+
+      expect(page).to have_no_select("add_filter_select", with_options: ["Principal"])
+      expect(page).to have_no_select("add_filter_select", with_options: ["ID"])
+      expect(page).to have_no_select("add_filter_select", with_options: ["Subproject of"])
+    end
+  end
+
+  describe "calling the page with the API v3 style parameters",
+           with_settings: { enabled_projects_columns: %w[name created_at project_status] } do
+    let(:filters) do
+      JSON.dump([{ active: { operator: "=", values: ["t"] } },
+                 { name_and_identifier: { operator: "~", values: ["Plain"] } }])
+    end
+
+    current_user { admin }
+
+    it "applies the filters and displays the matching projects" do
+      visit "#{projects_page.path}?filters=#{filters}"
+
+      # Filters have the effect of filtering out projects
+      projects_page.expect_projects_listed(project)
+      projects_page.expect_projects_not_listed(public_project)
+
+      # Applies the filters to the filters section
+      projects_page.toggle_filters_section
+      projects_page.expect_filter_set "active"
+      projects_page.expect_filter_set "name_and_identifier"
+
+      # Columns are taken from the default set as defined by the setting
+      projects_page.expect_columns("Name", "Created on", "Status")
+    end
+  end
+end
diff --git a/spec/features/projects/projects_portfolio_spec.rb b/spec/features/projects/lists/gantt_spec.rb
similarity index 96%
rename from spec/features/projects/projects_portfolio_spec.rb
rename to spec/features/projects/lists/gantt_spec.rb
index 62ed2eeb5951..f3216e52d2a0 100644
--- a/spec/features/projects/projects_portfolio_spec.rb
+++ b/spec/features/projects/lists/gantt_spec.rb
@@ -1,6 +1,6 @@
-#-- copyright
+# -- copyright
 # OpenProject is an open source project management software.
-# Copyright (C) the OpenProject GmbH
+# Copyright (C) 2010-2024 the OpenProject GmbH
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License version 3.
@@ -24,11 +24,11 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 # See COPYRIGHT and LICENSE files for more details.
-#++
+# ++
 
 require "spec_helper"
 
-RSpec.describe "Projects index page", :js, :with_cuprite, with_settings: { login_required?: false } do
+RSpec.describe "Projects lists page with Gantt menu", :js, :with_cuprite, with_settings: { login_required?: false } do
   include Components::Autocompleter::NgSelectAutocompleteHelpers
 
   shared_let(:admin) { create(:admin) }
diff --git a/spec/features/projects/lists/order_spec.rb b/spec/features/projects/lists/order_spec.rb
new file mode 100644
index 000000000000..4ba136e8929c
--- /dev/null
+++ b/spec/features/projects/lists/order_spec.rb
@@ -0,0 +1,276 @@
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2010-2024 the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+# ++
+
+require "spec_helper"
+
+RSpec.describe "Projects lists ordering", :js, :with_cuprite, with_settings: { login_required?: false } do
+  shared_let(:admin) { create(:admin) }
+
+  shared_let(:manager)   { create(:project_role, name: "Manager") }
+  shared_let(:developer) { create(:project_role, name: "Developer") }
+
+  shared_let(:custom_field) { create(:text_project_custom_field) }
+  shared_let(:invisible_custom_field) { create(:project_custom_field, admin_only: true) }
+
+  shared_let(:project) { create(:project, name: "Plain project", identifier: "plain-project") }
+  shared_let(:public_project) do
+    create(:project, name: "Public Pr", identifier: "public-pr", public: true) do |project|
+      project.custom_field_values = { invisible_custom_field.id => "Secret CF" }
+    end
+  end
+  shared_let(:development_project) { create(:project, name: "Development project", identifier: "development-project") }
+
+  let(:projects_page) { Pages::Projects::Index.new }
+
+  shared_let(:integer_custom_field) { create(:integer_project_custom_field) }
+  # order is important here as the implementation uses lft
+  # first but then reorders in ruby
+  shared_let(:child_project_z) { create(:project, parent: project, name: "Z Child") }
+
+  # intentionally written lowercase to test for case insensitive sorting
+  shared_let(:child_project_m) { create(:project, parent: project, name: "m Child") }
+
+  shared_let(:child_project_a) { create(:project, parent: project, name: "A Child") }
+
+  before do
+    login_as(admin)
+    visit projects_path
+
+    project.custom_field_values = { integer_custom_field.id => 1 }
+    project.save!
+    development_project.custom_field_values = { integer_custom_field.id => 2 }
+    development_project.save!
+    public_project.custom_field_values = { integer_custom_field.id => 3 }
+    public_project.save!
+    child_project_z.custom_field_values = { integer_custom_field.id => 4 }
+    child_project_z.save!
+    child_project_m.custom_field_values = { integer_custom_field.id => 4 }
+    child_project_m.save!
+    child_project_a.custom_field_values = { integer_custom_field.id => 4 }
+    child_project_a.save!
+  end
+
+  context "via the configure view dialog" do
+    before do
+      Setting.enabled_projects_columns += [integer_custom_field.column_name]
+    end
+
+    it "allows to sort via multiple columns" do
+      projects_page.open_configure_view
+      projects_page.switch_configure_view_tab(I18n.t("label_sort"))
+
+      # Initially we have the projects ordered by hierarchy
+      # When we sort by hierarchy, there is a special behavior that no other sorting is possible
+      # and the sort order is always ascending
+      projects_page.within_sort_row(0) do
+        projects_page.expect_sort_order(column_identifier: "lft", direction: "asc", direction_enabled: false)
+      end
+      projects_page.expect_number_of_sort_fields(1)
+
+      # Switch sorting order to Name descending
+      # We now get a second sort field to add another sort order, but it has nothing selected
+      # in the second field, name is not available as an option
+      projects_page.within_sort_row(0) do
+        projects_page.change_sort_order(column_identifier: :name, direction: :desc)
+      end
+      projects_page.expect_number_of_sort_fields(2)
+
+      projects_page.within_sort_row(1) do
+        projects_page.expect_sort_order(column_identifier: "", direction: "")
+        projects_page.expect_sort_option_is_disabled(column_identifier: :name)
+      end
+
+      # Let's add another sorting, this time by a custom field
+      # This will add a third sorting field
+      projects_page.within_sort_row(1) do
+        projects_page.change_sort_order(column_identifier: integer_custom_field.column_name, direction: :asc)
+      end
+
+      projects_page.expect_number_of_sort_fields(3)
+      projects_page.within_sort_row(2) do
+        projects_page.expect_sort_order(column_identifier: "", direction: "")
+        projects_page.expect_sort_option_is_disabled(column_identifier: :name)
+        projects_page.expect_sort_option_is_disabled(column_identifier: integer_custom_field.column_name)
+      end
+
+      # And now let's select a third option
+      # it will not add a 4th sorting field
+      projects_page.within_sort_row(2) do
+        projects_page.change_sort_order(column_identifier: :public, direction: :asc)
+      end
+      projects_page.expect_number_of_sort_fields(3)
+
+      # We unset the first sorting, this will move the 2nd sorting (custom field) to the first position and
+      # the 3rd sorting (public) to the second position and will add an empty option to the third position
+      projects_page.within_sort_row(0) do
+        projects_page.remove_sort_order
+      end
+
+      projects_page.expect_number_of_sort_fields(3)
+
+      projects_page.within_sort_row(0) do
+        projects_page.expect_sort_order(column_identifier: integer_custom_field.column_name, direction: :asc)
+      end
+      projects_page.within_sort_row(1) { projects_page.expect_sort_order(column_identifier: :public, direction: :asc) }
+      projects_page.within_sort_row(2) { projects_page.expect_sort_order(column_identifier: "", direction: "") }
+
+      # To roll back, we now select hierarchy as the third option, this will remove all other options
+      projects_page.within_sort_row(2) do
+        projects_page.change_sort_order(column_identifier: :lft, direction: :asc)
+      end
+
+      projects_page.within_sort_row(0) do
+        projects_page.expect_sort_order(column_identifier: "lft", direction: "asc", direction_enabled: false)
+      end
+      projects_page.expect_number_of_sort_fields(1)
+    end
+
+    it "resets the pagination when sorting (bug #55392)" do
+      # We need pagination, so reduce the page size to enable it
+      allow(Setting).to receive(:per_page_options_array).and_return([1, 5])
+      projects_page.set_page_size(1)
+      wait_for_reload
+      projects_page.expect_page_size(1)
+      projects_page.go_to_page(2) # Go to another page that is not the first one
+      wait_for_reload
+      projects_page.expect_current_page_number(2)
+
+      # Open config dialog and make changes to the sorting
+      projects_page.open_configure_view
+      projects_page.switch_configure_view_tab(I18n.t("label_sort"))
+      projects_page.within_sort_row(0) do
+        projects_page.change_sort_order(column_identifier: :name, direction: :desc)
+      end
+
+      # Save and close the dialog
+      projects_page.submit_config_view_dialog
+      wait_for_reload
+
+      # Changing the sorting resets the pagination to the first page
+      projects_page.expect_current_page_number(1)
+
+      # Go to another page again
+      projects_page.go_to_page(2)
+      wait_for_reload
+      projects_page.expect_current_page_number(2)
+
+      # Open dialog, do not change anything and save
+      projects_page.open_configure_view
+      projects_page.switch_configure_view_tab(I18n.t("label_sort"))
+      projects_page.submit_config_view_dialog
+      wait_for_reload
+
+      # An unchanged sorting will keep the current position in the pagination
+      projects_page.expect_current_page_number(2)
+    end
+
+    it "does not allow to sort via long text custom fields" do
+      long_text_custom_field = create(:text_project_custom_field)
+      Setting.enabled_projects_columns += [long_text_custom_field.column_name]
+
+      projects_page.open_configure_view
+      projects_page.switch_configure_view_tab(I18n.t("label_sort"))
+
+      projects_page.within_sort_row(0) do
+        projects_page.expect_sort_option_not_available(column_identifier: long_text_custom_field.column_name)
+      end
+    end
+  end
+
+  it "allows to alter the order in which projects are displayed via the column headers" do
+    Setting.enabled_projects_columns += [integer_custom_field.column_name]
+
+    # initially, ordered by name asc on each hierarchical level
+    projects_page
+      .expect_projects_in_order(development_project,
+                                project,
+                                child_project_a,
+                                child_project_m,
+                                child_project_z,
+                                public_project)
+
+    projects_page.click_table_header_to_open_action_menu("Name")
+    projects_page.sort_via_action_menu("Name", direction: :asc)
+    wait_for_reload
+
+    # Projects ordered by name asc
+    projects_page
+      .expect_projects_in_order(child_project_a,
+                                development_project,
+                                child_project_m,
+                                project,
+                                public_project,
+                                child_project_z)
+
+    projects_page.click_table_header_to_open_action_menu("Name")
+    projects_page.sort_via_action_menu("Name", direction: :desc)
+    wait_for_reload
+
+    # Projects ordered by name desc
+    projects_page
+      .expect_projects_in_order(child_project_z,
+                                public_project,
+                                project,
+                                child_project_m,
+                                development_project,
+                                child_project_a)
+
+    projects_page.click_table_header_to_open_action_menu(integer_custom_field.column_name)
+    projects_page.sort_via_action_menu(integer_custom_field.column_name, direction: :asc)
+    wait_for_reload
+
+    # Projects ordered by cf asc first then project name desc
+    projects_page
+      .expect_projects_in_order(project,
+                                development_project,
+                                public_project,
+                                child_project_z,
+                                child_project_m,
+                                child_project_a)
+
+    click_link_or_button('Sort by "Project hierarchy"')
+    wait_for_reload
+
+    # again ordered by name asc on each hierarchical level
+    projects_page
+      .expect_projects_in_order(development_project,
+                                project,
+                                child_project_a,
+                                child_project_m,
+                                child_project_z,
+                                public_project)
+  end
+
+  it "sorts projects by latest_activity_at" do
+    projects_page.click_table_header_to_open_action_menu("latest_activity_at")
+    projects_page.sort_via_action_menu("latest_activity_at", direction: :asc)
+    wait_for_reload
+
+    projects_page.expect_project_at_place(project, 1)
+  end
+end
diff --git a/spec/features/projects/lists/table_spec.rb b/spec/features/projects/lists/table_spec.rb
new file mode 100644
index 000000000000..3207b75464f8
--- /dev/null
+++ b/spec/features/projects/lists/table_spec.rb
@@ -0,0 +1,634 @@
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2010-2024 the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+# ++
+
+require "spec_helper"
+
+RSpec.describe "Projects lists table display and actions", :js, :with_cuprite, with_settings: { login_required?: false } do
+  shared_let(:admin) { create(:admin) }
+
+  shared_let(:manager)   { create(:project_role, name: "Manager") }
+  shared_let(:developer) { create(:project_role, name: "Developer") }
+
+  shared_let(:custom_field) { create(:text_project_custom_field) }
+  shared_let(:invisible_custom_field) { create(:project_custom_field, admin_only: true) }
+
+  shared_let(:project) { create(:project, name: "Plain project", identifier: "plain-project") }
+  shared_let(:public_project) do
+    create(:project, name: "Public Pr", identifier: "public-pr", public: true) do |project|
+      project.custom_field_values = { invisible_custom_field.id => "Secret CF" }
+    end
+  end
+  shared_let(:development_project) { create(:project, name: "Development project", identifier: "development-project") }
+
+  let(:news) { create(:news, project:) }
+  let(:projects_page) { Pages::Projects::Index.new }
+
+  include ProjectStatusHelper
+
+  def load_and_open_filters(user)
+    login_as(user)
+    projects_page.visit!
+    projects_page.open_filters
+  end
+
+  describe "project visibility restriction" do
+    context "for an anonymous user" do
+      specify "only public projects shall be visible" do
+        ProjectRole.anonymous
+        visit projects_path
+
+        expect(page).to have_no_text(project.name)
+        expect(page).to have_text(public_project.name)
+
+        # Test that the 'More' menu stays invisible on hover
+        expect(page).to have_no_css(".icon-show-more-horizontal")
+      end
+    end
+
+    context "for project members" do
+      shared_let(:user) do
+        create(:user,
+               member_with_roles: { development_project => developer },
+               login: "nerd",
+               firstname: "Alan",
+               lastname: "Turing")
+      end
+
+      specify "only public projects or those the user is a member of shall be visible" do
+        ProjectRole.non_member
+        login_as(user)
+        visit projects_path
+
+        expect(page).to have_text(development_project.name)
+        expect(page).to have_text(public_project.name)
+        expect(page).to have_no_text(project.name)
+
+        # Non-admin users shall not see invisible CFs.
+        expect(page).to have_no_text(invisible_custom_field.name.upcase)
+        expect(page).to have_no_select("add_filter_select", with_options: [invisible_custom_field.name])
+      end
+
+      context "with project attributes" do
+        let(:user) do
+          create(:user,
+                 member_with_roles: {
+                   development_project => create(:existing_project_role, permissions:),
+                   project => create(:existing_project_role)
+                 })
+        end
+
+        let!(:list_custom_field) do
+          create(:list_project_custom_field, multi_value: true).tap do |cf|
+            development_project.update(custom_field_values: { cf.id => [cf.value_of("A"), cf.value_of("B")] })
+            project.update(custom_field_values: { cf.id => [cf.value_of("A"), cf.value_of("B")] })
+          end
+        end
+
+        context "with view_project_attributes permission" do
+          let(:permissions) { %i(view_project_attributes) }
+
+          it "can see the project attribute field in the filter section" do
+            load_and_open_filters user
+
+            expect(page).to have_select("add_filter_select", with_options: [list_custom_field.name])
+          end
+        end
+
+        context "without view_project_attributes permission" do
+          let(:permissions) { [] }
+
+          it "cannot see the project attribute field in the filter section" do
+            load_and_open_filters user
+
+            expect(page).to have_no_select("add_filter_select", with_options: [list_custom_field.name])
+          end
+        end
+      end
+    end
+
+    context "for work package members" do
+      shared_let(:work_package) { create(:work_package, project: development_project) }
+      shared_let(:user) do
+        create(:user,
+               member_with_permissions: { work_package => [:view_work_packages] },
+               login: "nerd",
+               firstname: "Alan",
+               lastname: "Turing")
+      end
+
+      specify "only public projects or those the user is member in a specific work package" do
+        Setting.enabled_projects_columns += [custom_field.column_name]
+
+        development_project.update(
+          description: "I am a nice project",
+          status_explanation: "We are on track",
+          status_code: "on_track",
+          custom_field_values: { custom_field.id => "This is a test value" }
+        )
+
+        login_as(user)
+        projects_page.visit!
+
+        projects_page.within_table do
+          expect(page).to have_text(development_project.name)
+          expect(page).to have_text(public_project.name)
+          expect(page).to have_no_text(project.name)
+
+          # They should not see the description, status or custom fields for the project
+          expect(page).to have_no_text(development_project.description)
+          expect(page).to have_no_text(project_status_name(development_project.status_code))
+          expect(page).to have_no_text(development_project.status_explanation)
+          expect(page)
+            .to have_no_text(
+              development_project.custom_values_for_custom_field(
+                id: custom_field.id,
+                all: true
+              ).first.value
+            )
+        end
+      end
+
+      context "with project attributes" do
+        let!(:list_custom_field) do
+          create(:list_project_custom_field, multi_value: true).tap do |cf|
+            development_project.update(custom_field_values: { cf.id => [cf.value_of("A"), cf.value_of("B")] })
+            project.update(custom_field_values: { cf.id => [cf.value_of("A"), cf.value_of("B")] })
+          end
+        end
+
+        it "cannot see the project attribute field in the filter section" do
+          load_and_open_filters user
+
+          expect(page).to have_no_select("add_filter_select", with_options: [list_custom_field.name])
+        end
+      end
+    end
+
+    context "for admins" do
+      before do
+        project.update(created_at: 7.days.ago, description: "I am a nice project")
+
+        news
+      end
+
+      specify "all projects are visible" do
+        login_as(admin)
+        visit projects_path
+
+        expect(page).to have_text(public_project.name)
+        expect(page).to have_text(project.name)
+
+        # Test visibility of 'more' menu list items
+        projects_page.activate_menu_of(project) do |menu|
+          expect(menu).to have_text("Copy")
+          expect(menu).to have_text("Project settings")
+          expect(menu).to have_text("New subproject")
+          expect(menu).to have_text("Delete")
+          expect(menu).to have_text("Archive")
+        end
+
+        # Test visibility of admin only properties
+        within("#project-table") do
+          expect(page)
+            .to have_css("th", text: "REQUIRED DISK STORAGE")
+          expect(page)
+            .to have_css("th", text: "CREATED ON")
+          expect(page)
+            .to have_css("td", text: project.created_at.strftime("%m/%d/%Y"))
+          expect(page)
+            .to have_css("th", text: "LATEST ACTIVITY AT")
+          expect(page)
+            .to have_css("td", text: news.created_at.strftime("%m/%d/%Y"))
+        end
+      end
+
+      specify "project can be marked as favorite" do
+        login_as(admin)
+        visit projects_path
+
+        projects_page.activate_menu_of(project) do |menu|
+          expect(menu).to have_text("Add to favorites")
+          click_link_or_button "Add to favorites"
+        end
+
+        visit project_path(project)
+        expect(project).to be_favored_by(admin)
+
+        visit projects_path
+        projects_page.activate_menu_of(project) do |menu|
+          expect(menu).to have_text("Remove from favorites")
+          click_link_or_button "Remove from favorites"
+        end
+
+        visit project_path(project)
+        expect(project).not_to be_favored_by(admin)
+
+        visit projects_path
+        projects_page.within_row(project) do
+          page.find_test_selector("project-list-favorite-button").click
+        end
+
+        wait_for_network_idle
+
+        projects_page.activate_menu_of(project) do |menu|
+          expect(menu).to have_text("Remove from favorites")
+        end
+        expect(project).to be_favored_by(admin)
+
+        projects_page.within_row(project) do
+          page.find_test_selector("project-list-favorite-button").click
+        end
+
+        projects_page.activate_menu_of(project) do |menu|
+          expect(menu).to have_text("Add to favorites")
+        end
+        expect(project).not_to be_favored_by(admin)
+      end
+
+      specify "flash sortBy is being escaped" do
+        login_as(admin)
+        visit projects_path(sortBy: "[[\"><script src='/foobar.js'></script>\",\"\"]]")
+
+        error_text = "Orders ><script src='/foobar js'></script> is not set to one of the allowed values. and does not exist."
+        error_html = "Orders &gt;&lt;script src='/foobar js'&gt;&lt;/script&gt; is not set to one of the allowed values. " \
+                     "and does not exist."
+        expect_flash(type: :error, message: error_text)
+
+        error_container = find_flash_element(type: :error)
+        expect(error_container["innerHTML"]).to include error_html
+      end
+    end
+
+    context "for project attributes" do
+      let(:user) do
+        create(:user,
+               member_with_roles: {
+                 development_project => create(:existing_project_role, permissions:),
+                 project => create(:existing_project_role)
+               })
+      end
+
+      let!(:list_custom_field) do
+        create(:list_project_custom_field, multi_value: true).tap do |cf|
+          development_project.update(custom_field_values: { cf.id => [cf.value_of("A"), cf.value_of("B")] })
+          project.update(custom_field_values: { cf.id => [cf.value_of("A"), cf.value_of("B")] })
+        end
+      end
+
+      before do
+        login_as(user)
+        projects_page.visit!
+      end
+
+      context "with view_project_attributes permission" do
+        let(:permissions) { %i(view_project_attributes) }
+
+        it "can see the project attribute field value in the project list" do
+          projects_page.set_columns(list_custom_field.name)
+          projects_page.expect_columns(list_custom_field.name)
+
+          projects_page.within_row(development_project) do
+            expect(page).to have_css("td.#{list_custom_field.column_name}", text: "A, B")
+          end
+
+          projects_page.within_row(project) do
+            expect(page).to have_css("td.#{list_custom_field.column_name}", text: "")
+          end
+        end
+      end
+
+      context "without view_project_attributes permission" do
+        let(:permissions) { [] }
+
+        it "cannot see the project attribute field in the table configuration" do
+          projects_page.expect_no_config_columns(list_custom_field.name)
+        end
+      end
+    end
+  end
+
+  context "with valid Enterprise token" do
+    shared_let(:long_text_custom_field) { create(:text_project_custom_field) }
+    specify "CF columns and filters are not visible by default" do
+      load_and_open_filters admin
+
+      # CF's columns are not shown due to setting
+      expect(page).to have_no_text(custom_field.name.upcase)
+    end
+
+    specify "CF columns and filters are visible when added to settings" do
+      Setting.enabled_projects_columns += [custom_field.column_name, invisible_custom_field.column_name]
+      load_and_open_filters admin
+
+      # CF's column is present:
+      expect(page).to have_text(custom_field.name.upcase)
+      # CF's filter is present:
+      expect(page).to have_select("add_filter_select", with_options: [custom_field.name])
+
+      # Admins shall be the only ones to see invisible CFs
+      expect(page).to have_text(invisible_custom_field.name.upcase)
+      expect(page).to have_select("add_filter_select", with_options: [invisible_custom_field.name])
+    end
+
+    specify "long-text fields are truncated" do
+      development_project.update(
+        description: "I am a nice project with a very long long long long long long long long long description",
+        status_explanation: "<figure>I am a nice project status description with a figure</figure>",
+        custom_field_values: { custom_field.id => "This is a short value",
+                               long_text_custom_field.id => "This is a very long long long long long long long value" }
+      )
+
+      development_project.save!
+      login_as(admin)
+      Setting.enabled_projects_columns += [custom_field.column_name, long_text_custom_field.column_name, "description",
+                                           "status_explanation"]
+      projects_page.visit!
+
+      # Check if the description is truncated and shows the Expand button correctly
+      projects_page.within_row(development_project) do
+        expect(page).to have_css('td.description [data-test-selector="expand-button"]')
+        page.find('td.description [data-test-selector="expand-button"]').click
+      end
+
+      expect(page).to have_css(".Overlay-body", text: development_project.description)
+
+      # Check if the status explanation with an html tag is truncated and shows the cell text and Expand button correctly
+      projects_page.within_row(development_project) do
+        expect(page).to have_css('td.status_explanation [data-test-selector="expand-button"]')
+        expect(page).to have_css("td.status_explanation", text: "Preview not available")
+      end
+
+      # Check if a long-text custom field which has a short text as value is not truncated and there is no Expand button there
+      projects_page.within_row(development_project) do
+        expect(page).to have_no_css("td.cf_#{custom_field.id} [data-test-selector=\"expand-button\"]")
+        expect(page).to have_css("td.cf_#{custom_field.id}", text: "This is a short value")
+      end
+
+      # Check if a long-text custom field which has a long text as value is truncated and there is an Expand button there
+      projects_page.within_row(development_project) do
+        expect(page).to have_css("td.cf_#{long_text_custom_field.id} [data-test-selector=\"expand-button\"]")
+        expect(page).to have_css("td.cf_#{long_text_custom_field.id}",
+                                 text: "This is a very long long long long long long long value")
+      end
+    end
+  end
+
+  context "when paginating", with_settings: { enabled_projects_columns: %w[name project_status] } do
+    before do
+      allow(Setting).to receive(:per_page_options_array).and_return([1, 5])
+    end
+
+    it "keeps applied filters, orders and columns" do
+      load_and_open_filters admin
+
+      projects_page.filter_by_name_and_identifier("project")
+
+      wait_for_reload
+
+      projects_page.set_columns("Name")
+      wait_for_reload
+      projects_page.expect_columns("Name")
+      projects_page.expect_no_columns("Status")
+
+      # Sorts ASC by name
+      projects_page.click_table_header_to_open_action_menu("Name")
+      projects_page.sort_via_action_menu("Name", direction: :asc)
+      wait_for_reload
+      projects_page.expect_sort_order_via_table_header("Name", direction: :asc)
+
+      # Results should be filtered and ordered ASC by name and only the selected columns should be present
+      projects_page.expect_projects_listed(development_project)
+      projects_page.expect_projects_not_listed(public_project, # as it is filtered out
+                                               project)        # as it is on the second page
+      projects_page.expect_columns("Name")
+      projects_page.expect_no_columns("Status")
+      expect(page).to have_text("Next") # as the result set is larger than 1
+
+      # Changing the page size to 5 and back to 1 should not change the filters (which we test later on the second page)
+      projects_page.set_page_size(5)
+      wait_for_reload
+      projects_page.expect_page_size(5)
+
+      projects_page.set_page_size(1)
+      wait_for_reload
+      projects_page.expect_page_size(1)
+
+      projects_page.go_to_page(2) # Go to pagination page 2
+      wait_for_reload
+      projects_page.expect_current_page_number(2)
+
+      # On page 2 you should see the second page of the filtered set ordered ASC by name and only the selected columns exist
+      projects_page.expect_projects_listed(project)
+      projects_page.expect_projects_not_listed(public_project,      # Filtered out
+                                               development_project) # Present on page 1
+      projects_page.expect_columns("Name")
+      projects_page.expect_no_columns("Status")
+      projects_page.expect_total_pages(2) # Filters kept active, so there is no third page.
+
+      # Sorts DESC by name
+      projects_page.click_table_header_to_open_action_menu("Name")
+      projects_page.sort_via_action_menu("Name", direction: :desc)
+      wait_for_reload
+      projects_page.expect_sort_order_via_table_header("Name", direction: :desc)
+
+      # Clicking on sorting resets the page to the first one
+      projects_page.expect_current_page_number(1)
+
+      # The same filters should still be intact but the order should be DESC on name
+      projects_page.expect_projects_listed(project)
+      projects_page.expect_projects_not_listed(public_project, # Filtered out
+                                               development_project) # Present on page 2
+
+      projects_page.expect_total_pages(2) # Filters kept active, so there is no third page.
+      projects_page.expect_columns("Name")
+      projects_page.expect_no_columns("Status")
+
+      # Sending the filter form again what implies to compose the request freshly
+      wait_for_reload
+
+      projects_page.expect_sort_order_via_table_header("Name", direction: :desc)
+
+      # We should see page 1, resetting pagination, as it is a new filter, but keeping the DESC order on the project
+      # name
+      projects_page.expect_projects_listed(project)
+      projects_page.expect_projects_not_listed(development_project, # as it is on the second page
+                                               public_project)      # as it filtered out
+      projects_page.expect_total_pages(2) # as the result set is larger than 1
+      projects_page.expect_columns("Name")
+      projects_page.expect_no_columns("Status")
+    end
+  end
+
+  context "for non-admins with role with permission" do
+    shared_let(:can_copy_projects_role) do
+      create(:project_role, name: "Can Copy Projects Role", permissions: [:copy_projects])
+    end
+    shared_let(:can_add_subprojects_role) do
+      create(:project_role, name: "Can Add Subprojects Role", permissions: [:add_subprojects])
+    end
+
+    shared_let(:parent_project) do
+      create(:project,
+             name: "Parent project",
+             identifier: "parent-project")
+    end
+
+    shared_let(:can_copy_projects_manager) do
+      create(:user,
+             member_with_roles: { parent_project => can_copy_projects_role })
+    end
+    shared_let(:can_add_subprojects_manager) do
+      create(:user,
+             member_with_roles: { parent_project => can_add_subprojects_role })
+    end
+    let(:simple_member) do
+      create(:user,
+             member_with_roles: { parent_project => developer })
+    end
+
+    before do
+      # We are not admin so we need to force the built-in roles to have them.
+      ProjectRole.non_member
+
+      # Remove public projects from the default list for these scenarios.
+      public_project.update(active: false)
+
+      project.update(created_at: 7.days.ago)
+
+      parent_project.enabled_module_names -= ["activity"]
+      news
+    end
+
+    it 'can see the "More" menu' do
+      login_as(simple_member)
+      visit projects_path
+
+      expect(page).to have_text(parent_project.name)
+
+      projects_page.activate_menu_of(parent_project) do |menu|
+        expect(menu).to have_text("Add to favorites")
+        expect(menu).to have_no_text("Copy")
+      end
+
+      # For a project member with :copy_projects privilege the 'More' menu is visible.
+      login_as(can_copy_projects_manager)
+      visit projects_path
+
+      expect(page).to have_text(parent_project.name)
+
+      projects_page.activate_menu_of(parent_project) do |menu|
+        expect(menu).to have_text("Copy")
+      end
+
+      # For a project member with :add_subprojects privilege the 'More' menu is visible.
+      login_as(can_add_subprojects_manager)
+      visit projects_path
+
+      projects_page.activate_menu_of(parent_project) do |menu|
+        expect(menu).to have_text("Add to favorites")
+        expect(menu).to have_text("New subproject")
+      end
+
+      # Test admin only properties are invisible
+      within("#project-table") do
+        expect(page)
+          .to have_no_css("th", text: "REQUIRED DISK STORAGE")
+        expect(page)
+          .to have_no_css("th", text: "CREATED ON")
+        expect(page)
+          .to have_no_css("td", text: project.created_at.strftime("%m/%d/%Y"))
+        expect(page)
+          .to have_no_css("th", text: "LATEST ACTIVITY AT")
+        expect(page)
+          .to have_no_css("td", text: news.created_at.strftime("%m/%d/%Y"))
+      end
+    end
+  end
+
+  context "with a multi-value custom field" do
+    let!(:list_custom_field) do
+      create(:list_project_custom_field, multi_value: true).tap do |cf|
+        project.update(custom_field_values: { cf.id => [cf.value_of("A"), cf.value_of("B")] })
+      end
+    end
+
+    before do
+      allow(Setting)
+        .to receive(:enabled_projects_columns)
+        .and_return [list_custom_field.column_name]
+
+      login_as(admin)
+      visit projects_path
+    end
+
+    it "shows the multi selection" do
+      expected_sort = list_custom_field
+                        .custom_options
+                        .where(value: %w[A B])
+                        .reorder(:id)
+                        .pluck(:value)
+      expect(page).to have_css(".#{list_custom_field.column_name}.format-list", text: expected_sort.join(", "))
+    end
+  end
+
+  describe "project activity menu item" do
+    context "for projects with activity module enabled" do
+      shared_let(:project_with_activity_enabled) { project }
+      shared_let(:work_packages_viewer) { create(:project_role, name: "Viewer", permissions: [:view_work_packages]) }
+      shared_let(:simple_member) do
+        create(:user,
+               member_with_roles: { project_with_activity_enabled => work_packages_viewer })
+      end
+      shared_let(:work_package) { create(:work_package, project: project_with_activity_enabled) }
+
+      before do
+        project_with_activity_enabled.enabled_module_names += ["activity"]
+        project_with_activity_enabled.save
+      end
+
+      it "is displayed and redirects to project activity page with only project attributes visible" do
+        login_as(simple_member)
+        visit projects_path
+
+        expect(page).to have_text(project.name)
+
+        # Test visibility of 'more' menu list items
+        projects_page.activate_menu_of(project) do |menu|
+          expect(menu).to have_text("Project activity")
+          expect(menu).to have_text("Add to favorites")
+
+          click_link_or_button "Project activity"
+        end
+
+        expect(page).to have_current_path(project_activity_index_path(project_with_activity_enabled), ignore_query: true)
+        expect(page).to have_checked_field(id: "event_types_project_attributes")
+        expect(page).to have_unchecked_field(id: "event_types_work_packages")
+      end
+    end
+  end
+end
diff --git a/spec/features/projects/modules_spec.rb b/spec/features/projects/modules_spec.rb
index 045ab880ed6a..69ea63ff35b8 100644
--- a/spec/features/projects/modules_spec.rb
+++ b/spec/features/projects/modules_spec.rb
@@ -34,7 +34,7 @@
   end
 
   let(:permissions) { %i(edit_project select_project_modules view_work_packages) }
-  let(:settings_page) { Pages::Projects::Settings.new(project) }
+  let(:modules_settings_page) { Pages::Projects::Settings::Modules.new(project) }
 
   current_user do
     create(:user, member_with_permissions: { project => permissions })
@@ -43,7 +43,7 @@
   it "allows adding and removing modules" do
     project_work_packages_menu_link_selector = '//ul[contains(@class, "menu_root")]//span[text()="Work packages"]'
 
-    settings_page.visit_tab!("modules")
+    modules_settings_page.visit!
 
     expect(page).to have_unchecked_field "Activity"
     expect(page).to have_unchecked_field "Calendar"
@@ -95,10 +95,11 @@
       create(:user,
              member_with_permissions: { project => %i(edit_project) })
     end
+    let(:general_settings_page) { Pages::Projects::Settings::General.new(project) }
 
     before do
       login_as user_without_permission
-      settings_page.visit_tab!("general")
+      general_settings_page.visit!
     end
 
     it "I can't see the modules menu item" do
diff --git a/spec/features/projects/project_custom_fields/overview_page/dialog/permission_spec.rb b/spec/features/projects/project_custom_fields/overview_page/dialog/permission_spec.rb
index df7bc3a8464c..579893825534 100644
--- a/spec/features/projects/project_custom_fields/overview_page/dialog/permission_spec.rb
+++ b/spec/features/projects/project_custom_fields/overview_page/dialog/permission_spec.rb
@@ -31,7 +31,6 @@
 
 RSpec.describe "Edit project custom fields on project overview page", :js do
   include_context "with seeded projects, members and project custom fields"
-
   let(:overview_page) { Pages::Projects::Show.new(project) }
 
   describe "with insufficient View attributes permissions" do
@@ -52,7 +51,7 @@
     end
 
     it "shows the attributes sidebar" do
-      overview_page.within_async_loaded_sidebar do
+      overview_page.within_project_attributes_sidebar do
         expect(page).to have_text("Input fields")
       end
     end
@@ -65,7 +64,7 @@
     end
 
     it "does not show the edit buttons" do
-      overview_page.within_async_loaded_sidebar do
+      overview_page.within_project_attributes_sidebar do
         expect(page).to have_no_css("[data-test-selector='project-custom-field-section-edit-button']")
       end
     end
@@ -81,7 +80,7 @@
     end
 
     it "does not show the edit buttons" do
-      overview_page.within_async_loaded_sidebar do
+      overview_page.within_project_attributes_sidebar do
         expect(page).to have_no_css("[data-test-selector='project-custom-field-section-edit-button']")
       end
     end
@@ -94,7 +93,7 @@
     end
 
     it "shows the edit buttons" do
-      overview_page.within_async_loaded_sidebar do
+      overview_page.within_project_attributes_sidebar do
         expect(page).to have_css("[data-test-selector='project-custom-field-section-edit-button']", count: 3)
       end
     end
diff --git a/spec/features/projects/project_custom_fields/overview_page/sidebar_spec.rb b/spec/features/projects/project_custom_fields/overview_page/sidebar_spec.rb
index 23bb5d72ff2b..1f96df0b8a06 100644
--- a/spec/features/projects/project_custom_fields/overview_page/sidebar_spec.rb
+++ b/spec/features/projects/project_custom_fields/overview_page/sidebar_spec.rb
@@ -50,7 +50,7 @@
     it "shows the project custom field sections in the correct order" do
       overview_page.visit_page
 
-      overview_page.within_async_loaded_sidebar do
+      overview_page.within_project_attributes_sidebar do
         sections = page.all(".op-project-custom-field-section-container")
 
         expect(sections.size).to eq(3)
@@ -64,7 +64,7 @@
 
       overview_page.visit_page
 
-      overview_page.within_async_loaded_sidebar do
+      overview_page.within_project_attributes_sidebar do
         sections = page.all(".op-project-custom-field-section-container")
 
         expect(sections.size).to eq(3)
@@ -78,7 +78,7 @@
     it "shows the project custom fields in the correct order within the sections" do
       overview_page.visit_page
 
-      overview_page.within_async_loaded_sidebar do
+      overview_page.within_project_attributes_sidebar do
         overview_page.within_custom_field_section_container(section_for_input_fields) do
           fields = page.all(".op-project-custom-field-container")
 
@@ -118,7 +118,7 @@
 
       overview_page.visit_page
 
-      overview_page.within_async_loaded_sidebar do
+      overview_page.within_project_attributes_sidebar do
         overview_page.within_custom_field_section_container(section_for_input_fields) do
           fields = page.all(".op-project-custom-field-container")
 
@@ -140,7 +140,7 @@
 
       overview_page.visit_page
 
-      overview_page.within_async_loaded_sidebar do
+      overview_page.within_project_attributes_sidebar do
         expect(page).to have_no_text "String field enabled for other project"
       end
     end
@@ -152,7 +152,7 @@
         it "shows the correct value for the project custom field if given" do
           overview_page.visit_page
 
-          overview_page.within_async_loaded_sidebar do
+          overview_page.within_project_attributes_sidebar do
             overview_page.within_custom_field_container(boolean_project_custom_field) do
               expect(page).to have_text "Boolean field"
               expect(page).to have_text "Yes"
@@ -170,7 +170,7 @@
         it "shows the correct value for the project custom field if given" do
           overview_page.visit_page
 
-          overview_page.within_async_loaded_sidebar do
+          overview_page.within_project_attributes_sidebar do
             overview_page.within_custom_field_container(boolean_project_custom_field) do
               expect(page).to have_text "Boolean field"
               expect(page).to have_text "No"
@@ -187,7 +187,7 @@
         it "shows an N/A text for the project custom field if no value given" do
           overview_page.visit_page
 
-          overview_page.within_async_loaded_sidebar do
+          overview_page.within_project_attributes_sidebar do
             overview_page.within_custom_field_container(boolean_project_custom_field) do
               expect(page).to have_text "Boolean field"
               expect(page).to have_text I18n.t("placeholders.default")
@@ -200,7 +200,7 @@
 
           overview_page.visit_page
 
-          overview_page.within_async_loaded_sidebar do
+          overview_page.within_project_attributes_sidebar do
             overview_page.within_custom_field_container(boolean_project_custom_field) do
               expect(page).to have_text "Boolean field"
               expect(page).to have_text I18n.t("placeholders.default")
@@ -211,7 +211,7 @@
 
           overview_page.visit_page
 
-          overview_page.within_async_loaded_sidebar do
+          overview_page.within_project_attributes_sidebar do
             overview_page.within_custom_field_container(boolean_project_custom_field) do
               expect(page).to have_text "Boolean field"
               expect(page).to have_text I18n.t("placeholders.default")
@@ -226,7 +226,7 @@
         it "shows the correct value for the project custom field if given" do
           overview_page.visit_page
 
-          overview_page.within_async_loaded_sidebar do
+          overview_page.within_project_attributes_sidebar do
             overview_page.within_custom_field_container(string_project_custom_field) do
               expect(page).to have_text "String field"
               expect(page).to have_text "Foo"
@@ -243,7 +243,7 @@
         it "shows the correct value for the project custom field if given" do
           overview_page.visit_page
 
-          overview_page.within_async_loaded_sidebar do
+          overview_page.within_project_attributes_sidebar do
             overview_page.within_custom_field_container(string_project_custom_field) do
               expect(page).to have_text "String field"
               expect(page).to have_text I18n.t("placeholders.default")
@@ -260,7 +260,7 @@
         it "shows an N/A text for the project custom field if no value given" do
           overview_page.visit_page
 
-          overview_page.within_async_loaded_sidebar do
+          overview_page.within_project_attributes_sidebar do
             overview_page.within_custom_field_container(string_project_custom_field) do
               expect(page).to have_text "String field"
               expect(page).to have_text I18n.t("placeholders.default")
@@ -273,7 +273,7 @@
 
           overview_page.visit_page
 
-          overview_page.within_async_loaded_sidebar do
+          overview_page.within_project_attributes_sidebar do
             overview_page.within_custom_field_container(string_project_custom_field) do
               expect(page).to have_text "String field"
               expect(page).to have_text I18n.t("placeholders.default")
@@ -288,7 +288,7 @@
         it "shows the correct value for the project custom field if given" do
           overview_page.visit_page
 
-          overview_page.within_async_loaded_sidebar do
+          overview_page.within_project_attributes_sidebar do
             overview_page.within_custom_field_container(integer_project_custom_field) do
               expect(page).to have_text "Integer field"
               expect(page).to have_text "123"
@@ -305,7 +305,7 @@
         it "shows the correct value for the project custom field if given" do
           overview_page.visit_page
 
-          overview_page.within_async_loaded_sidebar do
+          overview_page.within_project_attributes_sidebar do
             overview_page.within_custom_field_container(integer_project_custom_field) do
               expect(page).to have_text "Integer field"
               expect(page).to have_text I18n.t("placeholders.default")
@@ -322,7 +322,7 @@
         it "shows an N/A text for the project custom field if no value given" do
           overview_page.visit_page
 
-          overview_page.within_async_loaded_sidebar do
+          overview_page.within_project_attributes_sidebar do
             overview_page.within_custom_field_container(integer_project_custom_field) do
               expect(page).to have_text "Integer field"
               expect(page).to have_text I18n.t("placeholders.default")
@@ -335,7 +335,7 @@
 
           overview_page.visit_page
 
-          overview_page.within_async_loaded_sidebar do
+          overview_page.within_project_attributes_sidebar do
             overview_page.within_custom_field_container(integer_project_custom_field) do
               expect(page).to have_text "Integer field"
               expect(page).to have_text I18n.t("placeholders.default")
@@ -350,7 +350,7 @@
         it "shows the correct value for the project custom field if given" do
           overview_page.visit_page
 
-          overview_page.within_async_loaded_sidebar do
+          overview_page.within_project_attributes_sidebar do
             overview_page.within_custom_field_container(date_project_custom_field) do
               expect(page).to have_text "Date field"
               expect(page).to have_text "01/01/2024"
@@ -367,7 +367,7 @@
         it "shows the correct value for the project custom field if given" do
           overview_page.visit_page
 
-          overview_page.within_async_loaded_sidebar do
+          overview_page.within_project_attributes_sidebar do
             overview_page.within_custom_field_container(date_project_custom_field) do
               expect(page).to have_text "Date field"
               expect(page).to have_text I18n.t("placeholders.default")
@@ -384,7 +384,7 @@
         it "shows an N/A text for the project custom field if no value given" do
           overview_page.visit_page
 
-          overview_page.within_async_loaded_sidebar do
+          overview_page.within_project_attributes_sidebar do
             overview_page.within_custom_field_container(date_project_custom_field) do
               expect(page).to have_text "Date field"
               expect(page).to have_text I18n.t("placeholders.default")
@@ -397,7 +397,7 @@
 
           overview_page.visit_page
 
-          overview_page.within_async_loaded_sidebar do
+          overview_page.within_project_attributes_sidebar do
             overview_page.within_custom_field_container(date_project_custom_field) do
               expect(page).to have_text "Date field"
               expect(page).to have_text I18n.t("placeholders.default")
@@ -412,7 +412,7 @@
         it "shows the correct value for the project custom field if given" do
           overview_page.visit_page
 
-          overview_page.within_async_loaded_sidebar do
+          overview_page.within_project_attributes_sidebar do
             overview_page.within_custom_field_container(float_project_custom_field) do
               expect(page).to have_text "Float field"
               expect(page).to have_text "123.456"
@@ -429,7 +429,7 @@
         it "shows the correct value for the project custom field if given" do
           overview_page.visit_page
 
-          overview_page.within_async_loaded_sidebar do
+          overview_page.within_project_attributes_sidebar do
             overview_page.within_custom_field_container(float_project_custom_field) do
               expect(page).to have_text "Float field"
               expect(page).to have_text I18n.t("placeholders.default")
@@ -446,7 +446,7 @@
         it "shows an N/A text for the project custom field if no value given" do
           overview_page.visit_page
 
-          overview_page.within_async_loaded_sidebar do
+          overview_page.within_project_attributes_sidebar do
             overview_page.within_custom_field_container(float_project_custom_field) do
               expect(page).to have_text "Float field"
               expect(page).to have_text I18n.t("placeholders.default")
@@ -459,7 +459,7 @@
 
           overview_page.visit_page
 
-          overview_page.within_async_loaded_sidebar do
+          overview_page.within_project_attributes_sidebar do
             overview_page.within_custom_field_container(float_project_custom_field) do
               expect(page).to have_text "Float field"
               expect(page).to have_text I18n.t("placeholders.default")
@@ -479,7 +479,7 @@
           it "shows the correct value for the project custom field if given without truncation and dialog button" do
             overview_page.visit_page
 
-            overview_page.within_async_loaded_sidebar do
+            overview_page.within_project_attributes_sidebar do
               overview_page.within_custom_field_container(text_project_custom_field) do
                 expect(page).to have_text "Text field"
                 expect(page).to have_text "Lorem ipsum"
@@ -500,7 +500,7 @@
           it "shows the correct value for the project custom field if given with truncation and dialog button" do
             overview_page.visit_page
 
-            overview_page.within_async_loaded_sidebar do
+            overview_page.within_project_attributes_sidebar do
               overview_page.within_custom_field_container(text_project_custom_field) do
                 expect(page).to have_text "Text field"
                 expect(page).to have_text (("lorem " * 5).to_s)
@@ -523,7 +523,7 @@
         it "shows the correct value for the project custom field if given" do
           overview_page.visit_page
 
-          overview_page.within_async_loaded_sidebar do
+          overview_page.within_project_attributes_sidebar do
             overview_page.within_custom_field_container(text_project_custom_field) do
               expect(page).to have_text "Text field"
               expect(page).to have_text I18n.t("placeholders.default")
@@ -542,7 +542,7 @@
         it "shows an N/A text for the project custom field if no value given" do
           overview_page.visit_page
 
-          overview_page.within_async_loaded_sidebar do
+          overview_page.within_project_attributes_sidebar do
             overview_page.within_custom_field_container(text_project_custom_field) do
               expect(page).to have_text "Text field"
               expect(page).to have_text I18n.t("placeholders.default")
@@ -557,7 +557,7 @@
 
           overview_page.visit_page
 
-          overview_page.within_async_loaded_sidebar do
+          overview_page.within_project_attributes_sidebar do
             overview_page.within_custom_field_container(text_project_custom_field) do
               expect(page).to have_text "Text field"
               expect(page).to have_text I18n.t("placeholders.default")
@@ -574,7 +574,7 @@
         it "shows the correct value for the project custom field if given" do
           overview_page.visit_page
 
-          overview_page.within_async_loaded_sidebar do
+          overview_page.within_project_attributes_sidebar do
             overview_page.within_custom_field_container(list_project_custom_field) do
               expect(page).to have_text "List field"
               expect(page).to have_text "Option 1"
@@ -591,7 +591,7 @@
         it "shows the correct value for the project custom field if given" do
           overview_page.visit_page
 
-          overview_page.within_async_loaded_sidebar do
+          overview_page.within_project_attributes_sidebar do
             overview_page.within_custom_field_container(list_project_custom_field) do
               expect(page).to have_text "List field"
               expect(page).to have_text I18n.t("placeholders.default")
@@ -608,7 +608,7 @@
         it "shows an N/A text for the project custom field if no value given" do
           overview_page.visit_page
 
-          overview_page.within_async_loaded_sidebar do
+          overview_page.within_project_attributes_sidebar do
             overview_page.within_custom_field_container(list_project_custom_field) do
               expect(page).to have_text "List field"
               expect(page).to have_text I18n.t("placeholders.default")
@@ -621,7 +621,7 @@
 
           overview_page.visit_page
 
-          overview_page.within_async_loaded_sidebar do
+          overview_page.within_project_attributes_sidebar do
             overview_page.within_custom_field_container(list_project_custom_field) do
               expect(page).to have_text "List field"
               expect(page).to have_text I18n.t("placeholders.default")
@@ -636,7 +636,7 @@
         it "shows the correct value for the project custom field if given" do
           overview_page.visit_page
 
-          overview_page.within_async_loaded_sidebar do
+          overview_page.within_project_attributes_sidebar do
             overview_page.within_custom_field_container(version_project_custom_field) do
               expect(page).to have_text "Version field"
               expect(page).to have_text "Version 1"
@@ -653,7 +653,7 @@
         it "shows the correct value for the project custom field if given" do
           overview_page.visit_page
 
-          overview_page.within_async_loaded_sidebar do
+          overview_page.within_project_attributes_sidebar do
             overview_page.within_custom_field_container(version_project_custom_field) do
               expect(page).to have_text "Version field"
               expect(page).to have_text I18n.t("placeholders.default")
@@ -670,7 +670,7 @@
         it "shows an N/A text for the project custom field if no value given" do
           overview_page.visit_page
 
-          overview_page.within_async_loaded_sidebar do
+          overview_page.within_project_attributes_sidebar do
             overview_page.within_custom_field_container(version_project_custom_field) do
               expect(page).to have_text "Version field"
               expect(page).to have_text I18n.t("placeholders.default")
@@ -685,7 +685,7 @@
         it "shows the correct value for the project custom field if given" do
           overview_page.visit_page
 
-          overview_page.within_async_loaded_sidebar do
+          overview_page.within_project_attributes_sidebar do
             overview_page.within_custom_field_container(user_project_custom_field) do
               expect(page).to have_text "User field"
               expect(page).to have_css("opce-principal")
@@ -703,7 +703,7 @@
         it "shows the correct value for the project custom field if given" do
           overview_page.visit_page
 
-          overview_page.within_async_loaded_sidebar do
+          overview_page.within_project_attributes_sidebar do
             overview_page.within_custom_field_container(user_project_custom_field) do
               expect(page).to have_text "User field"
               expect(page).to have_text I18n.t("placeholders.default")
@@ -720,7 +720,7 @@
         it "shows an N/A text for the project custom field if no value given" do
           overview_page.visit_page
 
-          overview_page.within_async_loaded_sidebar do
+          overview_page.within_project_attributes_sidebar do
             overview_page.within_custom_field_container(user_project_custom_field) do
               expect(page).to have_text "User field"
               expect(page).to have_text I18n.t("placeholders.default")
@@ -735,7 +735,7 @@
         it "shows the correct values for the project custom field if given" do
           overview_page.visit_page
 
-          overview_page.within_async_loaded_sidebar do
+          overview_page.within_project_attributes_sidebar do
             overview_page.within_custom_field_container(multi_list_project_custom_field) do
               expect(page).to have_text "Multi list field"
               expect(page).to have_text "Option 1, Option 2"
@@ -752,7 +752,7 @@
         it "shows an N/A text for the project custom field if no value given" do
           overview_page.visit_page
 
-          overview_page.within_async_loaded_sidebar do
+          overview_page.within_project_attributes_sidebar do
             overview_page.within_custom_field_container(multi_list_project_custom_field) do
               expect(page).to have_text "Multi list field"
               expect(page).to have_text I18n.t("placeholders.default")
@@ -766,7 +766,7 @@
 
           overview_page.visit_page
 
-          overview_page.within_async_loaded_sidebar do
+          overview_page.within_project_attributes_sidebar do
             overview_page.within_custom_field_container(multi_list_project_custom_field) do
               expect(page).to have_text "Multi list field"
               expect(page).to have_text I18n.t("placeholders.default")
@@ -781,7 +781,7 @@
         it "shows the correct values for the project custom field if given" do
           overview_page.visit_page
 
-          overview_page.within_async_loaded_sidebar do
+          overview_page.within_project_attributes_sidebar do
             overview_page.within_custom_field_container(multi_version_project_custom_field) do
               expect(page).to have_text "Multi version field"
               expect(page).to have_text "Version 1, Version 2"
@@ -798,7 +798,7 @@
         it "shows an N/A text for the project custom field if no value given" do
           overview_page.visit_page
 
-          overview_page.within_async_loaded_sidebar do
+          overview_page.within_project_attributes_sidebar do
             overview_page.within_custom_field_container(multi_version_project_custom_field) do
               expect(page).to have_text "Multi version field"
               expect(page).to have_text I18n.t("placeholders.default")
@@ -813,7 +813,7 @@
         it "shows the correct values for the project custom field if given" do
           overview_page.visit_page
 
-          overview_page.within_async_loaded_sidebar do
+          overview_page.within_project_attributes_sidebar do
             overview_page.within_custom_field_container(multi_user_project_custom_field) do
               expect(page).to have_text "Multi user field"
               expect(page).to have_css "opce-principal", count: 2
@@ -832,7 +832,7 @@
         it "shows an N/A text for the project custom field if no value given" do
           overview_page.visit_page
 
-          overview_page.within_async_loaded_sidebar do
+          overview_page.within_project_attributes_sidebar do
             overview_page.within_custom_field_container(multi_user_project_custom_field) do
               expect(page).to have_text "Multi user field"
               expect(page).to have_text I18n.t("placeholders.default")
diff --git a/spec/features/projects/project_custom_fields/settings/mapping_spec.rb b/spec/features/projects/project_custom_fields/settings/mapping_spec.rb
index f94c13871eee..3cc245f6fb6d 100644
--- a/spec/features/projects/project_custom_fields/settings/mapping_spec.rb
+++ b/spec/features/projects/project_custom_fields/settings/mapping_spec.rb
@@ -260,7 +260,7 @@
     it "filters the project custom fields by name with given user input" do
       visit project_settings_project_custom_fields_path(project)
 
-      fill_in "project-custom-fields-mapping-filter", with: "Boolean"
+      fill_in "border-box-filter", with: "Boolean"
 
       within_custom_field_section_container(section_for_input_fields) do
         expect(page).to have_content("Boolean field")
diff --git a/spec/features/projects/projects_index_spec.rb b/spec/features/projects/projects_index_spec.rb
deleted file mode 100644
index 5e375ac252b8..000000000000
--- a/spec/features/projects/projects_index_spec.rb
+++ /dev/null
@@ -1,1622 +0,0 @@
-#-- copyright
-# OpenProject is an open source project management software.
-# Copyright (C) the OpenProject GmbH
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License version 3.
-#
-# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-# Copyright (C) 2006-2013 Jean-Philippe Lang
-# Copyright (C) 2010-2013 the ChiliProject Team
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# See COPYRIGHT and LICENSE files for more details.
-#++
-
-require "spec_helper"
-
-RSpec.describe "Projects index page", :js, :with_cuprite, with_settings: { login_required?: false } do
-  shared_let(:admin) { create(:admin) }
-
-  shared_let(:manager)   { create(:project_role, name: "Manager") }
-  shared_let(:developer) { create(:project_role, name: "Developer") }
-
-  shared_let(:custom_field) { create(:text_project_custom_field) }
-  shared_let(:invisible_custom_field) { create(:project_custom_field, admin_only: true) }
-
-  shared_let(:project) { create(:project, name: "Plain project", identifier: "plain-project") }
-  shared_let(:public_project) do
-    create(:project, name: "Public Pr", identifier: "public-pr", public: true) do |project|
-      project.custom_field_values = { invisible_custom_field.id => "Secret CF" }
-    end
-  end
-  shared_let(:development_project) { create(:project, name: "Development project", identifier: "development-project") }
-
-  let(:news) { create(:news, project:) }
-  let(:projects_page) { Pages::Projects::Index.new }
-
-  include ProjectStatusHelper
-
-  def load_and_open_filters(user)
-    login_as(user)
-    projects_page.visit!
-    projects_page.open_filters
-  end
-
-  describe "project visibility restriction" do
-    context "for an anonymous user" do
-      specify "only public projects shall be visible" do
-        ProjectRole.anonymous
-        visit projects_path
-
-        expect(page).to have_no_text(project.name)
-        expect(page).to have_text(public_project.name)
-
-        # Test that the 'More' menu stays invisible on hover
-        expect(page).to have_no_css(".icon-show-more-horizontal")
-      end
-    end
-
-    context "for project members" do
-      shared_let(:user) do
-        create(:user,
-               member_with_roles: { development_project => developer },
-               login: "nerd",
-               firstname: "Alan",
-               lastname: "Turing")
-      end
-
-      specify "only public projects or those the user is a member of shall be visible" do
-        ProjectRole.non_member
-        login_as(user)
-        visit projects_path
-
-        expect(page).to have_text(development_project.name)
-        expect(page).to have_text(public_project.name)
-        expect(page).to have_no_text(project.name)
-
-        # Non-admin users shall not see invisible CFs.
-        expect(page).to have_no_text(invisible_custom_field.name.upcase)
-        expect(page).to have_no_select("add_filter_select", with_options: [invisible_custom_field.name])
-      end
-
-      context "with project attributes" do
-        let(:user) do
-          create(:user,
-                 member_with_roles: {
-                   development_project => create(:existing_project_role, permissions:),
-                   project => create(:existing_project_role)
-                 })
-        end
-
-        let!(:list_custom_field) do
-          create(:list_project_custom_field, multi_value: true).tap do |cf|
-            development_project.update(custom_field_values: { cf.id => [cf.value_of("A"), cf.value_of("B")] })
-            project.update(custom_field_values: { cf.id => [cf.value_of("A"), cf.value_of("B")] })
-          end
-        end
-
-        context "with view_project_attributes permission" do
-          let(:permissions) { %i(view_project_attributes) }
-
-          it "can see the project attribute field in the filter section" do
-            load_and_open_filters user
-
-            expect(page).to have_select("add_filter_select", with_options: [list_custom_field.name])
-          end
-        end
-
-        context "without view_project_attributes permission" do
-          let(:permissions) { [] }
-
-          it "cannot see the project attribute field in the filter section" do
-            load_and_open_filters user
-
-            expect(page).to have_no_select("add_filter_select", with_options: [list_custom_field.name])
-          end
-        end
-      end
-    end
-
-    context "for work package members" do
-      shared_let(:work_package) { create(:work_package, project: development_project) }
-      shared_let(:user) do
-        create(:user,
-               member_with_permissions: { work_package => [:view_work_packages] },
-               login: "nerd",
-               firstname: "Alan",
-               lastname: "Turing")
-      end
-
-      specify "only public projects or those the user is member in a specific work package" do
-        Setting.enabled_projects_columns += [custom_field.column_name]
-
-        development_project.update(
-          description: "I am a nice project",
-          status_explanation: "We are on track",
-          status_code: "on_track",
-          custom_field_values: { custom_field.id => "This is a test value" }
-        )
-
-        login_as(user)
-        projects_page.visit!
-
-        projects_page.within_table do
-          expect(page).to have_text(development_project.name)
-          expect(page).to have_text(public_project.name)
-          expect(page).to have_no_text(project.name)
-
-          # They should not see the description, status or custom fields for the project
-          expect(page).to have_no_text(development_project.description)
-          expect(page).to have_no_text(project_status_name(development_project.status_code))
-          expect(page).to have_no_text(development_project.status_explanation)
-          expect(page)
-            .to have_no_text(
-              development_project.custom_values_for_custom_field(
-                id: custom_field.id,
-                all: true
-              ).first.value
-            )
-        end
-      end
-
-      context "with project attributes" do
-        let!(:list_custom_field) do
-          create(:list_project_custom_field, multi_value: true).tap do |cf|
-            development_project.update(custom_field_values: { cf.id => [cf.value_of("A"), cf.value_of("B")] })
-            project.update(custom_field_values: { cf.id => [cf.value_of("A"), cf.value_of("B")] })
-          end
-        end
-
-        it "cannot see the project attribute field in the filter section" do
-          load_and_open_filters user
-
-          expect(page).to have_no_select("add_filter_select", with_options: [list_custom_field.name])
-        end
-      end
-    end
-
-    context "for admins" do
-      before do
-        project.update(created_at: 7.days.ago, description: "I am a nice project")
-
-        news
-      end
-
-      specify "all projects are visible" do
-        login_as(admin)
-        visit projects_path
-
-        expect(page).to have_text(public_project.name)
-        expect(page).to have_text(project.name)
-
-        # Test visibility of 'more' menu list items
-        projects_page.activate_menu_of(project) do |menu|
-          expect(menu).to have_text("Copy")
-          expect(menu).to have_text("Project settings")
-          expect(menu).to have_text("New subproject")
-          expect(menu).to have_text("Delete")
-          expect(menu).to have_text("Archive")
-        end
-
-        # Test visibility of admin only properties
-        within("#project-table") do
-          expect(page)
-            .to have_css("th", text: "REQUIRED DISK STORAGE")
-          expect(page)
-            .to have_css("th", text: "CREATED ON")
-          expect(page)
-            .to have_css("td", text: project.created_at.strftime("%m/%d/%Y"))
-          expect(page)
-            .to have_css("th", text: "LATEST ACTIVITY AT")
-          expect(page)
-            .to have_css("td", text: news.created_at.strftime("%m/%d/%Y"))
-        end
-      end
-
-      specify "project can be marked as favorite" do
-        login_as(admin)
-        visit projects_path
-
-        projects_page.activate_menu_of(project) do |menu|
-          expect(menu).to have_text("Add to favorites")
-          click_link_or_button "Add to favorites"
-        end
-
-        visit project_path(project)
-        expect(project).to be_favored_by(admin)
-
-        visit projects_path
-        projects_page.activate_menu_of(project) do |menu|
-          expect(menu).to have_text("Remove from favorites")
-          click_link_or_button "Remove from favorites"
-        end
-
-        visit project_path(project)
-        expect(project).not_to be_favored_by(admin)
-
-        visit projects_path
-        projects_page.within_row(project) do
-          page.find_test_selector("project-list-favorite-button").click
-        end
-
-        projects_page.activate_menu_of(project) do |menu|
-          expect(menu).to have_text("Remove from favorites")
-        end
-        expect(project).to be_favored_by(admin)
-
-        projects_page.within_row(project) do
-          page.find_test_selector("project-list-favorite-button").click
-        end
-
-        projects_page.activate_menu_of(project) do |menu|
-          expect(menu).to have_text("Add to favorites")
-        end
-        expect(project).not_to be_favored_by(admin)
-      end
-
-      specify "flash sortBy is being escaped" do
-        login_as(admin)
-        visit projects_path(sortBy: "[[\"><script src='/foobar.js'></script>\",\"\"]]")
-
-        error_text = "Orders ><script src='/foobar js'></script> is not set to one of the allowed values. and does not exist."
-        error_html = "Orders &gt;&lt;script src='/foobar js'&gt;&lt;/script&gt; is not set to one of the allowed values. and does not exist."
-        expect_flash(type: :error, message: error_text)
-
-        error_container = find_flash_element(type: :error)
-        expect(error_container["innerHTML"]).to include error_html
-      end
-    end
-
-    context "for project attributes" do
-      let(:user) do
-        create(:user,
-               member_with_roles: {
-                 development_project => create(:existing_project_role, permissions:),
-                 project => create(:existing_project_role)
-               })
-      end
-
-      let!(:list_custom_field) do
-        create(:list_project_custom_field, multi_value: true).tap do |cf|
-          development_project.update(custom_field_values: { cf.id => [cf.value_of("A"), cf.value_of("B")] })
-          project.update(custom_field_values: { cf.id => [cf.value_of("A"), cf.value_of("B")] })
-        end
-      end
-
-      before do
-        login_as(user)
-        projects_page.visit!
-      end
-
-      context "with view_project_attributes permission" do
-        let(:permissions) { %i(view_project_attributes) }
-
-        it "can see the project attribute field value in the project list" do
-          projects_page.set_columns(list_custom_field.name)
-          projects_page.expect_columns(list_custom_field.name)
-
-          projects_page.within_row(development_project) do
-            expect(page).to have_css("td.#{list_custom_field.column_name}", text: "A, B")
-          end
-
-          projects_page.within_row(project) do
-            expect(page).to have_css("td.#{list_custom_field.column_name}", text: "")
-          end
-        end
-      end
-
-      context "without view_project_attributes permission" do
-        let(:permissions) { [] }
-
-        it "cannot see the project attribute field in the table configuration" do
-          projects_page.expect_no_config_columns(list_custom_field.name)
-        end
-      end
-    end
-  end
-
-  context "with valid Enterprise token" do
-    shared_let(:long_text_custom_field) { create(:text_project_custom_field) }
-    specify "CF columns and filters are not visible by default" do
-      load_and_open_filters admin
-
-      # CF's columns are not shown due to setting
-      expect(page).to have_no_text(custom_field.name.upcase)
-    end
-
-    specify "CF columns and filters are visible when added to settings" do
-      Setting.enabled_projects_columns += [custom_field.column_name, invisible_custom_field.column_name]
-      load_and_open_filters admin
-
-      # CF's column is present:
-      expect(page).to have_text(custom_field.name.upcase)
-      # CF's filter is present:
-      expect(page).to have_select("add_filter_select", with_options: [custom_field.name])
-
-      # Admins shall be the only ones to see invisible CFs
-      expect(page).to have_text(invisible_custom_field.name.upcase)
-      expect(page).to have_select("add_filter_select", with_options: [invisible_custom_field.name])
-    end
-
-    specify "long-text fields are truncated" do
-      development_project.update(
-        description: "I am a nice project with a very long long long long long long long long long description",
-        status_explanation: "<figure>I am a nice project status description with a figure</figure>",
-        custom_field_values: { custom_field.id => "This is a short value",
-                               long_text_custom_field.id => "This is a very long long long long long long long value" }
-      )
-
-      development_project.save!
-      login_as(admin)
-      Setting.enabled_projects_columns += [custom_field.column_name, long_text_custom_field.column_name, "description",
-                                           "status_explanation"]
-      projects_page.visit!
-
-      # Check if the description is truncated and shows the Expand button correctly
-      projects_page.within_row(development_project) do
-        expect(page).to have_css('td.description [data-test-selector="expand-button"]')
-        page.find('td.description [data-test-selector="expand-button"]').click
-      end
-
-      expect(page).to have_css(".Overlay-body", text: development_project.description)
-
-      # Check if the status explanation with an html tag is truncated and shows the cell text and Expand button correctly
-      projects_page.within_row(development_project) do
-        expect(page).to have_css('td.status_explanation [data-test-selector="expand-button"]')
-        expect(page).to have_css("td.status_explanation", text: "Preview not available")
-      end
-
-      # Check if a long-text custom field which has a short text as value is not truncated and there is no Expand button there
-      projects_page.within_row(development_project) do
-        expect(page).to have_no_css("td.cf_#{custom_field.id} [data-test-selector=\"expand-button\"]")
-        expect(page).to have_css("td.cf_#{custom_field.id}", text: "This is a short value")
-      end
-
-      # Check if a long-text custom field which has a long text as value is truncated and there is an Expand button there
-      projects_page.within_row(development_project) do
-        expect(page).to have_css("td.cf_#{long_text_custom_field.id} [data-test-selector=\"expand-button\"]")
-        expect(page).to have_css("td.cf_#{long_text_custom_field.id}",
-                                 text: "This is a very long long long long long long long value")
-      end
-    end
-  end
-
-  context "with a filter set" do
-    it "only shows the matching projects and filters" do
-      load_and_open_filters admin
-
-      projects_page.filter_by_name_and_identifier("Plain")
-
-      # Filter is applied: Only the project that contains the the word "Plain" gets listed
-      projects_page.expect_projects_listed(project)
-      projects_page.expect_projects_not_listed(public_project)
-      # Filter form is visible and the filter is still set.
-      expect(page).to have_field("name_and_identifier", with: "Plain")
-    end
-  end
-
-  context "when paginating", with_settings: { enabled_projects_columns: %w[name project_status] } do
-    before do
-      allow(Setting).to receive(:per_page_options_array).and_return([1, 5])
-    end
-
-    it "keeps applied filters, orders and columns" do
-      load_and_open_filters admin
-
-      projects_page.filter_by_name_and_identifier("project")
-
-      wait_for_reload
-
-      projects_page.set_columns("Name")
-      wait_for_reload
-      projects_page.expect_columns("Name")
-      projects_page.expect_no_columns("Status")
-
-      # Sorts ASC by name
-      projects_page.click_table_header_to_open_action_menu("Name")
-      projects_page.sort_via_action_menu("Name", direction: :asc)
-      wait_for_reload
-      projects_page.expect_sort_order_via_table_header("Name", direction: :asc)
-
-      # Results should be filtered and ordered ASC by name and only the selected columns should be present
-      projects_page.expect_projects_listed(development_project)
-      projects_page.expect_projects_not_listed(public_project, # as it is filtered out
-                                               project)        # as it is on the second page
-      projects_page.expect_columns("Name")
-      projects_page.expect_no_columns("Status")
-      expect(page).to have_text("Next") # as the result set is larger than 1
-
-      # Changing the page size to 5 and back to 1 should not change the filters (which we test later on the second page)
-      projects_page.set_page_size(5)
-      wait_for_reload
-      projects_page.expect_page_size(5)
-
-      projects_page.set_page_size(1)
-      wait_for_reload
-      projects_page.expect_page_size(1)
-
-      projects_page.go_to_page(2) # Go to pagination page 2
-      wait_for_reload
-      projects_page.expect_current_page_number(2)
-
-      # On page 2 you should see the second page of the filtered set ordered ASC by name and only the selected columns exist
-      projects_page.expect_projects_listed(project)
-      projects_page.expect_projects_not_listed(public_project,      # Filtered out
-                                               development_project) # Present on page 1
-      projects_page.expect_columns("Name")
-      projects_page.expect_no_columns("Status")
-      projects_page.expect_total_pages(2) # Filters kept active, so there is no third page.
-
-      # Sorts DESC by name
-      projects_page.click_table_header_to_open_action_menu("Name")
-      projects_page.sort_via_action_menu("Name", direction: :desc)
-      wait_for_reload
-      projects_page.expect_sort_order_via_table_header("Name", direction: :desc)
-
-      # Clicking on sorting resets the page to the first one
-      projects_page.expect_current_page_number(1)
-
-      # The same filters should still be intact but the order should be DESC on name
-      projects_page.expect_projects_listed(project)
-      projects_page.expect_projects_not_listed(public_project, # Filtered out
-                                               development_project) # Present on page 2
-
-      projects_page.expect_total_pages(2) # Filters kept active, so there is no third page.
-      projects_page.expect_columns("Name")
-      projects_page.expect_no_columns("Status")
-
-      # Sending the filter form again what implies to compose the request freshly
-      wait_for_reload
-
-      projects_page.expect_sort_order_via_table_header("Name", direction: :desc)
-
-      # We should see page 1, resetting pagination, as it is a new filter, but keeping the DESC order on the project
-      # name
-      projects_page.expect_projects_listed(project)
-      projects_page.expect_projects_not_listed(development_project, # as it is on the second page
-                                               public_project)      # as it filtered out
-      projects_page.expect_total_pages(2) # as the result set is larger than 1
-      projects_page.expect_columns("Name")
-      projects_page.expect_no_columns("Status")
-    end
-  end
-
-  context "when filter of type" do
-    specify "Name and identifier gives results in both, name and identifier" do
-      load_and_open_filters admin
-
-      # Filter on model attribute 'name'
-      projects_page.filter_by_name_and_identifier("Plain")
-      wait_for_reload
-
-      projects_page.expect_projects_listed(project)
-      projects_page.expect_projects_not_listed(development_project, public_project)
-
-      projects_page.remove_filter("name_and_identifier")
-      projects_page.expect_projects_listed(project, development_project, public_project)
-
-      # Filter on model attribute 'name' triggered by keyboard input event instead of change
-      projects_page.filter_by_name_and_identifier("Plain", send_keys: true)
-      wait_for_reload
-
-      projects_page.expect_projects_listed(project)
-      projects_page.expect_projects_not_listed(development_project, public_project)
-
-      projects_page.remove_filter("name_and_identifier")
-      projects_page.expect_projects_listed(project, development_project, public_project)
-
-      # Filter on model attribute 'identifier'
-      projects_page.filter_by_name_and_identifier("plain-project")
-      wait_for_reload
-
-      projects_page.expect_projects_listed(project)
-      projects_page.expect_projects_not_listed(development_project, public_project)
-    end
-
-    describe "Active or archived" do
-      shared_let(:parent_project) do
-        create(:project,
-               name: "Parent project",
-               identifier: "parent-project")
-      end
-      shared_let(:child_project) do
-        create(:project,
-               name: "Child project",
-               identifier: "child-project",
-               parent: parent_project)
-      end
-
-      specify 'filter on "status", archive and unarchive' do
-        load_and_open_filters admin
-
-        # value selection defaults to "active"'
-        expect(page).to have_css('li[data-filter-name="active"]')
-
-        projects_page.expect_projects_listed(parent_project,
-                                             child_project,
-                                             project,
-                                             development_project,
-                                             public_project)
-
-        accept_alert do
-          projects_page.click_menu_item_of("Archive", parent_project)
-        end
-        wait_for_reload
-
-        projects_page.expect_projects_not_listed(parent_project,
-                                                 child_project) # The child project gets archived automatically
-
-        projects_page.expect_projects_listed(project, development_project, public_project)
-
-        visit project_overview_path(parent_project)
-        expect(page).to have_text("The project you're trying to access has been archived.")
-
-        # The child project gets archived automatically
-        visit project_overview_path(child_project)
-        expect(page).to have_text("The project you're trying to access has been archived.")
-
-        load_and_open_filters admin
-
-        projects_page.filter_by_active("no")
-
-        projects_page.expect_projects_listed(parent_project, child_project, archived: true)
-
-        # Test visibility of 'more' menu list items
-        projects_page.activate_menu_of(parent_project) do |menu|
-          expect(menu).to have_text("Add to favorites")
-          expect(menu).to have_text("Unarchive")
-          expect(menu).to have_text("Delete")
-          expect(menu).to have_no_text("Archive")
-          expect(menu).to have_no_text("Copy")
-          expect(menu).to have_no_text("Settings")
-          expect(menu).to have_no_text("New subproject")
-
-          click_link_or_button("Unarchive")
-        end
-
-        # The child project does not get unarchived automatically
-        visit project_path(child_project)
-        expect(page).to have_text("The project you're trying to access has been archived.")
-
-        visit project_path(parent_project)
-        expect(page).to have_text(parent_project.name)
-
-        load_and_open_filters admin
-
-        projects_page.filter_by_active("yes")
-
-        projects_page.expect_projects_listed(parent_project,
-                                             project,
-                                             development_project,
-                                             public_project)
-        projects_page.expect_projects_not_listed(child_project)
-      end
-    end
-
-    describe "I am member or not" do
-      shared_let(:member) { create(:user, member_with_permissions: { project => %i[view_work_packages edit_work_packages] }) }
-
-      it "filters for projects I'm a member on and those where I'm not" do
-        ProjectRole.non_member
-        load_and_open_filters member
-
-        projects_page.expect_projects_listed(project, public_project)
-
-        projects_page.filter_by_membership("yes")
-        wait_for_reload
-
-        projects_page.expect_projects_listed(project)
-        projects_page.expect_projects_not_listed(public_project, development_project)
-
-        projects_page.filter_by_membership("no")
-        wait_for_reload
-
-        projects_page.expect_projects_listed(public_project)
-        projects_page.expect_projects_not_listed(project, development_project)
-      end
-    end
-
-    describe "project status filter" do
-      shared_let(:no_status_project) do
-        # A project that doesn't have a status code set
-        create(:project,
-               name: "No status project")
-      end
-
-      shared_let(:green_project) do
-        # A project that has a status code set
-        create(:project,
-               status_code: "on_track",
-               name: "Green project")
-      end
-
-      it "sorts and filters on project status" do
-        login_as(admin)
-        projects_page.visit!
-
-        projects_page.click_table_header_to_open_action_menu("project_status")
-        projects_page.sort_via_action_menu("project_status", direction: :asc)
-
-        projects_page.expect_project_at_place(green_project, 1)
-        expect(page).to have_text("(1 - 5/5)")
-
-        projects_page.click_table_header_to_open_action_menu("project_status")
-        projects_page.sort_via_action_menu("project_status", direction: :desc)
-
-        projects_page.expect_project_at_place(green_project, 5)
-        expect(page).to have_text("(1 - 5/5)")
-
-        projects_page.open_filters
-
-        projects_page.set_filter("project_status_code",
-                                 "Project status",
-                                 "is (OR)",
-                                 ["On track"])
-        wait_for_reload
-
-        expect(page).to have_text(green_project.name)
-        expect(page).to have_no_text(no_status_project.name)
-
-        projects_page.set_filter("project_status_code",
-                                 "Project status",
-                                 "is not empty",
-                                 [])
-        wait_for_reload
-
-        expect(page).to have_text(green_project.name)
-        expect(page).to have_no_text(no_status_project.name)
-
-        projects_page.set_filter("project_status_code",
-                                 "Project status",
-                                 "is empty",
-                                 [])
-        wait_for_reload
-
-        expect(page).to have_no_text(green_project.name)
-        expect(page).to have_text(no_status_project.name)
-
-        projects_page.set_filter("project_status_code",
-                                 "Project status",
-                                 "is not",
-                                 ["On track"])
-        wait_for_reload
-
-        expect(page).to have_no_text(green_project.name)
-        expect(page).to have_text(no_status_project.name)
-      end
-    end
-
-    describe "other filter types" do
-      context "for admins" do
-        shared_let(:list_custom_field) { create(:list_project_custom_field) }
-        shared_let(:date_custom_field) { create(:date_project_custom_field) }
-        shared_let(:datetime_of_this_week) do
-          today = Date.current
-          # Ensure that the date is not today but still in the middle of the week to not run into week-start-issues here.
-          date_of_this_week = today + ((today.wday % 7) > 2 ? -1 : 1)
-          DateTime.parse("#{date_of_this_week}T11:11:11+00:00")
-        end
-        shared_let(:fixed_datetime) { DateTime.parse("2017-11-11T11:11:11+00:00") }
-
-        shared_let(:project_created_on_today) do
-          freeze_time
-          project = create(:project,
-                           name: "Created today project")
-          project.custom_field_values = { list_custom_field.id => list_custom_field.possible_values[2],
-                                          date_custom_field.id => "2011-11-11" }
-          project.save!
-          project
-        ensure
-          travel_back
-        end
-        shared_let(:project_created_on_this_week) do
-          travel_to(datetime_of_this_week)
-          create(:project,
-                 name: "Created on this week project")
-        ensure
-          travel_back
-        end
-        shared_let(:project_created_on_six_days_ago) do
-          travel_to(DateTime.now - 6.days)
-          create(:project,
-                 name: "Created on six days ago project")
-        ensure
-          travel_back
-        end
-        shared_let(:project_created_on_fixed_date) do
-          travel_to(fixed_datetime)
-          create(:project,
-                 name: "Created on fixed date project")
-        ensure
-          travel_back
-        end
-        shared_let(:todays_wp) do
-          # This WP should trigger a change to the project's 'latest activity at' DateTime
-          create(:work_package,
-                 updated_at: DateTime.now,
-                 project: project_created_on_today)
-        end
-
-        before do
-          project_created_on_today
-          load_and_open_filters admin
-        end
-
-        specify "selecting operator" do
-          # created on 'today' shows projects that were created today
-          projects_page.set_filter("created_at",
-                                   "Created on",
-                                   "today")
-          wait_for_reload
-          expect(page).to have_no_text(project_created_on_this_week.name)
-          expect(page).to have_text(project_created_on_today.name)
-          expect(page).to have_no_text(project_created_on_fixed_date.name)
-
-          # created on 'this week' shows projects that were created within the last seven days
-          projects_page.remove_filter("created_at")
-
-          projects_page.set_filter("created_at",
-                                   "Created on",
-                                   "this week")
-          wait_for_reload
-
-          expect(page).to have_no_text(project_created_on_fixed_date.name)
-          expect(page).to have_text(project_created_on_today.name)
-          expect(page).to have_text(project_created_on_this_week.name)
-
-          # created on 'on' shows projects that were created within the last seven days
-          projects_page.remove_filter("created_at")
-
-          projects_page.set_filter("created_at",
-                                   "Created on",
-                                   "on",
-                                   ["2017-11-11"])
-          wait_for_reload
-
-          expect(page).to have_text(project_created_on_fixed_date.name)
-          expect(page).to have_no_text(project_created_on_today.name)
-          expect(page).to have_no_text(project_created_on_this_week.name)
-
-          # created on 'less than days ago'
-          projects_page.remove_filter("created_at")
-
-          projects_page.set_filter("created_at",
-                                   "Created on",
-                                   "less than days ago",
-                                   ["1"])
-          wait_for_reload
-
-          expect(page).to have_text(project_created_on_today.name)
-          expect(page).to have_no_text(project_created_on_fixed_date.name)
-
-          # created on 'less than days ago' triggered by an input event
-          projects_page.remove_filter("created_at")
-          projects_page.set_filter("created_at",
-                                   "Created on",
-                                   "less than days ago",
-                                   ["1"],
-                                   send_keys: true)
-          wait_for_reload
-
-          expect(page).to have_text(project_created_on_today.name)
-          expect(page).to have_no_text(project_created_on_fixed_date.name)
-
-          # created on 'more than days ago'
-          projects_page.remove_filter("created_at")
-
-          projects_page.set_filter("created_at",
-                                   "Created on",
-                                   "more than days ago",
-                                   ["1"])
-          wait_for_reload
-
-          expect(page).to have_text(project_created_on_fixed_date.name)
-          expect(page).to have_no_text(project_created_on_today.name)
-
-          # created on 'more than days ago'
-          projects_page.remove_filter("created_at")
-
-          projects_page.set_filter("created_at",
-                                   "Created on",
-                                   "more than days ago",
-                                   ["1"],
-                                   send_keys: true)
-          wait_for_reload
-
-          expect(page).to have_text(project_created_on_fixed_date.name)
-          expect(page).to have_no_text(project_created_on_today.name)
-
-          # created on 'between'
-          projects_page.remove_filter("created_at")
-
-          projects_page.set_filter("created_at",
-                                   "Created on",
-                                   "between",
-                                   ["2017-11-10", "2017-11-12"])
-          wait_for_reload
-
-          expect(page).to have_text(project_created_on_fixed_date.name)
-          expect(page).to have_no_text(project_created_on_today.name)
-
-          # Latest activity at 'today'. This spot check would fail if the data does not get collected from multiple tables
-          projects_page.remove_filter("created_at")
-
-          projects_page.set_filter("latest_activity_at",
-                                   "Latest activity at",
-                                   "today")
-          wait_for_reload
-
-          expect(page).to have_no_text(project_created_on_fixed_date.name)
-          expect(page).to have_text(project_created_on_today.name)
-
-          # CF List
-          projects_page.remove_filter("latest_activity_at")
-
-          projects_page.set_filter(list_custom_field.column_name,
-                                   list_custom_field.name,
-                                   "is (OR)",
-                                   [list_custom_field.possible_values[2].value])
-          wait_for_reload
-
-          expect(page).to have_no_text(project_created_on_fixed_date.name)
-          expect(page).to have_text(project_created_on_today.name)
-
-          # switching to multiselect keeps the current selection
-          cf_filter = page.find("li[data-filter-name='#{list_custom_field.column_name}']")
-
-          select_value_id = "#{list_custom_field.column_name}_value"
-
-          within(cf_filter) do
-            # Initial filter is a 'single select'
-            expect(cf_filter.find(:select, select_value_id)).not_to be_multiple
-            click_on "Toggle multiselect"
-            # switching to multiselect keeps the current selection
-            expect(cf_filter.find(:select, select_value_id)).to be_multiple
-            expect(cf_filter).to have_select(select_value_id, selected: list_custom_field.possible_values[2].value)
-
-            select list_custom_field.possible_values[3].value, from: select_value_id
-          end
-          wait_for_reload
-
-          cf_filter = page.find("li[data-filter-name='#{list_custom_field.column_name}']")
-          within(cf_filter) do
-            # Query has two values for that filter, so it should show a 'multi select'.
-            expect(cf_filter.find(:select, select_value_id)).to be_multiple
-            expect(cf_filter)
-              .to have_select(select_value_id,
-                              selected: [list_custom_field.possible_values[2].value,
-                                         list_custom_field.possible_values[3].value])
-
-            # switching to single select keeps the first selection
-            select list_custom_field.possible_values[1].value, from: select_value_id
-            unselect list_custom_field.possible_values[2].value, from: select_value_id
-
-            click_on "Toggle multiselect"
-            expect(cf_filter.find(:select, select_value_id)).not_to be_multiple
-            expect(cf_filter).to have_select(select_value_id, selected: list_custom_field.possible_values[1].value)
-            expect(cf_filter).to have_no_select(select_value_id, selected: list_custom_field.possible_values[3].value)
-          end
-          wait_for_reload
-
-          cf_filter = page.find("li[data-filter-name='#{list_custom_field.column_name}']")
-          within(cf_filter) do
-            # Query has one value for that filter, so it should show a 'single select'.
-            expect(cf_filter.find(:select, select_value_id)).not_to be_multiple
-          end
-
-          # CF date filter work (at least for one operator)
-          projects_page.remove_filter(list_custom_field.column_name)
-
-          projects_page.set_filter(date_custom_field.column_name,
-                                   date_custom_field.name,
-                                   "on",
-                                   ["2011-11-11"])
-          wait_for_reload
-
-          expect(page).to have_no_text(project_created_on_fixed_date.name)
-          expect(page).to have_text(project_created_on_today.name)
-
-          # Disabling a CF in the project should remove the project from results
-
-          project_created_on_today.project_custom_field_project_mappings.destroy_all
-
-          # refresh the page
-          page.driver.refresh
-          wait_for_reload
-
-          expect(page).to have_no_text(project_created_on_today.name)
-          expect(page).to have_no_text(project_created_on_fixed_date.name)
-        end
-
-        pending "NOT WORKING YET: Date vs. DateTime issue: Selecting same date for from and to value shows projects of that date"
-      end
-
-      context "for non-admins" do
-        let(:user) do
-          create(:user,
-                 member_with_roles: {
-                   development_project => create(:existing_project_role, permissions:),
-                   project => create(:existing_project_role)
-                 })
-        end
-
-        let!(:list_custom_field) do
-          create(:list_project_custom_field,
-                 multi_value: true,
-                 possible_values: ["Option 1", "Option 2", "Option 3"]).tap do |cf|
-            development_project.update(custom_field_values: { cf.id => [cf.value_of("Option 1")] })
-            project.update(custom_field_values: { cf.id => [cf.value_of("Option 1")] })
-          end
-        end
-
-        context "with view_project_attributes permission" do
-          let(:permissions) { %i(view_project_attributes) }
-
-          it "can find projects filtered by the project attribute" do
-            load_and_open_filters user
-
-            projects_page.set_filter(list_custom_field.column_name,
-                                     list_custom_field.name,
-                                     "is (OR)",
-                                     ["Option 1"])
-
-            # Filter is applied: Only projects with view_project_attributes permission are returned
-            projects_page.expect_projects_listed(development_project)
-            projects_page.expect_projects_not_listed(project)
-            # Filter form is visible and the filter is still set.
-            expect(page).to have_css("li[data-filter-name=\"#{list_custom_field.column_name}\"]")
-          end
-        end
-      end
-    end
-
-    describe "public filter" do
-      it 'filters on "public" status' do
-        load_and_open_filters admin
-
-        projects_page.expect_projects_listed(project, public_project)
-
-        projects_page.filter_by_public("no")
-        wait_for_reload
-
-        projects_page.expect_projects_listed(project)
-        projects_page.expect_projects_not_listed(public_project)
-
-        load_and_open_filters admin
-
-        projects_page.filter_by_public("yes")
-        wait_for_reload
-
-        projects_page.expect_projects_listed(public_project)
-        projects_page.expect_projects_not_listed(project)
-      end
-    end
-  end
-
-  context "for non-admins with role with permission" do
-    shared_let(:can_copy_projects_role) do
-      create(:project_role, name: "Can Copy Projects Role", permissions: [:copy_projects])
-    end
-    shared_let(:can_add_subprojects_role) do
-      create(:project_role, name: "Can Add Subprojects Role", permissions: [:add_subprojects])
-    end
-
-    shared_let(:parent_project) do
-      create(:project,
-             name: "Parent project",
-             identifier: "parent-project")
-    end
-
-    shared_let(:can_copy_projects_manager) do
-      create(:user,
-             member_with_roles: { parent_project => can_copy_projects_role })
-    end
-    shared_let(:can_add_subprojects_manager) do
-      create(:user,
-             member_with_roles: { parent_project => can_add_subprojects_role })
-    end
-    let(:simple_member) do
-      create(:user,
-             member_with_roles: { parent_project => developer })
-    end
-
-    before do
-      # We are not admin so we need to force the built-in roles to have them.
-      ProjectRole.non_member
-
-      # Remove public projects from the default list for these scenarios.
-      public_project.update(active: false)
-
-      project.update(created_at: 7.days.ago)
-
-      parent_project.enabled_module_names -= ["activity"]
-      news
-    end
-
-    it 'can see the "More" menu' do
-      login_as(simple_member)
-      visit projects_path
-
-      expect(page).to have_text(parent_project.name)
-
-      projects_page.activate_menu_of(parent_project) do |menu|
-        expect(menu).to have_text("Add to favorites")
-        expect(menu).to have_no_text("Copy")
-      end
-
-      # For a project member with :copy_projects privilege the 'More' menu is visible.
-      login_as(can_copy_projects_manager)
-      visit projects_path
-
-      expect(page).to have_text(parent_project.name)
-
-      projects_page.activate_menu_of(parent_project) do |menu|
-        expect(menu).to have_text("Copy")
-      end
-
-      # For a project member with :add_subprojects privilege the 'More' menu is visible.
-      login_as(can_add_subprojects_manager)
-      visit projects_path
-
-      projects_page.activate_menu_of(parent_project) do |menu|
-        expect(menu).to have_text("Add to favorites")
-        expect(menu).to have_text("New subproject")
-      end
-
-      # Test admin only properties are invisible
-      within("#project-table") do
-        expect(page)
-          .to have_no_css("th", text: "REQUIRED DISK STORAGE")
-        expect(page)
-          .to have_no_css("th", text: "CREATED ON")
-        expect(page)
-          .to have_no_css("td", text: project.created_at.strftime("%m/%d/%Y"))
-        expect(page)
-          .to have_no_css("th", text: "LATEST ACTIVITY AT")
-        expect(page)
-          .to have_no_css("td", text: news.created_at.strftime("%m/%d/%Y"))
-      end
-    end
-  end
-
-  describe "order" do
-    shared_let(:integer_custom_field) { create(:integer_project_custom_field) }
-    # order is important here as the implementation uses lft
-    # first but then reorders in ruby
-    shared_let(:child_project_z) { create(:project, parent: project, name: "Z Child") }
-
-    # intentionally written lowercase to test for case insensitive sorting
-    shared_let(:child_project_m) { create(:project, parent: project, name: "m Child") }
-
-    shared_let(:child_project_a) { create(:project, parent: project, name: "A Child") }
-
-    before do
-      login_as(admin)
-      visit projects_path
-
-      project.custom_field_values = { integer_custom_field.id => 1 }
-      project.save!
-      development_project.custom_field_values = { integer_custom_field.id => 2 }
-      development_project.save!
-      public_project.custom_field_values = { integer_custom_field.id => 3 }
-      public_project.save!
-      child_project_z.custom_field_values = { integer_custom_field.id => 4 }
-      child_project_z.save!
-      child_project_m.custom_field_values = { integer_custom_field.id => 4 }
-      child_project_m.save!
-      child_project_a.custom_field_values = { integer_custom_field.id => 4 }
-      child_project_a.save!
-    end
-
-    context "via the configure view dialog" do
-      before do
-        Setting.enabled_projects_columns += [integer_custom_field.column_name]
-      end
-
-      it "allows to sort via multiple columns" do
-        projects_page.open_configure_view
-        projects_page.switch_configure_view_tab(I18n.t("label_sort"))
-
-        # Initially we have the projects ordered by hierarchy
-        # When we sort by hierarchy, there is a special behavior that no other sorting is possible
-        # and the sort order is always ascending
-        projects_page.within_sort_row(0) do
-          projects_page.expect_sort_order(column_identifier: "lft", direction: "asc", direction_enabled: false)
-        end
-        projects_page.expect_number_of_sort_fields(1)
-
-        # Switch sorting order to Name descending
-        # We now get a second sort field to add another sort order, but it has nothing selected
-        # in the second field, name is not available as an option
-        projects_page.within_sort_row(0) do
-          projects_page.change_sort_order(column_identifier: :name, direction: :desc)
-        end
-        projects_page.expect_number_of_sort_fields(2)
-
-        projects_page.within_sort_row(1) do
-          projects_page.expect_sort_order(column_identifier: "", direction: "")
-          projects_page.expect_sort_option_is_disabled(column_identifier: :name)
-        end
-
-        # Let's add another sorting, this time by a custom field
-        # This will add a third sorting field
-        projects_page.within_sort_row(1) do
-          projects_page.change_sort_order(column_identifier: integer_custom_field.column_name, direction: :asc)
-        end
-
-        projects_page.expect_number_of_sort_fields(3)
-        projects_page.within_sort_row(2) do
-          projects_page.expect_sort_order(column_identifier: "", direction: "")
-          projects_page.expect_sort_option_is_disabled(column_identifier: :name)
-          projects_page.expect_sort_option_is_disabled(column_identifier: integer_custom_field.column_name)
-        end
-
-        # And now let's select a third option
-        # it will not add a 4th sorting field
-        projects_page.within_sort_row(2) do
-          projects_page.change_sort_order(column_identifier: :public, direction: :asc)
-        end
-        projects_page.expect_number_of_sort_fields(3)
-
-        # We unset the first sorting, this will move the 2nd sorting (custom field) to the first position and
-        # the 3rd sorting (public) to the second position and will add an empty option to the third position
-        projects_page.within_sort_row(0) do
-          projects_page.remove_sort_order
-        end
-
-        projects_page.expect_number_of_sort_fields(3)
-
-        projects_page.within_sort_row(0) do
-          projects_page.expect_sort_order(column_identifier: integer_custom_field.column_name, direction: :asc)
-        end
-        projects_page.within_sort_row(1) { projects_page.expect_sort_order(column_identifier: :public, direction: :asc) }
-        projects_page.within_sort_row(2) { projects_page.expect_sort_order(column_identifier: "", direction: "") }
-
-        # To roll back, we now select hierarchy as the third option, this will remove all other options
-        projects_page.within_sort_row(2) do
-          projects_page.change_sort_order(column_identifier: :lft, direction: :asc)
-        end
-
-        projects_page.within_sort_row(0) do
-          projects_page.expect_sort_order(column_identifier: "lft", direction: "asc", direction_enabled: false)
-        end
-        projects_page.expect_number_of_sort_fields(1)
-      end
-
-      it "resets the pagination when sorting (bug #55392)" do
-        # We need pagination, so reduce the page size to enable it
-        allow(Setting).to receive(:per_page_options_array).and_return([1, 5])
-        projects_page.set_page_size(1)
-        wait_for_reload
-        projects_page.expect_page_size(1)
-        projects_page.go_to_page(2) # Go to another page that is not the first one
-        wait_for_reload
-        projects_page.expect_current_page_number(2)
-
-        # Open config dialog and make changes to the sorting
-        projects_page.open_configure_view
-        projects_page.switch_configure_view_tab(I18n.t("label_sort"))
-        projects_page.within_sort_row(0) do
-          projects_page.change_sort_order(column_identifier: :name, direction: :desc)
-        end
-
-        # Save and close the dialog
-        projects_page.submit_config_view_dialog
-        wait_for_reload
-
-        # Changing the sorting resets the pagination to the first page
-        projects_page.expect_current_page_number(1)
-
-        # Go to another page again
-        projects_page.go_to_page(2)
-        wait_for_reload
-        projects_page.expect_current_page_number(2)
-
-        # Open dialog, do not change anything and save
-        projects_page.open_configure_view
-        projects_page.switch_configure_view_tab(I18n.t("label_sort"))
-        projects_page.submit_config_view_dialog
-        wait_for_reload
-
-        # An unchanged sorting will keep the current position in the pagination
-        projects_page.expect_current_page_number(2)
-      end
-
-      it "does not allow to sort via long text custom fields" do
-        long_text_custom_field = create(:text_project_custom_field)
-        Setting.enabled_projects_columns += [long_text_custom_field.column_name]
-
-        projects_page.open_configure_view
-        projects_page.switch_configure_view_tab(I18n.t("label_sort"))
-
-        projects_page.within_sort_row(0) do
-          projects_page.expect_sort_option_not_available(column_identifier: long_text_custom_field.column_name)
-        end
-      end
-    end
-
-    it "allows to alter the order in which projects are displayed via the column headers" do
-      Setting.enabled_projects_columns += [integer_custom_field.column_name]
-
-      # initially, ordered by name asc on each hierarchical level
-      projects_page
-        .expect_projects_in_order(development_project,
-                                  project,
-                                  child_project_a,
-                                  child_project_m,
-                                  child_project_z,
-                                  public_project)
-
-      projects_page.click_table_header_to_open_action_menu("Name")
-      projects_page.sort_via_action_menu("Name", direction: :asc)
-      wait_for_reload
-
-      # Projects ordered by name asc
-      projects_page
-        .expect_projects_in_order(child_project_a,
-                                  development_project,
-                                  child_project_m,
-                                  project,
-                                  public_project,
-                                  child_project_z)
-
-      projects_page.click_table_header_to_open_action_menu("Name")
-      projects_page.sort_via_action_menu("Name", direction: :desc)
-      wait_for_reload
-
-      # Projects ordered by name desc
-      projects_page
-        .expect_projects_in_order(child_project_z,
-                                  public_project,
-                                  project,
-                                  child_project_m,
-                                  development_project,
-                                  child_project_a)
-
-      projects_page.click_table_header_to_open_action_menu(integer_custom_field.column_name)
-      projects_page.sort_via_action_menu(integer_custom_field.column_name, direction: :asc)
-      wait_for_reload
-
-      # Projects ordered by cf asc first then project name desc
-      projects_page
-        .expect_projects_in_order(project,
-                                  development_project,
-                                  public_project,
-                                  child_project_z,
-                                  child_project_m,
-                                  child_project_a)
-
-      click_link_or_button('Sort by "Project hierarchy"')
-      wait_for_reload
-
-      # again ordered by name asc on each hierarchical level
-      projects_page
-        .expect_projects_in_order(development_project,
-                                  project,
-                                  child_project_a,
-                                  child_project_m,
-                                  child_project_z,
-                                  public_project)
-    end
-
-    it "sorts projects by latest_activity_at" do
-      projects_page.click_table_header_to_open_action_menu("latest_activity_at")
-      projects_page.sort_via_action_menu("latest_activity_at", direction: :asc)
-      wait_for_reload
-
-      projects_page.expect_project_at_place(project, 1)
-    end
-  end
-
-  describe "blocked filter" do
-    it "is not visible" do
-      load_and_open_filters admin
-
-      expect(page).to have_no_select("add_filter_select", with_options: ["Principal"])
-      expect(page).to have_no_select("add_filter_select", with_options: ["ID"])
-      expect(page).to have_no_select("add_filter_select", with_options: ["Subproject of"])
-    end
-  end
-
-  describe "column selection", with_settings: { enabled_projects_columns: %w[name created_at] } do
-    # Will still receive the :view_project permission
-    shared_let(:user) do
-      create(:user, member_with_permissions: { project => %i(view_project_attributes),
-                                               development_project => %i(view_project_attributes) })
-    end
-
-    shared_let(:integer_custom_field) { create(:integer_project_custom_field) }
-
-    shared_let(:non_member) { create(:non_member, permissions: %i(view_project_attributes)) }
-
-    current_user { user }
-
-    before do
-      public_project.custom_field_values = { integer_custom_field.id => 1 }
-      public_project.save!
-      project.custom_field_values = { integer_custom_field.id => 2 }
-      project.save!
-      development_project.custom_field_values = { integer_custom_field.id => 3 }
-      development_project.save!
-
-      public_project.on_track!
-      project.off_track!
-      development_project.at_risk!
-    end
-
-    it "allows to select columns to be displayed" do
-      projects_page.visit!
-
-      projects_page.set_columns("Name", "Status", integer_custom_field.name)
-
-      projects_page.expect_no_columns("Public", "Description", "Project status description")
-
-      projects_page.within_row(project) do
-        expect(page)
-          .to have_css(".name", text: project.name)
-        expect(page)
-          .to have_css(".cf_#{integer_custom_field.id}", text: 2)
-        expect(page)
-          .to have_css(".project_status", text: "OFF TRACK")
-        expect(page)
-          .to have_no_css(".created_at ")
-      end
-
-      projects_page.within_row(public_project) do
-        expect(page)
-          .to have_css(".name", text: public_project.name)
-        expect(page)
-          .to have_css(".cf_#{integer_custom_field.id}", text: 1)
-        expect(page)
-          .to have_css(".project_status", text: "ON TRACK")
-        expect(page)
-          .to have_no_css(".created_at ")
-      end
-
-      projects_page.within_row(development_project) do
-        expect(page)
-          .to have_css(".name", text: development_project.name)
-        expect(page)
-          .to have_css(".cf_#{integer_custom_field.id}", text: 3)
-        expect(page)
-          .to have_css(".project_status", text: "AT RISK")
-        expect(page)
-          .to have_no_css(".created_at ")
-      end
-    end
-  end
-
-  context "with a multi-value custom field" do
-    let!(:list_custom_field) do
-      create(:list_project_custom_field, multi_value: true).tap do |cf|
-        project.update(custom_field_values: { cf.id => [cf.value_of("A"), cf.value_of("B")] })
-      end
-    end
-
-    before do
-      allow(Setting)
-        .to receive(:enabled_projects_columns)
-        .and_return [list_custom_field.column_name]
-
-      login_as(admin)
-      visit projects_path
-    end
-
-    it "shows the multi selection" do
-      expected_sort = list_custom_field
-                        .custom_options
-                        .where(value: %w[A B])
-                        .reorder(:id)
-                        .pluck(:value)
-      expect(page).to have_css(".#{list_custom_field.column_name}.format-list", text: expected_sort.join(", "))
-    end
-  end
-
-  describe "project activity menu item" do
-    context "for projects with activity module enabled" do
-      shared_let(:project_with_activity_enabled) { project }
-      shared_let(:work_packages_viewer) { create(:project_role, name: "Viewer", permissions: [:view_work_packages]) }
-      shared_let(:simple_member) do
-        create(:user,
-               member_with_roles: { project_with_activity_enabled => work_packages_viewer })
-      end
-      shared_let(:work_package) { create(:work_package, project: project_with_activity_enabled) }
-
-      before do
-        project_with_activity_enabled.enabled_module_names += ["activity"]
-        project_with_activity_enabled.save
-      end
-
-      it "is displayed and redirects to project activity page with only project attributes visible" do
-        login_as(simple_member)
-        visit projects_path
-
-        expect(page).to have_text(project.name)
-
-        # Test visibility of 'more' menu list items
-        projects_page.activate_menu_of(project) do |menu|
-          expect(menu).to have_text("Project activity")
-          expect(menu).to have_text("Add to favorites")
-
-          click_link_or_button "Project activity"
-        end
-
-        expect(page).to have_current_path(project_activity_index_path(project_with_activity_enabled), ignore_query: true)
-        expect(page).to have_checked_field(id: "event_types_project_attributes")
-        expect(page).to have_unchecked_field(id: "event_types_work_packages")
-      end
-    end
-  end
-
-  describe "calling the page with the API v3 style parameters",
-           with_settings: { enabled_projects_columns: %w[name created_at project_status] } do
-    let(:filters) do
-      JSON.dump([{ active: { operator: "=", values: ["t"] } },
-                 { name_and_identifier: { operator: "~", values: ["Plain"] } }])
-    end
-
-    current_user { admin }
-
-    it "applies the filters and displays the matching projects" do
-      visit "#{projects_page.path}?filters=#{filters}"
-
-      # Filters have the effect of filtering out projects
-      projects_page.expect_projects_listed(project)
-      projects_page.expect_projects_not_listed(public_project)
-
-      # Applies the filters to the filters section
-      projects_page.toggle_filters_section
-      projects_page.expect_filter_set "active"
-      projects_page.expect_filter_set "name_and_identifier"
-
-      # Columns are taken from the default set as defined by the setting
-      projects_page.expect_columns("Name", "Created on", "Status")
-    end
-  end
-
-  context "when using the action menu", with_settings: { enabled_projects_columns: %w[created_at name project_status] } do
-    before do
-      login_as(admin)
-      visit projects_path
-    end
-
-    describe "moving a column" do
-      it "moves the selected column one place to the left and right" do
-        projects_page.expect_columns_in_order("Created on", "Name", "Status")
-
-        # Move "Name" column to the left
-        projects_page.click_table_header_to_open_action_menu("Name")
-        projects_page.move_column_via_action_menu("Name", direction: :left)
-        wait_for_reload
-
-        # Name was moved left?
-        projects_page.expect_columns_in_order("Name", "Created on", "Status")
-
-        # Now move it back to the right once
-        projects_page.click_table_header_to_open_action_menu("Name")
-        projects_page.move_column_via_action_menu("Name", direction: :right)
-        wait_for_reload
-
-        # Original position should have been restored
-        projects_page.expect_columns_in_order("Created on", "Name", "Status")
-
-        # Looking at the leftmost column
-        projects_page.click_table_header_to_open_action_menu("created_at")
-        projects_page.within("#menu-created_at-overlay") do
-          # It should allow us to move the column right
-          expect(page)
-            .to have_css("a[data-test-selector='created_at-move-col-right']", text: I18n.t(:label_move_column_right))
-
-          # It should not allow us to move the column further left
-          expect(page)
-            .to have_no_css("a[data-test-selector='created_at-move-col-left']", text: I18n.t(:label_move_column_left))
-        end
-
-        # Looking at the rightmost column
-        projects_page.click_table_header_to_open_action_menu("project_status")
-        projects_page.within("#menu-project_status-overlay") do
-          # It should allow us to move the column further left
-          expect(page)
-            .to have_css("a[data-test-selector='project_status-move-col-left']", text: I18n.t(:label_move_column_left))
-
-          # It should not allow us to move the column right
-          expect(page)
-            .to have_no_css("a[data-test-selector='project_status-move-col-right']", text: I18n.t(:label_move_column_right))
-        end
-      end
-    end
-
-    describe "sorting a column",
-             with_settings: { enabled_projects_columns: %w[created_at name project_status description] } do
-      it "does not offer the sorting options for columns that are not sortable" do
-        projects_page.expect_columns_in_order("Created on", "Name", "Status", "Description")
-
-        projects_page.click_table_header_to_open_action_menu("Description")
-        projects_page.expect_no_sorting_option_in_action_menu("Description")
-      end
-    end
-
-    describe "removing a column" do
-      it "removes the column from the table view" do
-        projects_page.expect_columns_in_order("Created on", "Name", "Status")
-
-        # Remove "Name" column
-        projects_page.click_table_header_to_open_action_menu("Name")
-        projects_page.remove_column_via_action_menu("Name")
-        wait_for_reload
-
-        # Name was removed
-        projects_page.expect_columns_in_order("Created on", "Status")
-
-        # Remove "Status" column, too
-        projects_page.click_table_header_to_open_action_menu("project_status")
-        projects_page.remove_column_via_action_menu("project_status")
-        wait_for_reload
-
-        # It was removed
-        projects_page.expect_columns_in_order("Created on")
-      end
-    end
-
-    describe "adding a column" do
-      it "opens the configure view dialog" do
-        projects_page.click_table_header_to_open_action_menu("Name")
-        projects_page.click_add_column_in_action_menu("Name")
-
-        # Configure view dialog was opened
-        expect(page).to have_css("#op-project-list-configure-dialog")
-      end
-    end
-
-    describe "filtering by column",
-             with_settings: { enabled_projects_columns: %w[created_at identifier project_status] } do
-      it "adds the filter for a selected column" do
-        projects_page.click_table_header_to_open_action_menu("created_at")
-        projects_page.expect_filter_option_in_action_menu("created_at")
-        projects_page.filter_by_column_via_action_menu("created_at")
-
-        # Filter component is visible
-        expect(page).to have_select("add_filter_select")
-        # Filter for column is visible and can now be specified by the user
-        expect(page).to have_css(".advanced-filters--filter-name[for='created_at']")
-
-        # The correct filter input field has focus
-        expect(page.has_focus_on?(".advanced-filters--filter-value input#created_at_value")).to be(true)
-      end
-
-      it "adds the filter for a selected column that has a different filter mapped to its column" do
-        projects_page.click_table_header_to_open_action_menu("project_status")
-        projects_page.expect_filter_option_in_action_menu("project_status")
-        projects_page.filter_by_column_via_action_menu("project_status")
-
-        # Filter component is visible
-        expect(page).to have_select("add_filter_select")
-        # Filter for column is visible. Note that the filter name is different from the column attribute!
-        expect(page).to have_css(".advanced-filters--filter-name[for='project_status_code']")
-      end
-
-      it "does not offer to filter if the column has no associated filter" do
-        # There is no filter mapping for the identifier column: we should not get the option to filter by it
-        projects_page.click_table_header_to_open_action_menu("identifier")
-        projects_page.expect_no_filter_option_in_action_menu("identifier")
-
-        # Filters have not been activated and are therefore not visible
-        expect(page).to have_no_select("add_filter_select")
-      end
-    end
-  end
-end
diff --git a/spec/features/projects/template_spec.rb b/spec/features/projects/template_spec.rb
index 50bb5b0bc2cb..3eb87740cf53 100644
--- a/spec/features/projects/template_spec.rb
+++ b/spec/features/projects/template_spec.rb
@@ -43,16 +43,16 @@
       visit project_settings_general_path(project)
 
       # Make a template
-      find(".button", text: "Set as template").click
+      page.find_test_selector("project-settings-more-menu").click
+      page.find_test_selector("project-settings--mark-template", text: "Set as template").click
       expect_and_dismiss_flash(message: "Successful update.")
 
-      expect(page).to have_css(".button", text: "Remove from templates")
       project.reload
       expect(project).to be_templated
 
       # unset template
-      find(".button", text: "Remove from templates").click
-      expect(page).to have_css(".button", text: "Set as template")
+      page.find_test_selector("project-settings-more-menu").click
+      page.find_test_selector("project-settings--mark-template", text: "Remove from templates").click
 
       project.reload
       expect(project).not_to be_templated
diff --git a/spec/features/repositories/repository_settings_spec.rb b/spec/features/repositories/repository_settings_spec.rb
index 4932ce5be88c..2b074a36de67 100644
--- a/spec/features/repositories/repository_settings_spec.rb
+++ b/spec/features/repositories/repository_settings_spec.rb
@@ -86,7 +86,7 @@
         find("a.icon-remove", text: I18n.t(:button_remove)).click
         expect(page).to have_css(".op-toast.-warning")
         SeleniumHubWaiter.wait
-        find("a", text: I18n.t(:button_remove)).click
+        page.find_test_selector("remove-repository-button").click
       end
 
       vendor = find('select[name="scm_vendor"]')
diff --git a/spec/features/types/activate_in_project_spec.rb b/spec/features/types/activate_in_project_spec.rb
index 4f0f1e67042b..68a484b591ce 100644
--- a/spec/features/types/activate_in_project_spec.rb
+++ b/spec/features/types/activate_in_project_spec.rb
@@ -37,7 +37,7 @@
   let!(:active_type) { create(:type) }
   let!(:type) { create(:type) }
   let!(:project) { create(:project, types: [active_type]) }
-  let(:project_settings_page) { Pages::Projects::Settings.new(project) }
+  let(:project_type_settings_page) { Pages::Projects::Settings::Type.new(project) }
   let(:work_packages_page) { Pages::WorkPackagesTable.new(project) }
 
   before do
@@ -51,7 +51,7 @@
     work_packages_page.expect_type_available_for_create(active_type)
     work_packages_page.expect_type_not_available_for_create(type)
 
-    project_settings_page.visit_tab!("types")
+    project_type_settings_page.visit!
 
     expect(page)
       .to have_unchecked_field(type.name)
@@ -62,9 +62,9 @@
     check(type.name)
     uncheck(active_type.name)
 
-    project_settings_page.save!
+    project_type_settings_page.save!
 
-    project_settings_page.expect_and_dismiss_flash(message: "Successful update.")
+    project_type_settings_page.expect_and_dismiss_flash(message: "Successful update.")
 
     expect(page)
       .to have_checked_field(type.name)
diff --git a/spec/features/types/form_configuration_spec.rb b/spec/features/types/form_configuration_spec.rb
index 0457df023ee0..0376c310c078 100644
--- a/spec/features/types/form_configuration_spec.rb
+++ b/spec/features/types/form_configuration_spec.rb
@@ -274,7 +274,7 @@
     end
 
     describe "custom fields" do
-      let(:project_settings_page) { Pages::Projects::Settings.new(project) }
+      let(:project_cf_settings_page) { Pages::Projects::Settings::WorkPackageCustomFields.new(project) }
 
       let(:custom_fields) { [custom_field] }
       let(:custom_field) { create(:issue_custom_field, :integer, name: "MyNumber") }
@@ -315,7 +315,7 @@ def add_cf_to_group
           wp_page.expect_attribute_hidden(cf_identifier_api)
 
           # Enable in project, should then be visible
-          project_settings_page.visit_tab!("custom_fields")
+          project_cf_settings_page.visit!
           expect(page).to have_css(".custom-field-#{custom_field.id} td", text: "MyNumber")
           expect(page).to have_css(".custom-field-#{custom_field.id} td", text: type.name)
 
@@ -356,7 +356,7 @@ def add_cf_to_group
           end
 
           # Ensure CF is checked
-          project_settings_page.visit_tab!("custom_fields")
+          project_cf_settings_page.visit!
           expect(page).to have_css(".custom-field-#{custom_field.id} td", text: "MyNumber")
           expect(page).to have_css(".custom-field-#{custom_field.id} td", text: type.name)
           expect(page).to have_css("#project_work_package_custom_field_ids_#{custom_field.id}[checked]")
diff --git a/spec/features/users/create_spec.rb b/spec/features/users/create_spec.rb
index b24ac2a4b4ad..a73cf2bc11f4 100644
--- a/spec/features/users/create_spec.rb
+++ b/spec/features/users/create_spec.rb
@@ -109,6 +109,7 @@
 
       perform_enqueued_jobs do
         new_user_page.submit!
+        wait_for_network_idle
       end
     end
 
@@ -120,6 +121,9 @@
     it_behaves_like "successful user creation" do
       describe "activation", :js do
         before do
+          # Ensure we clear any flashes
+          visit "/logout"
+
           allow(User).to receive(:current).and_call_original
 
           visit "/account/activate?token=#{token}"
diff --git a/spec/features/versions/delete_spec.rb b/spec/features/versions/delete_spec.rb
index 6f6cdffd3be5..1085227bac4e 100644
--- a/spec/features/versions/delete_spec.rb
+++ b/spec/features/versions/delete_spec.rb
@@ -47,10 +47,8 @@
     # from the version show page
     visit version_path(version)
 
-    within ".toolbar" do
-      accept_confirm do
-        click_link "Delete"
-      end
+    accept_confirm do
+      page.find_test_selector("version-delete-button").click
     end
 
     expect_flash(type: :error, message: I18n.t(:error_can_not_delete_in_use_archived_undisclosed))
@@ -61,10 +59,8 @@
     # from the version show page
     visit version_path(version)
 
-    within ".toolbar" do
-      accept_confirm do
-        click_link "Delete"
-      end
+    accept_confirm do
+      page.find_test_selector("version-delete-button").click
     end
 
     expect_flash(type: :error, message: "There are also work packages in archived projects.")
diff --git a/spec/features/versions/edit_spec.rb b/spec/features/versions/edit_spec.rb
index 28bbcde862b4..f853e07f6f5b 100644
--- a/spec/features/versions/edit_spec.rb
+++ b/spec/features/versions/edit_spec.rb
@@ -44,9 +44,7 @@
     # from the version show page
     visit version_path(version)
 
-    within ".toolbar" do
-      click_link "Edit"
-    end
+    page.find_test_selector("version-edit-button").click
 
     fill_in "Name", with: new_version_name
 
diff --git a/spec/features/work_packages/details/relations/primerized_relations_spec.rb b/spec/features/work_packages/details/relations/primerized_relations_spec.rb
index e15ff4192ccb..6dbd2958c8bd 100644
--- a/spec/features/work_packages/details/relations/primerized_relations_spec.rb
+++ b/spec/features/work_packages/details/relations/primerized_relations_spec.rb
@@ -114,12 +114,14 @@
            relation_type: Relation::TYPE_RELATES)
   end
 
-  let(:full_wp_view) { Pages::FullWorkPackage.new(work_package) }
   let(:relations_tab) { Components::WorkPackages::Relations.new(work_package) }
   let(:relations_panel_selector) { ".detail-panel--relations" }
   let(:relations_panel) { find(relations_panel_selector) }
   let(:work_packages_page) { Pages::PrimerizedSplitWorkPackage.new(work_package) }
   let(:tabs) { Components::WorkPackages::PrimerizedTabs.new }
+  let(:additional_setup) do
+    # Nothing but contexts might overwrite it
+  end
 
   current_user { user }
 
@@ -128,6 +130,7 @@ def label_for_relation_type(relation_type)
   end
 
   before do
+    additional_setup
     work_packages_page.visit_tab!("relations")
     expect_angular_frontend_initialized
     work_packages_page.expect_subject
@@ -195,10 +198,13 @@ def label_for_relation_type(relation_type)
 
       relation_row = relations_tab.expect_relation(relation_follows)
 
-      relations_tab.add_description_to_relation(relation_follows, "Discovered relations have descriptions!")
+      relations_tab.edit_relation_description(relation_follows, "Discovered relations have descriptions!")
 
-      # Reflects new description
+      relations_tab.edit_lag_of_relation(relation_follows, 5)
+
+      # Reflects new description and lag
       expect(relation_row).to have_text("Discovered relations have descriptions!")
+      expect(relation_row).to have_text("5 days")
 
       # Unchanged
       tabs.expect_counter("relations", 4)
@@ -232,8 +238,19 @@ def label_for_relation_type(relation_type)
       end
     end
 
+    it "does not show the lag field for all relation types" do
+      scroll_to_element relations_panel
+
+      relations_tab.open_relation_dialog(relation_relates)
+
+      within "##{WorkPackageRelationsTab::WorkPackageRelationDialogComponent::DIALOG_ID}" do
+        expect(page).to have_field("Work package", readonly: true)
+        expect(page).to have_no_field("Lag")
+      end
+    end
+
     context "with the shown WorkPackage being the 'to' relation part" do
-      let(:another_wp) { create(:work_package, type: type2, subject: "related to main") }
+      let(:another_wp) { create(:work_package, type: type2, subject: "Successor of main") }
 
       let(:relation_to) do
         create(:relation,
@@ -242,8 +259,7 @@ def label_for_relation_type(relation_type)
                relation_type: Relation::TYPE_FOLLOWS)
       end
 
-      before do
-        another_wp
+      let(:additional_setup) do
         relation_to
       end
 
@@ -252,7 +268,6 @@ def label_for_relation_type(relation_type)
 
         wait_for_network_idle
 
-        relations_tab.expect_relation(another_wp)
         relations_tab.open_relation_dialog(another_wp)
 
         within "##{WorkPackageRelationsTab::WorkPackageRelationDialogComponent::DIALOG_ID}" do
@@ -362,7 +377,7 @@ def label_for_relation_type(relation_type)
                             results_selector: "body")
 
         expect_no_ng_option(autocomplete_field,
-                            work_package.id,
+                            work_package.subject,
                             results_selector: "body")
       end
     end
diff --git a/spec/features/work_packages/navigation_spec.rb b/spec/features/work_packages/navigation_spec.rb
index 7e6240e7d7b7..2676991e3d6b 100644
--- a/spec/features/work_packages/navigation_spec.rb
+++ b/spec/features/work_packages/navigation_spec.rb
@@ -62,7 +62,7 @@
     global_work_packages.visit!
 
     global_work_packages.expect_work_package_listed(work_package)
-    global_html_title.expect_first_segment "All open"
+    global_html_title.expect_first_segment "All open | Work Packages"
 
     # open details pane for work package
 
@@ -70,14 +70,14 @@
 
     split_work_package.expect_subject
     split_work_package.expect_current_path
-    global_html_title.expect_first_segment wp_title_segment
+    global_html_title.expect_first_segment "#{wp_title_segment} | Work Packages"
 
     # Go to full screen by double click
     full_work_package = global_work_packages.open_full_screen_by_doubleclick(work_package)
 
     full_work_package.expect_subject
     full_work_package.expect_current_path
-    global_html_title.expect_first_segment wp_title_segment
+    global_html_title.expect_first_segment "#{wp_title_segment} | Work Packages"
 
     # deep link work package details pane
 
@@ -97,17 +97,17 @@
     project_work_packages.visit!
 
     project_work_packages.expect_work_package_listed(work_package)
-    project_html_title.expect_first_segment "All open"
+    project_html_title.expect_first_segment "All open | Work Packages"
 
     # Visit query with project wp
     project_work_packages.visit_query query
     project_work_packages.expect_work_package_listed(work_package)
-    project_html_title.expect_first_segment "My fancy query"
+    project_html_title.expect_first_segment "My fancy query | Work Packages"
 
     # Go back to work packages without query
     page.execute_script("window.history.back()")
     project_work_packages.expect_work_package_listed(work_package)
-    project_html_title.expect_first_segment "All open"
+    project_html_title.expect_first_segment "All open | Work Packages"
 
     # open project work package details pane
 
@@ -115,19 +115,19 @@
 
     split_project_work_package.expect_subject
     split_project_work_package.expect_current_path
-    project_html_title.expect_first_segment wp_title_segment
+    project_html_title.expect_first_segment "#{wp_title_segment} | Work Packages"
 
     # open work package full screen by button
     full_work_package = split_project_work_package.switch_to_fullscreen
 
     full_work_package.expect_subject
     expect(page).to have_current_path project_work_package_path(project, work_package, "activity")
-    project_html_title.expect_first_segment wp_title_segment
+    project_html_title.expect_first_segment "#{wp_title_segment} | Work Packages"
 
     # Switch tabs
     full_work_package.switch_to_tab tab: :relations
     expect(page).to have_current_path project_work_package_path(project, work_package, "relations")
-    project_html_title.expect_first_segment wp_title_segment
+    project_html_title.expect_first_segment "#{wp_title_segment} | Work Packages"
 
     # Back to split screen using the button
     full_work_package.go_back
diff --git a/spec/features/work_packages/reminders_spec.rb b/spec/features/work_packages/reminders_spec.rb
new file mode 100644
index 000000000000..7b4bfa8a0dfa
--- /dev/null
+++ b/spec/features/work_packages/reminders_spec.rb
@@ -0,0 +1,400 @@
+# frozen_string_literal: true
+
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+# ++
+
+require "spec_helper"
+
+RSpec.describe "Work package reminder modal",
+               :js,
+               :with_cuprite do
+  let!(:project) { create(:project) }
+  let!(:work_package) { create(:work_package, project:) }
+  let!(:role_that_allows_managing_own_reminders) do
+    create(:project_role, permissions: %i[view_work_packages])
+  end
+  let!(:role_that_does_not_allow_managing_own_reminders) do
+    create(:project_role, permissions: %i[view_project])
+  end
+
+  let!(:user_with_permissions) do
+    local_offset = Time.now.gmt_offset # rubocop:disable Rails/TimeZone
+    time_zone = UserPreferences::UpdateContract.assignable_time_zones
+                                                 .find { |tz| tz.now.utc_offset == local_offset }
+    create(:user,
+           member_with_roles: { project => role_that_allows_managing_own_reminders },
+           preferences: { time_zone: time_zone.tzinfo.canonical_zone.name })
+  end
+  let!(:user_without_permissions) do
+    create(:user,
+           member_with_roles: { project => role_that_does_not_allow_managing_own_reminders })
+  end
+
+  let(:work_package_page) { Pages::FullWorkPackage.new(work_package) }
+  let(:center) { Pages::Notifications::Center.new }
+
+  context "with permissions to manage own reminders" do
+    current_user { user_with_permissions }
+
+    it "renders the reminder button when visiting the work package page" do
+      work_package_page.visit!
+      work_package_page.expect_reminder_button
+    end
+
+    specify "can create a reminder, subsequently update it and delete it" do
+      date = Date.current + 2.weeks
+      time = Time.zone.parse("05:00")
+
+      work_package_page.visit!
+      work_package_page.click_reminder_button
+      wait_for_network_idle
+      within ".spot-modal" do
+        expect(page)
+          .to have_css(".spot-modal--header-title", text: "Set reminder")
+        expect(page)
+          .to have_css(".spot-modal--subheader",
+                       text: "You will receive a notification for this work package at the chosen time.")
+        fill_in "Date", with: date
+        fill_in "Time", with: time
+        fill_in "Note", with: "Never forget!"
+
+        click_link_or_button "Set reminder"
+      end
+
+      work_package_page.expect_and_dismiss_flash(type: :success,
+                                                 message: I18n.t("work_package.reminders.success_creation_message"))
+      work_package_page.expect_reminder_button_alarm_set_icon
+
+      expect(Reminder.last)
+      .to have_attributes(
+        remindable: work_package,
+        creator: user_with_permissions,
+        remind_at: DateTime.parse("#{date} #{time}"),
+        note: "Never forget!"
+      )
+
+      work_package_page.click_reminder_button
+      wait_for_network_idle
+      within ".spot-modal" do
+        expect(page)
+          .to have_css(".spot-modal--header-title", text: "Edit reminder")
+        expect(page)
+          .to have_css(".spot-modal--subheader",
+                       text: "You will receive a notification for this work package at the chosen time.")
+        expect(page).to have_field("Date", with: date)
+        expect(page).to have_field("Time", with: time.in_time_zone(current_user.time_zone).strftime("%H:%M"))
+        expect(page).to have_field("Note", with: "Never forget!")
+        expect(page).to have_button("Save")
+
+        fill_in "Note", with: "Remember to never forget!"
+        click_link_or_button "Save"
+      end
+
+      work_package_page.expect_and_dismiss_flash(type: :success,
+                                                 message: I18n.t("work_package.reminders.success_update_message"))
+      expect(Reminder.last)
+        .to have_attributes(
+          remindable: work_package,
+          creator: user_with_permissions,
+          remind_at: DateTime.parse("#{date} #{time}"),
+          note: "Remember to never forget!"
+        )
+
+      work_package_page.click_reminder_button
+      wait_for_network_idle
+      within ".spot-modal" do
+        click_link_or_button "Remove reminder"
+      end
+
+      work_package_page.expect_and_dismiss_flash(type: :success,
+                                                 message: I18n.t("work_package.reminders.success_deletion_message"))
+      work_package_page.expect_reminder_button_alarm_not_set_icon
+      expect(Reminder.upcoming_and_visible_to(user_with_permissions).count).to eq(0)
+    end
+
+    it "renders an error flash when the reminder modal is opened in edit mode" \
+       "and the notification for it is fired and subsequently clicking save",
+       with_settings: { notifications_polling_interval: 1_000 } do
+      Reminders::CreateService.new(user: current_user).call(
+        remindable: work_package,
+        remind_at: 1.minute.from_now,
+        creator: current_user,
+        note: "Will fire soon"
+      )
+
+      work_package_page.visit!
+      work_package_page.expect_reminder_button_alarm_set_icon
+      work_package_page.click_reminder_button
+      wait_for_network_idle
+
+      within ".spot-modal" do
+        expect(page)
+          .to have_css(".spot-modal--header-title", text: "Edit reminder")
+        expect(page)
+          .to have_css(".spot-modal--subheader",
+                       text: "You will receive a notification for this work package at the chosen time.")
+      end
+
+      perform_enqueued_jobs
+      center.expect_bell_count(1)
+
+      within ".spot-modal" do
+        fill_in "Note", with: "I'm changing this"
+        click_link_or_button "Save"
+        wait_for_network_idle
+      end
+
+      work_package_page.expect_flash(type: :danger,
+                                     message: I18n.t(:error_reminder_not_found))
+
+      within ".spot-modal" do
+        find_test_selector("op-reminder-dialog-modal--close-icon").click
+      end
+
+      work_package_page.dismiss_flash!
+      work_package_page.expect_reminder_button_alarm_not_set_icon
+      work_package_page.click_reminder_button
+      wait_for_network_idle
+
+      within ".spot-modal" do
+        # Now it should be the create reminder modal
+        expect(page).to have_css(".spot-modal--header-title", text: "Set reminder")
+      end
+    end
+
+    describe "validations" do
+      it "renders errors on the date field or time field when the reminder is in the past" do
+        two_am = Time.zone.parse("02:00")
+        thirty_minutes_ago = 30.minutes.ago
+                                    .in_time_zone(current_user.time_zone)
+                                    .strftime("%H:%M")
+                                    .to_time
+        thirty_minutes_from_now = 30.minutes.from_now
+                                        .in_time_zone(current_user.time_zone)
+                                        .strftime("%H:%M")
+                                        .to_time
+        yesterday = Time.current.in_time_zone(current_user.time_zone).yesterday.to_date
+        today = Time.current.in_time_zone(current_user.time_zone).to_date
+
+        work_package_page.visit!
+        work_package_page.click_reminder_button
+        wait_for_network_idle
+        within ".spot-modal" do
+          expect(page)
+            .to have_css(".spot-modal--header-title", text: "Set reminder")
+          expect(page)
+            .to have_css(".spot-modal--subheader",
+                         text: "You will receive a notification for this work package at the chosen time.")
+
+          # Yesterday 02:00
+          fill_in "Date", with: yesterday
+          fill_in "Time", with: two_am
+          fill_in "Note", with: "Never forget!"
+          click_link_or_button "Set reminder"
+
+          wait_for_network_idle
+          expect(page).to have_css(".FormControl-inlineValidation", text: "Date must be in the future.")
+          expect(page).to have_css(".FormControl-inlineValidation", text: "Time must be in the future.")
+
+          # 30 minutes ago
+          fill_in "Date", with: today
+          fill_in "Time", with: thirty_minutes_ago
+          click_link_or_button "Set reminder"
+
+          wait_for_network_idle
+          expect(page).to have_css(".FormControl-inlineValidation", text: "Time must be in the future.")
+          expect(page).to have_no_css(".FormControl-inlineValidation", text: "Date must be in the future.", wait: 0)
+
+          # 30 minutes from now
+          fill_in "Date", with: today
+          fill_in "Time", with: thirty_minutes_from_now
+          click_link_or_button "Set reminder"
+
+          wait_for_network_idle
+        end
+
+        work_package_page.expect_and_dismiss_flash(type: :success,
+                                                   message: I18n.t("work_package.reminders.success_creation_message"))
+        work_package_page.expect_reminder_button_alarm_set_icon
+      end
+
+      it "renders a required error on the date or time field when either isn't set" do
+        work_package_page.visit!
+        work_package_page.click_reminder_button
+        wait_for_network_idle
+
+        within ".spot-modal" do
+          expect(page)
+            .to have_css(".spot-modal--header-title", text: "Set reminder")
+          expect(page)
+            .to have_css(".spot-modal--subheader",
+                         text: "You will receive a notification for this work package at the chosen time.")
+
+          # Click the Schedule button without filling in the date or time
+          click_link_or_button "Set reminder"
+
+          wait_for_network_idle
+          expect(page).to have_css(".FormControl-inlineValidation", text: "Date can't be blank")
+          expect(page).to have_css(".FormControl-inlineValidation", text: "Time can't be blank")
+
+          # Fill in the date but not the time
+          fill_in "Date", with: 1.week.from_now.to_date
+          click_link_or_button "Set reminder"
+
+          wait_for_network_idle
+          # The error message is only on the time field
+          expect(page).to have_css(".FormControl-inlineValidation", text: "Time can't be blank")
+          expect(page).to have_no_css(".FormControl-inlineValidation", text: "Date can't be blank", wait: 0)
+
+          # Fill in the time but not the date
+          fill_in "Date", with: ""
+          fill_in "Time", with: Time.zone.parse("05:00")
+          click_link_or_button "Set reminder"
+
+          wait_for_network_idle
+          expect(page).to have_css(".FormControl-inlineValidation", text: "Date can't be blank.")
+          expect(page).to have_no_css(".FormControl-inlineValidation", text: "Time can't be blank.", wait: 0)
+        end
+      end
+
+      it "removes the reminder count without a refresh when the notification is fired",
+         with_settings: { notifications_polling_interval: 1_000 } do
+        # Set to remind far in the future to avoid flakiness
+        # and job triggered on demand later in the spec
+        Reminders::CreateService.new(user: current_user).call(
+          remindable: work_package,
+          remind_at: 20.seconds.from_now,
+          creator: current_user,
+          note: "Just fired"
+        )
+
+        work_package_page.visit!
+        work_package_page.expect_reminder_button_alarm_set_icon
+        center.expect_bell_count(0)
+
+        perform_enqueued_jobs
+
+        center.expect_bell_count(1)
+        work_package_page.expect_reminder_button_alarm_not_set_icon
+      end
+    end
+
+    context "with a reminder" do
+      let!(:reminder) do
+        create(:reminder,
+               remindable: work_package,
+               creator: current_user)
+      end
+
+      it "renders the reminder button with the correct count" do
+        work_package_page.visit!
+        work_package_page.expect_reminder_button
+        work_package_page.expect_reminder_button_alarm_set_icon
+      end
+
+      specify "clicking on the reminder button opens the edit reminder modal" do
+        work_package_page.visit!
+        work_package_page.click_reminder_button
+        wait_for_network_idle
+        within ".spot-modal" do
+          expect(page)
+            .to have_css(".spot-modal--header-title", text: "Edit reminder")
+          expect(page)
+            .to have_css(".spot-modal--subheader",
+                         text: "You will receive a notification for this work package at the chosen time.")
+          expect(page).to have_field("Date", with: reminder.remind_at.in_time_zone(current_user.time_zone).to_date)
+          expect(page).to have_field("Time", with: reminder.remind_at.in_time_zone(current_user.time_zone).strftime("%H:%M"))
+          expect(page).to have_field("Note", with: reminder.note)
+          expect(page).to have_button("Save")
+        end
+      end
+    end
+
+    context "without a reminder" do
+      it "renders the reminder button without a count" do
+        work_package_page.visit!
+        work_package_page.expect_reminder_button
+        work_package_page.expect_reminder_button_alarm_not_set_icon
+      end
+
+      specify "clicking on the reminder button opens the create reminder modal" do
+        work_package_page.visit!
+        work_package_page.click_reminder_button
+        wait_for_network_idle
+        within ".spot-modal" do
+          expect(page)
+            .to have_css(".spot-modal--header-title", text: "Set reminder")
+          expect(page)
+            .to have_css(".spot-modal--subheader",
+                         text: "You will receive a notification for this work package at the chosen time.")
+          expect(page).to have_field("Date")
+          expect(page).to have_field("Time")
+          expect(page).to have_field("Note")
+          expect(page).to have_button("Set reminder")
+        end
+      end
+    end
+
+    it "has a Primer close button that closes the Angular spot modal" do
+      work_package_page.visit!
+      work_package_page.click_reminder_button
+      wait_for_network_idle
+      within ".spot-modal" do
+        expect(page)
+          .to have_css(".spot-modal--header-title", text: "Set reminder")
+        find_test_selector("op-reminder-modal-close-button").click
+      end
+
+      expect(page).to have_no_css(".spot-modal", wait: 0)
+    end
+  end
+
+  context "without permissions to manage own reminders" do
+    current_user { user_without_permissions }
+
+    it "does not render the reminder button when visiting the work package page" do
+      work_package_page.visit!
+      work_package_page.expect_no_reminder_button
+    end
+  end
+
+  context "with anonymous user with role that can view work packages", with_settings: { login_required: false } do
+    before do
+      ProjectRole.anonymous.add_permission! :view_work_packages
+      project.update!(public: true)
+    end
+
+    current_user { User.anonymous }
+
+    it "does not render the reminder button when visiting the work package page" do
+      work_package_page.visit!
+      work_package_page.ensure_loaded
+      work_package_page.expect_no_reminder_button
+    end
+  end
+end
diff --git a/spec/features/work_packages/share/filter_spec.rb b/spec/features/work_packages/share/filter_spec.rb
index c6682360059b..eaefdcbf6f75 100644
--- a/spec/features/work_packages/share/filter_spec.rb
+++ b/spec/features/work_packages/share/filter_spec.rb
@@ -276,20 +276,36 @@
     it "only displays shares that match the current set of applied filters" do
       share_modal.expect_open
 
+      # Change all shared to have the "View" role.
+      retry_block do
+        share_modal.toggle_select_all
+        share_modal.bulk_update("View")
+      end
+
       share_modal.toggle_select_all
-      share_modal.bulk_update("View")
-      share_modal.toggle_select_all
+
+      # Filter for the View role
 
       share_modal.filter("role", "View")
 
-      share_modal.expect_shared_with(project_user)
-      share_modal.expect_shared_with(project_user2)
-      share_modal.expect_shared_with(inherited_project_user)
-      share_modal.expect_shared_with(non_project_user)
-      share_modal.expect_shared_with(shared_project_group)
-      share_modal.expect_shared_with(shared_non_project_group)
+      # Since all shares have the View role, all shares should be displayed.
+
+      share_modal.expect_shared_with(project_user, "View")
+      share_modal.expect_shared_with(project_user2, "View")
+      share_modal.expect_shared_with(inherited_project_user, "View")
+      share_modal.expect_shared_with(non_project_user, "View")
+      share_modal.expect_shared_with(shared_project_group, "View")
+      share_modal.expect_shared_with(shared_non_project_group, "View")
+
+      # Change one share to have the Comment role.
 
       share_modal.change_role(project_user, "Comment")
+
+      # That share is no longer displayed as it does not match the current filter after the role change.
+      share_modal.expect_not_shared_with(project_user)
+
+      # When filtering for the Comment role, only the changed share should be displayed.
+
       share_modal.filter("role", "Comment")
       share_modal.expect_shared_with(project_user, "Comment")
       share_modal.expect_not_shared_with(project_user2)
@@ -298,6 +314,8 @@
       share_modal.expect_not_shared_with(shared_project_group)
       share_modal.expect_not_shared_with(shared_non_project_group)
 
+      # When filtering for the Edit role, no share matches and thus none should be displayed.
+
       share_modal.filter("role", "Edit")
       share_modal.expect_empty_search_blankslate
     end
diff --git a/spec/features/work_packages/update_ancestors_spec.rb b/spec/features/work_packages/update_ancestors_spec.rb
index c98645a8e2e7..2f980fdad2b2 100644
--- a/spec/features/work_packages/update_ancestors_spec.rb
+++ b/spec/features/work_packages/update_ancestors_spec.rb
@@ -86,7 +86,8 @@
   shared_let(:query) do
     create(:query,
            show_hierarchies: true,
-           column_names: %i[id status estimated_hours remaining_hours done_ratio subject])
+           column_names: %i[id status estimated_hours remaining_hours done_ratio subject],
+           sort_criteria: [["id", "asc"]])
   end
 
   let(:wp_table) { Pages::WorkPackagesTable.new project }
diff --git a/spec/helpers/sort_helper_spec.rb b/spec/helpers/sort_helper_spec.rb
index 1c4e9b2ff5f7..149da1f15bab 100644
--- a/spec/helpers/sort_helper_spec.rb
+++ b/spec/helpers/sort_helper_spec.rb
@@ -281,11 +281,7 @@ def session; @session ||= {}; end
   end
 
   describe "#sort_header_with_action_menu" do
-    subject(:output) do
-      helper.sort_header_with_action_menu("id",
-                                          %w[name id description], {}, **options)
-    end
-
+    let(:id_column) { Queries::Projects::Selects::Default.new "id" }
     let(:options) { { param: :json, sortable: true } }
     let(:sort_criteria) { SortHelper::SortCriteria.new }
 
@@ -295,6 +291,11 @@ def session; @session ||= {}; end
       Nokogiri::HTML(output).at_css("th .generic-table--sort-header action-menu")
     end
 
+    subject(:output) do
+      helper.sort_header_with_action_menu(id_column,
+                                          %w[name id description], {}, **options)
+    end
+
     before do
       # helper relies on this instance var
       @sort_criteria = sort_criteria
@@ -309,6 +310,10 @@ def session; @session ||= {}; end
       expect(action_menu.at_css("button#menu-id-button .Button-content .Button-label").text).to eq("Id")
     end
 
+    it "does not render an icon by default" do
+      expect(action_menu.at_css(".generic-table--action-menu-button .Button-leadingVisual")).to be_blank
+    end
+
     it "shows sorting actions in the action-menu" do
       sort_desc = action_menu.at_css("action-list .ActionListItem a[data-test-selector='id-sort-desc']")
       expect(sort_desc.at_css(".ActionListItem-label").text.strip).to eq("Sort descending")
@@ -343,7 +348,7 @@ def session; @session ||= {}; end
 
     context "with the current column being the leftmost one" do
       subject(:output) do
-        helper.sort_header_with_action_menu("id",
+        helper.sort_header_with_action_menu(id_column,
                                             %w[id name description], {}, **options)
       end
 
@@ -359,7 +364,7 @@ def session; @session ||= {}; end
 
     context "with the current column being the rightmost one" do
       subject(:output) do
-        helper.sort_header_with_action_menu("id",
+        helper.sort_header_with_action_menu(id_column,
                                             %w[name description id], {}, **options)
       end
 
@@ -397,7 +402,7 @@ def session; @session ||= {}; end
 
     context "with a filter mapping for the column" do
       subject(:output) do
-        helper.sort_header_with_action_menu("id",
+        helper.sort_header_with_action_menu(id_column,
                                             %w[name id description], { "id" => "id_code" }, **options)
       end
 
@@ -413,7 +418,7 @@ def session; @session ||= {}; end
     context "with the filter mapping specifying there is no filter for the column" do
       subject(:output) do
         # With the filter name mapped to nil, we expect no filter action to be present.
-        helper.sort_header_with_action_menu("id",
+        helper.sort_header_with_action_menu(id_column,
                                             %w[name id description], { "id" => nil }, **options)
       end
 
@@ -422,5 +427,44 @@ def session; @session ||= {}; end
         expect(filter_by).to be_nil
       end
     end
+
+    context "with a life cycle gate column" do
+      let(:life_cycle_step) { create(:project_gate_definition) }
+      let(:life_cycle_column) { Queries::Projects::Selects::LifeCycleStep.new("lcsd_#{life_cycle_step.id}") }
+
+      let(:options) { { caption: life_cycle_step.name } }
+
+      subject(:output) do
+        # Not setting any filter column mappings here, so for other column types, this should use the default filter
+        helper.sort_header_with_action_menu(life_cycle_column,
+                                            %W[name lcsd_#{life_cycle_step.id}], {}, **options)
+      end
+
+      it "never offers a filter by action" do
+        # But a life cycle column never offers a filter (until #59183 is implemented)
+        filter_by = action_menu.at_css("action-list .ActionListItem button[data-test-selector='id-filter-by']")
+        expect(filter_by).to be_nil
+      end
+
+      it "shows a diamond icon in the header for gates" do
+        icon = action_menu.at_css(".generic-table--action-menu-button .Button-leadingVisual .octicon-diamond")
+        expect(icon).to be_present
+
+        header_text = action_menu.at_css(".generic-table--action-menu-button .Button-label").text.strip
+        expect(header_text).to eq(life_cycle_column.caption)
+      end
+
+      context "with a life cycle stage column" do
+        let(:life_cycle_step) { create(:project_stage_definition) }
+
+        it "shows a commit icon in the header for gates" do
+          icon = action_menu.at_css(".generic-table--action-menu-button .Button-leadingVisual .octicon-git-commit")
+          expect(icon).to be_present
+
+          header_text = action_menu.at_css(".generic-table--action-menu-button .Button-label").text.strip
+          expect(header_text).to eq(life_cycle_column.caption)
+        end
+      end
+    end
   end
 end
diff --git a/spec/helpers/toolbar_helper_spec.rb b/spec/helpers/toolbar_helper_spec.rb
index 45acd1057388..9e17f77cfad4 100644
--- a/spec/helpers/toolbar_helper_spec.rb
+++ b/spec/helpers/toolbar_helper_spec.rb
@@ -119,7 +119,7 @@
         <div class="toolbar-container">
           <div class="toolbar">
             <div class="title-container">
-              <h2>&lt;/h2&gt;&lt;script&gt;alert(&quot;foobar!&quot;);&lt;/script&gt; &raquo; <a href="/users/1234">foobar</a></h2>
+              <h2>&lt;/h2&gt;&lt;script&gt;alert(&quot;foobar!&quot;);&lt;/script&gt; &raquo <a href="/users/1234">foobar</a></h2>
             </div>
             <ul class="toolbar-items"></ul>
           </div>
diff --git a/spec/lib/api/contracts/model_contract_spec.rb b/spec/lib/api/contracts/model_contract_spec.rb
index dc47b35544b1..9854403d193a 100644
--- a/spec/lib/api/contracts/model_contract_spec.rb
+++ b/spec/lib/api/contracts/model_contract_spec.rb
@@ -149,8 +149,7 @@
 
     context "when the model extends both modules" do
       before do
-        allow(model).to receive(:changed_by_user).and_return([:custom_field1])
-        allow(model).to receive(:changed_with_custom_fields).and_return([:no_allowed])
+        allow(model).to receive_messages(changed_by_user: [:custom_field1], changed_with_custom_fields: [:no_allowed])
       end
 
       it "adds an error to the custom field attribute from the OpenProject::ChangedBySystem module" do
@@ -159,5 +158,14 @@
           .to include(:error_readonly)
       end
     end
+
+    context "when a context is provided" do
+      it "propagates the contex to the model as well" do
+        allow(model).to receive(:valid?)
+
+        model_contract.valid?(:custom_context)
+        expect(model).to have_received(:valid?).with(:custom_context)
+      end
+    end
   end
 end
diff --git a/spec/lib/api/v3/notifications/notification_representer_rendering_spec.rb b/spec/lib/api/v3/notifications/notification_representer_rendering_spec.rb
index c0fb12c42cbd..bb3aef99788e 100644
--- a/spec/lib/api/v3/notifications/notification_representer_rendering_spec.rb
+++ b/spec/lib/api/v3/notifications/notification_representer_rendering_spec.rb
@@ -267,5 +267,60 @@
                 .at_path("_embedded/details")
       end
     end
+
+    shared_examples_for "embeds a Values::Property for reminder note" do
+      it "embeds a Values::Property" do
+        expect(generated)
+          .to be_json_eql("Values::Property".to_json)
+                .at_path("_embedded/details/0/_type")
+      end
+
+      it "has a note value for the `property` property" do
+        expect(generated)
+          .to be_json_eql("note".to_json)
+                .at_path("_embedded/details/0/property")
+      end
+
+      it "has a reminder`s note for the value" do
+        expect(generated)
+          .to be_json_eql(notification.reminder.note.to_json)
+                .at_path("_embedded/details/0/value")
+      end
+    end
+
+    context "for a reminder when embedding" do
+      let(:reminder) { build_stubbed(:reminder) }
+      let(:reason) { :reminder }
+      let(:embed_links) { true }
+
+      before do
+        allow(notification).to receive(:reminder).and_return(reminder)
+      end
+
+      it_behaves_like "embeds a Values::Property for reminder note"
+    end
+
+    context "for a reminder when not embedding" do
+      let(:reminder) { build_stubbed(:reminder) }
+      let(:reason) { :reminder }
+      let(:embed_links) { false }
+
+      before do
+        allow(notification).to receive(:reminder).and_return(reminder)
+      end
+
+      it_behaves_like "embeds a Values::Property for reminder note"
+    end
+
+    context "for a reminder with no notification" do
+      let(:reminder) { nil }
+      let(:reason) { :reminder }
+
+      it "has an empty details array" do
+        expect(generated)
+          .to have_json_size(0)
+                .at_path("_embedded/details")
+      end
+    end
   end
 end
diff --git a/spec/lib/api/v3/user_preferences/user_preference_representer_parsing_spec.rb b/spec/lib/api/v3/user_preferences/user_preference_representer_parsing_spec.rb
index d4265853456e..61e190a42dd6 100644
--- a/spec/lib/api/v3/user_preferences/user_preference_representer_parsing_spec.rb
+++ b/spec/lib/api/v3/user_preferences/user_preference_representer_parsing_spec.rb
@@ -38,6 +38,21 @@
   let(:user) { build_stubbed(:user) }
   let(:representer) { described_class.new(preference, current_user: user) }
 
+  describe "immediate_reminders" do
+    let(:request_body) do
+      {
+        "immediateReminders" => {
+          "mentioned" => true,
+          "personalReminder" => false
+        }
+      }
+    end
+
+    it "parses the enabled flag" do
+      expect(parsed.immediate_reminders).to eql({ "mentioned" => true, "personal_reminder" => false })
+    end
+  end
+
   describe "notification_settings" do
     let(:request_body) do
       {
diff --git a/spec/lib/custom_field_form_builder_spec.rb b/spec/lib/custom_field_form_builder_spec.rb
index 00820ae90378..06337c5ed128 100644
--- a/spec/lib/custom_field_form_builder_spec.rb
+++ b/spec/lib/custom_field_form_builder_spec.rb
@@ -255,6 +255,7 @@
       let(:project) { build_stubbed(:project) }
       let(:user1) { build_stubbed(:user) }
       let(:user2) { build_stubbed(:user) }
+      let(:scope) { instance_double(ActiveRecord::Relation) }
 
       let(:resource) { project }
 
@@ -268,8 +269,12 @@
         end
 
         allow(project)
-          .to(receive(:principals))
-          .and_return([user1, user2])
+          .to receive(:principals)
+                .and_return(scope)
+
+        allow(scope)
+          .to receive(:select)
+                .and_return([user1, user2])
       end
 
       it_behaves_like "wrapped in container", "select-container" do
diff --git a/spec/lib/journal_formatter/custom_field_spec.rb b/spec/lib/journal_formatter/custom_field_spec.rb
index 2398bd319a94..9287ee055570 100644
--- a/spec/lib/journal_formatter/custom_field_spec.rb
+++ b/spec/lib/journal_formatter/custom_field_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #-- copyright
 # OpenProject is an open source project management software.
 # Copyright (C) the OpenProject GmbH
@@ -50,8 +52,8 @@ def url_helper = Rails.application.routes.url_helpers
     allow(CustomField).to receive(:find_by).and_return(nil)
     allow(CustomField)
       .to receive(:find_by)
-            .with(id: custom_field.id)
-            .and_return(custom_field)
+      .with(id: custom_field.id)
+      .and_return(custom_field)
   end
 
   context "with html requested by default" do
@@ -196,8 +198,8 @@ def url_helper = Rails.application.routes.url_helpers
 
       allow(wherestub)
         .to receive(:where)
-              .with(id: [user1.id, user2.id])
-              .and_return(visible_users)
+        .with(id: [user1.id, user2.id])
+        .and_return(visible_users)
     end
 
     describe "with two visible users" do
@@ -248,37 +250,37 @@ def url_helper = Rails.application.routes.url_helpers
 
       allow(custom_field)
         .to receive(:custom_options)
-              .and_return(cf_options)
+        .and_return(cf_options)
 
       allow(cf_options)
         .to receive(:where)
-              .with(id: [1, 2])
-              .and_return(old_options)
+        .with(id: [1, 2])
+        .and_return(old_options)
 
       allow(cf_options)
         .to receive(:where)
-              .with(id: [3, 4])
-              .and_return(new_options)
+        .with(id: [3, 4])
+        .and_return(new_options)
 
       allow(old_options)
         .to receive(:order)
-              .with(:position)
-              .and_return(old_options)
+        .with(:position)
+        .and_return(old_options)
 
       allow(new_options)
         .to receive(:order)
-              .with(:position)
-              .and_return(new_options)
+        .with(:position)
+        .and_return(new_options)
 
       allow(old_options)
         .to receive(:pluck)
-              .with(:id, :value)
-              .and_return(old_custom_option_names)
+        .with(:id, :value)
+        .and_return(old_custom_option_names)
 
       allow(new_options)
         .to receive(:pluck)
-              .with(:id, :value)
-              .and_return(new_custom_option_names)
+        .with(:id, :value)
+        .and_return(new_custom_option_names)
     end
 
     describe "with both values being a comma separated list of ids" do
@@ -395,4 +397,94 @@ def url_helper = Rails.application.routes.url_helpers
       end
     end
   end
+
+  context "for hierarchy custom field" do
+    shared_let(:custom_field) { create(:hierarchy_wp_custom_field) }
+    shared_let(:service) { CustomFields::Hierarchy::HierarchicalItemService.new }
+    shared_let(:root) { service.generate_root(custom_field).value! }
+    shared_let(:luke) { service.insert_item(parent: root, label: "luke", short: "LS").value! }
+    shared_let(:mara) { service.insert_item(parent: luke, label: "mara").value! }
+
+    describe "first value being nil and second value a string" do
+      let(:values) { [nil, mara.id.to_s] }
+      let(:formatted_value) { mara.ancestry_path }
+      let(:expected) do
+        I18n.t(:text_journal_set_to,
+               label: "<strong>#{custom_field.name}</strong>",
+               value: "<i>#{formatted_value}</i>")
+      end
+
+      it { expect(rendered).to be_html_eql(expected) }
+    end
+
+    describe "first value being a string and second value being nil" do
+      let(:values) { [mara.id.to_s, nil] }
+      let(:formatted_value) { mara.ancestry_path }
+      let(:expected) do
+        I18n.t(:text_journal_deleted,
+               label: "<strong>#{custom_field.name}</strong>",
+               old: "<strike><i>#{formatted_value}</i></strike>")
+      end
+
+      it { expect(rendered).to be_html_eql(expected) }
+    end
+
+    context "with multiple values" do
+      describe "first value being nil and second value a string" do
+        let(:values) { [nil, [luke.id, mara.id].join(",")] }
+        let(:formatted_value) { [luke.ancestry_path, mara.ancestry_path].join(", ") }
+        let(:expected) do
+          I18n.t(:text_journal_set_to,
+                 label: "<strong>#{custom_field.name}</strong>",
+                 value: "<i>#{formatted_value}</i>")
+        end
+
+        it { expect(rendered).to be_html_eql(expected) }
+      end
+
+      describe "first value being a string and second value being nil" do
+        let(:values) { [[luke.id, mara.id].join(","), nil] }
+        let(:formatted_value) { [luke.ancestry_path, mara.ancestry_path].join(", ") }
+        let(:expected) do
+          I18n.t(:text_journal_deleted,
+                 label: "<strong>#{custom_field.name}</strong>",
+                 old: "<strike><i>#{formatted_value}</i></strike>")
+        end
+
+        it { expect(rendered).to be_html_eql(expected) }
+      end
+
+      describe "both values being strings" do
+        let(:values) { [[luke.id, mara.id].join(","), luke.id.to_s] }
+        let(:original_value) { [luke.ancestry_path, mara.ancestry_path].join(", ") }
+        let(:formatted_value) { luke.ancestry_path }
+
+        let(:expected) do
+          I18n.t(:text_journal_changed_plain,
+                 label: "<strong>#{custom_field.name}</strong>",
+                 linebreak: "",
+                 old: "<i>#{original_value}</i>",
+                 new: "<i>#{formatted_value}</i>")
+        end
+
+        it { expect(rendered).to be_html_eql(expected) }
+      end
+
+      describe "with a deleted item" do
+        let(:values) { [[luke.id, -100].join(","), luke.id.to_s] }
+        let(:original_value) { [luke.ancestry_path, I18n.t(:label_deleted_custom_item)].join(", ") }
+        let(:formatted_value) { luke.ancestry_path }
+
+        let(:expected) do
+          I18n.t(:text_journal_changed_plain,
+                 label: "<strong>#{custom_field.name}</strong>",
+                 linebreak: "",
+                 old: "<i>#{original_value}</i>",
+                 new: "<i>#{formatted_value}</i>")
+        end
+
+        it { expect(rendered).to be_html_eql(expected) }
+      end
+    end
+  end
 end
diff --git a/spec/mailers/digest_mailer_spec.rb b/spec/mailers/digest_mailer_spec.rb
index 4dabc26717c4..70452b2fba15 100644
--- a/spec/mailers/digest_mailer_spec.rb
+++ b/spec/mailers/digest_mailer_spec.rb
@@ -159,7 +159,7 @@
         end
 
         it "matches generated text" do
-          expect(mail_body).to have_text("Start date was 1 day ago")
+          expect(mail_body).to have_text("Start date was 1 day ago.")
         end
       end
 
@@ -175,7 +175,7 @@
         end
 
         it "matches generated text" do
-          expect(mail_body).to have_text("Start date is in 2 days")
+          expect(mail_body).to have_text("Start date is in 2 days.")
         end
       end
 
@@ -191,7 +191,7 @@
         end
 
         it "matches generated text" do
-          expect(mail_body).to have_text("Overdue since 3 days")
+          expect(mail_body).to have_text("Overdue since 3 days.")
         end
       end
 
@@ -207,7 +207,7 @@
         end
 
         it "matches generated text" do
-          expect(mail_body).to have_text("Finish date is in 3 days")
+          expect(mail_body).to have_text("Finish date is in 3 days.")
         end
       end
 
@@ -224,7 +224,7 @@
         end
 
         it "matches generated text" do
-          expect(mail_body).to include('<span style="color: #C92A2A">Overdue since 2 days</span>')
+          expect(mail_body).to include('<span style="color: #C92A2A">Overdue since 2 days.</span>')
         end
       end
 
@@ -241,7 +241,7 @@
         end
 
         it "matches generated text" do
-          expect(mail_body).to have_text("Milestone date is in 1 day")
+          expect(mail_body).to have_text("Milestone date is in 1 day.")
         end
       end
 
@@ -255,7 +255,7 @@
         end
 
         it "matches generated text" do
-          expect(mail_body).to have_text("Finish date is deleted")
+          expect(mail_body).to have_text("Finish date is deleted.")
         end
       end
 
@@ -271,7 +271,7 @@
         end
 
         it "matches generated text" do
-          expect(mail_body).to have_text("Finish date is today")
+          expect(mail_body).to have_text("Finish date is today.")
         end
       end
 
@@ -287,7 +287,7 @@
         end
 
         it "matches generated text" do
-          expect(mail_body).to have_text("Finish date is in 1 day")
+          expect(mail_body).to have_text("Finish date is in 1 day.")
         end
       end
 
diff --git a/spec/mailers/previews/reminders/notification_mailer_preview.rb b/spec/mailers/previews/reminders/notification_mailer_preview.rb
new file mode 100644
index 000000000000..f14b979f07c1
--- /dev/null
+++ b/spec/mailers/previews/reminders/notification_mailer_preview.rb
@@ -0,0 +1,36 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+# Preview all emails at http://localhost:3000/rails/mailers/reminders/notification_mailer
+class Reminders::NotificationMailerPreview < ActionMailer::Preview
+  # Preview this email at http://localhost:3000/rails/mailers/reminders/notification_mailer/reminder_notification
+  def reminder_notification
+    notification = Notification.where(reason: :reminder).first
+    Reminders::NotificationMailer.reminder_notification(notification)
+  end
+end
diff --git a/spec/mailers/reminders/notification_mailer_spec.rb b/spec/mailers/reminders/notification_mailer_spec.rb
new file mode 100644
index 000000000000..bc2202204724
--- /dev/null
+++ b/spec/mailers/reminders/notification_mailer_spec.rb
@@ -0,0 +1,83 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+
+RSpec.describe Reminders::NotificationMailer do
+  let(:work_package) { build_stubbed(:work_package) }
+  let(:user) { build_stubbed(:user) }
+  let(:recipient) { user }
+
+  let(:notification) do
+    reminder = build_stubbed(:reminder, remindable: work_package, creator: user, note: "This is an important reminder")
+    build_stubbed(:notification, reason: :reminder, recipient:, resource: work_package, reminder:)
+  end
+
+  describe "#reminder_notification" do
+    subject(:mail) { described_class.reminder_notification(notification) }
+
+    let(:mail_body) { mail.body.parts.detect { |part| part["Content-Type"].value == "text/html" }.body.to_s }
+
+    describe "Email subject" do
+      context "when the reminder has a note" do
+        it "includes the note" do
+          expect(mail.subject).to eql("OpenProject - Reminder: This is an important reminder")
+        end
+      end
+
+      context "when the reminder does not have a note" do
+        before do
+          notification.reminder.note = ""
+        end
+
+        it "includes the work package subject" do
+          expect(mail.subject).to eql("OpenProject - Reminder: #{work_package.subject}")
+        end
+      end
+    end
+
+    it "sends to the recipient" do
+      expect(mail.to)
+        .to contain_exactly(recipient.mail)
+    end
+
+    it "sets the expected message_id header" do
+      expect(mail.message_id)
+        .to eql "op.reminder.#{Time.current.strftime('%Y%m%d%H%M%S')}.#{recipient.id}@example.net"
+    end
+
+    it "sets the expected openproject headers" do
+      expect(mail["X-OpenProject-User"]&.value)
+        .to eql(recipient.name)
+    end
+
+    it "mail body includes the reminder note" do
+      expect(mail_body).to include("Note: “This is an important reminder”")
+    end
+  end
+end
diff --git a/spec/migrations/add_project_life_cycle_step_roles_spec.rb b/spec/migrations/add_project_life_cycle_step_roles_spec.rb
new file mode 100644
index 000000000000..d7317dd8ac1e
--- /dev/null
+++ b/spec/migrations/add_project_life_cycle_step_roles_spec.rb
@@ -0,0 +1,135 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+require Rails.root.join("db/migrate/20241126111225_add_project_life_cycle_step_roles.rb")
+
+RSpec.describe AddProjectLifeCycleStepRoles, type: :model do
+  # Silencing migration logs, since we are not interested in that during testing
+  subject { ActiveRecord::Migration.suppress_messages { described_class.new.change } }
+
+  shared_examples_for "not changing permissions" do
+    it "is not changed" do
+      expect { subject }.not_to change { role.reload.permissions }
+    end
+
+    it "does not adds any new permissions" do
+      expect { subject }.not_to change(RolePermission, :count)
+    end
+  end
+
+  shared_examples_for "migration is idempotent" do
+    context "when the migration is ran twice" do
+      before { subject }
+
+      it_behaves_like "not changing permissions"
+    end
+  end
+
+  shared_examples_for "adding permissions" do |new_permissions|
+    it "adds the #{new_permissions} permissions for the role" do
+      public_permissions = OpenProject::AccessControl.public_permissions.map(&:name)
+      expect { subject }.to change { role.reload.permissions }
+        .from(match_array(permissions + public_permissions))
+        .to match_array(permissions + public_permissions + new_permissions)
+    end
+
+    it "adds #{new_permissions.size} new permissions" do
+      expect { subject }.to change(RolePermission, :count).by(new_permissions.size)
+    end
+  end
+
+  context "for a role not eligible to view_project_stages_and_gates" do
+    let!(:role) do
+      create(:project_role,
+             add_public_permissions: false,
+             permissions: %i[permission1 permission2])
+    end
+
+    it_behaves_like "not changing permissions"
+    it_behaves_like "migration is idempotent"
+  end
+
+  context "for a role eligible to view_project_stages_and_gates" do
+    let(:permissions) { %i[view_project permission1 permission2] }
+    let!(:role) { create(:project_role, permissions:) }
+
+    it_behaves_like "adding permissions", %i[view_project_stages_and_gates]
+    it_behaves_like "migration is idempotent"
+  end
+
+  context "for a role with view_project_stages_and_gates" do
+    let(:permissions) { %i[view_project_stages_and_gates view_project permission1 permission2] }
+    let!(:role) { create(:project_role, permissions:) }
+
+    it_behaves_like "not changing permissions"
+    it_behaves_like "migration is idempotent"
+  end
+
+  context "for a role not eligible to edit_project_stages_and_gates" do
+    let(:permissions) do
+      %i[view_project_stages_and_gates permission1 permission2]
+    end
+    let!(:role) { create(:project_role, permissions:) }
+
+    it_behaves_like "not changing permissions"
+    it_behaves_like "migration is idempotent"
+  end
+
+  context "for a role eligible to edit_project_stages_and_gates having view_project_stages_and_gates" do
+    let(:permissions) do
+      %i[view_project_stages_and_gates edit_project
+         view_project permission1 permission2]
+    end
+    let!(:role) { create(:project_role, permissions:) }
+
+    it_behaves_like "adding permissions", %i[edit_project_stages_and_gates]
+    it_behaves_like "migration is idempotent"
+  end
+
+  context "for a role eligible to edit_project_stages_and_gates not having view_project_stages_and_gates" do
+    let(:permissions) do
+      %i[edit_project view_project permission1 permission2]
+    end
+    let!(:role) { create(:project_role, permissions:) }
+
+    it_behaves_like "adding permissions", %i[edit_project_stages_and_gates view_project_stages_and_gates]
+    it_behaves_like "migration is idempotent"
+  end
+
+  context "for a role that already has the edit_project_stages_and_gates and view_project_stages_and_gates permission" do
+    let(:permissions) do
+      %i[edit_project_stages_and_gates view_project_stages_and_gates
+         edit_project view_project permission1 permission2]
+    end
+    let!(:role) { create(:project_role, permissions:) }
+
+    it_behaves_like "not changing permissions"
+    it_behaves_like "migration is idempotent"
+  end
+end
diff --git a/spec/migrations/adds_position_cache_to_hierarchy_items_spec.rb b/spec/migrations/adds_position_cache_to_hierarchy_items_spec.rb
new file mode 100644
index 000000000000..06dece3786c0
--- /dev/null
+++ b/spec/migrations/adds_position_cache_to_hierarchy_items_spec.rb
@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+require Rails.root.join("db/migrate/20250102161733_adds_position_cache_to_hierarchy_items.rb")
+
+RSpec.describe AddsPositionCacheToHierarchyItems, type: :model do
+  let(:custom_field) { create(:hierarchy_wp_custom_field) }
+  let(:service) { CustomFields::Hierarchy::HierarchicalItemService.new }
+
+  it "backfills the position_cache value on already existing hierarchy items" do
+    ActiveRecord::Migration.suppress_messages { described_class.new.down }
+
+    root = service.generate_root(custom_field).value!
+    anakin = service.insert_item(label: "luke", parent: root).value!
+    chewie = service.insert_item(label: "chewbacca", parent: root).value!
+    luke = service.insert_item(label: "luke", parent: anakin).value!
+    leia = service.insert_item(label: "leia", parent: anakin).value!
+
+    expect(root.self_and_descendants_preordered).to eq([root, anakin, luke, leia, chewie])
+
+    ActiveRecord::Migration.suppress_messages { described_class.new.up }
+
+    expect(root.reload.position_cache).to eq(125)
+    expect(anakin.reload.position_cache).to eq(150)
+    expect(luke.reload.position_cache).to eq(155)
+    expect(leia.reload.position_cache).to eq(160)
+    expect(chewie.reload.position_cache).to eq(175)
+  end
+end
diff --git a/spec/migrations/remove_incorrect_manage_own_reminders_permission_spec.rb b/spec/migrations/remove_incorrect_manage_own_reminders_permission_spec.rb
new file mode 100644
index 000000000000..7b9dfa87b816
--- /dev/null
+++ b/spec/migrations/remove_incorrect_manage_own_reminders_permission_spec.rb
@@ -0,0 +1,69 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+require Rails.root.join("db/migrate/20250108100511_remove_incorrect_manage_own_reminders_permission.rb")
+
+RSpec.describe RemoveIncorrectManageOwnRemindersPermission, type: :model do
+  let(:permissions) { %i[permission1 permission2 manage_own_reminders] }
+  let(:non_member) { create(:non_member, permissions:) }
+  let(:anonymous) { create(:anonymous_role, permissions:) }
+  let(:other_role) { create(:work_package_role, permissions:) }
+
+  let(:anonymous_user_reminder) do
+    create(:reminder, :with_unread_notifications, creator: AnonymousUser.first)
+  end
+
+  let(:normal_user_reminder) { create(:reminder, :with_unread_notifications) }
+
+  it "removes the `manage_own_reminders` permission from non member and anonymous roles" do
+    expect(non_member.permissions).to include(:manage_own_reminders)
+    expect(anonymous.permissions).to include(:manage_own_reminders)
+    expect(other_role.permissions).to include(:manage_own_reminders)
+
+    expect(anonymous_user_reminder).to be_persisted
+    expect(normal_user_reminder.creator).to be_persisted
+
+    expect do
+      ActiveRecord::Migration.suppress_messages { described_class.migrate(:up) }
+    end.to(
+      change(RolePermission, :count).by(-2) &
+        change(Reminder, :count).by(-1) &
+        change(ReminderNotification, :count).by(-1) &
+        change(Notification, :count).by(-1)
+    )
+
+    expect(non_member.reload.permissions).not_to include(:manage_own_reminders)
+    expect(anonymous.reload.permissions).not_to include(:manage_own_reminders)
+    expect(other_role.reload.permissions).to include(:manage_own_reminders)
+
+    reminder_creators = Reminder.pluck(:creator_id)
+    expect(reminder_creators).not_to include(AnonymousUser.first.id)
+    expect(reminder_creators).to include(normal_user_reminder.creator_id)
+  end
+end
diff --git a/spec/models/concerns/remindable_spec.rb b/spec/models/concerns/remindable_spec.rb
new file mode 100644
index 000000000000..c86420aa8f73
--- /dev/null
+++ b/spec/models/concerns/remindable_spec.rb
@@ -0,0 +1,37 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+
+RSpec.describe Remindable do
+  let(:remindable) { build_stubbed(:work_package) }
+
+  describe "Associations" do
+    it { expect(remindable).to have_many(:reminders) }
+  end
+end
diff --git a/spec/models/custom_actions/actions/custom_field_spec.rb b/spec/models/custom_actions/actions/custom_field_spec.rb
index 05c68c594384..afc2c54b1f00 100644
--- a/spec/models/custom_actions/actions/custom_field_spec.rb
+++ b/spec/models/custom_actions/actions/custom_field_spec.rb
@@ -441,12 +441,17 @@
          build_stubbed(:user),
          build_stubbed(:user)]
       end
+      let(:scope) { instance_double(ActiveRecord::Relation) }
 
       before do
         allow(Principal)
           .to receive(:in_visible_project_or_me)
-          .with(User.current)
-          .and_return(users)
+                .with(User.current)
+                .and_return(scope)
+
+        allow(scope)
+          .to receive(:select)
+                .and_return(users)
       end
 
       context "for a non required field" do
@@ -515,12 +520,17 @@
          build_stubbed(:user),
          build_stubbed(:user)]
       end
+      let(:scope) { instance_double(ActiveRecord::Relation) }
 
       before do
         allow(Principal)
           .to receive(:in_visible_project_or_me)
-          .with(User.current)
-          .and_return(users)
+                .with(User.current)
+                .and_return(scope)
+
+        allow(scope)
+          .to receive(:select)
+                .and_return(users)
       end
 
       it_behaves_like "associated custom action validations" do
diff --git a/spec/models/custom_field/order_statements_spec.rb b/spec/models/custom_field/order_statements_spec.rb
new file mode 100644
index 000000000000..9286cc3a9b2c
--- /dev/null
+++ b/spec/models/custom_field/order_statements_spec.rb
@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+
+RSpec.describe CustomField::OrderStatements do
+  # integration tests at spec/models/query/results_cf_sorting_integration_spec.rb
+  context "when hierarchy" do
+    let(:service) { CustomFields::Hierarchy::HierarchicalItemService.new }
+    let(:item) { service.generate_root(custom_field).value! }
+
+    subject(:custom_field) { create(:hierarchy_wp_custom_field) }
+
+    before do
+      service.insert_item(parent: item, label: "Test")
+    end
+
+    describe "#order_statement" do
+      it { expect(subject.order_statement).to eq("cf_order_#{custom_field.id}.value") }
+    end
+
+    describe "#order_join_statement" do
+      it "must be equal" do
+        expect(custom_field.order_join_statement).to eq(<<-SQL.squish)
+          LEFT OUTER JOIN (
+            SELECT DISTINCT ON (cv.customized_id) cv.customized_id
+                 , item.position_cache "value"
+                 , cv.value ids
+            FROM "custom_values" cv INNER JOIN "hierarchical_items" item ON item.id = cv.value::bigint
+            WHERE cv.customized_type = 'WorkPackage' AND cv.custom_field_id = #{custom_field.id}
+                  AND cv.value IS NOT NULL AND cv.value != '' ORDER BY cv.customized_id, cv.id
+          ) cf_order_#{custom_field.id} ON cf_order_#{custom_field.id}.customized_id = "work_packages".id
+        SQL
+      end
+    end
+  end
+end
diff --git a/spec/models/custom_field_spec.rb b/spec/models/custom_field_spec.rb
index f448ba748120..67ecadbe568e 100644
--- a/spec/models/custom_field_spec.rb
+++ b/spec/models/custom_field_spec.rb
@@ -215,17 +215,27 @@
     let(:project) { build_stubbed(:project) }
     let(:user1) { build_stubbed(:user) }
     let(:user2) { build_stubbed(:user) }
+    let(:in_visible_scope) { instance_double(ActiveRecord::Relation) }
+    let(:principals_scope) { instance_double(ActiveRecord::Relation) }
 
     context "for a user custom field" do
       before do
         field.field_format = "user"
         allow(project)
           .to receive(:principals)
-          .and_return([user1, user2])
+                .and_return(principals_scope)
+
+        allow(principals_scope)
+          .to receive(:select)
+                .and_return([user1, user2])
 
         allow(Principal)
           .to receive(:in_visible_project_or_me)
-          .and_return([user2])
+                .and_return(in_visible_scope)
+
+        allow(in_visible_scope)
+          .to receive(:select)
+                .and_return([user2])
       end
 
       context "for a project" do
diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb
index 7e9c73044222..c21c920e2617 100644
--- a/spec/models/notification_spec.rb
+++ b/spec/models/notification_spec.rb
@@ -28,6 +28,40 @@
 require "spec_helper"
 
 RSpec.describe Notification do
+  describe "Associations" do
+    it { is_expected.to belong_to(:journal) }
+    it { is_expected.to belong_to(:resource) }
+    it { is_expected.to belong_to(:actor).class_name("User") }
+    it { is_expected.to belong_to(:recipient).class_name("User") }
+
+    it { is_expected.to have_one(:reminder_notification).dependent(:destroy) }
+    it { is_expected.to have_one(:reminder).through(:reminder_notification) }
+  end
+
+  describe "Enums" do
+    it do
+      expect(subject).to define_enum_for(:reason)
+        .with_values(
+          mentioned: 0,
+          assigned: 1,
+          watched: 2,
+          subscribed: 3,
+          commented: 4,
+          created: 5,
+          processed: 6,
+          prioritized: 7,
+          scheduled: 8,
+          responsible: 9,
+          date_alert_start_date: 10,
+          date_alert_due_date: 11,
+          shared: 12,
+          reminder: 13
+        )
+        .with_prefix
+        .backed_by_column_of_type(:integer)
+    end
+  end
+
   describe ".save" do
     context "for a non existing journal (e.g. because it has been deleted)" do
       let(:notification) { build(:notification) }
diff --git a/spec/models/project/gate_definition_spec.rb b/spec/models/project/gate_definition_spec.rb
index 7d69be5a91ef..2b1d4c2f9eca 100644
--- a/spec/models/project/gate_definition_spec.rb
+++ b/spec/models/project/gate_definition_spec.rb
@@ -40,4 +40,18 @@
                         .dependent(:destroy)
     end
   end
+
+  describe "validations" do
+    it "is invalid if type and class name do not match" do
+      subject.type = "Project::StageDefinition"
+      expect(subject).not_to be_valid
+      expect(subject.errors.symbols_for(:type)).to include(:type_and_class_name_mismatch)
+    end
+  end
+
+  describe "#step_class" do
+    it "returns Project::Stage" do
+      expect(subject.step_class).to eq(Project::Gate)
+    end
+  end
 end
diff --git a/spec/models/project/gate_spec.rb b/spec/models/project/gate_spec.rb
index f634c63c1836..5fb5bcc7825b 100644
--- a/spec/models/project/gate_spec.rb
+++ b/spec/models/project/gate_spec.rb
@@ -33,7 +33,6 @@
   it_behaves_like "a Project::LifeCycleStep event"
 
   describe "validations" do
-    it { is_expected.to validate_presence_of(:date) }
     it { is_expected.to validate_inclusion_of(:type).in_array(["Project::Gate"]).with_message(:must_be_a_gate) }
 
     it "is invalid if `end_date` is present" do
@@ -41,12 +40,18 @@
 
       expect(subject).not_to be_valid
       expect(subject.errors[:base])
-        .to include("Cannot assign `end_date` to a Project::Gate")
+        .to include("Cannot assign end date to a Project::Gate")
     end
 
     it "is valid if `end_date` is not present" do
       valid_gate = build(:project_gate, end_date: nil)
       expect(valid_gate).to be_valid
     end
+
+    it "is invalid if type and class name do not match" do
+      subject.type = "Project::Stage"
+      expect(subject).not_to be_valid
+      expect(subject.errors.symbols_for(:type)).to include(:type_and_class_name_mismatch)
+    end
   end
 end
diff --git a/spec/models/project/life_cycle_step_definition_spec.rb b/spec/models/project/life_cycle_step_definition_spec.rb
index 6251817bb2ef..8fee988c59ac 100644
--- a/spec/models/project/life_cycle_step_definition_spec.rb
+++ b/spec/models/project/life_cycle_step_definition_spec.rb
@@ -29,8 +29,8 @@
 require "rails_helper"
 
 RSpec.describe Project::LifeCycleStepDefinition do
-  it "cannot be instantiated" do
-    expect { described_class.new }.to raise_error(NotImplementedError)
+  it "can be instantiated" do
+    expect { described_class.new }.not_to raise_error
   end
 
   context "with a Project::StageDefinition" do
@@ -39,6 +39,23 @@
     it { is_expected.to have_readonly_attribute(:type) }
   end
 
+  describe "validations" do
+    it { is_expected.to validate_presence_of(:name) }
+    it { is_expected.to validate_uniqueness_of(:name) }
+
+    it {
+      expect(subject).to validate_inclusion_of(:type)
+        .in_array(%w[Project::StageDefinition Project::GateDefinition])
+        .with_message(:must_be_a_stage_or_gate)
+    }
+
+    it "is invalid if type and class name do not match" do
+      subject.type = "Project::GateDefinition"
+      expect(subject).not_to be_valid
+      expect(subject.errors.symbols_for(:type)).to include(:type_and_class_name_mismatch)
+    end
+  end
+
   # For more specs see:
   # - spec/support/shared/project_life_cycle_helpers.rb
   # - spec/models/project/gate_definition_spec.rb
diff --git a/spec/models/project/life_cycle_step_spec.rb b/spec/models/project/life_cycle_step_spec.rb
index 03722a2cb66a..9c8660f41e3b 100644
--- a/spec/models/project/life_cycle_step_spec.rb
+++ b/spec/models/project/life_cycle_step_spec.rb
@@ -29,8 +29,8 @@
 require "rails_helper"
 
 RSpec.describe Project::LifeCycleStep do
-  it "cannot be instantiated" do
-    expect { described_class.new }.to raise_error(NotImplementedError)
+  it "can be instantiated" do
+    expect { described_class.new }.not_to raise_error(NotImplementedError)
   end
 
   describe "with an instantiated Gate" do
@@ -40,6 +40,36 @@
     it { is_expected.to have_readonly_attribute(:type) }
   end
 
+  describe "validations" do
+    it "is invalid if type and class name do not match" do
+      subject.type = "Project::Gate"
+      expect(subject).not_to be_valid
+      expect(subject.errors.symbols_for(:type)).to include(:type_and_class_name_mismatch)
+    end
+  end
+
+  describe ".visible" do
+    let(:project) { create(:project) }
+    let(:development_project) { create(:project) }
+    let(:user) do
+      create(:user,
+             member_with_permissions:
+             { project => %i(view_project view_project_stages_and_gates),
+               development_project => %i(view_project) })
+    end
+
+    let!(:life_cycle_gate) { create(:project_gate, project:) }
+    let!(:life_cycle_stage) { create(:project_stage, project:) }
+    let!(:life_cycle_stage_dev) { create(:project_stage, project: development_project) }
+    let!(:inactive_life_cycle_gate) { create(:project_gate, project:, active: false) }
+    let!(:inactive_life_cycle_stage) { create(:project_stage, project: development_project, active: false) }
+
+    it "returns active steps where the user has a view_project_stages_and_gates permission" do
+      expected_steps = [life_cycle_gate, life_cycle_stage]
+      expect(described_class.visible(user)).to eq(expected_steps)
+    end
+  end
+
   # For more specs see:
   # - spec/support/shared/project_life_cycle_helpers.rb
   # - spec/models/project/gate_spec.rb
diff --git a/spec/models/project/stage_definition_spec.rb b/spec/models/project/stage_definition_spec.rb
index f642056d4a34..0f236e6b46a6 100644
--- a/spec/models/project/stage_definition_spec.rb
+++ b/spec/models/project/stage_definition_spec.rb
@@ -40,4 +40,18 @@
                         .dependent(:destroy)
     end
   end
+
+  describe "validations" do
+    it "is invalid if type and class name do not match" do
+      subject.type = "Project::GateDefinition"
+      expect(subject).not_to be_valid
+      expect(subject.errors.symbols_for(:type)).to include(:type_and_class_name_mismatch)
+    end
+  end
+
+  describe "#step_class" do
+    it "returns Project::Stage" do
+      expect(subject.step_class).to eq(Project::Stage)
+    end
+  end
 end
diff --git a/spec/models/project/stage_spec.rb b/spec/models/project/stage_spec.rb
index 6fd727a34b27..99388f780f89 100644
--- a/spec/models/project/stage_spec.rb
+++ b/spec/models/project/stage_spec.rb
@@ -33,8 +33,6 @@
   it_behaves_like "a Project::LifeCycleStep event"
 
   describe "validations" do
-    it { is_expected.to validate_presence_of(:start_date) }
-    it { is_expected.to validate_presence_of(:end_date) }
     it { is_expected.to validate_inclusion_of(:type).in_array(["Project::Stage"]).with_message(:must_be_a_stage) }
 
     it "is valid when `start_date` and `end_date` are present" do
@@ -42,4 +40,108 @@
       expect(valid_stage).to be_valid
     end
   end
+
+  describe "#not_set?" do
+    it "returns true if start_date or end_date is blank" do
+      expect(subject.not_set?).to be(true)
+    end
+
+    it "returns false if both start_date and end_date are present" do
+      subject.start_date = Time.zone.today
+      subject.end_date = Date.tomorrow
+      expect(subject.not_set?).to be(false)
+    end
+  end
+
+  describe "#date_range=" do
+    it "splits a valid date range string into start_date and end_date" do
+      subject.date_range = "2024-11-26 - 2024-11-27"
+      expect(subject.start_date).to eq(Date.parse("2024-11-26"))
+      expect(subject.end_date).to eq(Date.parse("2024-11-27"))
+    end
+
+    it "sets end_date to start_date if a single date is provided" do
+      subject.date_range = "2024-11-26"
+      expect(subject.start_date).to eq(Date.parse("2024-11-26"))
+      expect(subject.end_date).to eq(Date.parse("2024-11-26"))
+    end
+  end
+
+  describe "#validate_date_range" do
+    it "is valid when both dates are blank" do
+      stage = build(:project_stage, start_date: nil, end_date: nil)
+      expect(stage).to be_valid
+    end
+
+    it "adds error if start_date is blank" do
+      subject.end_date = Time.zone.today
+      expect(subject).not_to be_valid
+      expect(subject.errors.symbols_for(:date_range)).to include(:incomplete)
+    end
+
+    it "adds error if end_date is blank" do
+      subject.start_date = Time.zone.today
+      expect(subject).not_to be_valid
+      expect(subject.errors.symbols_for(:date_range)).to include(:incomplete)
+    end
+
+    it "adds error if start_date is after end_date" do
+      subject.start_date = Date.tomorrow
+      subject.end_date = Time.zone.today
+      expect(subject).not_to be_valid
+      expect(subject.errors.symbols_for(:date_range)).to include(:start_date_must_be_before_end_date)
+    end
+
+    it "does not add errors if start_date is before or equal to end_date" do
+      subject.start_date = Time.zone.today
+      subject.end_date = Time.zone.today
+      expect(subject).not_to be_valid
+      expect(subject.errors[:date_range]).to be_empty
+    end
+
+    it "is invalid if type and class name do not match" do
+      subject.type = "Project::Gate"
+      expect(subject).not_to be_valid
+      expect(subject.errors.symbols_for(:type)).to include(:type_and_class_name_mismatch)
+    end
+  end
+
+  describe "#working_days_count" do
+    it "returns nil if not_set? is true" do
+      allow(Day).to receive(:working)
+
+      subject.start_date = nil
+      subject.end_date = nil
+
+      expect(subject.working_days_count).to be_nil
+      expect(Day).not_to have_received(:working)
+    end
+
+    it "returns the correct number of days if start_date and end_date are the same" do
+      subject.start_date = Time.zone.today
+      subject.end_date = Time.zone.today
+      expect(subject.working_days_count).to eq(1)
+    end
+
+    it "returns the correct number of days for a valid date range" do
+      subject.start_date = Date.parse("2024-11-25")
+      subject.end_date = Date.parse("2024-11-27")
+      expect(subject.working_days_count).to eq(3)
+    end
+
+    it "calls the Day.working.from_range method with the right arguments" do
+      subject.start_date = Date.parse("2024-11-25")
+      subject.end_date = Date.parse("2024-11-27")
+
+      allow(Day).to receive(:working).and_return(Day)
+      allow(Day).to receive(:from_range)
+                .with(from: subject.start_date, to: subject.end_date)
+                .and_return([])
+
+      expect(subject.working_days_count).to eq(0)
+
+      expect(Day).to have_received(:working).with(no_args)
+      expect(Day).to have_received(:from_range).with(from: subject.start_date, to: subject.end_date)
+    end
+  end
 end
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 2f191a053f34..2d3ab1fe2f1b 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -383,6 +383,47 @@
 
   describe "life_cycles" do
     it { is_expected.to have_many(:life_cycle_steps).class_name("Project::LifeCycleStep").dependent(:destroy) }
+
+    it "has many available_life_cycle_steps" do
+      expect(subject).to have_many(:available_life_cycle_steps)
+                    .class_name("Project::LifeCycleStep")
+                    .inverse_of(:project)
+                    .dependent(:destroy)
+                    .order(position: :asc)
+    end
+
+    it "checks for active flag" do
+      expect(subject.available_life_cycle_steps.to_sql)
+        .to include("\"project_life_cycle_steps\".\"active\" = TRUE")
+    end
+
+    it "checks for :view_project_stages_and_gates permission" do
+      project_condition = described_class.allowed_to(User.current, :view_project_stages_and_gates).select(:id)
+
+      expect(subject.available_life_cycle_steps.to_sql).to include(project_condition.to_sql)
+    end
+
+    it "eager loads :definition" do
+      expect(subject.available_life_cycle_steps.to_sql)
+        .to include("LEFT OUTER JOIN \"project_life_cycle_step_definitions\" ON")
+    end
+
+    describe ".validates_associated" do
+      let(:user) do
+        create(:user, member_with_permissions: { project => %i(view_project view_project_stages_and_gates) })
+      end
+      let!(:project_stage) { create :project_stage, :skip_validate, project:, start_date: nil }
+
+      before { allow(User).to receive(:current).and_return user }
+
+      it "is valid without a validation context" do
+        expect(project).to be_valid
+      end
+
+      it "is invalid with the :saving_life_cycle_steps validation context" do
+        expect(project).not_to be_valid(:saving_life_cycle_steps)
+      end
+    end
   end
 
   describe "#enabled_module_names=", with_settings: { default_projects_modules: %w(work_package_tracking repository) } do
diff --git a/spec/models/query/results_cf_sorting_integration_spec.rb b/spec/models/query/results_cf_sorting_integration_spec.rb
index 461e9ba3c738..49711dab3365 100644
--- a/spec/models/query/results_cf_sorting_integration_spec.rb
+++ b/spec/models/query/results_cf_sorting_integration_spec.rb
@@ -343,4 +343,33 @@ def wp_without_cf_value
       end
     end
   end
+
+  context "for hierarchy format" do
+    include_examples "it sorts" do
+      let(:custom_field) { create(:hierarchy_wp_custom_field, hierarchy_root: nil) }
+      let(:root) { service.generate_root(custom_field).value! }
+      let(:service) { CustomFields::Hierarchy::HierarchicalItemService.new }
+
+      let!(:item_first) { service.insert_item(parent: root, label: "aa item").value! }
+      let!(:item_a) { service.insert_item(parent: root, label: "item_a").value! }
+      let!(:item_a1) { service.insert_item(parent: item_a, label: "item_a1").value! }
+      let!(:item_a2) { service.insert_item(parent: item_a, label: "item_a2").value! }
+      let!(:item_c) { service.insert_item(parent: root, label: "item_c").value! }
+      let!(:item_b) { service.insert_item(parent: root, label: "item_b").value! }
+      let!(:item_last) { service.insert_item(parent: root, label: "zz item").value! }
+
+      let(:work_packages) do
+        [
+          wp_without_cf_value,
+          wp_with_cf_value(item_first.id),
+          wp_with_cf_value(item_a.id),
+          wp_with_cf_value(item_a1.id),
+          wp_with_cf_value(item_a2.id),
+          wp_with_cf_value(item_b.id),
+          wp_with_cf_value(item_c.id),
+          wp_with_cf_value(item_last.id)
+        ]
+      end
+    end
+  end
 end
diff --git a/spec/models/reminder_notification_spec.rb b/spec/models/reminder_notification_spec.rb
new file mode 100644
index 000000000000..d079c49aae08
--- /dev/null
+++ b/spec/models/reminder_notification_spec.rb
@@ -0,0 +1,36 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+
+RSpec.describe ReminderNotification do
+  describe "Associations" do
+    it { is_expected.to belong_to(:reminder) }
+    it { is_expected.to belong_to(:notification).dependent(:destroy) }
+  end
+end
diff --git a/spec/models/reminder_spec.rb b/spec/models/reminder_spec.rb
new file mode 100644
index 000000000000..759aa91296aa
--- /dev/null
+++ b/spec/models/reminder_spec.rb
@@ -0,0 +1,126 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+
+RSpec.describe Reminder do
+  describe "Associations" do
+    it { is_expected.to belong_to(:remindable) }
+    it { is_expected.to belong_to(:creator).class_name("User") }
+    it { is_expected.to have_many(:reminder_notifications).dependent(:destroy) }
+    it { is_expected.to have_many(:notifications).through(:reminder_notifications) }
+  end
+
+  describe "Scopes" do
+    describe ".visible" do
+      it "returns reminders where the creator is the given user" do
+        user = create(:user)
+        other_user = create(:user)
+        reminder = create(:reminder, creator: user)
+        _other_reminder = create(:reminder, creator: other_user)
+
+        expect(described_class.visible(user)).to contain_exactly(reminder)
+      end
+    end
+
+    describe ".upcoming_and_visible_to" do
+      it "returns reminders where the creator is the given user" \
+         "and there are no reminder_notifications for it yet" do
+        user = create(:user)
+        other_user = create(:user)
+        reminder = create(:reminder, creator: user)
+        _another_reminder_with_notification = create(:reminder, creator: user) do |r|
+          create(:reminder_notification, reminder: r)
+        end
+        _other_users_reminder_with_notification = create(:reminder, creator: other_user) do |r|
+          create(:reminder_notification, reminder: r)
+        end
+        _other_users_reminder = create(:reminder, creator: other_user)
+
+        expect(described_class.upcoming_and_visible_to(user)).to contain_exactly(reminder)
+      end
+    end
+  end
+
+  describe "#unread_notifications?" do
+    context "with an unread notification" do
+      subject { create(:reminder, :with_unread_notifications) }
+
+      it { is_expected.to be_an_unread_notification }
+      it { expect(subject.unread_notifications).to be_present }
+    end
+
+    context "with no unread notifications" do
+      subject { create(:reminder, :with_read_notifications) }
+
+      it { is_expected.not_to be_an_unread_notification }
+      it { expect(subject.unread_notifications).to be_empty }
+    end
+
+    context "with no notifications" do
+      subject { build_stubbed(:reminder) }
+
+      it { is_expected.not_to be_an_unread_notification }
+      it { expect(subject.unread_notifications).to be_empty }
+    end
+  end
+
+  describe "#scheduled?" do
+    it "returns true if job_id is present" do
+      reminder = build_stubbed(:reminder, :scheduled)
+
+      expect(reminder).to be_scheduled
+    end
+
+    it "returns false if job_id is not present" do
+      reminder = build(:reminder, job_id: nil)
+
+      expect(reminder).not_to be_scheduled
+    end
+
+    it "returns false if completed_at is present" do
+      reminder = build(:reminder, :scheduled, :completed)
+
+      expect(reminder).not_to be_scheduled
+    end
+  end
+
+  describe "#completed?" do
+    it "returns true if completed_at is present" do
+      reminder = build(:reminder, :completed)
+
+      expect(reminder).to be_completed
+    end
+
+    it "returns false if completed_at is not present" do
+      reminder = build(:reminder, completed_at: nil)
+
+      expect(reminder).not_to be_completed
+    end
+  end
+end
diff --git a/spec/models/type_spec.rb b/spec/models/type_spec.rb
index 60c624564433..7f4073acc72c 100644
--- a/spec/models/type_spec.rb
+++ b/spec/models/type_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #-- copyright
 # OpenProject is an open source project management software.
 # Copyright (C) the OpenProject GmbH
@@ -42,7 +44,7 @@
     end
 
     it "returns the types enabled in the provided project" do
-      expect(Type.enabled_in(project)).to contain_exactly(type)
+      expect(described_class.enabled_in(project)).to contain_exactly(type)
     end
   end
 
@@ -125,4 +127,44 @@
       end
     end
   end
+
+  describe "#patterns" do
+    it "returns nil when no patterns are defined" do
+      type = create(:type)
+
+      expect(type.patterns).to be_nil
+    end
+
+    it "returns a PatternCollection" do
+      type = create(:type, patterns: {
+                      subject: { blueprint: "{{work_package:custom_field_123}} - {{project:custom_field_321}}", enabled: true }
+                    })
+
+      expect(type.patterns).to be_a(Types::PatternCollection)
+      expect(type.patterns[:subject])
+        .to eq(Types::Pattern.new("{{work_package:custom_field_123}} - {{project:custom_field_321}}", true))
+    end
+  end
+
+  describe "#patterns=" do
+    subject(:type) { build(:type) }
+
+    context "when an invalid value is passed" do
+      it "defaults to nil" do
+        type.patterns = 4
+
+        expect(type.patterns).to be_nil
+        expect { type.save! }.not_to raise_error
+      end
+    end
+
+    it "converts the incoming hash into a PatternCollection" do
+      type.patterns = { subject: { blueprint: "some_string", enabled: false } }
+
+      expect(type.patterns).to be_a(Types::PatternCollection)
+      expect(type.patterns[:subject]).to be_a(Types::Pattern)
+
+      expect { type.save! }.not_to raise_error
+    end
+  end
 end
diff --git a/spec/models/work_packages/pdf_export/work_package_to_pdf_spec.rb b/spec/models/work_packages/pdf_export/work_package_to_pdf_spec.rb
index a516118e6da1..dd17000ba086 100644
--- a/spec/models/work_packages/pdf_export/work_package_to_pdf_spec.rb
+++ b/spec/models/work_packages/pdf_export/work_package_to_pdf_spec.rb
@@ -216,10 +216,17 @@ def get_column_value(column_name)
     content = export_pdf.content
     # If you want to actually see the PDF for debugging, uncomment the following line
     # File.binwrite('WorkPackageToPdf-test-preview.pdf', content)
+    page_xobjects = PDF::Inspector::XObject.analyze(content).page_xobjects
+    images = page_xobjects.flat_map { |o| o.values.select { |v| v.hash[:Subtype] == :Image } }
+    logos = page_xobjects.flat_map do |o|
+      o.values.flat_map do |v|
+        form_object = v.hash[:Subtype] == :Form ? v.hash.dig(:Resources, :XObject, :I1) : nil
+        form_object if form_object&.hash && form_object.hash[:Subtype] == :Image
+      end
+    end
     { strings: PDF::Inspector::Text.analyze(content).strings,
-      images: PDF::Inspector::XObject.analyze(content).page_xobjects.flat_map do |o|
-        o.values.select { |v| v.hash[:Subtype] == :Image }
-      end }
+      logos:,
+      images: }
   end
 
   describe "with a request for a PDF" do
@@ -438,5 +445,33 @@ def get_column_value(column_name)
         expect(result.join(" ")).to eq(expected_result.join(" "))
       end
     end
+
+    describe "with a logo image" do
+      let(:description) { "" }
+
+      describe "default" do
+        it "contains the default specified logo image" do
+          expect(pdf[:logos].length).to eq(1)
+          # Rails.root.join("app/assets/images/logo_openproject.png")
+          expect(pdf[:logos].first.hash[:Height]).to eq(150)
+          expect(pdf[:logos].first.hash[:Width]).to eq(700)
+        end
+      end
+
+      describe "custom specified" do
+        let(:custom_style) { build(:custom_style_with_export_logo) } # custom style factory
+
+        before do
+          allow(CustomStyle).to receive(:current).and_return(custom_style)
+        end
+
+        it "contains the custom specified logo image" do
+          expect(pdf[:logos].length).to eq(1)
+          # Rails.root.join("spec/support/custom_styles/export_logos/export_logo_image.png")
+          expect(pdf[:logos].first.hash[:Height]).to eq(30)
+          expect(pdf[:logos].first.hash[:Width]).to eq(149)
+        end
+      end
+    end
   end
 end
diff --git a/spec/permissions/edit_project_life_cycles_spec.rb b/spec/permissions/edit_project_life_cycles_spec.rb
new file mode 100644
index 000000000000..7e81ea0f34d1
--- /dev/null
+++ b/spec/permissions/edit_project_life_cycles_spec.rb
@@ -0,0 +1,44 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+require File.expand_path("../support/permission_specs", __dir__)
+
+RSpec.describe Overviews::OverviewsController, "edit_project_life_cycles permission", # rubocop:disable RSpec/EmptyExampleGroup,RSpec/SpecFilePathFormat
+               type: :controller do
+  include PermissionSpecs
+
+  # render dialog with inputs for editing project attributes with edit_project permission
+  check_permission_required_for("overviews/overviews#project_life_cycles_dialog", :edit_project_stages_and_gates)
+
+  # render form with inputs for editing project attributes with edit_project permission
+  check_permission_required_for("overviews/overviews#project_life_cycles_form", :edit_project_stages_and_gates)
+
+  # update project attributes with edit_project permission, deeper permission check via contract in place
+  check_permission_required_for("overviews/overviews#update_project_life_cycles", :edit_project_stages_and_gates)
+end
diff --git a/spec/permissions/view_project_life_cycles_spec.rb b/spec/permissions/view_project_life_cycles_spec.rb
new file mode 100644
index 000000000000..294c55fa8a68
--- /dev/null
+++ b/spec/permissions/view_project_life_cycles_spec.rb
@@ -0,0 +1,38 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+require File.expand_path("../support/permission_specs", __dir__)
+
+RSpec.describe Overviews::OverviewsController, "view_project_life_cycles permission", # rubocop:disable RSpec/EmptyExampleGroup,RSpec/SpecFilePathFormat
+               type: :controller do
+  include PermissionSpecs
+
+  # render sidebar on project overview page with view_project permission
+  check_permission_required_for("overviews/overviews#project_life_cycles_sidebar", :view_project_stages_and_gates)
+end
diff --git a/spec/requests/api/v3/authentication_spec.rb b/spec/requests/api/v3/authentication_spec.rb
index 658232433892..1c95c9e62165 100644
--- a/spec/requests/api/v3/authentication_spec.rb
+++ b/spec/requests/api/v3/authentication_spec.rb
@@ -424,7 +424,7 @@ def set_basic_auth_header(user, password)
               headers: {
                 "Accept" => "*/*",
                 "Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3",
-                "User-Agent" => "JSON::JWK::Set::Fetcher 2.8.2"
+                "User-Agent" => "JSON::JWK::Set::Fetcher 2.9.1"
               }
             )
             .to_return(status: 200, body: '{"keys":[{"kid":"CANAG6lJUPKqKDoWxxXL5wAHf2U18BAzm_LJm7RPTGk","kty":"RSA","alg":"RSA-OAEP","use":"enc","n":"nqJexS6n-SxKSDUxXp_dsNwDW6cZ4Rtgqq9ut_lp1CNSph5wTnLG3aQQsTEvx5o3-SZ-pHjJ0gtEpg7clAz-w-YQyZoAXkFtQqmZJxsmdS4K0yILxO3WUNdJQlutjmq-Ri50Senn5IV7yEYWLo8St1qzUqWZhp0HKudyty24triC9UJTK03W3_Tr5c1X8vKL8duAjvLB7p_sYUOrnLq5pD5lqwxVSAiN8qS5zVNZMrhGV5aN1vN_vue_tw8c2SVOCLLTrUh3441rYaeo-UwQZF7ZTm30xflqAIfe8qMoB20wtWYAXR0D5iqkkdEH4XanCYVm5vdUFIPPvXZhRDWoNQ","e":"AQAB","x5c":["MIICmzCCAYMCBgGQupeGPzANBgkqhkiG9w0BAQsFADARMQ8wDQYDVQQDDAZtYXN0ZXIwHhcNMjQwNzE2MDgwODMwWhcNMzQwNzE2MDgxMDEwWjARMQ8wDQYDVQQDDAZtYXN0ZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCeol7FLqf5LEpINTFen92w3ANbpxnhG2Cqr263+WnUI1KmHnBOcsbdpBCxMS/Hmjf5Jn6keMnSC0SmDtyUDP7D5hDJmgBeQW1CqZknGyZ1LgrTIgvE7dZQ10lCW62Oar5GLnRJ6efkhXvIRhYujxK3WrNSpZmGnQcq53K3Lbi2uIL1QlMrTdbf9OvlzVfy8ovx24CO8sHun+xhQ6ucurmkPmWrDFVICI3ypLnNU1kyuEZXlo3W83++57+3DxzZJU4IstOtSHfjjWthp6j5TBBkXtlObfTF+WoAh97yoygHbTC1ZgBdHQPmKqSR0QfhdqcJhWbm91QUg8+9dmFENag1AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAB/AGvP0gviPoJszj/oQgBsMpPGRHLpnTmrXnTaa7Xk2sgExAb4zUAwxGjtR347t697cpiKQYBkR2ndswnt93Sx/Ot+yn5BdYcNvZuEh5jb5bkH2V4h6/LrYljTymby+XPBEf+XLhBOjoI3SKtNJk4pEqVNwLuKKbObqJcE3G3VBVSdzRUcIrjZr7yAQeLnhczS3hJ0Ct6Y7S5Q6DK+/PU1+AvlW+7GfzpRMqVfLcqhNpRwdCVGlJYKaUJfIe1vav10D94xA0U1sKex3iA1S+1HlS2BCWx/0rXwgcquMpUZlOAKiT0K6SIFxBFFnM9eQbF97Dz7Bzw+jyqStGUcH9YA="],"x5t":"TuBfrOL00KXDrOWTv3jw7Uxx3hA","x5t#S256":"7su5lOXF5qcMuvp44ynsoyk3B0l9Sr_bOVlg768shpY"},{"kid":"97AmyvoS8BFFRfm585GPgA16G1H2V22EdxxuAYUuoKk","kty":"RSA","alg":"RS256","use":"sig","n":"jMB2r7BG4QJzLnA2_fgG1mxlh2RX_MSx0lc2lrPIVFGYBuAu8irwRLSexX5aQdD_AtnxLD4g9jiG6VEDwmWopEe0fr-QMl0IiES5tJuQMrjhajOkzr8xTYu6zl-knL0tu99iRbmKNYzEcv0TAgY_95n4gD5tPhYvY4gXuHrFKqYkJQPsSgoThlH7hAtfzsDt6yp3P2lQUESGg3pzc_J_NKnQkkggcNB06Hlz4DmcHxhWXK51P1V9cE7qh4PrhsJ-SOH5grcN9PtOZi6f2VlWdFdyisT-YehNklfVqBtdCLm7Ocghhl0HSgLuV-9dHCdwBLUpABsdsd0L3LRCUgRfjQ","e":"AQAB","x5c":["MIICmzCCAYMCBgGQupeFFTANBgkqhkiG9w0BAQsFADARMQ8wDQYDVQQDDAZtYXN0ZXIwHhcNMjQwNzE2MDgwODMwWhcNMzQwNzE2MDgxMDEwWjARMQ8wDQYDVQQDDAZtYXN0ZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCMwHavsEbhAnMucDb9+AbWbGWHZFf8xLHSVzaWs8hUUZgG4C7yKvBEtJ7FflpB0P8C2fEsPiD2OIbpUQPCZaikR7R+v5AyXQiIRLm0m5AyuOFqM6TOvzFNi7rOX6ScvS2732JFuYo1jMRy/RMCBj/3mfiAPm0+Fi9jiBe4esUqpiQlA+xKChOGUfuEC1/OwO3rKnc/aVBQRIaDenNz8n80qdCSSCBw0HToeXPgOZwfGFZcrnU/VX1wTuqHg+uGwn5I4fmCtw30+05mLp/ZWVZ0V3KKxP5h6E2SV9WoG10Iubs5yCGGXQdKAu5X710cJ3AEtSkAGx2x3QvctEJSBF+NAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAIoBCsOO0bXiVspoXkqdOts4+3sULbbp5aEwQscmLX017Zvv5jxdkZxUYk8L08lNB+WlC1ES4VlmtE06D0cWYErGpArJzVBKgYSA3CkA9veBEugHviMqfwg3suNc8S+GtaRBvpbVZtXydjjqA8GZ4eKhPoJLHHCX6X2Ad33Cdt0/ftucjTqAKVzzzgWZejy+ZKP6ybAqYJ+EZoPUXlyWT3uwcpGEJ3nzOYYGTfxOSmAwnH2v5Z/JWr9ex5o/+QBuBhFcg0z8NcHa3Z0E6ZC9GGxV7XztBqYicO+nONHTLCctoJmyXvLM4j8qIG2UQgPIiwIL0Jkz6xQAYyXvsb+LhM8="],"x5t":"BFrni6MoX-CJwtMT4vzij1HBSTI","x5t#S256":"-Ge3y4JRezxhGTDfbkNoz7prkokzYtbKQ9ardPtfcz4"}]}', headers: {})
@@ -495,7 +495,7 @@ def set_basic_auth_header(user, password)
               headers: {
                 "Accept" => "*/*",
                 "Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3",
-                "User-Agent" => "JSON::JWK::Set::Fetcher 2.8.2"
+                "User-Agent" => "JSON::JWK::Set::Fetcher 2.9.1"
               }
             )
             .to_return(status: 200, body: '{"keys":[{"kid":"CANAG6lJUPKqKDoWxxXL5wAHf2U18BAzm_LJm7RPTGk","kty":"RSA","alg":"RSA-OAEP","use":"enc","n":"nqJexS6n-SxKSDUxXp_dsNwDW6cZ4Rtgqq9ut_lp1CNSph5wTnLG3aQQsTEvx5o3-SZ-pHjJ0gtEpg7clAz-w-YQyZoAXkFtQqmZJxsmdS4K0yILxO3WUNdJQlutjmq-Ri50Senn5IV7yEYWLo8St1qzUqWZhp0HKudyty24triC9UJTK03W3_Tr5c1X8vKL8duAjvLB7p_sYUOrnLq5pD5lqwxVSAiN8qS5zVNZMrhGV5aN1vN_vue_tw8c2SVOCLLTrUh3441rYaeo-UwQZF7ZTm30xflqAIfe8qMoB20wtWYAXR0D5iqkkdEH4XanCYVm5vdUFIPPvXZhRDWoNQ","e":"AQAB","x5c":["MIICmzCCAYMCBgGQupeGPzANBgkqhkiG9w0BAQsFADARMQ8wDQYDVQQDDAZtYXN0ZXIwHhcNMjQwNzE2MDgwODMwWhcNMzQwNzE2MDgxMDEwWjARMQ8wDQYDVQQDDAZtYXN0ZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCeol7FLqf5LEpINTFen92w3ANbpxnhG2Cqr263+WnUI1KmHnBOcsbdpBCxMS/Hmjf5Jn6keMnSC0SmDtyUDP7D5hDJmgBeQW1CqZknGyZ1LgrTIgvE7dZQ10lCW62Oar5GLnRJ6efkhXvIRhYujxK3WrNSpZmGnQcq53K3Lbi2uIL1QlMrTdbf9OvlzVfy8ovx24CO8sHun+xhQ6ucurmkPmWrDFVICI3ypLnNU1kyuEZXlo3W83++57+3DxzZJU4IstOtSHfjjWthp6j5TBBkXtlObfTF+WoAh97yoygHbTC1ZgBdHQPmKqSR0QfhdqcJhWbm91QUg8+9dmFENag1AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAB/AGvP0gviPoJszj/oQgBsMpPGRHLpnTmrXnTaa7Xk2sgExAb4zUAwxGjtR347t697cpiKQYBkR2ndswnt93Sx/Ot+yn5BdYcNvZuEh5jb5bkH2V4h6/LrYljTymby+XPBEf+XLhBOjoI3SKtNJk4pEqVNwLuKKbObqJcE3G3VBVSdzRUcIrjZr7yAQeLnhczS3hJ0Ct6Y7S5Q6DK+/PU1+AvlW+7GfzpRMqVfLcqhNpRwdCVGlJYKaUJfIe1vav10D94xA0U1sKex3iA1S+1HlS2BCWx/0rXwgcquMpUZlOAKiT0K6SIFxBFFnM9eQbF97Dz7Bzw+jyqStGUcH9YA="],"x5t":"TuBfrOL00KXDrOWTv3jw7Uxx3hA","x5t#S256":"7su5lOXF5qcMuvp44ynsoyk3B0l9Sr_bOVlg768shpY"},{"kid":"9755555S8BFFRfm585GPgA16G1H2V22EdxxuAYUuoKk","kty":"RSA","alg":"RS256","use":"sig","n":"jMB2r7BG4QJzLnA2_fgG1mxlh2RX_MSx0lc2lrPIVFGYBuAu8irwRLSexX5aQdD_AtnxLD4g9jiG6VEDwmWopEe0fr-QMl0IiES5tJuQMrjhajOkzr8xTYu6zl-knL0tu99iRbmKNYzEcv0TAgY_95n4gD5tPhYvY4gXuHrFKqYkJQPsSgoThlH7hAtfzsDt6yp3P2lQUESGg3pzc_J_NKnQkkggcNB06Hlz4DmcHxhWXK51P1V9cE7qh4PrhsJ-SOH5grcN9PtOZi6f2VlWdFdyisT-YehNklfVqBtdCLm7Ocghhl0HSgLuV-9dHCdwBLUpABsdsd0L3LRCUgRfjQ","e":"AQAB","x5c":["MIICmzCCAYMCBgGQupeFFTANBgkqhkiG9w0BAQsFADARMQ8wDQYDVQQDDAZtYXN0ZXIwHhcNMjQwNzE2MDgwODMwWhcNMzQwNzE2MDgxMDEwWjARMQ8wDQYDVQQDDAZtYXN0ZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCMwHavsEbhAnMucDb9+AbWbGWHZFf8xLHSVzaWs8hUUZgG4C7yKvBEtJ7FflpB0P8C2fEsPiD2OIbpUQPCZaikR7R+v5AyXQiIRLm0m5AyuOFqM6TOvzFNi7rOX6ScvS2732JFuYo1jMRy/RMCBj/3mfiAPm0+Fi9jiBe4esUqpiQlA+xKChOGUfuEC1/OwO3rKnc/aVBQRIaDenNz8n80qdCSSCBw0HToeXPgOZwfGFZcrnU/VX1wTuqHg+uGwn5I4fmCtw30+05mLp/ZWVZ0V3KKxP5h6E2SV9WoG10Iubs5yCGGXQdKAu5X710cJ3AEtSkAGx2x3QvctEJSBF+NAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAIoBCsOO0bXiVspoXkqdOts4+3sULbbp5aEwQscmLX017Zvv5jxdkZxUYk8L08lNB+WlC1ES4VlmtE06D0cWYErGpArJzVBKgYSA3CkA9veBEugHviMqfwg3suNc8S+GtaRBvpbVZtXydjjqA8GZ4eKhPoJLHHCX6X2Ad33Cdt0/ftucjTqAKVzzzgWZejy+ZKP6ybAqYJ+EZoPUXlyWT3uwcpGEJ3nzOYYGTfxOSmAwnH2v5Z/JWr9ex5o/+QBuBhFcg0z8NcHa3Z0E6ZC9GGxV7XztBqYicO+nONHTLCctoJmyXvLM4j8qIG2UQgPIiwIL0Jkz6xQAYyXvsb+LhM8="],"x5t":"BFrni6MoX-CJwtMT4vzij1HBSTI","x5t#S256":"-Ge3y4JRezxhGTDfbkNoz7prkokzYtbKQ9ardPtfcz4"}]}', headers: {})
diff --git a/spec/requests/api/v3/reminders/reminders_api_spec.rb b/spec/requests/api/v3/reminders/reminders_api_spec.rb
new file mode 100644
index 000000000000..9367d6c52ae4
--- /dev/null
+++ b/spec/requests/api/v3/reminders/reminders_api_spec.rb
@@ -0,0 +1,124 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+
+RSpec.describe API::V3::Reminders::RemindersAPI do
+  let!(:project) { create(:project) }
+
+  let!(:role_with_permissions) { create(:project_role, permissions: %i[view_work_packages]) }
+  let!(:role_without_permissions) { create(:project_role, permissions: %i[view_project]) }
+
+  let!(:user_with_permissions) do
+    create(:user, member_with_roles: { project => role_with_permissions })
+  end
+  let!(:other_user_without_permissions) do
+    create(:user, member_with_roles: { project => role_without_permissions })
+  end
+
+  let!(:work_package) { create(:work_package, project:) }
+  let!(:other_work_package) { create(:work_package, project:) }
+
+  let!(:user_with_permissions_past_reminder) do
+    Reminders::CreateService.new(user: user_with_permissions, contract_class: nil)
+                           .call(remindable: work_package,
+                                 remind_at: 1.day.ago,
+                                 creator: user_with_permissions,
+                                 note: "I'm the user with permissions and my reminder is in the past")
+                           .result
+  end
+  let!(:user_with_permissions_future_reminder) do
+    Reminders::CreateService.new(user: user_with_permissions, contract_class: nil)
+                           .call(remindable: work_package,
+                                 remind_at: 1.day.from_now,
+                                 creator: user_with_permissions,
+                                 note: "I'm the user with permissions and my reminder is in the future")
+                           .result
+  end
+  let!(:user_with_permissions_future_reminder_in_other_work_package) do
+    Reminders::CreateService.new(user: user_with_permissions, contract_class: nil)
+                           .call(remindable: other_work_package,
+                                 remind_at: 1.day.from_now,
+                                 creator: user_with_permissions,
+                                 note: "I'm the user with permissions and my reminder is in the future in another work package")
+                           .result
+  end
+  let!(:other_user_without_permissions_reminder) do
+    Reminders::CreateService.new(user: other_user_without_permissions, contract_class: nil)
+                           .call(remindable: other_work_package,
+                                 remind_at: 1.day.from_now,
+                                 creator: other_user_without_permissions,
+                                 note: "I'm the other user without permissions and my reminder is in the future")
+                           .result
+  end
+  let!(:other_user_without_permissions_reminder_past) do
+    Reminders::CreateService.new(user: other_user_without_permissions, contract_class: nil)
+                           .call(remindable: other_work_package,
+                                 remind_at: 1.day.ago,
+                                 creator: other_user_without_permissions,
+                                 note: "I'm the other user without permissions and my reminder is in the past")
+                           .result
+  end
+  let!(:other_user_without_permissions_reminder_in_other_work_package) do
+    Reminders::CreateService.new(user: other_user_without_permissions, contract_class: nil)
+                           .call(remindable: other_work_package,
+                                 remind_at: 1.day.from_now,
+                                 creator: other_user_without_permissions,
+                                 note: "I'm the other user without permissions and my reminder is in the" \
+                                       "future in another work package")
+                           .result
+  end
+
+  let(:href) { "/api/v3/work_packages/#{work_package.id}/reminders" }
+  let(:request) { get href }
+  let(:result) do
+    request
+    JSON.parse last_response.body
+  end
+  let(:subjects) { reminders.pluck("id") }
+
+  def reminders
+    result["_embedded"]["elements"]
+  end
+
+  context "with no permissions" do
+    current_user { other_user_without_permissions }
+
+    it "responds with unprocessable entity" do
+      expect(result["errorIdentifier"]).to eq("urn:openproject-org:api:v3:errors:NotFound")
+    end
+  end
+
+  context "with permissions" do
+    current_user { user_with_permissions }
+
+    it "returns the future reminders for the current user in the given work package" do
+      expect(subjects).to contain_exactly(user_with_permissions_future_reminder.id)
+    end
+  end
+end
diff --git a/spec/requests/api/v3/work_packages/create_resource_spec.rb b/spec/requests/api/v3/work_packages/create_resource_spec.rb
index cc6ff6015d5a..de07c44385a5 100644
--- a/spec/requests/api/v3/work_packages/create_resource_spec.rb
+++ b/spec/requests/api/v3/work_packages/create_resource_spec.rb
@@ -113,7 +113,7 @@
     end
 
     it "creates a work package" do
-      expect(WorkPackage.all.count).to eq(1)
+      expect(WorkPackage.count).to eq(1)
     end
 
     it "uses the given parameters" do
@@ -152,7 +152,7 @@
       it_behaves_like "multiple errors", 422
 
       it "does not create a work package" do
-        expect(WorkPackage.all.count).to eq(0)
+        expect(WorkPackage.count).to eq(0)
       end
     end
 
@@ -176,7 +176,7 @@
       end
 
       it "does not create a work package" do
-        expect(WorkPackage.all.count).to eq(0)
+        expect(WorkPackage.count).to eq(0)
       end
     end
 
@@ -227,7 +227,7 @@
       end
 
       it "does not create a work package" do
-        expect(WorkPackage.all.count).to eq(0)
+        expect(WorkPackage.count).to eq(0)
       end
     end
 
@@ -310,7 +310,7 @@
           expect(last_response.body).to be_json_eql(
             api_v3_paths.file_links(work_package.id).to_json
           ).at_path("_links/fileLinks/href")
-          expect(last_response.body).to be_json_eql("1").at_path("_embedded/fileLinks/total")
+          expect(last_response.body).to have_json_path("_links/addFileLink")
         end
       end
     end
diff --git a/spec/services/custom_fields/hierarchy/hierarchical_item_service_spec.rb b/spec/services/custom_fields/hierarchy/hierarchical_item_service_spec.rb
index e88ed99bf4e1..36abb4b82eb9 100644
--- a/spec/services/custom_fields/hierarchy/hierarchical_item_service_spec.rb
+++ b/spec/services/custom_fields/hierarchy/hierarchical_item_service_spec.rb
@@ -31,8 +31,8 @@
 require "spec_helper"
 
 RSpec.describe CustomFields::Hierarchy::HierarchicalItemService do
-  let(:custom_field) { create(:custom_field, field_format: "hierarchy", hierarchy_root: nil) }
-  let(:invalid_custom_field) { create(:custom_field, field_format: "text", hierarchy_root: nil) }
+  let!(:custom_field) { create(:custom_field, field_format: "hierarchy", hierarchy_root: nil) }
+  let!(:invalid_custom_field) { create(:custom_field, field_format: "text", hierarchy_root: nil) }
 
   let!(:root) { service.generate_root(custom_field).value! }
   let!(:luke) { service.insert_item(parent: root, label: "luke", short: "LS").value! }
@@ -89,6 +89,14 @@
         bob = service.insert_item(parent: root, label: "Bob", sort_order: 1).value!
         expect(root.reload.children).to contain_exactly(luke, bob, leia)
       end
+
+      it "updates the position_cache" do
+        leia = service.insert_item(parent: root, label: "leia").value!
+        expect(root.reload.position_cache).to eq(64)
+
+        service.insert_item(parent: root, label: "Bob", sort_order: 1).value!
+        expect(leia.reload.position_cache).to eq(200)
+      end
     end
 
     context "with invalid item" do
@@ -133,6 +141,13 @@
         expect(CustomField::Hierarchy::Item.count).to eq(1)
         expect(root.reload.children).to be_empty
       end
+
+      it "updates the position_cache" do
+        result = service.delete_branch(item: luke)
+
+        expect(result).to be_success
+        expect(root.reload.position_cache).to eq(27)
+      end
     end
 
     context "with root item" do
@@ -214,6 +229,13 @@
       expect(luke.reload.ancestors).to contain_exactly(root, lando)
       expect(mara.reload.ancestors).to contain_exactly(root, lando, luke)
     end
+
+    it "updates the position_cache" do
+      service.move_item(item: luke, new_parent: lando)
+
+      preordered_descendants = root.reload.self_and_descendants_preordered.pluck(:label)
+      expect(root.self_and_descendants.reorder(:position_cache).pluck(:label)).to eq(preordered_descendants)
+    end
   end
 
   describe "#reorder_item" do
@@ -275,6 +297,13 @@
       expect(lando.reload.sort_order).to eq(1)
       expect(chewbacca.reload.sort_order).to eq(2)
     end
+
+    it "updates the position_cache" do
+      service.reorder_item(item: chewbacca, new_sort_order: 0)
+
+      preordered_descendants = root.reload.self_and_descendants_preordered.pluck(:label)
+      expect(root.self_and_descendants.reorder(:position_cache).pluck(:label)).to eq(preordered_descendants)
+    end
   end
 
   describe "#hashed_subtree" do
diff --git a/spec/services/reminders/create_service_spec.rb b/spec/services/reminders/create_service_spec.rb
new file mode 100644
index 000000000000..b220ee90aa75
--- /dev/null
+++ b/spec/services/reminders/create_service_spec.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+require "services/base_services/behaves_like_create_service"
+
+RSpec.describe Reminders::CreateService do
+  it_behaves_like "BaseServices create service" do
+    let(:factory) { :reminder }
+
+    before do
+      allow(model_instance).to receive(:update_columns).and_return(true)
+      allow(Reminders::ScheduleReminderJob).to receive(:schedule)
+        .with(model_instance)
+        .and_return(instance_double(Reminders::ScheduleReminderJob, job_id: 1))
+    end
+
+    it "schedules a reminder job" do
+      subject
+
+      expect(Reminders::ScheduleReminderJob).to have_received(:schedule).with(model_instance)
+      expect(model_instance).to have_received(:update_columns).with(job_id: 1)
+    end
+  end
+end
diff --git a/spec/services/reminders/delete_service_spec.rb b/spec/services/reminders/delete_service_spec.rb
new file mode 100644
index 000000000000..40607fecb3c9
--- /dev/null
+++ b/spec/services/reminders/delete_service_spec.rb
@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+require "services/base_services/behaves_like_delete_service"
+
+RSpec.describe Reminders::DeleteService do
+  it_behaves_like "BaseServices delete service" do
+    let(:factory) { :reminder }
+
+    before do
+      allow(model_instance).to receive(:update).and_return(model_destroy_result)
+    end
+  end
+
+  describe "Remove reminder" do
+    subject { described_class.new(user:, model: model_instance).call }
+
+    let(:model_instance) { create(:reminder, :scheduled, :with_unread_notifications, creator: user) }
+    let(:user) { create(:admin) }
+
+    context "with an existing unfinished scheduled job" do
+      let(:job) { instance_double(GoodJob::Job, finished?: false, destroy: true) }
+
+      before do
+        model_instance.update(job_id: 1, completed_at: nil)
+        allow(GoodJob::Job).to receive(:find_by).and_return(job)
+      end
+
+      it "completes the reminder" do
+        expect { subject }.to change(model_instance, :completed_at).from(nil)
+
+        aggregate_failures "destroy existing job" do
+          expect(GoodJob::Job).to have_received(:find_by).with(id: "1")
+          expect(job).to have_received(:destroy)
+        end
+
+        aggregate_failures "marks unread notifications as read" do
+          expect(model_instance.notifications.count).to eq(1)
+          expect(model_instance.unread_notifications.count).to eq(0)
+        end
+
+        aggregate_failures "marks the reminder as complete" do
+          expect(model_instance).to be_completed
+        end
+      end
+    end
+
+    context "with an existing finished scheduled job" do
+      let(:job) { instance_double(GoodJob::Job, finished?: true, destroy: true) }
+
+      before do
+        model_instance.update(job_id: 1, completed_at: nil)
+        allow(GoodJob::Job).to receive(:find_by).and_return(job)
+      end
+
+      it "completes the reminder" do
+        expect { subject }.to change(model_instance, :completed_at).from(nil)
+
+        aggregate_failures "does NOT destroy existing job" do
+          expect(GoodJob::Job).to have_received(:find_by).with(id: "1")
+          expect(job).not_to have_received(:destroy)
+        end
+
+        aggregate_failures "marks the reminder as complete" do
+          expect(model_instance).to be_completed
+        end
+      end
+    end
+  end
+end
diff --git a/spec/services/reminders/update_service_spec.rb b/spec/services/reminders/update_service_spec.rb
new file mode 100644
index 000000000000..be14bd68b154
--- /dev/null
+++ b/spec/services/reminders/update_service_spec.rb
@@ -0,0 +1,149 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+require "services/base_services/behaves_like_update_service"
+
+RSpec.describe Reminders::UpdateService do
+  it_behaves_like "BaseServices update service" do
+    let(:factory) { :reminder }
+  end
+
+  describe "remind_at changed" do
+    subject { described_class.new(user:, model: model_instance).call(call_attributes) }
+
+    let(:model_instance) { create(:reminder, :scheduled, :with_unread_notifications, creator: user) }
+    let(:user) { create(:admin) }
+    let(:call_attributes) { { remind_at: 2.days.from_now } }
+
+    before do
+      model_instance.update(job_id: 1)
+      allow(Reminders::ScheduleReminderJob).to receive(:schedule)
+        .with(model_instance)
+        .and_return(instance_double(Reminders::ScheduleReminderJob, job_id: 2))
+    end
+
+    context "with an existing unfinished scheduled job" do
+      let(:job) { instance_double(GoodJob::Job, finished?: false, destroy: true) }
+
+      before do
+        allow(GoodJob::Job).to receive(:find_by).and_return(job)
+      end
+
+      it "reschedules the reminder" do
+        expect { subject }.to change(model_instance, :job_id).from("1").to("2")
+
+        aggregate_failures "destroy existing job" do
+          expect(GoodJob::Job).to have_received(:find_by).with(id: "1")
+          expect(job).to have_received(:destroy)
+        end
+
+        aggregate_failures "marks unread notifications as read" do
+          expect(model_instance.notifications.count).to eq(1)
+          expect(model_instance.unread_notifications.count).to eq(0)
+        end
+
+        aggregate_failures "schedule new job" do
+          expect(model_instance.remind_at.to_i).to eq(call_attributes[:remind_at].to_i)
+          expect(Reminders::ScheduleReminderJob).to have_received(:schedule).with(model_instance)
+        end
+      end
+    end
+
+    context "with an existing finished scheduled job" do
+      let(:job) { instance_double(GoodJob::Job, finished?: true, destroy: true) }
+
+      before do
+        allow(GoodJob::Job).to receive(:find_by).and_return(job)
+      end
+
+      it "schedules a new job" do
+        expect { subject }.to change(model_instance, :job_id).from("1").to("2")
+
+        aggregate_failures "does NOT destroy existing job" do
+          expect(GoodJob::Job).to have_received(:find_by).with(id: "1")
+          expect(job).not_to have_received(:destroy)
+        end
+
+        aggregate_failures "schedule new job" do
+          expect(model_instance.remind_at.to_i).to eq(call_attributes[:remind_at].to_i)
+          expect(Reminders::ScheduleReminderJob).to have_received(:schedule).with(model_instance)
+        end
+      end
+    end
+
+    context "with remind_at attribute in non-utc timezone" do
+      let(:call_attributes) { { remind_at: 2.days.from_now.in_time_zone("Africa/Nairobi") } }
+
+      it "reschedules the reminder" do
+        expect { subject }.to change(model_instance, :job_id).from("1").to("2")
+
+        aggregate_failures "schedule new job" do
+          expect(model_instance.remind_at.to_i).to eq(call_attributes[:remind_at].to_i)
+          expect(Reminders::ScheduleReminderJob).to have_received(:schedule).with(model_instance)
+        end
+      end
+    end
+  end
+
+  describe "unchangeable attributes" do
+    let(:original_creator) { create(:user) }
+    let(:original_remindable) { create(:work_package) }
+    let(:model_instance) { create(:reminder, creator: original_creator, remindable: original_remindable) }
+
+    context "when attempting to update the creator" do
+      subject { described_class.new(user: model_instance.creator, model: model_instance).call(creator: another_user) }
+
+      let(:another_user) { create(:user) }
+
+      it "does not update the creator", :aggregate_failures do
+        update_svc = subject
+
+        expect(update_svc).to be_a_failure
+        expect(update_svc.result.reload.creator).to eq(original_creator)
+        expect(update_svc.message).to eq("Creator is invalid. may not be accessed. cannot be changed.")
+      end
+    end
+
+    context "when attempting to update the remindable" do
+      subject { described_class.new(user: model_instance.creator, model: model_instance).call(remindable: another_remindable) }
+
+      let(:another_remindable) { create(:work_package) }
+
+      it "does not update the remindable", :aggregate_failures do
+        update_svc = subject
+
+        expect(update_svc).to be_a_failure
+        expect(update_svc.result.reload.remindable).to eq(original_remindable)
+        expect(update_svc.message).to include("cannot be changed.")
+      end
+    end
+  end
+end
diff --git a/spec/support/components/datepicker/basic_datepicker.rb b/spec/support/components/datepicker/basic_datepicker.rb
index 08198fccd8b1..ade084d66983 100644
--- a/spec/support/components/datepicker/basic_datepicker.rb
+++ b/spec/support/components/datepicker/basic_datepicker.rb
@@ -22,5 +22,10 @@ def self.update_field(trigger, date)
     def flatpickr_container
       container.find(".flatpickr-calendar")
     end
+
+    def open(trigger)
+      input = page.find(trigger)
+      input.click
+    end
   end
 end
diff --git a/spec/support/components/projects/project_life_cycles/edit_dialog.rb b/spec/support/components/projects/project_life_cycles/edit_dialog.rb
new file mode 100644
index 000000000000..83c1a3fce9f8
--- /dev/null
+++ b/spec/support/components/projects/project_life_cycles/edit_dialog.rb
@@ -0,0 +1,158 @@
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+# ++
+
+require "support/components/common/modal"
+require "support/components/autocompleter/ng_select_autocomplete_helpers"
+module Components
+  module Projects
+    module ProjectLifeCycles
+      class EditDialog < Components::Common::Modal
+        def dialog_css_selector
+          "dialog#edit-project-life-cycles-dialog"
+        end
+
+        def async_content_container_css_selector
+          "#{dialog_css_selector} [data-test-selector='async-dialog-content']"
+        end
+
+        def within_dialog(&)
+          within(dialog_css_selector, &)
+        end
+
+        def within_async_content(close_after_yield: false, &)
+          within(async_content_container_css_selector, &)
+          close if close_after_yield
+        end
+
+        def set_date_for(step, value:)
+          datepicker = if value.is_a?(Array)
+                         Components::RangeDatepicker.new
+                       else
+                         Components::BasicDatepicker.new
+                       end
+
+          datepicker.open(
+            "input[id^='project_available_life_cycle_steps_attributes_#{step.position - 1}']"
+          )
+
+          Array(value).each do |date|
+            datepicker.set_date(date.strftime("%Y-%m-%d"))
+          end
+        end
+
+        def close
+          within_dialog do
+            page.find(".close-button").click
+          end
+        end
+        alias_method :close_via_icon, :close
+
+        def close_via_button
+          within(dialog_css_selector) do
+            click_link_or_button "Cancel"
+          end
+        end
+
+        def submit
+          within(dialog_css_selector) do
+            page.find("[data-test-selector='save-project-life-cycles-button']").click
+          end
+        end
+
+        def expect_open
+          expect(page).to have_css(dialog_css_selector)
+        end
+
+        def expect_closed
+          expect(page).to have_no_css(dialog_css_selector)
+        end
+
+        def expect_async_content_loaded
+          expect(page).to have_css(async_content_container_css_selector)
+        end
+
+        def expect_input(label, value:, type:, position:)
+          field = type == :stage ? :date_range : :date
+          within_async_content do
+            expect(page).to have_field(
+              label,
+              with: value,
+              name: "project[available_life_cycle_steps_attributes][#{position - 1}][#{field}]"
+            )
+          end
+        end
+
+        def expect_input_for(step)
+          options = if step.is_a?(Project::Stage)
+                      value = "#{step.start_date.strftime('%Y-%m-%d')} - #{step.end_date.strftime('%Y-%m-%d')}"
+                      { type: :stage, value: }
+                    else
+                      value = step.date.strftime("%Y-%m-%d")
+                      { type: :gate, value: }
+                    end
+
+          expect_input(step.name, position: step.position, **options)
+        end
+
+        def expect_caption(step, text: nil, present: true)
+          selector = 'span[id^="caption"]'
+          expect_selector_for(step, selector:, text:, present:)
+        end
+
+        def expect_no_caption(step)
+          expect_caption(step, present: false)
+        end
+
+        def expect_validation_message(step, text: nil, present: true)
+          selector = 'div[id^="validation"]'
+          expect_selector_for(step, selector:, text:, present:)
+        end
+
+        def expect_no_validation_message(step)
+          expect_validation_message(step, present: false)
+        end
+
+        private
+
+        def expect_selector_for(step, selector:, text: nil, present: true)
+          within_async_content do
+            field = step.is_a?(Project::Stage) ? :date_range : :date
+            input_id = "#project_available_life_cycle_steps_attributes_#{step.position - 1}_#{field}"
+            parent = find(input_id).ancestor("primer-datepicker-field")
+
+            if present
+              expect(parent).to have_selector(selector, text:)
+            else
+              expect(parent).to have_no_selector(selector)
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/support/components/sharing/share_modal.rb b/spec/support/components/sharing/share_modal.rb
index d880da1ac960..11b846cb1b39 100644
--- a/spec/support/components/sharing/share_modal.rb
+++ b/spec/support/components/sharing/share_modal.rb
@@ -380,7 +380,7 @@ def select_not_existing_user_option(email)
       def expect_upsale_banner
         within_modal do
           expect(page)
-            .to have_text(I18n.t(:label_enterprise_addon))
+            .to have_text(I18n.t(:"ee.upsale.title"))
         end
       end
 
diff --git a/spec/support/components/work_packages/relations.rb b/spec/support/components/work_packages/relations.rb
index 3c645384d9db..875d26901ff7 100644
--- a/spec/support/components/work_packages/relations.rb
+++ b/spec/support/components/work_packages/relations.rb
@@ -187,7 +187,7 @@ def add_relation(type:, relatable:, description: nil)
           fill_in "Description", with: description
         end
 
-        click_link_or_button "Save"
+        click_link_or_button "Add"
 
         wait_for_reload if using_cuprite?
 
@@ -201,7 +201,7 @@ def add_relation(type:, relatable:, description: nil)
         find_row(target_wp)
       end
 
-      def add_description_to_relation(relatable, description)
+      def edit_relation_description(relatable, description)
         open_relation_dialog(relatable)
 
         within "##{WorkPackageRelationsTab::WorkPackageRelationDialogComponent::DIALOG_ID}" do
@@ -216,14 +216,14 @@ def add_description_to_relation(relatable, description)
         end
       end
 
-      def edit_relation_description(relatable, description)
+      def edit_lag_of_relation(relatable, lag)
         open_relation_dialog(relatable)
 
         within "##{WorkPackageRelationsTab::WorkPackageRelationDialogComponent::DIALOG_ID}" do
           expect(page).to have_field("Work package", readonly: true)
-          expect(page).to have_field("Description")
+          expect(page).to have_field("Lag")
 
-          fill_in "Description", with: description
+          fill_in "Lag", with: lag
 
           click_link_or_button "Save"
 
diff --git a/spec/support/pages/members.rb b/spec/support/pages/members.rb
index 42a2bb0111b9..864ce7ebcd65 100644
--- a/spec/support/pages/members.rb
+++ b/spec/support/pages/members.rb
@@ -76,6 +76,10 @@ def in_user_row(user, &)
       page.within(".principal-#{user.id}", &)
     end
 
+    def in_user_hover_card(user, &)
+      page.within_test_selector("user-hover-card-#{user.id}", &)
+    end
+
     ##
     # Adds the given user to this project.
     #
diff --git a/spec/support/pages/messages/show.rb b/spec/support/pages/messages/show.rb
index 9e4a7da7313b..9e8c8c43973a 100644
--- a/spec/support/pages/messages/show.rb
+++ b/spec/support/pages/messages/show.rb
@@ -37,7 +37,7 @@ def initialize(message)
     end
 
     def expect_subject(subject)
-      expect(page).to have_css(".title-container", text: subject)
+      expect(page).to have_css(".PageHeader-title", text: subject)
     end
 
     def expect_content(content)
@@ -68,9 +68,7 @@ def quote(content:, quoted_message: nil, subject: nil)
           click_on "Quote"
         end
       else
-        within ".toolbar-items" do
-          click_on "Quote"
-        end
+        page.find_test_selector("message-quote-button").click
       end
 
       sleep 1
diff --git a/spec/support/pages/projects/index.rb b/spec/support/pages/projects/index.rb
index 54f3111765f0..69034ae8c4b4 100644
--- a/spec/support/pages/projects/index.rb
+++ b/spec/support/pages/projects/index.rb
@@ -398,13 +398,14 @@ def set_columns(*columns)
         wait_for_network_idle
       end
 
-      def expect_no_config_columns(*columns)
+      def expect_no_config_columns(*columns, element_selector: ".op-draggable-autocomplete--input",
+                                   results_selector: ".ng-dropdown-panel-items")
         open_configure_view
 
         columns.each do |column|
-          expect_no_ng_option find(".op-draggable-autocomplete--input"),
+          expect_no_ng_option find(element_selector),
                               column,
-                              results_selector: ".ng-dropdown-panel-items"
+                              results_selector:
         end
 
         within "dialog" do
diff --git a/spec/support/pages/projects/settings.rb b/spec/support/pages/projects/settings.rb
deleted file mode 100644
index 7b698f23e05e..000000000000
--- a/spec/support/pages/projects/settings.rb
+++ /dev/null
@@ -1,91 +0,0 @@
-#-- copyright
-# OpenProject is an open source project management software.
-# Copyright (C) the OpenProject GmbH
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License version 3.
-#
-# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-# Copyright (C) 2006-2013 Jean-Philippe Lang
-# Copyright (C) 2010-2013 the ChiliProject Team
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-# See COPYRIGHT and LICENSE files for more details.
-#++
-
-require "support/pages/page"
-
-module Pages
-  module Projects
-    class Settings < Pages::Page
-      attr_accessor :project
-
-      def initialize(project)
-        super()
-
-        self.project = project
-      end
-
-      def visit_tab!(name)
-        visit "/projects/#{project.identifier}/settings/#{name}"
-      end
-
-      def expect_type_active(type)
-        expect_type(type, true)
-      end
-
-      def expect_type_inactive(type)
-        expect_type(type, false)
-      end
-
-      def expect_type(type, active = true)
-        expect(page)
-          .to have_field("project_planning_element_type_ids_#{type.id}", checked: active)
-      end
-
-      def expect_wp_custom_field_active(custom_field)
-        expect_wp_custom_field(custom_field, true)
-      end
-
-      def expect_wp_custom_field_inactive(custom_field)
-        expect_wp_custom_field(custom_field, false)
-      end
-
-      def activate_wp_custom_field(custom_field)
-        check custom_field.name
-      end
-
-      def save!
-        click_button "Save"
-      end
-
-      def expect_wp_custom_field(custom_field, active = true)
-        expect(page)
-          .to have_field(custom_field.name, checked: active)
-      end
-
-      def fieldset_label
-        find "fieldset#project_issue_custom_fields label"
-      end
-
-      private
-
-      def path
-        project_settings_general_path(project)
-      end
-    end
-  end
-end
diff --git a/spec/support/pages/projects/settings/general.rb b/spec/support/pages/projects/settings/general.rb
new file mode 100644
index 000000000000..64f34ee9818e
--- /dev/null
+++ b/spec/support/pages/projects/settings/general.rb
@@ -0,0 +1,49 @@
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2010-2024 the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+# ++
+
+require "support/pages/page"
+
+module Pages
+  module Projects
+    module Settings
+      class General < Pages::Page
+        attr_reader :project
+
+        def initialize(project)
+          super()
+
+          @project = project
+        end
+
+        def path
+          "/projects/#{project.identifier}/settings/general"
+        end
+      end
+    end
+  end
+end
diff --git a/spec/support/pages/projects/settings/life_cycle.rb b/spec/support/pages/projects/settings/life_cycle.rb
new file mode 100644
index 000000000000..ab8ea8f0bcdd
--- /dev/null
+++ b/spec/support/pages/projects/settings/life_cycle.rb
@@ -0,0 +1,115 @@
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2010-2024 the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+# ++
+
+require "support/pages/page"
+
+module Pages
+  module Projects
+    module Settings
+      class LifeCycle < Pages::Page
+        attr_reader :project
+
+        def initialize(project)
+          super()
+
+          @project = project
+        end
+
+        def path
+          "/projects/#{project.identifier}/settings/life_cycle"
+        end
+
+        # Checks if the life cycle steps are listed in the order given and with the correct toggle state.
+        # @param life_cycle_definitions [Hash{LifeCycleElement => Boolean}]
+        def expect_listed(**life_cycle_steps)
+          life_cycle_steps.each_cons(2) do |(predecessor, _), (successor, _)|
+            expect(page).to have_css("#{life_cycle_test_selector(predecessor)} ~ #{life_cycle_test_selector(successor)}")
+          end
+
+          life_cycle_steps.each do |step, active|
+            expect_toggle_state(step, active)
+          end
+        end
+
+        def expect_not_listed(*life_cycle_steps)
+          life_cycle_steps.each do |step|
+            expect(page).to have_no_css(life_cycle_test_selector(step))
+          end
+        end
+
+        def expect_toggle_state(definition, active)
+          within toggle_step(definition) do
+            expect(page)
+              .to have_css(".ToggleSwitch-status#{expected_toggle_status(active)}"),
+                  "Expected toggle for '#{definition.name}' to be #{expected_toggle_status(active)} " \
+                  "but was #{expected_toggle_status(!active)}"
+          end
+        end
+
+        def toggle(definition)
+          toggle_step(definition).click
+        end
+
+        def disable_all
+          find_test_selector("disable-all-life-cycle-steps").click
+        end
+
+        def enable_all
+          find_test_selector("enable-all-life-cycle-steps").click
+        end
+
+        def life_cycle_test_selector(definition)
+          test_selector("project-life-cycle-step-#{definition.id}")
+        end
+
+        def toggle_step(definition)
+          find_test_selector("toggle-project-life-cycle-#{definition.id}")
+        end
+
+        def filter_by(filter)
+          fill_in I18n.t("projects.settings.life_cycle.filter.label"), with: filter
+        end
+
+        def expected_toggle_status(active)
+          active ? "On" : "Off"
+        end
+
+        # Reloads the page and via the check carried out on the Home page
+        # a proper reload is ensured.
+        def reload_with_home_page_detour
+          visit home_path
+
+          expect(page)
+            .to have_css(".PageHeader-title", text: "Home")
+
+          visit!
+        end
+      end
+    end
+  end
+end
diff --git a/spec/support/pages/projects/settings/modules.rb b/spec/support/pages/projects/settings/modules.rb
new file mode 100644
index 000000000000..f97681f7901f
--- /dev/null
+++ b/spec/support/pages/projects/settings/modules.rb
@@ -0,0 +1,49 @@
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2010-2024 the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+# ++
+
+require "support/pages/page"
+
+module Pages
+  module Projects
+    module Settings
+      class Modules < Pages::Page
+        attr_accessor :project
+
+        def initialize(project)
+          super()
+
+          self.project = project
+        end
+
+        def path
+          "/projects/#{project.identifier}/settings/modules"
+        end
+      end
+    end
+  end
+end
diff --git a/spec/support/pages/projects/settings/type.rb b/spec/support/pages/projects/settings/type.rb
new file mode 100644
index 000000000000..de34fe8566ac
--- /dev/null
+++ b/spec/support/pages/projects/settings/type.rb
@@ -0,0 +1,66 @@
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2010-2024 the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+# ++
+
+require "support/pages/page"
+
+module Pages
+  module Projects
+    module Settings
+      class Type < Pages::Page
+        attr_accessor :project
+
+        def initialize(project)
+          super()
+
+          self.project = project
+        end
+
+        def path
+          "/projects/#{project.identifier}/settings/types"
+        end
+
+        def expect_type_active(type)
+          expect_type(type, active: true)
+        end
+
+        def expect_type_inactive(type)
+          expect_type(type, active: false)
+        end
+
+        def expect_type(type, active: true)
+          expect(page)
+            .to have_field("project_planning_element_type_ids_#{type.id}", checked: active)
+        end
+
+        def save!
+          click_link_or_button "Save"
+        end
+      end
+    end
+  end
+end
diff --git a/spec/support/pages/projects/settings/work_package_custom_fields.rb b/spec/support/pages/projects/settings/work_package_custom_fields.rb
new file mode 100644
index 000000000000..4b80d0cfe0bf
--- /dev/null
+++ b/spec/support/pages/projects/settings/work_package_custom_fields.rb
@@ -0,0 +1,70 @@
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2010-2024 the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+# ++
+
+require "support/pages/page"
+
+module Pages
+  module Projects
+    module Settings
+      class WorkPackageCustomFields < Pages::Page
+        attr_accessor :project
+
+        def initialize(project)
+          super()
+
+          self.project = project
+        end
+
+        def path
+          "/projects/#{project.identifier}/settings/custom_fields"
+        end
+
+        def expect_active(custom_field)
+          expect_field(custom_field, active: true)
+        end
+
+        def expect_inactive(custom_field)
+          expect_field(custom_field, active: false)
+        end
+
+        def activate(custom_field)
+          check custom_field.name
+        end
+
+        def expect_field(custom_field, active: true)
+          expect(page)
+            .to have_field(custom_field.name, checked: active)
+        end
+
+        def save!
+          click_link_or_button "Save"
+        end
+      end
+    end
+  end
+end
diff --git a/spec/support/pages/projects/show.rb b/spec/support/pages/projects/show.rb
index 7e1ea638a052..4877c69ab00e 100644
--- a/spec/support/pages/projects/show.rb
+++ b/spec/support/pages/projects/show.rb
@@ -33,11 +33,9 @@ module Projects
     class Show < ::Pages::Page
       attr_reader :project
 
-      # rubocop:disable Lint/MissingSuper
       def initialize(project)
         @project = project
       end
-      # rubocop:enable Lint/MissingSuper
 
       def path
         project_path(project)
@@ -53,10 +51,15 @@ def visit_page
 
       def expect_no_visible_sidebar
         expect_angular_frontend_initialized
-        expect(page).to have_no_css(".op-grid-page--grid-container")
+        expect(page).to have_no_css(".op-grid-page--sidebar")
       end
 
-      def within_async_loaded_sidebar(&)
+      def expect_visible_sidebar
+        expect_angular_frontend_initialized
+        expect(page).to have_css(".op-grid-page--sidebar")
+      end
+
+      def within_project_attributes_sidebar(&)
         within "#project-custom-fields-sidebar" do
           expect(page).to have_css("[data-test-selector='project-custom-fields-sidebar-async-content']")
           yield
@@ -72,7 +75,7 @@ def within_custom_field_container(custom_field, &)
       end
 
       def open_edit_dialog_for_section(section)
-        within_async_loaded_sidebar do
+        within_project_attributes_sidebar do
           scroll_to_element(page.find("[data-test-selector='project-custom-field-section-#{section.id}']"))
           within_custom_field_section_container(section) do
             page.find("[data-test-selector='project-custom-field-section-edit-button']").click
@@ -82,6 +85,25 @@ def open_edit_dialog_for_section(section)
         expect(page).to have_css("[data-test-selector='async-dialog-content']", wait: 5)
       end
 
+      def open_edit_dialog_for_life_cycles
+        within_life_cycles_sidebar do
+          page.find("[data-test-selector='project-life-cycles-edit-button']").click
+        end
+
+        Components::Projects::ProjectLifeCycles::EditDialog.new.tap(&:expect_open)
+      end
+
+      def within_life_cycles_sidebar(&)
+        within "#project-life-cycles-sidebar" do
+          expect(page).to have_css("[data-test-selector='project-life-cycles-sidebar-async-content']")
+          yield
+        end
+      end
+
+      def within_life_cycle_container(life_cycle, &)
+        within("[data-test-selector='project-life-cycle-#{life_cycle.id}']", &)
+      end
+
       def expand_text(custom_field)
         within_custom_field_container(custom_field) do
           page.find('[data-test-selector="expand-button"]').click
diff --git a/spec/support/pages/work_packages/full_work_package.rb b/spec/support/pages/work_packages/full_work_package.rb
index 8fd650b0c975..6c9aa88b7a93 100644
--- a/spec/support/pages/work_packages/full_work_package.rb
+++ b/spec/support/pages/work_packages/full_work_package.rb
@@ -56,6 +56,37 @@ def expect_share_button_count(count)
       end
     end
 
+    def expect_reminder_button
+      expect(page).to have_test_selector("op-wp-reminder-button")
+    end
+
+    def expect_reminder_button_alarm_set_icon
+      page.within_test_selector("op-wp-reminder-button") do
+        expect(page).to have_css("svg[op-alarm-set-icon]", wait: 10)
+      end
+    end
+
+    def expect_reminder_button_alarm_not_set_icon
+      expect(page).to have_test_selector("op-wp-reminder-button")
+      expect(page).to have_css("svg[op-alarm-icon]", wait: 10)
+    end
+
+    def expect_no_reminder_button
+      expect(page).not_to have_test_selector("op-wp-reminder-button")
+    end
+
+    def click_reminder_button
+      within toolbar do
+        # The request to the capabilities endpoint determines
+        # whether the "Reminder" button is rendered or not.
+        # Instead of waiting for an idle network (which may
+        # include waiting for other network requests unrelated to
+        # reminders), waiting for the button to be present makes
+        # the spec a bit faster.
+        find_test_selector("op-wp-reminder-button", wait: 10).click
+      end
+    end
+
     def wait_for_activity_tab
       expect(page).to have_test_selector("op-wp-activity-tab", wait: 10)
       # wait for stimulus js component to be mounted
diff --git a/spec/support/rspec_retry.rb b/spec/support/rspec_retry.rb
index 281fe9779792..8145d377aac8 100644
--- a/spec/support/rspec_retry.rb
+++ b/spec/support/rspec_retry.rb
@@ -76,6 +76,11 @@ def retry_block(args: {}, screenshot: false, &)
     end
   end
 
+  # By default retry_block works with StandardError, but the ExpectationNotMetError is
+  # not inherited from StandardError. Adding the RSpec::Expectations::ExpectationNotMetError
+  # will makes sure we retry if an expectation fails inside the retry_block.
+  args[:on] ||= [StandardError, RSpec::Expectations::ExpectationNotMetError]
+
   Retriable.retriable(on_retry: log_errors, **args, &)
 end
 
diff --git a/spec/views/projects/settings/general/show.html.erb_spec.rb b/spec/views/projects/settings/general/show.html.erb_spec.rb
index 0b69f5048c1e..ed110d75e3b3 100644
--- a/spec/views/projects/settings/general/show.html.erb_spec.rb
+++ b/spec/views/projects/settings/general/show.html.erb_spec.rb
@@ -29,6 +29,7 @@
 require "spec_helper"
 
 RSpec.describe "projects/settings/general/show" do
+  include TestSelectorFinders
   let(:project) { build_stubbed(:project) }
 
   describe "project copy permission" do
@@ -44,7 +45,7 @@
       end
 
       it "the copy link should be visible" do
-        expect(rendered).to have_css "a.copy"
+        expect(rendered).to have_test_selector "project-settings--copy"
       end
     end
 
@@ -72,8 +73,8 @@
     end
 
     it "show delete and archive buttons" do
-      expect(rendered).to have_css("li.toolbar-item span.button--text", text: "Archive")
-      expect(rendered).to have_css("li.toolbar-item span.button--text", text: "Delete")
+      expect(rendered).to have_test_selector "project-settings--archive"
+      expect(rendered).to have_test_selector "project-settings--delete"
     end
   end
 
diff --git a/spec/workers/mails/reminders/notification_delivery_job_spec.rb b/spec/workers/mails/reminders/notification_delivery_job_spec.rb
new file mode 100644
index 000000000000..aa95970cc15d
--- /dev/null
+++ b/spec/workers/mails/reminders/notification_delivery_job_spec.rb
@@ -0,0 +1,57 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+
+RSpec.describe Mails::Reminders::NotificationDeliveryJob do
+  shared_let(:work_package) { create(:work_package) }
+  shared_let(:user) { create(:user) }
+
+  shared_let(:notification) do
+    reminder = create(:reminder, remindable: work_package, creator: user)
+    create(:notification, reason: :reminder, recipient: user, resource: work_package, reminder:)
+  end
+
+  before do
+    allow(Reminders::NotificationMailer).to receive(:reminder_notification).and_call_original
+  end
+
+  describe "#perform" do
+    subject { described_class.new.perform(notification) }
+
+    it "sends the reminder notification" do
+      expect { subject }.to change(ActionMailer::Base.deliveries, :count).by(1)
+      expect(Reminders::NotificationMailer).to have_received(:reminder_notification).with(notification)
+
+      aggregate_failures "notification marked as sent" do
+        notification.reload
+        expect(notification.mail_alert_sent).to be(true)
+      end
+    end
+  end
+end
diff --git a/spec/workers/reminders/schedule_reminder_job_spec.rb b/spec/workers/reminders/schedule_reminder_job_spec.rb
new file mode 100644
index 000000000000..90f5abecefd0
--- /dev/null
+++ b/spec/workers/reminders/schedule_reminder_job_spec.rb
@@ -0,0 +1,98 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+require "spec_helper"
+
+RSpec.describe Reminders::ScheduleReminderJob do
+  describe ".schedule" do
+    let(:reminder) { create(:reminder) }
+
+    subject { described_class.schedule(reminder) }
+
+    it "enqueues a ScheduleReminderJob" do
+      expect { subject }
+        .to have_enqueued_job(described_class)
+              .at(reminder.remind_at)
+              .with(reminder)
+    end
+  end
+
+  describe "#perform" do
+    let(:reminder) { create(:reminder) }
+
+    subject { described_class.new.perform(reminder) }
+
+    it "creates a notification from the reminder" do
+      notification_svc = nil
+      expect { notification_svc = subject }.to change(Notification, :count).by(1) & change(ReminderNotification, :count).by(1)
+
+      aggregate_failures "notification attributes" do
+        notification = notification_svc.result
+
+        expect(notification.recipient_id).to eq(reminder.creator_id)
+        expect(notification.resource).to eq(reminder.remindable)
+        expect(notification.reason).to eq("reminder")
+      end
+
+      aggregate_failures "marks reminder as having unread notifications" do
+        expect(reminder.reload).to be_an_unread_notification
+      end
+    end
+
+    context "when the reminder is already notified" do
+      before do
+        create(:reminder_notification, reminder: reminder, notification: create(:notification, read_ian: false))
+      end
+
+      it "does not create a notification from the reminder" do
+        expect { subject }.not_to change(Notification, :count)
+      end
+    end
+
+    context "when the recipient has immediate reminders enabled" do
+      it "enqueues a NotificationDeliveryJob" do
+        expect { subject }
+          .to have_enqueued_job(Mails::Reminders::NotificationDeliveryJob)
+                .with(a_kind_of(Notification))
+      end
+    end
+
+    context "when the recipient has immediate reminders disabled" do
+      before do
+        recipient = reminder.creator
+        recipient.pref.immediate_reminders = { personal_reminder: false }
+        recipient.pref.save
+      end
+
+      it "does not enqueue a NotificationDeliveryJob" do
+        expect { subject }
+          .not_to have_enqueued_job(Mails::Reminders::NotificationDeliveryJob)
+      end
+    end
+  end
+end