From f42131af1b7c7970323d21fa5d91022644587d22 Mon Sep 17 00:00:00 2001
From: hel-platta-automation
 <95360595+hel-platta-automation@users.noreply.github.com>
Date: Fri, 13 Dec 2024 07:05:13 +0000
Subject: [PATCH] Update configuration

---
 .dockerignore                                 |   4 +
 compose.yaml                                  |  16 ++-
 composer.lock                                 |  74 +++++-----
 ...ty_form_display.node.news_item.default.yml | 134 +++++++++---------
 ...iew_display.node.news_item.card_teaser.yml |   2 +-
 ...ty_view_display.node.news_item.default.yml |  86 +++++------
 ...iew_display.paragraph.hearings.default.yml |   2 +-
 ...es.external_entity_type.helfi_hearings.yml |   2 +-
 ...orage.node.field_news_item_links_title.yml |   2 +-
 .../field.storage.node.field_short_title.yml  |   2 +-
 conf/cmi/language/ar/views.view.archive.yml   |  14 +-
 conf/cmi/language/ar/views.view.content.yml   |  12 +-
 .../language/ar/views.view.content_recent.yml |   8 +-
 conf/cmi/language/ar/views.view.files.yml     |  18 +--
 conf/cmi/language/ar/views.view.glossary.yml  |  14 +-
 .../language/ar/views.view.helfi_redirect.yml |  45 ++++++
 .../language/ar/views.view.locked_content.yml |  16 +--
 conf/cmi/language/ar/views.view.media.yml     |  14 +-
 .../language/ar/views.view.media_library.yml  |  14 +-
 conf/cmi/language/ar/views.view.news.yml      |   8 +-
 .../ar/views.view.paragraphs_library.yml      |  18 +--
 conf/cmi/language/ar/views.view.redirect.yml  |  34 ++---
 ...views.view.scheduler_scheduled_content.yml |  20 +--
 .../language/ar/views.view.taxonomy_term.yml  |  14 +-
 .../ar/views.view.user_admin_people.yml       |  16 +--
 conf/cmi/language/ar/views.view.who_s_new.yml |   8 +-
 .../language/ar/views.view.who_s_online.yml   |   8 +-
 conf/cmi/language/de/views.view.archive.yml   |  16 +--
 conf/cmi/language/de/views.view.content.yml   |  10 +-
 .../language/de/views.view.content_recent.yml |   8 +-
 conf/cmi/language/de/views.view.files.yml     |  20 +--
 conf/cmi/language/de/views.view.glossary.yml  |  16 +--
 .../language/de/views.view.helfi_redirect.yml |  80 +++++++++++
 .../language/de/views.view.locked_content.yml |  16 +--
 conf/cmi/language/de/views.view.media.yml     |  14 +-
 .../language/de/views.view.media_library.yml  |  16 +--
 conf/cmi/language/de/views.view.news.yml      |   8 +-
 .../de/views.view.paragraphs_library.yml      |  16 +--
 conf/cmi/language/de/views.view.redirect.yml  |  62 ++++----
 ...views.view.scheduler_scheduled_content.yml |  16 +--
 .../language/de/views.view.taxonomy_term.yml  |  16 +--
 .../de/views.view.user_admin_people.yml       |  16 +--
 conf/cmi/language/de/views.view.who_s_new.yml |   8 +-
 .../language/de/views.view.who_s_online.yml   |   8 +-
 conf/cmi/language/es/views.view.archive.yml   |  12 +-
 conf/cmi/language/es/views.view.content.yml   |   8 +-
 .../language/es/views.view.content_recent.yml |   4 +-
 conf/cmi/language/es/views.view.files.yml     |  18 +--
 conf/cmi/language/es/views.view.glossary.yml  |  12 +-
 .../language/es/views.view.helfi_redirect.yml |  80 +++++++++++
 .../language/es/views.view.locked_content.yml |  14 +-
 conf/cmi/language/es/views.view.media.yml     |  12 +-
 .../language/es/views.view.media_library.yml  |  12 +-
 conf/cmi/language/es/views.view.news.yml      |   4 +-
 .../es/views.view.paragraphs_library.yml      |  16 +--
 conf/cmi/language/es/views.view.redirect.yml  |  54 +++----
 ...views.view.scheduler_scheduled_content.yml |  16 +--
 .../language/es/views.view.taxonomy_term.yml  |  12 +-
 .../es/views.view.user_admin_people.yml       |  14 +-
 conf/cmi/language/es/views.view.who_s_new.yml |   4 +-
 .../language/es/views.view.who_s_online.yml   |   4 +-
 conf/cmi/language/et/views.view.archive.yml   |  16 +--
 conf/cmi/language/et/views.view.content.yml   |  12 +-
 .../language/et/views.view.content_recent.yml |   8 +-
 conf/cmi/language/et/views.view.files.yml     |  22 +--
 conf/cmi/language/et/views.view.glossary.yml  |  16 +--
 .../language/et/views.view.helfi_redirect.yml |  54 +++++++
 .../language/et/views.view.locked_content.yml |  18 +--
 conf/cmi/language/et/views.view.media.yml     |  16 +--
 .../language/et/views.view.media_library.yml  |  16 +--
 conf/cmi/language/et/views.view.news.yml      |   8 +-
 .../et/views.view.paragraphs_library.yml      |  20 +--
 conf/cmi/language/et/views.view.redirect.yml  |  42 +++---
 ...views.view.scheduler_scheduled_content.yml |  20 +--
 .../language/et/views.view.taxonomy_term.yml  |  16 +--
 .../et/views.view.user_admin_people.yml       |  18 +--
 conf/cmi/language/et/views.view.who_s_new.yml |   8 +-
 .../language/et/views.view.who_s_online.yml   |   8 +-
 conf/cmi/language/fa/views.view.archive.yml   |  16 +--
 conf/cmi/language/fa/views.view.content.yml   |  12 +-
 .../language/fa/views.view.content_recent.yml |   8 +-
 conf/cmi/language/fa/views.view.files.yml     |  22 +--
 conf/cmi/language/fa/views.view.glossary.yml  |  16 +--
 .../language/fa/views.view.helfi_redirect.yml |  46 ++++++
 .../language/fa/views.view.locked_content.yml |  18 +--
 conf/cmi/language/fa/views.view.media.yml     |  16 +--
 .../language/fa/views.view.media_library.yml  |  16 +--
 conf/cmi/language/fa/views.view.news.yml      |   8 +-
 .../fa/views.view.paragraphs_library.yml      |  20 +--
 conf/cmi/language/fa/views.view.redirect.yml  |  38 ++---
 ...views.view.scheduler_scheduled_content.yml |  20 +--
 .../language/fa/views.view.taxonomy_term.yml  |  16 +--
 .../fa/views.view.user_admin_people.yml       |  18 +--
 conf/cmi/language/fa/views.view.who_s_new.yml |   8 +-
 .../language/fa/views.view.who_s_online.yml   |   8 +-
 ...ty_form_display.node.news_item.default.yml |   8 --
 .../language/fi/views.view.helfi_redirect.yml |  30 ++--
 conf/cmi/language/fi/views.view.redirect.yml  |  22 +--
 ...views.view.scheduler_scheduled_content.yml |   8 +-
 conf/cmi/language/fr/views.view.archive.yml   |  10 +-
 conf/cmi/language/fr/views.view.content.yml   |   6 +-
 .../language/fr/views.view.content_recent.yml |   4 +-
 conf/cmi/language/fr/views.view.files.yml     |  18 +--
 conf/cmi/language/fr/views.view.glossary.yml  |  10 +-
 .../language/fr/views.view.helfi_redirect.yml |  80 +++++++++++
 .../language/fr/views.view.locked_content.yml |  12 +-
 conf/cmi/language/fr/views.view.media.yml     |  12 +-
 .../language/fr/views.view.media_library.yml  |  10 +-
 conf/cmi/language/fr/views.view.news.yml      |   4 +-
 .../fr/views.view.paragraphs_library.yml      |  14 +-
 conf/cmi/language/fr/views.view.redirect.yml  |  60 ++++----
 ...views.view.scheduler_scheduled_content.yml |  16 +--
 .../language/fr/views.view.taxonomy_term.yml  |  10 +-
 .../fr/views.view.user_admin_people.yml       |  12 +-
 conf/cmi/language/fr/views.view.who_s_new.yml |   4 +-
 .../language/fr/views.view.who_s_online.yml   |   4 +-
 conf/cmi/language/ru/views.view.archive.yml   |  16 +--
 conf/cmi/language/ru/views.view.content.yml   |  12 +-
 .../language/ru/views.view.content_recent.yml |   8 +-
 conf/cmi/language/ru/views.view.files.yml     |  22 +--
 conf/cmi/language/ru/views.view.glossary.yml  |  16 +--
 .../language/ru/views.view.helfi_redirect.yml |  79 +++++++++++
 .../language/ru/views.view.locked_content.yml |  18 +--
 conf/cmi/language/ru/views.view.media.yml     |  16 +--
 .../language/ru/views.view.media_library.yml  |  16 +--
 conf/cmi/language/ru/views.view.news.yml      |   8 +-
 .../ru/views.view.paragraphs_library.yml      |  20 +--
 conf/cmi/language/ru/views.view.redirect.yml  |  64 ++++-----
 ...views.view.scheduler_scheduled_content.yml |  20 +--
 .../language/ru/views.view.taxonomy_term.yml  |  16 +--
 .../ru/views.view.user_admin_people.yml       |  18 +--
 conf/cmi/language/ru/views.view.who_s_new.yml |   8 +-
 .../language/ru/views.view.who_s_online.yml   |   8 +-
 conf/cmi/language/se/views.view.archive.yml   |   4 +-
 conf/cmi/language/se/views.view.content.yml   |   4 +-
 .../language/se/views.view.content_recent.yml |   2 +-
 conf/cmi/language/se/views.view.files.yml     |   2 +-
 conf/cmi/language/se/views.view.glossary.yml  |   4 +-
 .../language/se/views.view.helfi_redirect.yml |  23 +++
 .../language/se/views.view.locked_content.yml |   6 +-
 conf/cmi/language/se/views.view.media.yml     |   2 +-
 .../language/se/views.view.media_library.yml  |   4 +-
 conf/cmi/language/se/views.view.news.yml      |   2 +-
 .../se/views.view.paragraphs_library.yml      |   6 +-
 conf/cmi/language/se/views.view.redirect.yml  |  16 +--
 ...views.view.scheduler_scheduled_content.yml |  12 +-
 .../language/se/views.view.taxonomy_term.yml  |   4 +-
 .../se/views.view.user_admin_people.yml       |   4 +-
 conf/cmi/language/se/views.view.who_s_new.yml |   2 +-
 .../language/se/views.view.who_s_online.yml   |   2 +-
 .../language/sv/views.view.helfi_redirect.yml |   6 +
 conf/cmi/language/uk/views.view.archive.yml   |  16 +--
 conf/cmi/language/uk/views.view.content.yml   |  12 +-
 .../language/uk/views.view.content_recent.yml |   8 +-
 conf/cmi/language/uk/views.view.files.yml     |  22 +--
 conf/cmi/language/uk/views.view.glossary.yml  |  16 +--
 .../language/uk/views.view.helfi_redirect.yml |  76 ++++++++++
 .../language/uk/views.view.locked_content.yml |  18 +--
 conf/cmi/language/uk/views.view.media.yml     |  16 +--
 .../language/uk/views.view.media_library.yml  |  16 +--
 conf/cmi/language/uk/views.view.news.yml      |   8 +-
 .../uk/views.view.paragraphs_library.yml      |  20 +--
 conf/cmi/language/uk/views.view.redirect.yml  |  62 ++++----
 ...views.view.scheduler_scheduled_content.yml |  20 +--
 .../language/uk/views.view.taxonomy_term.yml  |  16 +--
 .../uk/views.view.user_admin_people.yml       |  18 +--
 conf/cmi/language/uk/views.view.who_s_new.yml |   8 +-
 .../language/uk/views.view.who_s_online.yml   |   8 +-
 .../language/zh-hans/views.view.archive.yml   |  16 +--
 .../language/zh-hans/views.view.content.yml   |  12 +-
 .../zh-hans/views.view.content_recent.yml     |   8 +-
 .../cmi/language/zh-hans/views.view.files.yml |  22 +--
 .../language/zh-hans/views.view.glossary.yml  |  16 +--
 .../zh-hans/views.view.helfi_redirect.yml     |  73 ++++++++++
 .../zh-hans/views.view.locked_content.yml     |  18 +--
 .../cmi/language/zh-hans/views.view.media.yml |  16 +--
 .../zh-hans/views.view.media_library.yml      |  16 +--
 conf/cmi/language/zh-hans/views.view.news.yml |   8 +-
 .../zh-hans/views.view.paragraphs_library.yml |  20 +--
 .../language/zh-hans/views.view.redirect.yml  |  58 ++++----
 ...views.view.scheduler_scheduled_content.yml |  20 +--
 .../zh-hans/views.view.taxonomy_term.yml      |  16 +--
 .../zh-hans/views.view.user_admin_people.yml  |  18 +--
 .../language/zh-hans/views.view.who_s_new.yml |   8 +-
 .../zh-hans/views.view.who_s_online.yml       |   8 +-
 conf/cmi/views.view.helfi_redirect.yml        |  97 ++++++++++++-
 phpunit.xml.dist                              |   6 +-
 tools/make/override.mk                        |   1 -
 tools/make/project/db-sync.sh                 |  25 ++++
 tools/make/project/git.mk                     |   2 +-
 tools/make/project/install.mk                 |  10 +-
 191 files changed, 2156 insertions(+), 1393 deletions(-)
 create mode 100644 .dockerignore
 create mode 100644 conf/cmi/language/ar/views.view.helfi_redirect.yml
 create mode 100644 conf/cmi/language/de/views.view.helfi_redirect.yml
 create mode 100644 conf/cmi/language/es/views.view.helfi_redirect.yml
 create mode 100644 conf/cmi/language/et/views.view.helfi_redirect.yml
 create mode 100644 conf/cmi/language/fa/views.view.helfi_redirect.yml
 create mode 100644 conf/cmi/language/fr/views.view.helfi_redirect.yml
 create mode 100644 conf/cmi/language/ru/views.view.helfi_redirect.yml
 create mode 100644 conf/cmi/language/se/views.view.helfi_redirect.yml
 create mode 100644 conf/cmi/language/uk/views.view.helfi_redirect.yml
 create mode 100644 conf/cmi/language/zh-hans/views.view.helfi_redirect.yml
 create mode 100644 tools/make/project/db-sync.sh

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 000000000..e3708ede3
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,4 @@
+.git/
+.github/
+.idea/
+*.sql
diff --git a/compose.yaml b/compose.yaml
index 703a8d29d..0e64d1db1 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -8,6 +8,7 @@ services:
     depends_on:
       - db
     environment:
+      WEBROOT: /app/public
       STAGE_FILE_PROXY_ORIGIN: "${STAGE_FILE_PROXY_ORIGIN}"
       STAGE_FILE_PROXY_ORIGIN_DIR: "${STAGE_FILE_PROXY_ORIGIN_DIR}"
       APP_ENV: "${APP_ENV:-local}"
@@ -24,7 +25,6 @@ services:
       # DOCKERHOST: host.docker.internal
       # Use drush server to run functional tests, so we don't have to care about
       # permission or SSL issues.
-      SIMPLETEST_BASE_URL: "http://app:8888"
       BROWSERTEST_OUTPUT_BASE_URL: "https://${DRUPAL_HOSTNAME}"
       BROWSERTEST_OUTPUT_DIRECTORY: "/app/public/sites/default/files/simpletest"
       DRUPAL_VARNISH_HOST: "${COMPOSE_PROJECT_NAME}-varnish"
@@ -160,13 +160,21 @@ services:
     profiles:
       - queue
   chromium:
-    # @todo Update this to newer version once minkphp supports Selenium 4.
-    # @see https://github.com/minkphp/MinkSelenium2Driver/pull/372
-    image: seleniarm/standalone-chromium:106.0
+    image: selenium/standalone-chromium
+    environment:
+      SE_NODE_OVERRIDE_MAX_SESSIONS: "true"
+      SE_NODE_MAX_SESSIONS: "16"
+      SE_START_XVFB: "false"
+      SE_START_VNC: "false"
+      SE_SESSION_RETRY_INTERVAL: "1"
+      SE_SESSION_REQUEST_TIMEOUT: "10"
+    depends_on:
+      - app
     networks:
       - internal
     profiles:
       - testing
+
 networks:
   internal:
     external: false
diff --git a/composer.lock b/composer.lock
index d1147164b..fb0b17498 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4253,16 +4253,16 @@
         },
         {
             "name": "drupal/hdbt",
-            "version": "6.8.17",
+            "version": "6.8.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git",
-                "reference": "063e0c51a83860dc872b9c7f9528f5d29824d5d8"
+                "reference": "d35f85ec2d568c68df67d01029b2c2cf952d63e9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/063e0c51a83860dc872b9c7f9528f5d29824d5d8",
-                "reference": "063e0c51a83860dc872b9c7f9528f5d29824d5d8",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/d35f85ec2d568c68df67d01029b2c2cf952d63e9",
+                "reference": "d35f85ec2d568c68df67d01029b2c2cf952d63e9",
                 "shasum": ""
             },
             "require": {
@@ -4281,10 +4281,10 @@
                 "Drupal"
             ],
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.17",
+                "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.20",
                 "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues"
             },
-            "time": "2024-12-09T14:01:58+00:00"
+            "time": "2024-12-12T07:31:27+00:00"
         },
         {
             "name": "drupal/hdbt_admin",
@@ -4480,12 +4480,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-tools.git",
-                "reference": "2abe26c3735150f630dd1203c3e60a77173d90fd"
+                "reference": "845a8c470a6f593b08e100f3c3d688fb07600f76"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/2abe26c3735150f630dd1203c3e60a77173d90fd",
-                "reference": "2abe26c3735150f630dd1203c3e60a77173d90fd",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/845a8c470a6f593b08e100f3c3d688fb07600f76",
+                "reference": "845a8c470a6f593b08e100f3c3d688fb07600f76",
                 "shasum": ""
             },
             "require": {
@@ -4560,7 +4560,7 @@
                 "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main",
                 "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues"
             },
-            "time": "2024-12-03T06:30:07+00:00"
+            "time": "2024-12-12T12:14:31+00:00"
         },
         {
             "name": "drupal/helfi_navigation",
@@ -4598,16 +4598,16 @@
         },
         {
             "name": "drupal/helfi_platform_config",
-            "version": "4.10.0",
+            "version": "4.10.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git",
-                "reference": "ba094b39d6a02da3f2f9085c47d3326509eb7caa"
+                "reference": "88e462f81f62bd9c23c2b76277c6412bc83808d8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/ba094b39d6a02da3f2f9085c47d3326509eb7caa",
-                "reference": "ba094b39d6a02da3f2f9085c47d3326509eb7caa",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/88e462f81f62bd9c23c2b76277c6412bc83808d8",
+                "reference": "88e462f81f62bd9c23c2b76277c6412bc83808d8",
                 "shasum": ""
             },
             "require": {
@@ -4733,10 +4733,10 @@
             ],
             "description": "HELfi platform config",
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.10.0",
+                "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.10.2",
                 "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues"
             },
-            "time": "2024-12-10T11:12:36+00:00"
+            "time": "2024-12-13T06:59:39+00:00"
         },
         {
             "name": "drupal/helfi_proxy",
@@ -6219,29 +6219,29 @@
         },
         {
             "name": "drupal/openid_connect",
-            "version": "3.0.0-alpha3",
+            "version": "3.0.0-alpha4",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/openid_connect.git",
-                "reference": "3.0.0-alpha3"
+                "reference": "3.0.0-alpha4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/openid_connect-3.0.0-alpha3.zip",
-                "reference": "3.0.0-alpha3",
-                "shasum": "002616dc2bfeb6b23204297e77d1f7a5369e69b3"
+                "url": "https://ftp.drupal.org/files/projects/openid_connect-3.0.0-alpha4.zip",
+                "reference": "3.0.0-alpha4",
+                "shasum": "3239f8a2e5fc98de1be7561309cb12153ef5b7c9"
             },
             "require": {
-                "drupal/core": "^9.3 || ^10",
+                "drupal/core": "^9.5 || ^10.2 || ^11",
                 "drupal/externalauth": "^2.0",
                 "ext-json": "*",
-                "php": ">=7.1.0"
+                "php": ">=8.1.0"
             },
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "3.0.0-alpha3",
-                    "datestamp": "1710708951",
+                    "version": "3.0.0-alpha4",
+                    "datestamp": "1734043889",
                     "security-coverage": {
                         "status": "not-covered",
                         "message": "Alpha releases are not covered by Drupal security advisories."
@@ -6261,6 +6261,10 @@
                     "name": "jcnventura",
                     "homepage": "https://www.drupal.org/user/122464"
                 },
+                {
+                    "name": "mstrelan",
+                    "homepage": "https://www.drupal.org/user/314289"
+                },
                 {
                     "name": "pfrilling",
                     "homepage": "https://www.drupal.org/user/169695"
@@ -13836,8 +13840,8 @@
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -14002,8 +14006,8 @@
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -15435,16 +15439,16 @@
         },
         {
             "name": "twig/twig",
-            "version": "v3.16.0",
+            "version": "v3.17.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "475ad2dc97d65d8631393e721e7e44fb544f0561"
+                "reference": "677ef8da6497a03048192aeeb5aa3018e379ac71"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/475ad2dc97d65d8631393e721e7e44fb544f0561",
-                "reference": "475ad2dc97d65d8631393e721e7e44fb544f0561",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/677ef8da6497a03048192aeeb5aa3018e379ac71",
+                "reference": "677ef8da6497a03048192aeeb5aa3018e379ac71",
                 "shasum": ""
             },
             "require": {
@@ -15499,7 +15503,7 @@
             ],
             "support": {
                 "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v3.16.0"
+                "source": "https://github.com/twigphp/Twig/tree/v3.17.1"
             },
             "funding": [
                 {
@@ -15511,7 +15515,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-29T08:27:05+00:00"
+            "time": "2024-12-12T09:58:10+00:00"
         },
         {
             "name": "twistor/flysystem-stream-wrapper",
diff --git a/conf/cmi/core.entity_form_display.node.news_item.default.yml b/conf/cmi/core.entity_form_display.node.news_item.default.yml
index b189ba6da..2dce2f294 100644
--- a/conf/cmi/core.entity_form_display.node.news_item.default.yml
+++ b/conf/cmi/core.entity_form_display.node.news_item.default.yml
@@ -168,6 +168,16 @@ content:
       rows: 5
       placeholder: ''
     third_party_settings: {  }
+  field_news_groups:
+    type: select2_entity_reference
+    weight: 25
+    region: content
+    settings:
+      width: 100%
+      autocomplete: false
+      match_operator: CONTAINS
+      match_limit: 10
+    third_party_settings: {  }
   field_news_item_links_link:
     type: linkit
     weight: 20
@@ -196,6 +206,42 @@ content:
       match_operator: CONTAINS
       match_limit: 10
     third_party_settings: {  }
+  field_news_item_updating_news:
+    type: paragraphs
+    weight: 17
+    region: content
+    settings:
+      title: Paragraph
+      title_plural: Paragraphs
+      edit_mode: open
+      closed_mode: summary
+      autocollapse: none
+      closed_mode_threshold: 0
+      add_mode: dropdown
+      form_display_mode: default
+      default_paragraph_type: _none
+      features:
+        add_above: '0'
+        collapse_edit_all: '0'
+        convert: '0'
+        duplicate: '0'
+    third_party_settings: {  }
+  field_news_neighbourhoods:
+    type: select2_entity_reference
+    weight: 27
+    region: content
+    settings:
+      width: 100%
+      autocomplete: false
+      match_operator: CONTAINS
+      match_limit: 10
+    third_party_settings: {  }
+  field_radioactivity:
+    type: radioactivity_reference
+    weight: 28
+    region: content
+    settings: {  }
+    third_party_settings: {  }
   field_short_title:
     type: string_textfield
     weight: 2
@@ -204,6 +250,13 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
+  in_recommendations:
+    type: boolean_checkbox
+    weight: 0
+    region: content
+    settings:
+      display_label: true
+    third_party_settings: {  }
   langcode:
     type: language_select
     weight: 0
@@ -241,6 +294,20 @@ content:
     region: content
     settings: {  }
     third_party_settings: {  }
+  show_annif_block:
+    type: boolean_checkbox
+    weight: 1
+    region: content
+    settings:
+      display_label: true
+    third_party_settings: {  }
+  show_recommendations:
+    type: boolean_checkbox
+    weight: 0
+    region: content
+    settings:
+      display_label: true
+    third_party_settings: {  }
   simple_sitemap:
     weight: 10
     region: content
@@ -294,72 +361,5 @@ content:
     region: content
     settings: {  }
     third_party_settings: {  }
-  field_news_item_updating_news:
-    type: paragraphs
-    weight: 17
-    region: content
-    settings:
-      title: Paragraph
-      title_plural: Paragraphs
-      edit_mode: open
-      closed_mode: summary
-      autocollapse: none
-      closed_mode_threshold: 0
-      add_mode: dropdown
-      form_display_mode: default
-      default_paragraph_type: _none
-      features:
-        add_above: '0'
-        collapse_edit_all: '0'
-        convert: '0'
-        duplicate: '0'
-    third_party_settings: {  }
-  field_news_groups:
-    type: select2_entity_reference
-    weight: 25
-    region: content
-    settings:
-      width: 100%
-      autocomplete: false
-      match_operator: CONTAINS
-      match_limit: 10
-    third_party_settings: {  }
-  field_news_neighbourhoods:
-    type: select2_entity_reference
-    weight: 27
-    region: content
-    settings:
-      width: 100%
-      autocomplete: false
-      match_operator: CONTAINS
-      match_limit: 10
-    third_party_settings: {  }
-  field_radioactivity:
-    type: radioactivity_reference
-    weight: 28
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  in_recommendations:
-    type: boolean_checkbox
-    weight: 0
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  show_annif_block:
-    type: boolean_checkbox
-    weight: 1
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  show_recommendations:
-    type: boolean_checkbox
-    weight: 0
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
 hidden:
   hide_sidebar_navigation: true
diff --git a/conf/cmi/core.entity_view_display.node.news_item.card_teaser.yml b/conf/cmi/core.entity_view_display.node.news_item.card_teaser.yml
index f0f1f3d56..188d5b0e5 100644
--- a/conf/cmi/core.entity_view_display.node.news_item.card_teaser.yml
+++ b/conf/cmi/core.entity_view_display.node.news_item.card_teaser.yml
@@ -77,6 +77,7 @@ content:
     weight: 4
     region: content
 hidden:
+  field_annif_keywords: true
   field_content: true
   field_lead_in: true
   field_main_image_caption: true
@@ -91,4 +92,3 @@ hidden:
   search_api_excerpt: true
   show_annif_block: true
   toc_enabled: true
-  field_annif_keywords: true
diff --git a/conf/cmi/core.entity_view_display.node.news_item.default.yml b/conf/cmi/core.entity_view_display.node.news_item.default.yml
index 82f17edc6..fad362023 100644
--- a/conf/cmi/core.entity_view_display.node.news_item.default.yml
+++ b/conf/cmi/core.entity_view_display.node.news_item.default.yml
@@ -61,6 +61,14 @@ content:
     third_party_settings: {  }
     weight: 8
     region: content
+  field_news_groups:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: false
+    third_party_settings: {  }
+    weight: 10
+    region: content
   field_news_item_links_link:
     type: link
     label: hidden
@@ -81,6 +89,41 @@ content:
     third_party_settings: {  }
     weight: 6
     region: content
+  field_news_item_tags:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: false
+    third_party_settings: {  }
+    weight: 11
+    region: content
+  field_news_item_updating_news:
+    type: entity_reference_revisions_entity_view
+    label: above
+    settings:
+      view_mode: default
+      link: ''
+    third_party_settings: {  }
+    weight: 13
+    region: content
+  field_news_neighbourhoods:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: false
+    third_party_settings: {  }
+    weight: 12
+    region: content
+  field_radioactivity:
+    type: radioactivity_reference_emitter
+    label: above
+    settings:
+      energy: 10.0
+      display: false
+      decimals: 0.0
+    third_party_settings: {  }
+    weight: 9
+    region: content
   field_short_title:
     type: string
     label: hidden
@@ -113,49 +156,6 @@ content:
     third_party_settings: {  }
     weight: 3
     region: content
-  field_news_groups:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: false
-    third_party_settings: {  }
-    weight: 10
-    region: content
-  field_news_item_tags:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: false
-    third_party_settings: {  }
-    weight: 11
-    region: content
-  field_news_neighbourhoods:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: false
-    third_party_settings: {  }
-    weight: 12
-    region: content
-  field_news_item_updating_news:
-    type: entity_reference_revisions_entity_view
-    label: above
-    settings:
-      view_mode: default
-      link: ''
-    third_party_settings: {  }
-    weight: 13
-    region: content
-  field_radioactivity:
-    type: radioactivity_reference_emitter
-    label: above
-    settings:
-      energy: 10.0
-      display: false
-      decimals: 0.0
-    third_party_settings: {  }
-    weight: 9
-    region: content
 hidden:
   field_news_groups: true
   field_news_item_tags: true
diff --git a/conf/cmi/core.entity_view_display.paragraph.hearings.default.yml b/conf/cmi/core.entity_view_display.paragraph.hearings.default.yml
index 0f5cd3de6..3b10323a5 100644
--- a/conf/cmi/core.entity_view_display.paragraph.hearings.default.yml
+++ b/conf/cmi/core.entity_view_display.paragraph.hearings.default.yml
@@ -31,9 +31,9 @@ content:
     weight: 0
     region: content
   list:
-    weight: 100
     settings: {  }
     third_party_settings: {  }
+    weight: 100
     region: content
 hidden:
   search_api_excerpt: true
diff --git a/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml b/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml
index 3134f2383..c8279899f 100644
--- a/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml
+++ b/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml
@@ -8,8 +8,8 @@ id: helfi_hearings
 label: 'Helfi: Hearing'
 label_plural: 'Helfi: Hearing'
 description: 'Helfi hearings from hearing api.'
-generate_aliases: false
 read_only: true
+generate_aliases: false
 field_mapper_id: jsonpath
 field_mapper_config:
   field_mappings:
diff --git a/conf/cmi/field.storage.node.field_news_item_links_title.yml b/conf/cmi/field.storage.node.field_news_item_links_title.yml
index 2d41142f9..917053936 100644
--- a/conf/cmi/field.storage.node.field_news_item_links_title.yml
+++ b/conf/cmi/field.storage.node.field_news_item_links_title.yml
@@ -12,8 +12,8 @@ entity_type: node
 type: string
 settings:
   max_length: 255
-  is_ascii: false
   case_sensitive: false
+  is_ascii: false
 module: core
 locked: false
 cardinality: 1
diff --git a/conf/cmi/field.storage.node.field_short_title.yml b/conf/cmi/field.storage.node.field_short_title.yml
index f953c0a94..72f2a19f9 100644
--- a/conf/cmi/field.storage.node.field_short_title.yml
+++ b/conf/cmi/field.storage.node.field_short_title.yml
@@ -12,8 +12,8 @@ entity_type: node
 type: string
 settings:
   max_length: 255
-  is_ascii: false
   case_sensitive: false
+  is_ascii: false
 module: core
 locked: false
 cardinality: 1
diff --git a/conf/cmi/language/ar/views.view.archive.yml b/conf/cmi/language/ar/views.view.archive.yml
index ec36a5421..ba50706eb 100644
--- a/conf/cmi/language/ar/views.view.archive.yml
+++ b/conf/cmi/language/ar/views.view.archive.yml
@@ -6,16 +6,16 @@ display:
       pager:
         options:
           expose:
-            items_per_page_options_all_label: '- الكل -'
-            offset_label: الإزاحة
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
           submit_button: تطبيق
-          reset_button_label: 'إعادة الضبط'
-          exposed_sorts_label: 'الترتيب حسب'
-          sort_asc_label: تصاعدي
-          sort_desc_label: تنازلي
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
   block_1:
     display_title: الصندوق
   page_1:
-    display_title: الصفحة
+    display_title: Page
diff --git a/conf/cmi/language/ar/views.view.content.yml b/conf/cmi/language/ar/views.view.content.yml
index ff0c7b220..ffe5f9a7c 100644
--- a/conf/cmi/language/ar/views.view.content.yml
+++ b/conf/cmi/language/ar/views.view.content.yml
@@ -32,11 +32,11 @@ display:
             previous: '‹ السابق'
       exposed_form:
         options:
-          submit_button: انتقاء
-          reset_button_label: 'إعادة الضبط'
-          exposed_sorts_label: 'الترتيب حسب'
-          sort_asc_label: تصاعدي
-          sort_desc_label: تنازلي
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       empty:
         area_text_custom:
           content: 'لا يوجد محتوى.'
@@ -58,7 +58,7 @@ display:
           expose:
             label: اللغة
   page_1:
-    display_title: الصفحة
+    display_title: Page
     display_options:
       menu:
         title: المحتوى
diff --git a/conf/cmi/language/ar/views.view.content_recent.yml b/conf/cmi/language/ar/views.view.content_recent.yml
index ea59fc2e9..559fa92c1 100644
--- a/conf/cmi/language/ar/views.view.content_recent.yml
+++ b/conf/cmi/language/ar/views.view.content_recent.yml
@@ -10,10 +10,10 @@ display:
       exposed_form:
         options:
           submit_button: تطبيق
-          reset_button_label: 'إعادة الضبط'
-          exposed_sorts_label: 'الترتيب حسب'
-          sort_asc_label: تصاعدي
-          sort_desc_label: تنازلي
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       empty:
         area_text_custom:
           content: 'لا يوجد محتوى.'
diff --git a/conf/cmi/language/ar/views.view.files.yml b/conf/cmi/language/ar/views.view.files.yml
index d68686b5f..2cfbab05a 100644
--- a/conf/cmi/language/ar/views.view.files.yml
+++ b/conf/cmi/language/ar/views.view.files.yml
@@ -22,15 +22,15 @@ display:
             next: 'التالي ›'
             previous: '‹ السابق'
           expose:
-            items_per_page_options_all_label: '- الكل -'
-            offset_label: الإزاحة
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
-          submit_button: انتقاء
-          reset_button_label: 'إعادة الضبط'
-          exposed_sorts_label: 'الترتيب حسب'
-          sort_asc_label: تصاعدي
-          sort_desc_label: تنازلي
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       filters:
         filename:
           expose:
@@ -60,8 +60,8 @@ display:
             next: 'التالي ›'
             previous: '‹ السابق'
           expose:
-            items_per_page_options_all_label: '- الكل -'
-            offset_label: الإزاحة
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       arguments:
         fid:
           exception:
diff --git a/conf/cmi/language/ar/views.view.glossary.yml b/conf/cmi/language/ar/views.view.glossary.yml
index fb47d49d1..2da5e5f6d 100644
--- a/conf/cmi/language/ar/views.view.glossary.yml
+++ b/conf/cmi/language/ar/views.view.glossary.yml
@@ -13,19 +13,19 @@ display:
       pager:
         options:
           expose:
-            items_per_page_options_all_label: '- الكل -'
-            offset_label: الإزاحة
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
           submit_button: تطبيق
-          reset_button_label: 'إعادة الضبط'
-          exposed_sorts_label: 'الترتيب حسب'
-          sort_asc_label: تصاعدي
-          sort_desc_label: تنازلي
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
   attachment_1:
     display_title: المرفق
   page_1:
-    display_title: الصفحة
+    display_title: Page
     display_options:
       menu:
         title: القاموس
diff --git a/conf/cmi/language/ar/views.view.helfi_redirect.yml b/conf/cmi/language/ar/views.view.helfi_redirect.yml
new file mode 100644
index 000000000..cd4ab0598
--- /dev/null
+++ b/conf/cmi/language/ar/views.view.helfi_redirect.yml
@@ -0,0 +1,45 @@
+display:
+  default:
+    display_title: Master
+    display_options:
+      fields:
+        redirect_source__path:
+          label: From
+          separator: ', '
+        is_custom:
+          label: Custom
+          separator: ', '
+        created:
+          label: Created
+      pager:
+        options:
+          tags:
+            next: 'next ›'
+            previous: '‹ previous'
+            first: '« first'
+            last: 'last »'
+          expose:
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
+      exposed_form:
+        options:
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      filters:
+        redirect_source__path:
+          expose:
+            label: From
+        redirect_redirect__uri:
+          expose:
+            label: To
+        is_custom:
+          expose:
+            label: Custom
+        status:
+          expose:
+            label: منشور
+  page_1:
+    display_title: Page
diff --git a/conf/cmi/language/ar/views.view.locked_content.yml b/conf/cmi/language/ar/views.view.locked_content.yml
index 0973d427d..7d321ad7a 100644
--- a/conf/cmi/language/ar/views.view.locked_content.yml
+++ b/conf/cmi/language/ar/views.view.locked_content.yml
@@ -1,19 +1,19 @@
 display:
   default:
-    display_title: الرئيسي
+    display_title: Master
     display_options:
       exposed_form:
         options:
           submit_button: تطبيق
-          reset_button_label: 'إعادة الضبط'
-          exposed_sorts_label: 'الترتيب حسب'
-          sort_asc_label: تصاعدي
-          sort_desc_label: تنازلي
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       pager:
         options:
           expose:
-            items_per_page_options_all_label: '- الكل -'
-            offset_label: الإزاحة
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       fields:
         node_bulk_form:
           action_title: إجراء
@@ -40,4 +40,4 @@ display:
           expose:
             label: العنوان
   page_1:
-    display_title: الصفحة
+    display_title: Page
diff --git a/conf/cmi/language/ar/views.view.media.yml b/conf/cmi/language/ar/views.view.media.yml
index 45497ee56..28c86b207 100644
--- a/conf/cmi/language/ar/views.view.media.yml
+++ b/conf/cmi/language/ar/views.view.media.yml
@@ -35,15 +35,15 @@ display:
             next: 'التالي ›'
             previous: '‹ السابق'
           expose:
-            items_per_page_options_all_label: '- الكل -'
-            offset_label: الإزاحة
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
-          submit_button: انتقاء
-          reset_button_label: 'إعادة الضبط'
-          exposed_sorts_label: 'الترتيب حسب'
-          sort_asc_label: تصاعدي
-          sort_desc_label: تنازلي
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       filters:
         bundle:
           expose:
diff --git a/conf/cmi/language/ar/views.view.media_library.yml b/conf/cmi/language/ar/views.view.media_library.yml
index 38247755c..0f64dd456 100644
--- a/conf/cmi/language/ar/views.view.media_library.yml
+++ b/conf/cmi/language/ar/views.view.media_library.yml
@@ -9,15 +9,15 @@ display:
       pager:
         options:
           expose:
-            items_per_page_options_all_label: '- الكل -'
-            offset_label: الإزاحة
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
           submit_button: 'عمل تصفية'
-          reset_button_label: 'إعادة الضبط'
-          exposed_sorts_label: 'الترتيب حسب'
-          sort_asc_label: تصاعدي
-          sort_desc_label: تنازلي
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       filters:
         status:
           group_info:
@@ -32,7 +32,7 @@ display:
           expose:
             label: اللغة
   page:
-    display_title: الصفحة
+    display_title: Page
     display_options:
       fields:
         media_bulk_form:
diff --git a/conf/cmi/language/ar/views.view.news.yml b/conf/cmi/language/ar/views.view.news.yml
index bcbe1330c..76880cd58 100644
--- a/conf/cmi/language/ar/views.view.news.yml
+++ b/conf/cmi/language/ar/views.view.news.yml
@@ -12,10 +12,10 @@ display:
       exposed_form:
         options:
           submit_button: تطبيق
-          reset_button_label: 'إعادة الضبط'
-          exposed_sorts_label: 'الترتيب حسب'
-          sort_asc_label: تصاعدي
-          sort_desc_label: تنازلي
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       arguments:
         nid:
           exception:
diff --git a/conf/cmi/language/ar/views.view.paragraphs_library.yml b/conf/cmi/language/ar/views.view.paragraphs_library.yml
index 15b1b590c..fe373076a 100644
--- a/conf/cmi/language/ar/views.view.paragraphs_library.yml
+++ b/conf/cmi/language/ar/views.view.paragraphs_library.yml
@@ -1,19 +1,19 @@
 display:
   default:
-    display_title: الرئيسي
+    display_title: Master
     display_options:
       exposed_form:
         options:
-          submit_button: انتقاء
-          reset_button_label: 'إعادة الضبط'
-          exposed_sorts_label: 'الترتيب حسب'
-          sort_asc_label: تصاعدي
-          sort_desc_label: تنازلي
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       pager:
         options:
           expose:
-            items_per_page_options_all_label: '- الكل -'
-            offset_label: الإزاحة
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       fields:
         label:
           label: التسمية
@@ -44,4 +44,4 @@ display:
           expose:
             label: النوع
   page_1:
-    display_title: الصفحة
+    display_title: Page
diff --git a/conf/cmi/language/ar/views.view.redirect.yml b/conf/cmi/language/ar/views.view.redirect.yml
index 3748b6cb7..3ff1a92e8 100644
--- a/conf/cmi/language/ar/views.view.redirect.yml
+++ b/conf/cmi/language/ar/views.view.redirect.yml
@@ -1,36 +1,36 @@
 display:
   default:
-    display_title: الرئيسي
+    display_title: Master
     display_options:
       exposed_form:
         options:
-          submit_button: انتقاء
-          reset_button_label: 'إعادة الضبط'
-          exposed_sorts_label: 'الترتيب حسب'
-          sort_asc_label: تصاعدي
-          sort_desc_label: تنازلي
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       pager:
         options:
           tags:
-            previous: '‹ السابقة'
-            next: 'التالية ›'
-            first: '« الأولى'
-            last: 'الأخيرة »'
+            previous: '‹ previous'
+            next: 'next ›'
+            first: '« first'
+            last: 'last »'
           expose:
-            items_per_page_options_all_label: '- الكل -'
-            offset_label: الإزاحة
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       fields:
         redirect_source__path:
-          label: من
+          label: From
           separator: ', '
         created:
-          label: الإنشاء
+          label: Created
       filters:
         redirect_source__path:
           expose:
-            label: من
+            label: From
         redirect_redirect__uri:
           expose:
-            label: إلى
+            label: To
   page_1:
-    display_title: الصفحة
+    display_title: Page
diff --git a/conf/cmi/language/ar/views.view.scheduler_scheduled_content.yml b/conf/cmi/language/ar/views.view.scheduler_scheduled_content.yml
index 9afc4941c..4e6e17dc0 100644
--- a/conf/cmi/language/ar/views.view.scheduler_scheduled_content.yml
+++ b/conf/cmi/language/ar/views.view.scheduler_scheduled_content.yml
@@ -3,18 +3,18 @@ display:
     display_options:
       exposed_form:
         options:
-          submit_button: انتقاء
-          reset_button_label: 'إعادة الضبط'
-          exposed_sorts_label: 'الترتيب حسب'
-          sort_asc_label: تصاعدي
-          sort_desc_label: تنازلي
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       pager:
         options:
           tags:
-            previous: '‹ السابقة'
-            next: 'التالية ›'
-            first: '« الأولى'
-            last: 'الأخيرة »'
+            previous: '‹ previous'
+            next: 'next ›'
+            first: '« first'
+            last: 'last »'
       fields:
         node_bulk_form:
           action_title: إجراء
@@ -58,7 +58,7 @@ display:
         langcode:
           expose:
             label: اللغة
-    display_title: الرئيسي
+    display_title: Master
   overview:
     display_options:
       tab_options:
diff --git a/conf/cmi/language/ar/views.view.taxonomy_term.yml b/conf/cmi/language/ar/views.view.taxonomy_term.yml
index 6c4bce3e5..156bc349d 100644
--- a/conf/cmi/language/ar/views.view.taxonomy_term.yml
+++ b/conf/cmi/language/ar/views.view.taxonomy_term.yml
@@ -6,15 +6,15 @@ display:
       pager:
         options:
           expose:
-            items_per_page_options_all_label: '- الكل -'
-            offset_label: الإزاحة
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
           submit_button: تطبيق
-          reset_button_label: 'إعادة الضبط'
-          exposed_sorts_label: 'الترتيب حسب'
-          sort_asc_label: تصاعدي
-          sort_desc_label: تنازلي
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       arguments:
         tid:
           exception:
@@ -22,4 +22,4 @@ display:
   feed_1:
     display_title: التلقيمة
   page_1:
-    display_title: الصفحة
+    display_title: Page
diff --git a/conf/cmi/language/ar/views.view.user_admin_people.yml b/conf/cmi/language/ar/views.view.user_admin_people.yml
index e3e7f7daa..aa81defb2 100644
--- a/conf/cmi/language/ar/views.view.user_admin_people.yml
+++ b/conf/cmi/language/ar/views.view.user_admin_people.yml
@@ -29,15 +29,15 @@ display:
             next: 'التالي ›'
             previous: '‹ السابق'
           expose:
-            items_per_page_options_all_label: '- الكل -'
-            offset_label: الإزاحة
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
-          submit_button: انتقاء
-          reset_button_label: 'إعادة الضبط'
-          exposed_sorts_label: 'الترتيب حسب'
-          sort_asc_label: تصاعدي
-          sort_desc_label: تنازلي
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       empty:
         area_text_custom:
           content: 'لا يوجد أشخاص.'
@@ -58,7 +58,7 @@ display:
             label: الصلاحية
       use_more_text: المزيد
   page_1:
-    display_title: الصفحة
+    display_title: Page
     display_options:
       menu:
         title: لائحة
diff --git a/conf/cmi/language/ar/views.view.who_s_new.yml b/conf/cmi/language/ar/views.view.who_s_new.yml
index 683a773bd..76fd4dfa5 100644
--- a/conf/cmi/language/ar/views.view.who_s_new.yml
+++ b/conf/cmi/language/ar/views.view.who_s_new.yml
@@ -7,10 +7,10 @@ display:
       exposed_form:
         options:
           submit_button: تطبيق
-          reset_button_label: 'إعادة الضبط'
-          exposed_sorts_label: 'الترتيب حسب'
-          sort_asc_label: تصاعدي
-          sort_desc_label: تنازلي
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
   block_1:
     display_title: 'المستخدمون الجدد'
     display_options:
diff --git a/conf/cmi/language/ar/views.view.who_s_online.yml b/conf/cmi/language/ar/views.view.who_s_online.yml
index 6582f68c8..f0d9b0dd7 100644
--- a/conf/cmi/language/ar/views.view.who_s_online.yml
+++ b/conf/cmi/language/ar/views.view.who_s_online.yml
@@ -6,10 +6,10 @@ display:
       exposed_form:
         options:
           submit_button: تطبيق
-          reset_button_label: 'إعادة الضبط'
-          exposed_sorts_label: 'الترتيب حسب'
-          sort_asc_label: تصاعدي
-          sort_desc_label: تنازلي
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       filters:
         access:
           expose:
diff --git a/conf/cmi/language/de/views.view.archive.yml b/conf/cmi/language/de/views.view.archive.yml
index d2ea9ee3a..ec2f49cdc 100644
--- a/conf/cmi/language/de/views.view.archive.yml
+++ b/conf/cmi/language/de/views.view.archive.yml
@@ -11,16 +11,16 @@ display:
             next: ››
             previous: ‹‹
           expose:
-            items_per_page_label: 'Elemente pro Seite'
-            items_per_page_options_all_label: '- Alle -'
-            offset_label: Versatz
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
           submit_button: Anwenden
-          reset_button_label: Zurücksetzen
-          exposed_sorts_label: Sortierung
-          sort_asc_label: Aufsteigend
-          sort_desc_label: Absteigend
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       arguments:
         created_year_month:
           title: '{{ arguments.created_year_month }}'
@@ -31,4 +31,4 @@ display:
         created_year_month:
           title: '{{ arguments.created_year_month }}'
   page_1:
-    display_title: Seite
+    display_title: Page
diff --git a/conf/cmi/language/de/views.view.content.yml b/conf/cmi/language/de/views.view.content.yml
index 9d4f1d334..09afd603a 100644
--- a/conf/cmi/language/de/views.view.content.yml
+++ b/conf/cmi/language/de/views.view.content.yml
@@ -35,10 +35,10 @@ display:
       exposed_form:
         options:
           submit_button: Filter
-          reset_button_label: Zurücksetzen
-          exposed_sorts_label: Sortierung
-          sort_asc_label: Aufsteigend
-          sort_desc_label: Absteigend
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       empty:
         area_text_custom:
           content: 'Kein Inhalt verfügbar.'
@@ -61,7 +61,7 @@ display:
           expose:
             label: Sprache
   page_1:
-    display_title: Seite
+    display_title: Page
     display_options:
       menu:
         title: Inhalt
diff --git a/conf/cmi/language/de/views.view.content_recent.yml b/conf/cmi/language/de/views.view.content_recent.yml
index 40b73cbef..f43e90970 100644
--- a/conf/cmi/language/de/views.view.content_recent.yml
+++ b/conf/cmi/language/de/views.view.content_recent.yml
@@ -11,10 +11,10 @@ display:
       exposed_form:
         options:
           submit_button: Anwenden
-          reset_button_label: Zurücksetzen
-          exposed_sorts_label: Sortierung
-          sort_asc_label: Aufsteigend
-          sort_desc_label: Absteigend
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       empty:
         area_text_custom:
           content: 'Kein Inhalt verfügbar.'
diff --git a/conf/cmi/language/de/views.view.files.yml b/conf/cmi/language/de/views.view.files.yml
index 2e2cc1bec..f0f93b1a0 100644
--- a/conf/cmi/language/de/views.view.files.yml
+++ b/conf/cmi/language/de/views.view.files.yml
@@ -35,16 +35,16 @@ display:
             next: 'Weiter ›'
             previous: '‹ Zurück'
           expose:
-            items_per_page_label: 'Elemente pro Seite'
-            items_per_page_options_all_label: '- Alle -'
-            offset_label: Versatz
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
           submit_button: Filter
-          reset_button_label: Zurücksetzen
-          exposed_sorts_label: Sortierung
-          sort_asc_label: Aufsteigend
-          sort_desc_label: Absteigend
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       empty:
         area_text_custom:
           content: 'Keine Dateien verfügbar'
@@ -83,9 +83,9 @@ display:
             next: 'Weiter ›'
             previous: '‹ Zurück'
           expose:
-            items_per_page_label: 'Elemente pro Seite'
-            items_per_page_options_all_label: '- Alle -'
-            offset_label: Versatz
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       arguments:
         fid:
           exception:
diff --git a/conf/cmi/language/de/views.view.glossary.yml b/conf/cmi/language/de/views.view.glossary.yml
index b4eedbe09..825274d5e 100644
--- a/conf/cmi/language/de/views.view.glossary.yml
+++ b/conf/cmi/language/de/views.view.glossary.yml
@@ -17,20 +17,20 @@ display:
             next: ››
             previous: ‹‹
           expose:
-            items_per_page_label: 'Elemente pro Seite'
-            items_per_page_options_all_label: '- Alle -'
-            offset_label: Versatz
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
           submit_button: Anwenden
-          reset_button_label: Zurücksetzen
-          exposed_sorts_label: Sortierung
-          sort_asc_label: Aufsteigend
-          sort_desc_label: Absteigend
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
   attachment_1:
     display_title: Anhang
   page_1:
-    display_title: Seite
+    display_title: Page
     display_options:
       menu:
         title: Glossar
diff --git a/conf/cmi/language/de/views.view.helfi_redirect.yml b/conf/cmi/language/de/views.view.helfi_redirect.yml
new file mode 100644
index 000000000..9f9f48955
--- /dev/null
+++ b/conf/cmi/language/de/views.view.helfi_redirect.yml
@@ -0,0 +1,80 @@
+label: Redirect
+description: 'List of redirects'
+display:
+  default:
+    display_title: Master
+    display_options:
+      title: Redirect
+      fields:
+        redirect_bulk_form:
+          action_title: 'With selection'
+        redirect_source__path:
+          label: From
+          separator: ', '
+        is_custom:
+          label: Custom
+          separator: ', '
+        created:
+          label: Created
+      pager:
+        options:
+          tags:
+            next: 'next ›'
+            previous: '‹ previous'
+            first: '« first'
+            last: 'last »'
+          expose:
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
+      exposed_form:
+        options:
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      empty:
+        area_text_custom:
+          content: 'There is no redirect yet.'
+      filters:
+        redirect_source__path:
+          expose:
+            label: From
+        redirect_redirect__uri:
+          expose:
+            label: To
+        status_code:
+          expose:
+            label: 'Status code'
+          group_info:
+            label: 'Status code'
+            group_items:
+              1:
+                title: '300 Multiple Choices'
+              2:
+                title: '301 Moved Permanently'
+              3:
+                title: '302 Found'
+              4:
+                title: '303 See Other'
+              5:
+                title: '304 Not Modified'
+              6:
+                title: '305 Use Proxy'
+              7:
+                title: '307 Temporary Redirect'
+        language:
+          expose:
+            label: 'Original language'
+        is_custom:
+          expose:
+            label: Custom
+        status:
+          expose:
+            label: Veröffentlicht
+  page_1:
+    display_title: Page
+    display_options:
+      menu:
+        title: Redirect
diff --git a/conf/cmi/language/de/views.view.locked_content.yml b/conf/cmi/language/de/views.view.locked_content.yml
index 2e462c52f..b8e539cd2 100644
--- a/conf/cmi/language/de/views.view.locked_content.yml
+++ b/conf/cmi/language/de/views.view.locked_content.yml
@@ -6,10 +6,10 @@ display:
       exposed_form:
         options:
           submit_button: Anwenden
-          reset_button_label: Zurücksetzen
-          exposed_sorts_label: Sortierung
-          sort_asc_label: Aufsteigend
-          sort_desc_label: Absteigend
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       pager:
         options:
           tags:
@@ -18,9 +18,9 @@ display:
             first: '« Anfang'
             last: 'Ende »'
           expose:
-            items_per_page_label: 'Elemente pro Seite'
-            items_per_page_options_all_label: '- Alle -'
-            offset_label: Versatz
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       fields:
         node_bulk_form:
           label: 'Node Massenbearbeitung Formular'
@@ -58,7 +58,7 @@ display:
         area_text_custom:
           content: 'Es gibt aktuell keine Inhalte mit Bearbeitungssperren'
   page_1:
-    display_title: Seite
+    display_title: Page
     display_options:
       menu:
         title: 'Gesperrte Inhalte'
diff --git a/conf/cmi/language/de/views.view.media.yml b/conf/cmi/language/de/views.view.media.yml
index 31ad3fde7..4e56efcc7 100644
--- a/conf/cmi/language/de/views.view.media.yml
+++ b/conf/cmi/language/de/views.view.media.yml
@@ -39,16 +39,16 @@ display:
             first: '« Anfang'
             last: 'Ende »'
           expose:
-            items_per_page_label: 'Elemente pro Seite'
-            items_per_page_options_all_label: '- Alle -'
-            offset_label: Versatz
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
           submit_button: Filter
-          reset_button_label: Zurücksetzen
-          exposed_sorts_label: Sortierung
-          sort_asc_label: Aufsteigend
-          sort_desc_label: Absteigend
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       empty:
         area_text_custom:
           content: 'Keine Medien verfügbar.'
diff --git a/conf/cmi/language/de/views.view.media_library.yml b/conf/cmi/language/de/views.view.media_library.yml
index 8dea96bd4..98a502127 100644
--- a/conf/cmi/language/de/views.view.media_library.yml
+++ b/conf/cmi/language/de/views.view.media_library.yml
@@ -14,16 +14,16 @@ display:
             next: ››
             previous: ‹‹
           expose:
-            items_per_page_label: 'Elemente pro Seite'
-            items_per_page_options_all_label: '- Alle -'
-            offset_label: Versatz
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
           submit_button: 'Filter anwenden'
-          reset_button_label: Zurücksetzen
-          exposed_sorts_label: Sortierung
-          sort_asc_label: Aufsteigend
-          sort_desc_label: Absteigend
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       empty:
         area_text_custom:
           content: 'Keine Medien verfügbar.'
@@ -58,7 +58,7 @@ display:
           expose:
             label: Sprache
   page:
-    display_title: Seite
+    display_title: Page
     display_options:
       fields:
         media_bulk_form:
diff --git a/conf/cmi/language/de/views.view.news.yml b/conf/cmi/language/de/views.view.news.yml
index 5ed8d37e8..4c601ad1c 100644
--- a/conf/cmi/language/de/views.view.news.yml
+++ b/conf/cmi/language/de/views.view.news.yml
@@ -12,10 +12,10 @@ display:
       exposed_form:
         options:
           submit_button: Anwenden
-          reset_button_label: Zurücksetzen
-          exposed_sorts_label: Sortierung
-          sort_asc_label: Aufsteigend
-          sort_desc_label: Absteigend
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       arguments:
         nid:
           exception:
diff --git a/conf/cmi/language/de/views.view.paragraphs_library.yml b/conf/cmi/language/de/views.view.paragraphs_library.yml
index 40b760369..5825b42b7 100644
--- a/conf/cmi/language/de/views.view.paragraphs_library.yml
+++ b/conf/cmi/language/de/views.view.paragraphs_library.yml
@@ -6,19 +6,19 @@ display:
       exposed_form:
         options:
           submit_button: Filter
-          reset_button_label: Zurücksetzen
-          exposed_sorts_label: Sortierung
-          sort_asc_label: Aufsteigend
-          sort_desc_label: Absteigend
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       pager:
         options:
           tags:
             previous: ‹‹
             next: ››
           expose:
-            items_per_page_label: 'Elemente pro Seite'
-            items_per_page_options_all_label: '- Alle -'
-            offset_label: Versatz
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       fields:
         label:
           label: Beschriftung
@@ -59,4 +59,4 @@ display:
         area_text_custom:
           content: 'Keine Bibliothekeinträge vorhanden.'
   page_1:
-    display_title: Seite
+    display_title: Page
diff --git a/conf/cmi/language/de/views.view.redirect.yml b/conf/cmi/language/de/views.view.redirect.yml
index a0d83ab43..8e78170bf 100644
--- a/conf/cmi/language/de/views.view.redirect.yml
+++ b/conf/cmi/language/de/views.view.redirect.yml
@@ -1,5 +1,5 @@
-label: Umleiten
-description: 'Liste der Umleitungen'
+label: Redirect
+description: 'List of redirects'
 display:
   default:
     display_title: Master
@@ -7,62 +7,62 @@ display:
       exposed_form:
         options:
           submit_button: Filter
-          reset_button_label: Zurücksetzen
-          exposed_sorts_label: Sortierung
-          sort_asc_label: Aufsteigend
-          sort_desc_label: Absteigend
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       pager:
         options:
           tags:
-            previous: '‹ vorherige Seite'
-            next: 'nächste Seite ›'
-            first: '« erste Seite'
-            last: 'letzte Seite »'
+            previous: '‹ previous'
+            next: 'next ›'
+            first: '« first'
+            last: 'last »'
           expose:
-            items_per_page_label: 'Elemente pro Seite'
-            items_per_page_options_all_label: '- Alle -'
-            offset_label: Versatz
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       fields:
         redirect_bulk_form:
-          action_title: 'Mit Auswahl'
+          action_title: 'With selection'
         redirect_source__path:
-          label: Von
+          label: From
           separator: ', '
         created:
-          label: Erstellt
+          label: Created
       filters:
         redirect_source__path:
           expose:
-            label: Von
+            label: From
         redirect_redirect__uri:
           expose:
-            label: An
+            label: To
         status_code:
           expose:
-            label: Statuscode
+            label: 'Status code'
           group_info:
-            label: Statuscode
+            label: 'Status code'
             group_items:
               1:
-                title: '300 Mehrere Auswahlmöglichkeiten'
+                title: '300 Multiple Choices'
               2:
-                title: '301 Dauerhaft verschoben'
+                title: '301 Moved Permanently'
               3:
-                title: '302 Gefunden'
+                title: '302 Found'
               4:
-                title: '303 Siehe andere'
+                title: '303 See Other'
               5:
-                title: '304 Nicht modifiziert'
+                title: '304 Not Modified'
               6:
-                title: '305 Proxy verwenden'
+                title: '305 Use Proxy'
               7:
-                title: '307 Temporäre Weiterleitung'
+                title: '307 Temporary Redirect'
         language:
           expose:
-            label: Originalsprache
-      title: Umleiten
+            label: 'Original language'
+      title: Redirect
       empty:
         area_text_custom:
-          content: 'Es wurde noch keine Umleitung eingerichtet.'
+          content: 'There is no redirect yet.'
   page_1:
-    display_title: Seite
+    display_title: Page
diff --git a/conf/cmi/language/de/views.view.scheduler_scheduled_content.yml b/conf/cmi/language/de/views.view.scheduler_scheduled_content.yml
index 67f64a96e..ae10e49ac 100644
--- a/conf/cmi/language/de/views.view.scheduler_scheduled_content.yml
+++ b/conf/cmi/language/de/views.view.scheduler_scheduled_content.yml
@@ -6,17 +6,17 @@ display:
       exposed_form:
         options:
           submit_button: Filter
-          reset_button_label: Zurücksetzen
-          exposed_sorts_label: Sortierung
-          sort_asc_label: Aufsteigend
-          sort_desc_label: Absteigend
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       pager:
         options:
           tags:
-            previous: '‹ vorherige Seite'
-            next: 'nächste Seite ›'
-            first: '« erste Seite'
-            last: 'letzte Seite »'
+            previous: '‹ previous'
+            next: 'next ›'
+            first: '« first'
+            last: 'last »'
       fields:
         node_bulk_form:
           action_title: Aktion
diff --git a/conf/cmi/language/de/views.view.taxonomy_term.yml b/conf/cmi/language/de/views.view.taxonomy_term.yml
index e6c2212cc..2ad3f9034 100644
--- a/conf/cmi/language/de/views.view.taxonomy_term.yml
+++ b/conf/cmi/language/de/views.view.taxonomy_term.yml
@@ -10,16 +10,16 @@ display:
             next: ››
             previous: ‹‹
           expose:
-            items_per_page_label: 'Elemente pro Seite'
-            items_per_page_options_all_label: '- Alle -'
-            offset_label: Versatz
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
           submit_button: Anwenden
-          reset_button_label: Zurücksetzen
-          exposed_sorts_label: Sortierung
-          sort_asc_label: Aufsteigend
-          sort_desc_label: Absteigend
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       arguments:
         tid:
           exception:
@@ -28,4 +28,4 @@ display:
   feed_1:
     display_title: Newsfeed
   page_1:
-    display_title: Seite
+    display_title: Page
diff --git a/conf/cmi/language/de/views.view.user_admin_people.yml b/conf/cmi/language/de/views.view.user_admin_people.yml
index ba10069f8..2cdf292b9 100644
--- a/conf/cmi/language/de/views.view.user_admin_people.yml
+++ b/conf/cmi/language/de/views.view.user_admin_people.yml
@@ -39,16 +39,16 @@ display:
             first: '« Anfang'
             last: 'Ende »'
           expose:
-            items_per_page_label: 'Elemente pro Seite'
-            items_per_page_options_all_label: '- Alle -'
-            offset_label: Versatz
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
           submit_button: Filter
-          reset_button_label: Zurücksetzen
-          exposed_sorts_label: Sortierung
-          sort_asc_label: Aufsteigend
-          sort_desc_label: Absteigend
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       empty:
         area_text_custom:
           content: 'Keine Personen verfügbar.'
@@ -72,7 +72,7 @@ display:
             label: Berechtigung
       use_more_text: mehr
   page_1:
-    display_title: Seite
+    display_title: Page
     display_options:
       menu:
         title: Liste
diff --git a/conf/cmi/language/de/views.view.who_s_new.yml b/conf/cmi/language/de/views.view.who_s_new.yml
index 69e66b1c8..f979d7f32 100644
--- a/conf/cmi/language/de/views.view.who_s_new.yml
+++ b/conf/cmi/language/de/views.view.who_s_new.yml
@@ -8,10 +8,10 @@ display:
       exposed_form:
         options:
           submit_button: Anwenden
-          reset_button_label: Zurücksetzen
-          exposed_sorts_label: Sortierung
-          sort_asc_label: Aufsteigend
-          sort_desc_label: Absteigend
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
   block_1:
     display_title: 'Neue Benutzer'
     display_options:
diff --git a/conf/cmi/language/de/views.view.who_s_online.yml b/conf/cmi/language/de/views.view.who_s_online.yml
index 69a87fefe..8d10ca7e1 100644
--- a/conf/cmi/language/de/views.view.who_s_online.yml
+++ b/conf/cmi/language/de/views.view.who_s_online.yml
@@ -8,10 +8,10 @@ display:
       exposed_form:
         options:
           submit_button: Anwenden
-          reset_button_label: Zurücksetzen
-          exposed_sorts_label: Sortierung
-          sort_asc_label: Aufsteigend
-          sort_desc_label: Absteigend
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       empty:
         area_text_custom:
           content: 'Momentan sind keine Benutzer online.'
diff --git a/conf/cmi/language/es/views.view.archive.yml b/conf/cmi/language/es/views.view.archive.yml
index 3c5eca3ac..871f6b855 100644
--- a/conf/cmi/language/es/views.view.archive.yml
+++ b/conf/cmi/language/es/views.view.archive.yml
@@ -11,14 +11,14 @@ display:
             next: ››
             previous: ‹‹
           expose:
-            items_per_page_label: 'Elementos por página'
-            items_per_page_options_all_label: '- Todo -'
-            offset_label: Desplazamiento
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
           submit_button: Aplicar
-          reset_button_label: Restablecer
-          exposed_sorts_label: 'Ordenar por'
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
           sort_asc_label: Asc
           sort_desc_label: Desc
       arguments:
@@ -31,4 +31,4 @@ display:
         created_year_month:
           title: '{{ arguments.created_year_month }}'
   page_1:
-    display_title: Página
+    display_title: Page
diff --git a/conf/cmi/language/es/views.view.content.yml b/conf/cmi/language/es/views.view.content.yml
index 7b2c96ab9..bbf528f81 100644
--- a/conf/cmi/language/es/views.view.content.yml
+++ b/conf/cmi/language/es/views.view.content.yml
@@ -34,9 +34,9 @@ display:
             last: 'Último »'
       exposed_form:
         options:
-          submit_button: Filtro
-          reset_button_label: Restablecer
-          exposed_sorts_label: 'Ordenar por'
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
           sort_asc_label: Asc
           sort_desc_label: Desc
       empty:
@@ -61,7 +61,7 @@ display:
           expose:
             label: Idioma
   page_1:
-    display_title: Página
+    display_title: Page
     display_options:
       menu:
         title: Contenido
diff --git a/conf/cmi/language/es/views.view.content_recent.yml b/conf/cmi/language/es/views.view.content_recent.yml
index ac26b8e86..f74f7960c 100644
--- a/conf/cmi/language/es/views.view.content_recent.yml
+++ b/conf/cmi/language/es/views.view.content_recent.yml
@@ -11,8 +11,8 @@ display:
       exposed_form:
         options:
           submit_button: Aplicar
-          reset_button_label: Restablecer
-          exposed_sorts_label: 'Ordenar por'
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
           sort_asc_label: Asc
           sort_desc_label: Desc
       empty:
diff --git a/conf/cmi/language/es/views.view.files.yml b/conf/cmi/language/es/views.view.files.yml
index 6d137b635..a38e66d9b 100644
--- a/conf/cmi/language/es/views.view.files.yml
+++ b/conf/cmi/language/es/views.view.files.yml
@@ -35,14 +35,14 @@ display:
             next: 'Siguiente >'
             previous: '‹ Anterior'
           expose:
-            items_per_page_label: 'Elementos por página'
-            items_per_page_options_all_label: '- Todo -'
-            offset_label: Desplazamiento
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
-          submit_button: Filtro
-          reset_button_label: Restablecer
-          exposed_sorts_label: 'Ordenar por'
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
           sort_asc_label: Asc
           sort_desc_label: Desc
       empty:
@@ -83,9 +83,9 @@ display:
             next: 'Siguiente >'
             previous: '‹ Anterior'
           expose:
-            items_per_page_label: 'Elementos por página'
-            items_per_page_options_all_label: '- Todo -'
-            offset_label: Desplazamiento
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       arguments:
         fid:
           exception:
diff --git a/conf/cmi/language/es/views.view.glossary.yml b/conf/cmi/language/es/views.view.glossary.yml
index 88bb0c9e2..1ccc7c9b4 100644
--- a/conf/cmi/language/es/views.view.glossary.yml
+++ b/conf/cmi/language/es/views.view.glossary.yml
@@ -17,20 +17,20 @@ display:
             next: ››
             previous: ‹‹
           expose:
-            items_per_page_label: 'Elementos por página'
-            items_per_page_options_all_label: '- Todo -'
-            offset_label: Desplazamiento
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
           submit_button: Aplicar
-          reset_button_label: Restablecer
-          exposed_sorts_label: 'Ordenar por'
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
           sort_asc_label: Asc
           sort_desc_label: Desc
   attachment_1:
     display_title: Adjunto
   page_1:
-    display_title: Página
+    display_title: Page
     display_options:
       menu:
         title: Glosario
diff --git a/conf/cmi/language/es/views.view.helfi_redirect.yml b/conf/cmi/language/es/views.view.helfi_redirect.yml
new file mode 100644
index 000000000..7c2d48052
--- /dev/null
+++ b/conf/cmi/language/es/views.view.helfi_redirect.yml
@@ -0,0 +1,80 @@
+label: Redirect
+description: 'List of redirects'
+display:
+  default:
+    display_title: Master
+    display_options:
+      title: Redirect
+      fields:
+        redirect_bulk_form:
+          action_title: 'With selection'
+        redirect_source__path:
+          label: From
+          separator: ', '
+        is_custom:
+          label: Custom
+          separator: ', '
+        created:
+          label: Created
+      pager:
+        options:
+          tags:
+            next: 'next ›'
+            previous: '‹ previous'
+            first: '« first'
+            last: 'last »'
+          expose:
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
+      exposed_form:
+        options:
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      empty:
+        area_text_custom:
+          content: 'There is no redirect yet.'
+      filters:
+        redirect_source__path:
+          expose:
+            label: From
+        redirect_redirect__uri:
+          expose:
+            label: To
+        status_code:
+          expose:
+            label: 'Status code'
+          group_info:
+            label: 'Status code'
+            group_items:
+              1:
+                title: '300 Multiple Choices'
+              2:
+                title: '301 Moved Permanently'
+              3:
+                title: '302 Found'
+              4:
+                title: '303 See Other'
+              5:
+                title: '304 Not Modified'
+              6:
+                title: '305 Use Proxy'
+              7:
+                title: '307 Temporary Redirect'
+        language:
+          expose:
+            label: 'Original language'
+        is_custom:
+          expose:
+            label: Custom
+        status:
+          expose:
+            label: Publicado
+  page_1:
+    display_title: Page
+    display_options:
+      menu:
+        title: Redirect
diff --git a/conf/cmi/language/es/views.view.locked_content.yml b/conf/cmi/language/es/views.view.locked_content.yml
index c114734bf..ea91d569e 100644
--- a/conf/cmi/language/es/views.view.locked_content.yml
+++ b/conf/cmi/language/es/views.view.locked_content.yml
@@ -1,12 +1,12 @@
 display:
   default:
-    display_title: Máster
+    display_title: Master
     display_options:
       exposed_form:
         options:
           submit_button: Aplicar
-          reset_button_label: Restablecer
-          exposed_sorts_label: 'Ordenar por'
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
           sort_asc_label: Asc
           sort_desc_label: Desc
       pager:
@@ -17,9 +17,9 @@ display:
             first: '« Primero'
             last: 'Último »'
           expose:
-            items_per_page_label: 'Elementos por página'
-            items_per_page_options_all_label: '- Todo -'
-            offset_label: Desplazamiento
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       fields:
         node_bulk_form:
           label: 'Formulario de operaciones masivas de nodo'
@@ -50,4 +50,4 @@ display:
           expose:
             label: Título
   page_1:
-    display_title: Página
+    display_title: Page
diff --git a/conf/cmi/language/es/views.view.media.yml b/conf/cmi/language/es/views.view.media.yml
index 17a8ee95f..63d604101 100644
--- a/conf/cmi/language/es/views.view.media.yml
+++ b/conf/cmi/language/es/views.view.media.yml
@@ -39,14 +39,14 @@ display:
             first: '« Primero'
             last: 'Último »'
           expose:
-            items_per_page_label: 'Elementos por página'
-            items_per_page_options_all_label: '- Todo -'
-            offset_label: Desplazamiento
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
-          submit_button: Filtro
-          reset_button_label: Restablecer
-          exposed_sorts_label: 'Ordenar por'
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
           sort_asc_label: Asc
           sort_desc_label: Desc
       empty:
diff --git a/conf/cmi/language/es/views.view.media_library.yml b/conf/cmi/language/es/views.view.media_library.yml
index 70b3ae256..6b6db57ca 100644
--- a/conf/cmi/language/es/views.view.media_library.yml
+++ b/conf/cmi/language/es/views.view.media_library.yml
@@ -14,14 +14,14 @@ display:
             next: ››
             previous: ‹‹
           expose:
-            items_per_page_label: 'Elementos por página'
-            items_per_page_options_all_label: '- Todo -'
-            offset_label: Desplazamiento
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
           submit_button: 'Aplicar filtros'
-          reset_button_label: Restablecer
-          exposed_sorts_label: 'Ordenar por'
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
           sort_asc_label: Asc
           sort_desc_label: Desc
       empty:
@@ -58,7 +58,7 @@ display:
           expose:
             label: Idioma
   page:
-    display_title: Página
+    display_title: Page
     display_options:
       fields:
         media_bulk_form:
diff --git a/conf/cmi/language/es/views.view.news.yml b/conf/cmi/language/es/views.view.news.yml
index 176fc1c26..87b248959 100644
--- a/conf/cmi/language/es/views.view.news.yml
+++ b/conf/cmi/language/es/views.view.news.yml
@@ -12,8 +12,8 @@ display:
       exposed_form:
         options:
           submit_button: Aplicar
-          reset_button_label: Restablecer
-          exposed_sorts_label: 'Ordenar por'
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
           sort_asc_label: Asc
           sort_desc_label: Desc
       arguments:
diff --git a/conf/cmi/language/es/views.view.paragraphs_library.yml b/conf/cmi/language/es/views.view.paragraphs_library.yml
index 774cdc34b..375e66ad8 100644
--- a/conf/cmi/language/es/views.view.paragraphs_library.yml
+++ b/conf/cmi/language/es/views.view.paragraphs_library.yml
@@ -1,13 +1,13 @@
 label: 'Biblioteca de Paragraphs'
 display:
   default:
-    display_title: Máster
+    display_title: Master
     display_options:
       exposed_form:
         options:
-          submit_button: Filtro
-          reset_button_label: Restablecer
-          exposed_sorts_label: 'Ordenar por'
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
           sort_asc_label: Asc
           sort_desc_label: Desc
       pager:
@@ -16,9 +16,9 @@ display:
             previous: ‹‹
             next: ››
           expose:
-            items_per_page_label: 'Elementos por página'
-            items_per_page_options_all_label: '- Todo -'
-            offset_label: Desplazamiento
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       fields:
         label:
           label: Etiqueta
@@ -57,4 +57,4 @@ display:
         area_text_custom:
           content: 'No hay artículos de la biblioteca disponibles.'
   page_1:
-    display_title: Página
+    display_title: Page
diff --git a/conf/cmi/language/es/views.view.redirect.yml b/conf/cmi/language/es/views.view.redirect.yml
index 8a894418c..70224f31c 100644
--- a/conf/cmi/language/es/views.view.redirect.yml
+++ b/conf/cmi/language/es/views.view.redirect.yml
@@ -1,68 +1,68 @@
-label: Redirección
+label: Redirect
 display:
   default:
-    display_title: Máster
+    display_title: Master
     display_options:
       exposed_form:
         options:
-          submit_button: Filtro
-          reset_button_label: Restablecer
-          exposed_sorts_label: 'Ordenar por'
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
           sort_asc_label: Asc
           sort_desc_label: Desc
       pager:
         options:
           tags:
-            previous: '‹ anterior'
-            next: 'siguiente ›'
-            first: '« primero'
-            last: 'último »'
+            previous: '‹ previous'
+            next: 'next ›'
+            first: '« first'
+            last: 'last »'
           expose:
-            items_per_page_label: 'Elementos por página'
-            items_per_page_options_all_label: '- Todo -'
-            offset_label: Desplazamiento
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       fields:
         redirect_bulk_form:
-          action_title: 'Con selección'
+          action_title: 'With selection'
         redirect_source__path:
-          label: Desde
+          label: From
           separator: ', '
         created:
-          label: Creado
+          label: Created
       filters:
         redirect_source__path:
           expose:
-            label: Desde
+            label: From
         redirect_redirect__uri:
           expose:
-            label: Para
+            label: To
         status_code:
           group_info:
             group_items:
               1:
-                title: '300 Múltiples posibilidades'
+                title: '300 Multiple Choices'
               2:
-                title: '301 Movido permanentemente'
+                title: '301 Moved Permanently'
               3:
-                title: '302 Encontrado'
+                title: '302 Found'
               4:
-                title: '303 Ver otra ubicación'
+                title: '303 See Other'
               5:
-                title: '304 No modificado'
+                title: '304 Not Modified'
               6:
-                title: '305 Usar proxy'
+                title: '305 Use Proxy'
               7:
-                title: '307 Redirección temporal'
+                title: '307 Temporary Redirect'
             label: 'Status code'
           expose:
             label: 'Status code'
         language:
           expose:
-            label: 'Lenguaje original'
-      title: Redirección
+            label: 'Original language'
+      title: Redirect
       empty:
         area_text_custom:
           content: 'There is no redirect yet.'
   page_1:
-    display_title: Página
+    display_title: Page
 description: 'List of redirects'
diff --git a/conf/cmi/language/es/views.view.scheduler_scheduled_content.yml b/conf/cmi/language/es/views.view.scheduler_scheduled_content.yml
index e7635db42..630f79a64 100644
--- a/conf/cmi/language/es/views.view.scheduler_scheduled_content.yml
+++ b/conf/cmi/language/es/views.view.scheduler_scheduled_content.yml
@@ -5,18 +5,18 @@ display:
     display_options:
       exposed_form:
         options:
-          submit_button: Filtro
-          reset_button_label: Restablecer
-          exposed_sorts_label: 'Ordenar por'
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
           sort_asc_label: Asc
           sort_desc_label: Desc
       pager:
         options:
           tags:
-            previous: '‹ anterior'
-            next: 'siguiente ›'
-            first: '« primero'
-            last: 'último »'
+            previous: '‹ previous'
+            next: 'next ›'
+            first: '« first'
+            last: 'last »'
       fields:
         node_bulk_form:
           action_title: Acción
@@ -67,7 +67,7 @@ display:
       empty:
         area_text_custom:
           content: 'No hay contenido planificado.'
-    display_title: Máster
+    display_title: Master
   overview:
     display_options:
       menu:
diff --git a/conf/cmi/language/es/views.view.taxonomy_term.yml b/conf/cmi/language/es/views.view.taxonomy_term.yml
index 3880536ed..8bae5465a 100644
--- a/conf/cmi/language/es/views.view.taxonomy_term.yml
+++ b/conf/cmi/language/es/views.view.taxonomy_term.yml
@@ -10,14 +10,14 @@ display:
             next: ››
             previous: ‹‹
           expose:
-            items_per_page_label: 'Elementos por página'
-            items_per_page_options_all_label: '- Todo -'
-            offset_label: Desplazamiento
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
           submit_button: Aplicar
-          reset_button_label: Restablecer
-          exposed_sorts_label: 'Ordenar por'
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
           sort_asc_label: Asc
           sort_desc_label: Desc
       arguments:
@@ -28,4 +28,4 @@ display:
   feed_1:
     display_title: 'Canal de noticias'
   page_1:
-    display_title: Página
+    display_title: Page
diff --git a/conf/cmi/language/es/views.view.user_admin_people.yml b/conf/cmi/language/es/views.view.user_admin_people.yml
index 37c7ddeeb..e87e45706 100644
--- a/conf/cmi/language/es/views.view.user_admin_people.yml
+++ b/conf/cmi/language/es/views.view.user_admin_people.yml
@@ -39,14 +39,14 @@ display:
             first: '« Primero'
             last: 'Último »'
           expose:
-            items_per_page_label: 'Elementos por página'
-            items_per_page_options_all_label: '- Todo -'
-            offset_label: Desplazamiento
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
-          submit_button: Filtro
-          reset_button_label: Restablecer
-          exposed_sorts_label: 'Ordenar por'
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
           sort_asc_label: Asc
           sort_desc_label: Desc
       empty:
@@ -72,7 +72,7 @@ display:
             label: Permiso
       use_more_text: más
   page_1:
-    display_title: Página
+    display_title: Page
     display_options:
       menu:
         title: Listado
diff --git a/conf/cmi/language/es/views.view.who_s_new.yml b/conf/cmi/language/es/views.view.who_s_new.yml
index 260480a95..70d2de6e1 100644
--- a/conf/cmi/language/es/views.view.who_s_new.yml
+++ b/conf/cmi/language/es/views.view.who_s_new.yml
@@ -8,8 +8,8 @@ display:
       exposed_form:
         options:
           submit_button: Aplicar
-          reset_button_label: Restablecer
-          exposed_sorts_label: 'Ordenar por'
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
           sort_asc_label: Asc
           sort_desc_label: Desc
   block_1:
diff --git a/conf/cmi/language/es/views.view.who_s_online.yml b/conf/cmi/language/es/views.view.who_s_online.yml
index 98dd69d5a..3e4eb3419 100644
--- a/conf/cmi/language/es/views.view.who_s_online.yml
+++ b/conf/cmi/language/es/views.view.who_s_online.yml
@@ -8,8 +8,8 @@ display:
       exposed_form:
         options:
           submit_button: Aplicar
-          reset_button_label: Restablecer
-          exposed_sorts_label: 'Ordenar por'
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
           sort_asc_label: Asc
           sort_desc_label: Desc
       empty:
diff --git a/conf/cmi/language/et/views.view.archive.yml b/conf/cmi/language/et/views.view.archive.yml
index 0fb5406a9..3c1aaf0ed 100644
--- a/conf/cmi/language/et/views.view.archive.yml
+++ b/conf/cmi/language/et/views.view.archive.yml
@@ -11,16 +11,16 @@ display:
             next: ››
             previous: ‹‹
           expose:
-            items_per_page_label: 'Kirjeid lehel'
-            items_per_page_options_all_label: '- Kõik -'
-            offset_label: Nihe
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
           submit_button: Rakenda
-          reset_button_label: Tühista
-          exposed_sorts_label: 'Sorteerimise alus'
-          sort_asc_label: Kasvav
-          sort_desc_label: Kahanev
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       arguments:
         created_year_month:
           title: '{{ arguments.created_year_month }}'
@@ -31,4 +31,4 @@ display:
         created_year_month:
           title: '{{ arguments.created_year_month }}'
   page_1:
-    display_title: Lehekülg
+    display_title: Page
diff --git a/conf/cmi/language/et/views.view.content.yml b/conf/cmi/language/et/views.view.content.yml
index 5e1a5c36e..fa0bbd161 100644
--- a/conf/cmi/language/et/views.view.content.yml
+++ b/conf/cmi/language/et/views.view.content.yml
@@ -34,11 +34,11 @@ display:
             last: 'Viimane »'
       exposed_form:
         options:
-          submit_button: Filtreeri
-          reset_button_label: Tühista
-          exposed_sorts_label: 'Sorteerimise alus'
-          sort_asc_label: Kasvav
-          sort_desc_label: Kahanev
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       empty:
         area_text_custom:
           content: 'Sisu puudub.'
@@ -61,7 +61,7 @@ display:
           expose:
             label: Keel
   page_1:
-    display_title: Lehekülg
+    display_title: Page
     display_options:
       menu:
         title: Sisu
diff --git a/conf/cmi/language/et/views.view.content_recent.yml b/conf/cmi/language/et/views.view.content_recent.yml
index 7813dbf17..a295753a6 100644
--- a/conf/cmi/language/et/views.view.content_recent.yml
+++ b/conf/cmi/language/et/views.view.content_recent.yml
@@ -11,10 +11,10 @@ display:
       exposed_form:
         options:
           submit_button: Rakenda
-          reset_button_label: Tühista
-          exposed_sorts_label: 'Sorteerimise alus'
-          sort_asc_label: Kasvav
-          sort_desc_label: Kahanev
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       empty:
         area_text_custom:
           content: 'Sisu puudub.'
diff --git a/conf/cmi/language/et/views.view.files.yml b/conf/cmi/language/et/views.view.files.yml
index 2edb4c800..88411061b 100644
--- a/conf/cmi/language/et/views.view.files.yml
+++ b/conf/cmi/language/et/views.view.files.yml
@@ -33,16 +33,16 @@ display:
             next: 'Järgmine ›'
             previous: '‹ Eelmine'
           expose:
-            items_per_page_label: 'Kirjeid lehel'
-            items_per_page_options_all_label: '- Kõik -'
-            offset_label: Nihe
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
-          submit_button: Filtreeri
-          reset_button_label: Tühista
-          exposed_sorts_label: 'Sorteerimise alus'
-          sort_asc_label: Kasvav
-          sort_desc_label: Kahanev
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       empty:
         area_text_custom:
           content: 'Ühtegi faili pole saadaval.'
@@ -81,9 +81,9 @@ display:
             next: 'Järgmine ›'
             previous: '‹ Eelmine'
           expose:
-            items_per_page_label: 'Kirjeid lehel'
-            items_per_page_options_all_label: '- Kõik -'
-            offset_label: Nihe
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       arguments:
         fid:
           exception:
diff --git a/conf/cmi/language/et/views.view.glossary.yml b/conf/cmi/language/et/views.view.glossary.yml
index b1de42887..1da8379b8 100644
--- a/conf/cmi/language/et/views.view.glossary.yml
+++ b/conf/cmi/language/et/views.view.glossary.yml
@@ -17,20 +17,20 @@ display:
             next: ››
             previous: ‹‹
           expose:
-            items_per_page_label: 'Kirjeid lehel'
-            items_per_page_options_all_label: '- Kõik -'
-            offset_label: Nihe
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
           submit_button: Rakenda
-          reset_button_label: Tühista
-          exposed_sorts_label: 'Sorteerimise alus'
-          sort_asc_label: Kasvav
-          sort_desc_label: Kahanev
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
   attachment_1:
     display_title: Manus
   page_1:
-    display_title: Lehekülg
+    display_title: Page
     display_options:
       menu:
         title: Sõnastik
diff --git a/conf/cmi/language/et/views.view.helfi_redirect.yml b/conf/cmi/language/et/views.view.helfi_redirect.yml
new file mode 100644
index 000000000..76eb7e584
--- /dev/null
+++ b/conf/cmi/language/et/views.view.helfi_redirect.yml
@@ -0,0 +1,54 @@
+label: Redirect
+display:
+  default:
+    display_title: Master
+    display_options:
+      title: Redirect
+      fields:
+        redirect_source__path:
+          label: From
+          separator: ', '
+        is_custom:
+          label: Custom
+          separator: ', '
+        created:
+          label: Created
+      pager:
+        options:
+          tags:
+            next: 'next ›'
+            previous: '‹ previous'
+            first: '« first'
+            last: 'last »'
+          expose:
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
+      exposed_form:
+        options:
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      filters:
+        redirect_source__path:
+          expose:
+            label: From
+        redirect_redirect__uri:
+          expose:
+            label: To
+        language:
+          expose:
+            label: 'Original language'
+        is_custom:
+          expose:
+            label: Custom
+        status:
+          expose:
+            label: Avaldatud
+  page_1:
+    display_title: Page
+    display_options:
+      menu:
+        title: Redirect
diff --git a/conf/cmi/language/et/views.view.locked_content.yml b/conf/cmi/language/et/views.view.locked_content.yml
index f683f5152..2654aa6be 100644
--- a/conf/cmi/language/et/views.view.locked_content.yml
+++ b/conf/cmi/language/et/views.view.locked_content.yml
@@ -1,14 +1,14 @@
 display:
   default:
-    display_title: Peamine
+    display_title: Master
     display_options:
       exposed_form:
         options:
           submit_button: Rakenda
-          reset_button_label: Tühista
-          exposed_sorts_label: 'Sorteerimise alus'
-          sort_asc_label: Kasvav
-          sort_desc_label: Kahanev
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       pager:
         options:
           tags:
@@ -17,9 +17,9 @@ display:
             first: '« Esimene'
             last: 'Viimane »'
           expose:
-            items_per_page_label: 'Kirjeid lehel'
-            items_per_page_options_all_label: '- Kõik -'
-            offset_label: Nihe
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       fields:
         node_bulk_form:
           action_title: Tegevus
@@ -49,4 +49,4 @@ display:
           expose:
             label: Pealkiri
   page_1:
-    display_title: Lehekülg
+    display_title: Page
diff --git a/conf/cmi/language/et/views.view.media.yml b/conf/cmi/language/et/views.view.media.yml
index 77e1c7e17..2114c7573 100644
--- a/conf/cmi/language/et/views.view.media.yml
+++ b/conf/cmi/language/et/views.view.media.yml
@@ -38,16 +38,16 @@ display:
             first: '« Esimene'
             last: 'Viimane »'
           expose:
-            items_per_page_label: 'Kirjeid lehel'
-            items_per_page_options_all_label: '- Kõik -'
-            offset_label: Nihe
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
-          submit_button: Filtreeri
-          reset_button_label: Tühista
-          exposed_sorts_label: 'Sorteerimise alus'
-          sort_asc_label: Kasvav
-          sort_desc_label: Kahanev
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       empty:
         area_text_custom:
           content: 'Meedia elemente pole saadaval.'
diff --git a/conf/cmi/language/et/views.view.media_library.yml b/conf/cmi/language/et/views.view.media_library.yml
index 3f37847d8..dbb1ddd4e 100644
--- a/conf/cmi/language/et/views.view.media_library.yml
+++ b/conf/cmi/language/et/views.view.media_library.yml
@@ -13,16 +13,16 @@ display:
             next: ››
             previous: ‹‹
           expose:
-            items_per_page_label: 'Kirjeid lehel'
-            items_per_page_options_all_label: '- Kõik -'
-            offset_label: Nihe
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
           submit_button: 'Rakenda filtrid'
-          reset_button_label: Tühista
-          exposed_sorts_label: 'Sorteerimise alus'
-          sort_asc_label: Kasvav
-          sort_desc_label: Kahanev
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       empty:
         area_text_custom:
           content: 'Meedia elemente pole saadaval.'
@@ -57,7 +57,7 @@ display:
           expose:
             label: Keel
   page:
-    display_title: Lehekülg
+    display_title: Page
     display_options:
       fields:
         media_bulk_form:
diff --git a/conf/cmi/language/et/views.view.news.yml b/conf/cmi/language/et/views.view.news.yml
index d74bf354c..53cfb9ca6 100644
--- a/conf/cmi/language/et/views.view.news.yml
+++ b/conf/cmi/language/et/views.view.news.yml
@@ -12,10 +12,10 @@ display:
       exposed_form:
         options:
           submit_button: Rakenda
-          reset_button_label: Tühista
-          exposed_sorts_label: 'Sorteerimise alus'
-          sort_asc_label: Kasvav
-          sort_desc_label: Kahanev
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       arguments:
         nid:
           exception:
diff --git a/conf/cmi/language/et/views.view.paragraphs_library.yml b/conf/cmi/language/et/views.view.paragraphs_library.yml
index 4064ab891..3a9f6cf69 100644
--- a/conf/cmi/language/et/views.view.paragraphs_library.yml
+++ b/conf/cmi/language/et/views.view.paragraphs_library.yml
@@ -1,23 +1,23 @@
 display:
   default:
-    display_title: Peamine
+    display_title: Master
     display_options:
       exposed_form:
         options:
-          submit_button: Filtreeri
-          reset_button_label: Tühista
-          exposed_sorts_label: 'Sorteerimise alus'
-          sort_asc_label: Kasvav
-          sort_desc_label: Kahanev
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       pager:
         options:
           tags:
             previous: ‹‹
             next: ››
           expose:
-            items_per_page_label: 'Kirjeid lehel'
-            items_per_page_options_all_label: '- Kõik -'
-            offset_label: Nihe
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       fields:
         label:
           label: Nimetus
@@ -50,4 +50,4 @@ display:
           expose:
             label: Liik
   page_1:
-    display_title: Lehekülg
+    display_title: Page
diff --git a/conf/cmi/language/et/views.view.redirect.yml b/conf/cmi/language/et/views.view.redirect.yml
index c3421f764..0ce8da135 100644
--- a/conf/cmi/language/et/views.view.redirect.yml
+++ b/conf/cmi/language/et/views.view.redirect.yml
@@ -1,42 +1,42 @@
-label: 'Suunatakse ümber'
+label: Redirect
 display:
   default:
-    display_title: Peamine
+    display_title: Master
     display_options:
       exposed_form:
         options:
-          submit_button: Filtreeri
-          reset_button_label: Tühista
-          exposed_sorts_label: 'Sorteerimise alus'
-          sort_asc_label: Kasvav
-          sort_desc_label: Kahanev
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       pager:
         options:
           tags:
-            previous: '‹ eelmine'
-            next: 'järgmine ›'
-            first: '« esimene'
-            last: 'viimane »'
+            previous: '‹ previous'
+            next: 'next ›'
+            first: '« first'
+            last: 'last »'
           expose:
-            items_per_page_label: 'Kirjeid lehel'
-            items_per_page_options_all_label: '- Kõik -'
-            offset_label: Nihe
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       fields:
         redirect_source__path:
-          label: Kellelt
+          label: From
           separator: ', '
         created:
-          label: Loodud
+          label: Created
       filters:
         redirect_source__path:
           expose:
-            label: Kellelt
+            label: From
         redirect_redirect__uri:
           expose:
-            label: Kellele
+            label: To
         language:
           expose:
-            label: 'Algne keel'
-      title: 'Suunatakse ümber'
+            label: 'Original language'
+      title: Redirect
   page_1:
-    display_title: Lehekülg
+    display_title: Page
diff --git a/conf/cmi/language/et/views.view.scheduler_scheduled_content.yml b/conf/cmi/language/et/views.view.scheduler_scheduled_content.yml
index 35dea7dc1..d60c2b4a6 100644
--- a/conf/cmi/language/et/views.view.scheduler_scheduled_content.yml
+++ b/conf/cmi/language/et/views.view.scheduler_scheduled_content.yml
@@ -3,18 +3,18 @@ display:
     display_options:
       exposed_form:
         options:
-          submit_button: Filtreeri
-          reset_button_label: Tühista
-          exposed_sorts_label: 'Sorteerimise alus'
-          sort_asc_label: Kasvav
-          sort_desc_label: Kahanev
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       pager:
         options:
           tags:
-            previous: '‹ eelmine'
-            next: 'järgmine ›'
-            first: '« esimene'
-            last: 'viimane »'
+            previous: '‹ previous'
+            next: 'next ›'
+            first: '« first'
+            last: 'last »'
       fields:
         node_bulk_form:
           action_title: Tegevus
@@ -60,7 +60,7 @@ display:
         langcode:
           expose:
             label: Keel
-    display_title: Peamine
+    display_title: Master
   overview:
     display_options:
       menu:
diff --git a/conf/cmi/language/et/views.view.taxonomy_term.yml b/conf/cmi/language/et/views.view.taxonomy_term.yml
index 7b482ef73..279f80405 100644
--- a/conf/cmi/language/et/views.view.taxonomy_term.yml
+++ b/conf/cmi/language/et/views.view.taxonomy_term.yml
@@ -10,16 +10,16 @@ display:
             next: ››
             previous: ‹‹
           expose:
-            items_per_page_label: 'Kirjeid lehel'
-            items_per_page_options_all_label: '- Kõik -'
-            offset_label: Nihe
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
           submit_button: Rakenda
-          reset_button_label: Tühista
-          exposed_sorts_label: 'Sorteerimise alus'
-          sort_asc_label: Kasvav
-          sort_desc_label: Kahanev
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       arguments:
         tid:
           exception:
@@ -28,4 +28,4 @@ display:
   feed_1:
     display_title: Andmevoog
   page_1:
-    display_title: Lehekülg
+    display_title: Page
diff --git a/conf/cmi/language/et/views.view.user_admin_people.yml b/conf/cmi/language/et/views.view.user_admin_people.yml
index dd52ef33d..b15444b82 100644
--- a/conf/cmi/language/et/views.view.user_admin_people.yml
+++ b/conf/cmi/language/et/views.view.user_admin_people.yml
@@ -33,16 +33,16 @@ display:
             first: '« Esimene'
             last: 'Viimane »'
           expose:
-            items_per_page_label: 'Kirjeid lehel'
-            items_per_page_options_all_label: '- Kõik -'
-            offset_label: Nihe
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
-          submit_button: Filtreeri
-          reset_button_label: Tühista
-          exposed_sorts_label: 'Sorteerimise alus'
-          sort_asc_label: Kasvav
-          sort_desc_label: Kahanev
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       empty:
         area_text_custom:
           content: 'Inimesed puuduvad.'
@@ -66,7 +66,7 @@ display:
             label: Õigus
       use_more_text: veel
   page_1:
-    display_title: Lehekülg
+    display_title: Page
     display_options:
       menu:
         title: Nimekiri
diff --git a/conf/cmi/language/et/views.view.who_s_new.yml b/conf/cmi/language/et/views.view.who_s_new.yml
index 97ebdf61b..2d786cd27 100644
--- a/conf/cmi/language/et/views.view.who_s_new.yml
+++ b/conf/cmi/language/et/views.view.who_s_new.yml
@@ -8,10 +8,10 @@ display:
       exposed_form:
         options:
           submit_button: Rakenda
-          reset_button_label: Tühista
-          exposed_sorts_label: 'Sorteerimise alus'
-          sort_asc_label: Kasvav
-          sort_desc_label: Kahanev
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
   block_1:
     display_title: 'Uued kasutajad'
     display_options:
diff --git a/conf/cmi/language/et/views.view.who_s_online.yml b/conf/cmi/language/et/views.view.who_s_online.yml
index 1d0180a27..a492e513e 100644
--- a/conf/cmi/language/et/views.view.who_s_online.yml
+++ b/conf/cmi/language/et/views.view.who_s_online.yml
@@ -8,10 +8,10 @@ display:
       exposed_form:
         options:
           submit_button: Rakenda
-          reset_button_label: Tühista
-          exposed_sorts_label: 'Sorteerimise alus'
-          sort_asc_label: Kasvav
-          sort_desc_label: Kahanev
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       empty:
         area_text_custom:
           content: 'Hetkel on lehel 0 kasutajat.'
diff --git a/conf/cmi/language/fa/views.view.archive.yml b/conf/cmi/language/fa/views.view.archive.yml
index 59d213cf5..07411af6f 100644
--- a/conf/cmi/language/fa/views.view.archive.yml
+++ b/conf/cmi/language/fa/views.view.archive.yml
@@ -7,17 +7,17 @@ display:
       pager:
         options:
           expose:
-            items_per_page_label: 'آیتم‌ها در هر صفحه'
-            items_per_page_options_all_label: '- همه -'
-            offset_label: جابجایی
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
           submit_button: تایید
-          reset_button_label: بازنشانی
-          exposed_sorts_label: 'مرتب کن بر اساس'
-          sort_asc_label: صعودی
-          sort_desc_label: نزولی
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
   block_1:
     display_title: بلوک
   page_1:
-    display_title: صفحه
+    display_title: Page
diff --git a/conf/cmi/language/fa/views.view.content.yml b/conf/cmi/language/fa/views.view.content.yml
index b7760092f..d012f717c 100644
--- a/conf/cmi/language/fa/views.view.content.yml
+++ b/conf/cmi/language/fa/views.view.content.yml
@@ -25,11 +25,11 @@ display:
           label: زبان
       exposed_form:
         options:
-          submit_button: فیلتر
-          reset_button_label: بازنشانی
-          exposed_sorts_label: 'مرتب کن بر اساس'
-          sort_asc_label: صعودی
-          sort_desc_label: نزولی
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       empty:
         area_text_custom:
           content: 'هیچ محتوایی در دسترس نیست.'
@@ -52,7 +52,7 @@ display:
           expose:
             label: زبان
   page_1:
-    display_title: صفحه
+    display_title: Page
     display_options:
       menu:
         title: محتوا
diff --git a/conf/cmi/language/fa/views.view.content_recent.yml b/conf/cmi/language/fa/views.view.content_recent.yml
index 489342844..563f89c2b 100644
--- a/conf/cmi/language/fa/views.view.content_recent.yml
+++ b/conf/cmi/language/fa/views.view.content_recent.yml
@@ -7,10 +7,10 @@ display:
       exposed_form:
         options:
           submit_button: تایید
-          reset_button_label: بازنشانی
-          exposed_sorts_label: 'مرتب کن بر اساس'
-          sort_asc_label: صعودی
-          sort_desc_label: نزولی
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       empty:
         area_text_custom:
           content: 'هیچ محتوایی در دسترس نیست.'
diff --git a/conf/cmi/language/fa/views.view.files.yml b/conf/cmi/language/fa/views.view.files.yml
index 7ccd9f1d2..2a09491d2 100644
--- a/conf/cmi/language/fa/views.view.files.yml
+++ b/conf/cmi/language/fa/views.view.files.yml
@@ -25,16 +25,16 @@ display:
       pager:
         options:
           expose:
-            items_per_page_label: 'آیتم‌ها در هر صفحه'
-            items_per_page_options_all_label: '- همه -'
-            offset_label: جابجایی
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
-          submit_button: فیلتر
-          reset_button_label: بازنشانی
-          exposed_sorts_label: 'مرتب کن بر اساس'
-          sort_asc_label: صعودی
-          sort_desc_label: نزولی
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       empty:
         area_text_custom:
           content: 'هیچ فایلی در دسترس نیست.'
@@ -64,9 +64,9 @@ display:
       pager:
         options:
           expose:
-            items_per_page_label: 'آیتم‌ها در هر صفحه'
-            items_per_page_options_all_label: '- همه -'
-            offset_label: جابجایی
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       arguments:
         fid:
           exception:
diff --git a/conf/cmi/language/fa/views.view.glossary.yml b/conf/cmi/language/fa/views.view.glossary.yml
index e4c23122e..651875ba0 100644
--- a/conf/cmi/language/fa/views.view.glossary.yml
+++ b/conf/cmi/language/fa/views.view.glossary.yml
@@ -12,17 +12,17 @@ display:
       pager:
         options:
           expose:
-            items_per_page_label: 'آیتم‌ها در هر صفحه'
-            items_per_page_options_all_label: '- همه -'
-            offset_label: جابجایی
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
           submit_button: تایید
-          reset_button_label: بازنشانی
-          exposed_sorts_label: 'مرتب کن بر اساس'
-          sort_asc_label: صعودی
-          sort_desc_label: نزولی
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
   attachment_1:
     display_title: پیوست
   page_1:
-    display_title: صفحه
+    display_title: Page
diff --git a/conf/cmi/language/fa/views.view.helfi_redirect.yml b/conf/cmi/language/fa/views.view.helfi_redirect.yml
new file mode 100644
index 000000000..cb8bb89be
--- /dev/null
+++ b/conf/cmi/language/fa/views.view.helfi_redirect.yml
@@ -0,0 +1,46 @@
+display:
+  default:
+    display_title: Master
+    display_options:
+      fields:
+        redirect_bulk_form:
+          action_title: 'With selection'
+        redirect_source__path:
+          label: From
+        is_custom:
+          label: Custom
+        created:
+          label: Created
+      pager:
+        options:
+          tags:
+            next: 'next ›'
+            previous: '‹ previous'
+            first: '« first'
+            last: 'last »'
+          expose:
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
+      exposed_form:
+        options:
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      filters:
+        redirect_source__path:
+          expose:
+            label: From
+        redirect_redirect__uri:
+          expose:
+            label: To
+        is_custom:
+          expose:
+            label: Custom
+        status:
+          expose:
+            label: 'منتشر شده'
+  page_1:
+    display_title: Page
diff --git a/conf/cmi/language/fa/views.view.locked_content.yml b/conf/cmi/language/fa/views.view.locked_content.yml
index 804608919..b51fd4064 100644
--- a/conf/cmi/language/fa/views.view.locked_content.yml
+++ b/conf/cmi/language/fa/views.view.locked_content.yml
@@ -1,20 +1,20 @@
 display:
   default:
-    display_title: مدیر
+    display_title: Master
     display_options:
       exposed_form:
         options:
           submit_button: تایید
-          reset_button_label: بازنشانی
-          exposed_sorts_label: 'مرتب کن بر اساس'
-          sort_asc_label: صعودی
-          sort_desc_label: نزولی
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       pager:
         options:
           expose:
-            items_per_page_label: 'آیتم‌ها در هر صفحه'
-            items_per_page_options_all_label: '- همه -'
-            offset_label: جابجایی
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       fields:
         node_bulk_form:
           action_title: عملکرد
@@ -40,4 +40,4 @@ display:
           expose:
             label: عنوان
   page_1:
-    display_title: صفحه
+    display_title: Page
diff --git a/conf/cmi/language/fa/views.view.media.yml b/conf/cmi/language/fa/views.view.media.yml
index 913e8d78a..1ffdaea85 100644
--- a/conf/cmi/language/fa/views.view.media.yml
+++ b/conf/cmi/language/fa/views.view.media.yml
@@ -25,16 +25,16 @@ display:
       pager:
         options:
           expose:
-            items_per_page_label: 'آیتم‌ها در هر صفحه'
-            items_per_page_options_all_label: '- همه -'
-            offset_label: جابجایی
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
-          submit_button: فیلتر
-          reset_button_label: بازنشانی
-          exposed_sorts_label: 'مرتب کن بر اساس'
-          sort_asc_label: صعودی
-          sort_desc_label: نزولی
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       filters:
         bundle:
           expose:
diff --git a/conf/cmi/language/fa/views.view.media_library.yml b/conf/cmi/language/fa/views.view.media_library.yml
index d99bc4557..d5e772cb1 100644
--- a/conf/cmi/language/fa/views.view.media_library.yml
+++ b/conf/cmi/language/fa/views.view.media_library.yml
@@ -9,15 +9,15 @@ display:
       pager:
         options:
           expose:
-            items_per_page_label: 'آیتم‌ها در هر صفحه'
-            items_per_page_options_all_label: '- همه -'
-            offset_label: جابجایی
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
-          reset_button_label: بازنشانی
-          exposed_sorts_label: 'مرتب کن بر اساس'
-          sort_asc_label: صعودی
-          sort_desc_label: نزولی
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       filters:
         status:
           group_info:
@@ -32,7 +32,7 @@ display:
           expose:
             label: زبان
   page:
-    display_title: صفحه
+    display_title: Page
     display_options:
       fields:
         media_bulk_form:
diff --git a/conf/cmi/language/fa/views.view.news.yml b/conf/cmi/language/fa/views.view.news.yml
index d5b6e59c8..4ef46bad4 100644
--- a/conf/cmi/language/fa/views.view.news.yml
+++ b/conf/cmi/language/fa/views.view.news.yml
@@ -8,10 +8,10 @@ display:
       exposed_form:
         options:
           submit_button: تایید
-          reset_button_label: بازنشانی
-          exposed_sorts_label: 'مرتب کن بر اساس'
-          sort_asc_label: صعودی
-          sort_desc_label: نزولی
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       arguments:
         nid:
           exception:
diff --git a/conf/cmi/language/fa/views.view.paragraphs_library.yml b/conf/cmi/language/fa/views.view.paragraphs_library.yml
index a36477ac5..509391bda 100644
--- a/conf/cmi/language/fa/views.view.paragraphs_library.yml
+++ b/conf/cmi/language/fa/views.view.paragraphs_library.yml
@@ -1,20 +1,20 @@
 display:
   default:
-    display_title: مدیر
+    display_title: Master
     display_options:
       exposed_form:
         options:
-          submit_button: فیلتر
-          reset_button_label: بازنشانی
-          exposed_sorts_label: 'مرتب کن بر اساس'
-          sort_asc_label: صعودی
-          sort_desc_label: نزولی
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       pager:
         options:
           expose:
-            items_per_page_label: 'آیتم‌ها در هر صفحه'
-            items_per_page_options_all_label: '- همه -'
-            offset_label: جابجایی
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       fields:
         label:
           label: برچسب
@@ -38,4 +38,4 @@ display:
           expose:
             label: نوع
   page_1:
-    display_title: صفحه
+    display_title: Page
diff --git a/conf/cmi/language/fa/views.view.redirect.yml b/conf/cmi/language/fa/views.view.redirect.yml
index d00c93bd4..14846f6ea 100644
--- a/conf/cmi/language/fa/views.view.redirect.yml
+++ b/conf/cmi/language/fa/views.view.redirect.yml
@@ -1,38 +1,38 @@
 display:
   default:
-    display_title: مدیر
+    display_title: Master
     display_options:
       exposed_form:
         options:
-          submit_button: فیلتر
-          reset_button_label: بازنشانی
-          exposed_sorts_label: 'مرتب کن بر اساس'
-          sort_asc_label: صعودی
-          sort_desc_label: نزولی
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       pager:
         options:
           tags:
-            previous: '‹ قبلی'
-            next: 'بعدی ›'
-            first: '« ابتدا'
-            last: 'انتها »'
+            previous: '‹ previous'
+            next: 'next ›'
+            first: '« first'
+            last: 'last »'
           expose:
-            items_per_page_label: 'آیتم‌ها در هر صفحه'
-            items_per_page_options_all_label: '- همه -'
-            offset_label: جابجایی
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       fields:
         redirect_bulk_form:
-          action_title: 'با انتخاب شده‌ها'
+          action_title: 'With selection'
         redirect_source__path:
-          label: از
+          label: From
         created:
-          label: 'ایجاد گردید'
+          label: Created
       filters:
         redirect_source__path:
           expose:
-            label: از
+            label: From
         redirect_redirect__uri:
           expose:
-            label: به
+            label: To
   page_1:
-    display_title: صفحه
+    display_title: Page
diff --git a/conf/cmi/language/fa/views.view.scheduler_scheduled_content.yml b/conf/cmi/language/fa/views.view.scheduler_scheduled_content.yml
index f7f967e9a..102102f8b 100644
--- a/conf/cmi/language/fa/views.view.scheduler_scheduled_content.yml
+++ b/conf/cmi/language/fa/views.view.scheduler_scheduled_content.yml
@@ -3,18 +3,18 @@ display:
     display_options:
       exposed_form:
         options:
-          submit_button: فیلتر
-          reset_button_label: بازنشانی
-          exposed_sorts_label: 'مرتب کن بر اساس'
-          sort_asc_label: صعودی
-          sort_desc_label: نزولی
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       pager:
         options:
           tags:
-            previous: '‹ قبلی'
-            next: 'بعدی ›'
-            first: '« ابتدا'
-            last: 'انتها »'
+            previous: '‹ previous'
+            next: 'next ›'
+            first: '« first'
+            last: 'last »'
       fields:
         node_bulk_form:
           action_title: عملکرد
@@ -51,7 +51,7 @@ display:
         langcode:
           expose:
             label: زبان
-    display_title: مدیر
+    display_title: Master
   overview:
     display_options:
       tab_options:
diff --git a/conf/cmi/language/fa/views.view.taxonomy_term.yml b/conf/cmi/language/fa/views.view.taxonomy_term.yml
index 39428a3d5..a0185e129 100644
--- a/conf/cmi/language/fa/views.view.taxonomy_term.yml
+++ b/conf/cmi/language/fa/views.view.taxonomy_term.yml
@@ -6,16 +6,16 @@ display:
       pager:
         options:
           expose:
-            items_per_page_label: 'آیتم‌ها در هر صفحه'
-            items_per_page_options_all_label: '- همه -'
-            offset_label: جابجایی
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
           submit_button: تایید
-          reset_button_label: بازنشانی
-          exposed_sorts_label: 'مرتب کن بر اساس'
-          sort_asc_label: صعودی
-          sort_desc_label: نزولی
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       arguments:
         tid:
           exception:
@@ -23,4 +23,4 @@ display:
   feed_1:
     display_title: خوراک
   page_1:
-    display_title: صفحه
+    display_title: Page
diff --git a/conf/cmi/language/fa/views.view.user_admin_people.yml b/conf/cmi/language/fa/views.view.user_admin_people.yml
index 90dc5f44f..08d3d355a 100644
--- a/conf/cmi/language/fa/views.view.user_admin_people.yml
+++ b/conf/cmi/language/fa/views.view.user_admin_people.yml
@@ -28,16 +28,16 @@ display:
       pager:
         options:
           expose:
-            items_per_page_label: 'آیتم‌ها در هر صفحه'
-            items_per_page_options_all_label: '- همه -'
-            offset_label: جابجایی
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
-          submit_button: فیلتر
-          reset_button_label: بازنشانی
-          exposed_sorts_label: 'مرتب کن بر اساس'
-          sort_asc_label: صعودی
-          sort_desc_label: نزولی
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       empty:
         area_text_custom:
           content: 'هیچ فردی در دسترس نیست.'
@@ -61,7 +61,7 @@ display:
             label: مجوز
       use_more_text: بیشتر
   page_1:
-    display_title: صفحه
+    display_title: Page
     display_options:
       menu:
         title: فهرست
diff --git a/conf/cmi/language/fa/views.view.who_s_new.yml b/conf/cmi/language/fa/views.view.who_s_new.yml
index 430436acd..6d9efe3bb 100644
--- a/conf/cmi/language/fa/views.view.who_s_new.yml
+++ b/conf/cmi/language/fa/views.view.who_s_new.yml
@@ -7,10 +7,10 @@ display:
       exposed_form:
         options:
           submit_button: تایید
-          reset_button_label: بازنشانی
-          exposed_sorts_label: 'مرتب کن بر اساس'
-          sort_asc_label: صعودی
-          sort_desc_label: نزولی
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
   block_1:
     display_title: 'کاربران جدید'
     display_options:
diff --git a/conf/cmi/language/fa/views.view.who_s_online.yml b/conf/cmi/language/fa/views.view.who_s_online.yml
index 3539bd91c..d599a4139 100644
--- a/conf/cmi/language/fa/views.view.who_s_online.yml
+++ b/conf/cmi/language/fa/views.view.who_s_online.yml
@@ -6,10 +6,10 @@ display:
       exposed_form:
         options:
           submit_button: تایید
-          reset_button_label: بازنشانی
-          exposed_sorts_label: 'مرتب کن بر اساس'
-          sort_asc_label: صعودی
-          sort_desc_label: نزولی
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       filters:
         access:
           expose:
diff --git a/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml b/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml
index 2a0d8abec..ddec27707 100644
--- a/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml
+++ b/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml
@@ -6,14 +6,6 @@ third_party_settings:
       label: Linkit
     group_main_image:
       label: Pääkuva
-    group_updating_news:
-      label: 'Päivittyvä uutinen'
-      format_settings:
-        description: 'Jätä sisältöalue tyhjäksi päivittyvän uutisen yläpuolelta, jos luot päivittyvän uutisen.<br />Lisää uusin uutispäivitys viimeiseksi. Verkkosivulla uutispäivitykset näytetään lukijalle uusimmasta vanhimpaan.'
-    group_automatically_recommended:
-      label: 'Automaattisesti suositellut sisällöt'
-      format_settings:
-        description: 'Suositellut sisällöt voivat olla uutisia tai artikkeleita. Suositukset perustuvat automaattisesti valittuihin uutisluokkiin. Uutisluokat valitaan sivun sisällön perusteella, kun sivu tallennetaan.'
 content:
   field_content:
     settings:
diff --git a/conf/cmi/language/fi/views.view.helfi_redirect.yml b/conf/cmi/language/fi/views.view.helfi_redirect.yml
index 78822a3cb..039970d49 100644
--- a/conf/cmi/language/fi/views.view.helfi_redirect.yml
+++ b/conf/cmi/language/fi/views.view.helfi_redirect.yml
@@ -5,20 +5,20 @@ display:
         status_code:
           group_info:
             group_items:
-              7:
-                title: '300 Multiple Choices'
               1:
-                title: '300 Multiple Choices'
+                title: '300 Useita valintoja'
               2:
-                title: '301 Moved Permanently'
+                title: '301 Pysyvästi siirretty'
               3:
-                title: '302 Found'
+                title: '302 Löydetty'
               4:
-                title: '303 See Other'
+                title: '303 Kts. toinen'
               5:
-                title: '304 Not Modified'
+                title: '304 Muuttamaton'
               6:
-                title: '305 Use Proxy'
+                title: '305 Käytä proxyä'
+              7:
+                title: '307 Tilapäinen uudelleenohjaus'
             label: Tilakoodi
           expose:
             label: Tilakoodi
@@ -34,6 +34,9 @@ display:
         is_custom:
           expose:
             label: 'Käyttäjän luoma'
+        status:
+          expose:
+            label: Julkaistu
       exposed_form:
         options:
           submit_button: Suodata
@@ -48,10 +51,10 @@ display:
             items_per_page_options_all_label: '- Kaikki -'
             offset_label: Offset
           tags:
-            next: 'next ›'
-            previous: '‹ previous'
-            first: '« first'
-            last: 'last »'
+            previous: '‹ edellinen'
+            next: 'seuraava ›'
+            first: '« ensimmäinen'
+            last: 'viimeinen »'
       fields:
         redirect_bulk_form:
           action_title: Valinnalla
@@ -63,6 +66,9 @@ display:
         is_custom:
           label: 'Käyttäjän luoma'
           separator: ', '
+        status:
+          label: Julkaistu
+          separator: ', '
       empty:
         area_text_custom:
           content: 'Ei ole vielä uudelleenohjaksia.'
diff --git a/conf/cmi/language/fi/views.view.redirect.yml b/conf/cmi/language/fi/views.view.redirect.yml
index f6db234f7..33a42fd66 100644
--- a/conf/cmi/language/fi/views.view.redirect.yml
+++ b/conf/cmi/language/fi/views.view.redirect.yml
@@ -6,19 +6,19 @@ display:
           group_info:
             group_items:
               7:
-                title: '300 Multiple Choices'
+                title: '307 Tilapäinen uudelleenohjaus'
               1:
-                title: '300 Multiple Choices'
+                title: '300 Useita valintoja'
               2:
-                title: '301 Moved Permanently'
+                title: '301 Pysyvästi siirretty'
               3:
-                title: '302 Found'
+                title: '302 Löydetty'
               4:
-                title: '303 See Other'
+                title: '303 Kts. toinen'
               5:
-                title: '304 Not Modified'
+                title: '304 Muuttamaton'
               6:
-                title: '305 Use Proxy'
+                title: '305 Käytä proxyä'
             label: Tilakoodi
           expose:
             label: Tilakoodi
@@ -41,10 +41,10 @@ display:
       pager:
         options:
           tags:
-            previous: '‹ previous'
-            next: 'next ›'
-            first: '« first'
-            last: 'last »'
+            previous: '‹ edellinen'
+            next: 'seuraava ›'
+            first: '« ensimmäinen'
+            last: 'viimeinen »'
           expose:
             items_per_page_label: 'Merkintöjä sivua kohti'
             items_per_page_options_all_label: '- Kaikki -'
diff --git a/conf/cmi/language/fi/views.view.scheduler_scheduled_content.yml b/conf/cmi/language/fi/views.view.scheduler_scheduled_content.yml
index db5a883f8..2f57f70a9 100644
--- a/conf/cmi/language/fi/views.view.scheduler_scheduled_content.yml
+++ b/conf/cmi/language/fi/views.view.scheduler_scheduled_content.yml
@@ -63,10 +63,10 @@ display:
       pager:
         options:
           tags:
-            previous: '‹ previous'
-            next: 'next ›'
-            first: '« first'
-            last: 'last »'
+            previous: '‹ edellinen'
+            next: 'seuraava ›'
+            first: '« ensimmäinen'
+            last: 'viimeinen »'
     display_title: Oletus
   overview:
     display_options:
diff --git a/conf/cmi/language/fr/views.view.archive.yml b/conf/cmi/language/fr/views.view.archive.yml
index f288eca36..3539e86d0 100644
--- a/conf/cmi/language/fr/views.view.archive.yml
+++ b/conf/cmi/language/fr/views.view.archive.yml
@@ -11,14 +11,14 @@ display:
             next: ››
             previous: ‹‹
           expose:
-            items_per_page_label: 'Éléments par page'
-            items_per_page_options_all_label: '- Tout -'
-            offset_label: Décalage
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
           submit_button: Appliquer
-          reset_button_label: Réinitialiser
-          exposed_sorts_label: 'Trier par'
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
           sort_asc_label: Asc
           sort_desc_label: Desc
       arguments:
diff --git a/conf/cmi/language/fr/views.view.content.yml b/conf/cmi/language/fr/views.view.content.yml
index ca5615170..99627fca1 100644
--- a/conf/cmi/language/fr/views.view.content.yml
+++ b/conf/cmi/language/fr/views.view.content.yml
@@ -34,9 +34,9 @@ display:
             last: 'Dernier »'
       exposed_form:
         options:
-          submit_button: Filtrer
-          reset_button_label: Réinitialiser
-          exposed_sorts_label: 'Trier par'
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
           sort_asc_label: Asc
           sort_desc_label: Desc
       empty:
diff --git a/conf/cmi/language/fr/views.view.content_recent.yml b/conf/cmi/language/fr/views.view.content_recent.yml
index 19705fa22..35fce7229 100644
--- a/conf/cmi/language/fr/views.view.content_recent.yml
+++ b/conf/cmi/language/fr/views.view.content_recent.yml
@@ -11,8 +11,8 @@ display:
       exposed_form:
         options:
           submit_button: Appliquer
-          reset_button_label: Réinitialiser
-          exposed_sorts_label: 'Trier par'
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
           sort_asc_label: Asc
           sort_desc_label: Desc
       empty:
diff --git a/conf/cmi/language/fr/views.view.files.yml b/conf/cmi/language/fr/views.view.files.yml
index f57730af0..a46f85f3f 100644
--- a/conf/cmi/language/fr/views.view.files.yml
+++ b/conf/cmi/language/fr/views.view.files.yml
@@ -35,14 +35,14 @@ display:
             next: 'Suivant ›'
             previous: '‹ Précédent'
           expose:
-            items_per_page_label: 'Éléments par page'
-            items_per_page_options_all_label: '- Tout -'
-            offset_label: Décalage
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
-          submit_button: Filtrer
-          reset_button_label: Réinitialiser
-          exposed_sorts_label: 'Trier par'
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
           sort_asc_label: Asc
           sort_desc_label: Desc
       empty:
@@ -83,9 +83,9 @@ display:
             next: 'Suivant ›'
             previous: '‹ Précédent'
           expose:
-            items_per_page_label: 'Éléments par page'
-            items_per_page_options_all_label: '- Tout -'
-            offset_label: Décalage
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       arguments:
         fid:
           exception:
diff --git a/conf/cmi/language/fr/views.view.glossary.yml b/conf/cmi/language/fr/views.view.glossary.yml
index b54815212..e151e4161 100644
--- a/conf/cmi/language/fr/views.view.glossary.yml
+++ b/conf/cmi/language/fr/views.view.glossary.yml
@@ -17,14 +17,14 @@ display:
             next: ››
             previous: ‹‹
           expose:
-            items_per_page_label: 'Éléments par page'
-            items_per_page_options_all_label: '- Tout -'
-            offset_label: Décalage
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
           submit_button: Appliquer
-          reset_button_label: Réinitialiser
-          exposed_sorts_label: 'Trier par'
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
           sort_asc_label: Asc
           sort_desc_label: Desc
   attachment_1:
diff --git a/conf/cmi/language/fr/views.view.helfi_redirect.yml b/conf/cmi/language/fr/views.view.helfi_redirect.yml
new file mode 100644
index 000000000..878cd1a18
--- /dev/null
+++ b/conf/cmi/language/fr/views.view.helfi_redirect.yml
@@ -0,0 +1,80 @@
+label: Redirect
+description: 'List of redirects'
+display:
+  default:
+    display_title: Master
+    display_options:
+      title: Redirect
+      fields:
+        redirect_bulk_form:
+          action_title: 'With selection'
+        redirect_source__path:
+          label: From
+          separator: ', '
+        is_custom:
+          label: Custom
+          separator: ', '
+        created:
+          label: Created
+      pager:
+        options:
+          tags:
+            next: 'next ›'
+            previous: '‹ previous'
+            first: '« first'
+            last: 'last »'
+          expose:
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
+      exposed_form:
+        options:
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      empty:
+        area_text_custom:
+          content: 'There is no redirect yet.'
+      filters:
+        redirect_source__path:
+          expose:
+            label: From
+        redirect_redirect__uri:
+          expose:
+            label: To
+        status_code:
+          expose:
+            label: 'Status code'
+          group_info:
+            label: 'Status code'
+            group_items:
+              1:
+                title: '300 Multiple Choices'
+              2:
+                title: '301 Moved Permanently'
+              3:
+                title: '302 Found'
+              4:
+                title: '303 See Other'
+              5:
+                title: '304 Not Modified'
+              6:
+                title: '305 Use Proxy'
+              7:
+                title: '307 Temporary Redirect'
+        language:
+          expose:
+            label: 'Original language'
+        is_custom:
+          expose:
+            label: Custom
+        status:
+          expose:
+            label: Publié
+  page_1:
+    display_title: Page
+    display_options:
+      menu:
+        title: Redirect
diff --git a/conf/cmi/language/fr/views.view.locked_content.yml b/conf/cmi/language/fr/views.view.locked_content.yml
index 4530fd87c..e6628071e 100644
--- a/conf/cmi/language/fr/views.view.locked_content.yml
+++ b/conf/cmi/language/fr/views.view.locked_content.yml
@@ -1,12 +1,12 @@
 display:
   default:
-    display_title: Maître
+    display_title: Master
     display_options:
       exposed_form:
         options:
           submit_button: Appliquer
-          reset_button_label: Réinitialiser
-          exposed_sorts_label: 'Trier par'
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
           sort_asc_label: Asc
           sort_desc_label: Desc
       pager:
@@ -17,9 +17,9 @@ display:
             first: '« Premier'
             last: 'Dernier »'
           expose:
-            items_per_page_label: 'Éléments par page'
-            items_per_page_options_all_label: '- Tout -'
-            offset_label: Décalage
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       fields:
         node_bulk_form:
           label: 'Formulaire des opérations en masse sur les nœuds'
diff --git a/conf/cmi/language/fr/views.view.media.yml b/conf/cmi/language/fr/views.view.media.yml
index 9daad21d8..4f30114bf 100644
--- a/conf/cmi/language/fr/views.view.media.yml
+++ b/conf/cmi/language/fr/views.view.media.yml
@@ -39,14 +39,14 @@ display:
             first: '« Premier'
             last: 'Dernier »'
           expose:
-            items_per_page_label: 'Éléments par page'
-            items_per_page_options_all_label: '- Tout -'
-            offset_label: Décalage
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
-          submit_button: Filtrer
-          reset_button_label: Réinitialiser
-          exposed_sorts_label: 'Trier par'
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
           sort_asc_label: Asc
           sort_desc_label: Desc
       empty:
diff --git a/conf/cmi/language/fr/views.view.media_library.yml b/conf/cmi/language/fr/views.view.media_library.yml
index 02382c856..f203a14e9 100644
--- a/conf/cmi/language/fr/views.view.media_library.yml
+++ b/conf/cmi/language/fr/views.view.media_library.yml
@@ -14,14 +14,14 @@ display:
             next: ››
             previous: ‹‹
           expose:
-            items_per_page_label: 'Éléments par page'
-            items_per_page_options_all_label: '- Tout -'
-            offset_label: Décalage
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
           submit_button: 'Appliquer les filtres'
-          reset_button_label: Réinitialiser
-          exposed_sorts_label: 'Trier par'
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
           sort_asc_label: Asc
           sort_desc_label: Desc
       empty:
diff --git a/conf/cmi/language/fr/views.view.news.yml b/conf/cmi/language/fr/views.view.news.yml
index 2d946fc3e..3fab0c923 100644
--- a/conf/cmi/language/fr/views.view.news.yml
+++ b/conf/cmi/language/fr/views.view.news.yml
@@ -12,8 +12,8 @@ display:
       exposed_form:
         options:
           submit_button: Appliquer
-          reset_button_label: Réinitialiser
-          exposed_sorts_label: 'Trier par'
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
           sort_asc_label: Asc
           sort_desc_label: Desc
       arguments:
diff --git a/conf/cmi/language/fr/views.view.paragraphs_library.yml b/conf/cmi/language/fr/views.view.paragraphs_library.yml
index b63351d44..77d8f6f87 100644
--- a/conf/cmi/language/fr/views.view.paragraphs_library.yml
+++ b/conf/cmi/language/fr/views.view.paragraphs_library.yml
@@ -1,13 +1,13 @@
 label: 'Bibliothèque de paragraphes'
 display:
   default:
-    display_title: Maître
+    display_title: Master
     display_options:
       exposed_form:
         options:
-          submit_button: Filtrer
-          reset_button_label: Réinitialiser
-          exposed_sorts_label: 'Trier par'
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
           sort_asc_label: Asc
           sort_desc_label: Desc
       pager:
@@ -16,9 +16,9 @@ display:
             previous: ‹‹
             next: ››
           expose:
-            items_per_page_label: 'Éléments par page'
-            items_per_page_options_all_label: '- Tout -'
-            offset_label: Décalage
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       fields:
         label:
           label: Libellé
diff --git a/conf/cmi/language/fr/views.view.redirect.yml b/conf/cmi/language/fr/views.view.redirect.yml
index 88bee5068..8e78170bf 100644
--- a/conf/cmi/language/fr/views.view.redirect.yml
+++ b/conf/cmi/language/fr/views.view.redirect.yml
@@ -1,68 +1,68 @@
-label: Rediriger
-description: 'Liste des redirections'
+label: Redirect
+description: 'List of redirects'
 display:
   default:
-    display_title: Maître
+    display_title: Master
     display_options:
       exposed_form:
         options:
-          submit_button: Filtrer
-          reset_button_label: Réinitialiser
-          exposed_sorts_label: 'Trier par'
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
           sort_asc_label: Asc
           sort_desc_label: Desc
       pager:
         options:
           tags:
-            previous: "‹\_précédent"
-            next: "suivant\_›"
-            first: "«\_premier"
-            last: "dernier\_»"
+            previous: '‹ previous'
+            next: 'next ›'
+            first: '« first'
+            last: 'last »'
           expose:
-            items_per_page_label: 'Éléments par page'
-            items_per_page_options_all_label: '- Tout -'
-            offset_label: Décalage
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       fields:
         redirect_bulk_form:
-          action_title: 'Pour la sélection'
+          action_title: 'With selection'
         redirect_source__path:
-          label: 'A partir de'
+          label: From
           separator: ', '
         created:
-          label: Créé
+          label: Created
       filters:
         redirect_source__path:
           expose:
-            label: 'A partir de'
+            label: From
         redirect_redirect__uri:
           expose:
-            label: À
+            label: To
         status_code:
           expose:
-            label: 'Code du statut'
+            label: 'Status code'
           group_info:
-            label: 'Code du statut'
+            label: 'Status code'
             group_items:
               1:
-                title: '300 Choix Multiples'
+                title: '300 Multiple Choices'
               2:
-                title: '301 Redirection Permanente'
+                title: '301 Moved Permanently'
               3:
-                title: '302 Trouvé'
+                title: '302 Found'
               4:
-                title: '303 Voir Ailleurs'
+                title: '303 See Other'
               5:
-                title: '304 Non Modifié'
+                title: '304 Not Modified'
               6:
-                title: '305 Utilise un Proxy'
+                title: '305 Use Proxy'
               7:
-                title: '307 Redirection Temporaire'
+                title: '307 Temporary Redirect'
         language:
           expose:
-            label: 'Langue initiale'
-      title: Rediriger
+            label: 'Original language'
+      title: Redirect
       empty:
         area_text_custom:
-          content: "Il n'y a pas encore de redirection."
+          content: 'There is no redirect yet.'
   page_1:
     display_title: Page
diff --git a/conf/cmi/language/fr/views.view.scheduler_scheduled_content.yml b/conf/cmi/language/fr/views.view.scheduler_scheduled_content.yml
index ef43a6b62..e5dec122b 100644
--- a/conf/cmi/language/fr/views.view.scheduler_scheduled_content.yml
+++ b/conf/cmi/language/fr/views.view.scheduler_scheduled_content.yml
@@ -4,18 +4,18 @@ display:
     display_options:
       exposed_form:
         options:
-          submit_button: Filtrer
-          reset_button_label: Réinitialiser
-          exposed_sorts_label: 'Trier par'
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
           sort_asc_label: Asc
           sort_desc_label: Desc
       pager:
         options:
           tags:
-            previous: "‹\_précédent"
-            next: "suivant\_›"
-            first: "«\_premier"
-            last: "dernier\_»"
+            previous: '‹ previous'
+            next: 'next ›'
+            first: '« first'
+            last: 'last »'
       fields:
         node_bulk_form:
           action_title: Action
@@ -66,7 +66,7 @@ display:
       empty:
         area_text_custom:
           content: 'No scheduled content.'
-    display_title: Maître
+    display_title: Master
   overview:
     display_options:
       menu:
diff --git a/conf/cmi/language/fr/views.view.taxonomy_term.yml b/conf/cmi/language/fr/views.view.taxonomy_term.yml
index 67e4c4b78..13bcd3360 100644
--- a/conf/cmi/language/fr/views.view.taxonomy_term.yml
+++ b/conf/cmi/language/fr/views.view.taxonomy_term.yml
@@ -10,14 +10,14 @@ display:
             next: ››
             previous: ‹‹
           expose:
-            items_per_page_label: 'Éléments par page'
-            items_per_page_options_all_label: '- Tout -'
-            offset_label: Décalage
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
           submit_button: Appliquer
-          reset_button_label: Réinitialiser
-          exposed_sorts_label: 'Trier par'
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
           sort_asc_label: Asc
           sort_desc_label: Desc
       arguments:
diff --git a/conf/cmi/language/fr/views.view.user_admin_people.yml b/conf/cmi/language/fr/views.view.user_admin_people.yml
index 60223d863..82f6845ad 100644
--- a/conf/cmi/language/fr/views.view.user_admin_people.yml
+++ b/conf/cmi/language/fr/views.view.user_admin_people.yml
@@ -39,14 +39,14 @@ display:
             first: '« Premier'
             last: 'Dernier »'
           expose:
-            items_per_page_label: 'Éléments par page'
-            items_per_page_options_all_label: '- Tout -'
-            offset_label: Décalage
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
-          submit_button: Filtrer
-          reset_button_label: Réinitialiser
-          exposed_sorts_label: 'Trier par'
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
           sort_asc_label: Asc
           sort_desc_label: Desc
       empty:
diff --git a/conf/cmi/language/fr/views.view.who_s_new.yml b/conf/cmi/language/fr/views.view.who_s_new.yml
index 9d8c33b24..8f294bc18 100644
--- a/conf/cmi/language/fr/views.view.who_s_new.yml
+++ b/conf/cmi/language/fr/views.view.who_s_new.yml
@@ -8,8 +8,8 @@ display:
       exposed_form:
         options:
           submit_button: Appliquer
-          reset_button_label: Réinitialiser
-          exposed_sorts_label: 'Trier par'
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
           sort_asc_label: Asc
           sort_desc_label: Desc
   block_1:
diff --git a/conf/cmi/language/fr/views.view.who_s_online.yml b/conf/cmi/language/fr/views.view.who_s_online.yml
index 627954877..5149cd518 100644
--- a/conf/cmi/language/fr/views.view.who_s_online.yml
+++ b/conf/cmi/language/fr/views.view.who_s_online.yml
@@ -8,8 +8,8 @@ display:
       exposed_form:
         options:
           submit_button: Appliquer
-          reset_button_label: Réinitialiser
-          exposed_sorts_label: 'Trier par'
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
           sort_asc_label: Asc
           sort_desc_label: Desc
       empty:
diff --git a/conf/cmi/language/ru/views.view.archive.yml b/conf/cmi/language/ru/views.view.archive.yml
index b2ad3ea27..cdd65c064 100644
--- a/conf/cmi/language/ru/views.view.archive.yml
+++ b/conf/cmi/language/ru/views.view.archive.yml
@@ -11,16 +11,16 @@ display:
             next: ››
             previous: ‹‹
           expose:
-            items_per_page_label: 'Элементов на страницу'
-            items_per_page_options_all_label: '- Все -'
-            offset_label: Пропустить
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
           submit_button: Применить
-          reset_button_label: Сбросить
-          exposed_sorts_label: 'Сортировать по'
-          sort_asc_label: 'По возрастанию'
-          sort_desc_label: 'По убыванию'
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       arguments:
         created_year_month:
           title: '{{ arguments.created_year_month }}'
@@ -31,4 +31,4 @@ display:
         created_year_month:
           title: '{{ arguments.created_year_month }}'
   page_1:
-    display_title: Страница
+    display_title: Page
diff --git a/conf/cmi/language/ru/views.view.content.yml b/conf/cmi/language/ru/views.view.content.yml
index 0cab959b4..a333ae8e1 100644
--- a/conf/cmi/language/ru/views.view.content.yml
+++ b/conf/cmi/language/ru/views.view.content.yml
@@ -34,11 +34,11 @@ display:
             last: 'Последняя »'
       exposed_form:
         options:
-          submit_button: Фильтр
-          reset_button_label: Сбросить
-          exposed_sorts_label: 'Сортировать по'
-          sort_asc_label: 'По возрастанию'
-          sort_desc_label: 'По убыванию'
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       empty:
         area_text_custom:
           content: 'Нет доступных материалов.'
@@ -61,7 +61,7 @@ display:
           expose:
             label: Язык
   page_1:
-    display_title: Страница
+    display_title: Page
     display_options:
       menu:
         title: Содержимое
diff --git a/conf/cmi/language/ru/views.view.content_recent.yml b/conf/cmi/language/ru/views.view.content_recent.yml
index b79c40eb1..2bed0b7a3 100644
--- a/conf/cmi/language/ru/views.view.content_recent.yml
+++ b/conf/cmi/language/ru/views.view.content_recent.yml
@@ -9,10 +9,10 @@ display:
       exposed_form:
         options:
           submit_button: Применить
-          reset_button_label: Сбросить
-          exposed_sorts_label: 'Сортировать по'
-          sort_asc_label: 'По возрастанию'
-          sort_desc_label: 'По убыванию'
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       empty:
         area_text_custom:
           content: 'Нет доступных материалов.'
diff --git a/conf/cmi/language/ru/views.view.files.yml b/conf/cmi/language/ru/views.view.files.yml
index 564788fc4..81438f2d5 100644
--- a/conf/cmi/language/ru/views.view.files.yml
+++ b/conf/cmi/language/ru/views.view.files.yml
@@ -35,16 +35,16 @@ display:
             next: 'Следующий ›'
             previous: '‹ Предыдущий'
           expose:
-            items_per_page_label: 'Элементов на страницу'
-            items_per_page_options_all_label: '- Все -'
-            offset_label: Пропустить
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
-          submit_button: Фильтр
-          reset_button_label: Сбросить
-          exposed_sorts_label: 'Сортировать по'
-          sort_asc_label: 'По возрастанию'
-          sort_desc_label: 'По убыванию'
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       empty:
         area_text_custom:
           content: 'Нет доступных файлов.'
@@ -83,9 +83,9 @@ display:
             next: 'Следующий ›'
             previous: '‹ Предыдущий'
           expose:
-            items_per_page_label: 'Элементов на страницу'
-            items_per_page_options_all_label: '- Все -'
-            offset_label: Пропустить
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       arguments:
         fid:
           exception:
diff --git a/conf/cmi/language/ru/views.view.glossary.yml b/conf/cmi/language/ru/views.view.glossary.yml
index 222e0677d..75f5b421c 100644
--- a/conf/cmi/language/ru/views.view.glossary.yml
+++ b/conf/cmi/language/ru/views.view.glossary.yml
@@ -17,20 +17,20 @@ display:
             next: ››
             previous: ‹‹
           expose:
-            items_per_page_label: 'Элементов на страницу'
-            items_per_page_options_all_label: '- Все -'
-            offset_label: Пропустить
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
           submit_button: Применить
-          reset_button_label: Сбросить
-          exposed_sorts_label: 'Сортировать по'
-          sort_asc_label: 'По возрастанию'
-          sort_desc_label: 'По убыванию'
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
   attachment_1:
     display_title: Вложение
   page_1:
-    display_title: Страница
+    display_title: Page
     display_options:
       menu:
         title: Глоссарий
diff --git a/conf/cmi/language/ru/views.view.helfi_redirect.yml b/conf/cmi/language/ru/views.view.helfi_redirect.yml
new file mode 100644
index 000000000..589864427
--- /dev/null
+++ b/conf/cmi/language/ru/views.view.helfi_redirect.yml
@@ -0,0 +1,79 @@
+label: Redirect
+display:
+  default:
+    display_title: Master
+    display_options:
+      title: Redirect
+      fields:
+        redirect_bulk_form:
+          action_title: 'With selection'
+        redirect_source__path:
+          label: From
+          separator: ', '
+        is_custom:
+          label: Custom
+          separator: ', '
+        created:
+          label: Created
+      pager:
+        options:
+          tags:
+            next: 'next ›'
+            previous: '‹ previous'
+            first: '« first'
+            last: 'last »'
+          expose:
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
+      exposed_form:
+        options:
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      empty:
+        area_text_custom:
+          content: 'There is no redirect yet.'
+      filters:
+        redirect_source__path:
+          expose:
+            label: From
+        redirect_redirect__uri:
+          expose:
+            label: To
+        status_code:
+          expose:
+            label: 'Status code'
+          group_info:
+            label: 'Status code'
+            group_items:
+              1:
+                title: '300 Multiple Choices'
+              2:
+                title: '301 Moved Permanently'
+              3:
+                title: '302 Found'
+              4:
+                title: '303 See Other'
+              5:
+                title: '304 Not Modified'
+              6:
+                title: '305 Use Proxy'
+              7:
+                title: '307 Temporary Redirect'
+        language:
+          expose:
+            label: 'Original language'
+        is_custom:
+          expose:
+            label: Custom
+        status:
+          expose:
+            label: Опубликовано
+  page_1:
+    display_title: Page
+    display_options:
+      menu:
+        title: Redirect
diff --git a/conf/cmi/language/ru/views.view.locked_content.yml b/conf/cmi/language/ru/views.view.locked_content.yml
index 79471ce64..66db0d52c 100644
--- a/conf/cmi/language/ru/views.view.locked_content.yml
+++ b/conf/cmi/language/ru/views.view.locked_content.yml
@@ -1,14 +1,14 @@
 display:
   default:
-    display_title: Основной
+    display_title: Master
     display_options:
       exposed_form:
         options:
           submit_button: Применить
-          reset_button_label: Сбросить
-          exposed_sorts_label: 'Сортировать по'
-          sort_asc_label: 'По возрастанию'
-          sort_desc_label: 'По убыванию'
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       pager:
         options:
           tags:
@@ -17,9 +17,9 @@ display:
             first: '« Первая'
             last: 'Последняя »'
           expose:
-            items_per_page_label: 'Элементов на страницу'
-            items_per_page_options_all_label: '- Все -'
-            offset_label: Пропустить
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       fields:
         node_bulk_form:
           label: 'Форма массовых операций с материалами'
@@ -50,4 +50,4 @@ display:
           expose:
             label: Заголовок
   page_1:
-    display_title: Страница
+    display_title: Page
diff --git a/conf/cmi/language/ru/views.view.media.yml b/conf/cmi/language/ru/views.view.media.yml
index 26ae62b48..a2d2ffc2e 100644
--- a/conf/cmi/language/ru/views.view.media.yml
+++ b/conf/cmi/language/ru/views.view.media.yml
@@ -39,16 +39,16 @@ display:
             first: '« Первая'
             last: 'Последняя »'
           expose:
-            items_per_page_label: 'Элементов на страницу'
-            items_per_page_options_all_label: '- Все -'
-            offset_label: Пропустить
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
-          submit_button: Фильтр
-          reset_button_label: Сбросить
-          exposed_sorts_label: 'Сортировать по'
-          sort_asc_label: 'По возрастанию'
-          sort_desc_label: 'По убыванию'
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       empty:
         area_text_custom:
           content: 'Мультимедийных файлов не найдено.'
diff --git a/conf/cmi/language/ru/views.view.media_library.yml b/conf/cmi/language/ru/views.view.media_library.yml
index 5b2c71b65..0501a6ea2 100644
--- a/conf/cmi/language/ru/views.view.media_library.yml
+++ b/conf/cmi/language/ru/views.view.media_library.yml
@@ -14,16 +14,16 @@ display:
             next: ››
             previous: ‹‹
           expose:
-            items_per_page_label: 'Элементов на страницу'
-            items_per_page_options_all_label: '- Все -'
-            offset_label: Пропустить
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
           submit_button: 'Применить фильтры'
-          reset_button_label: Сбросить
-          exposed_sorts_label: 'Сортировать по'
-          sort_asc_label: 'По возрастанию'
-          sort_desc_label: 'По убыванию'
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       empty:
         area_text_custom:
           content: 'Мультимедийных файлов не найдено.'
@@ -58,7 +58,7 @@ display:
           expose:
             label: Язык
   page:
-    display_title: Страница
+    display_title: Page
     display_options:
       fields:
         media_bulk_form:
diff --git a/conf/cmi/language/ru/views.view.news.yml b/conf/cmi/language/ru/views.view.news.yml
index ad53cf074..99b06d73d 100644
--- a/conf/cmi/language/ru/views.view.news.yml
+++ b/conf/cmi/language/ru/views.view.news.yml
@@ -12,10 +12,10 @@ display:
       exposed_form:
         options:
           submit_button: Применить
-          reset_button_label: Сбросить
-          exposed_sorts_label: 'Сортировать по'
-          sort_asc_label: 'По возрастанию'
-          sort_desc_label: 'По убыванию'
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       arguments:
         nid:
           exception:
diff --git a/conf/cmi/language/ru/views.view.paragraphs_library.yml b/conf/cmi/language/ru/views.view.paragraphs_library.yml
index b17d375d9..a467b252c 100644
--- a/conf/cmi/language/ru/views.view.paragraphs_library.yml
+++ b/conf/cmi/language/ru/views.view.paragraphs_library.yml
@@ -1,24 +1,24 @@
 label: 'Библиотека параграфов'
 display:
   default:
-    display_title: Основной
+    display_title: Master
     display_options:
       exposed_form:
         options:
-          submit_button: Фильтр
-          reset_button_label: Сбросить
-          exposed_sorts_label: 'Сортировать по'
-          sort_asc_label: 'По возрастанию'
-          sort_desc_label: 'По убыванию'
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       pager:
         options:
           tags:
             previous: ‹‹
             next: ››
           expose:
-            items_per_page_label: 'Элементов на страницу'
-            items_per_page_options_all_label: '- Все -'
-            offset_label: Пропустить
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       fields:
         label:
           label: Метка
@@ -57,4 +57,4 @@ display:
         area_text_custom:
           content: 'В библиотеке нет доступных элементов.'
   page_1:
-    display_title: Страница
+    display_title: Page
diff --git a/conf/cmi/language/ru/views.view.redirect.yml b/conf/cmi/language/ru/views.view.redirect.yml
index c4a7feb9f..870d00cf0 100644
--- a/conf/cmi/language/ru/views.view.redirect.yml
+++ b/conf/cmi/language/ru/views.view.redirect.yml
@@ -1,67 +1,67 @@
-label: Переадресация
+label: Redirect
 display:
   default:
-    display_title: Основной
+    display_title: Master
     display_options:
       exposed_form:
         options:
-          submit_button: Фильтр
-          reset_button_label: Сбросить
-          exposed_sorts_label: 'Сортировать по'
-          sort_asc_label: 'По возрастанию'
-          sort_desc_label: 'По убыванию'
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       pager:
         options:
           tags:
-            previous: '‹ предыдущая'
-            next: 'следующая ›'
-            first: '« первая'
-            last: 'последняя »'
+            previous: '‹ previous'
+            next: 'next ›'
+            first: '« first'
+            last: 'last »'
           expose:
-            items_per_page_label: 'Элементов на страницу'
-            items_per_page_options_all_label: '- Все -'
-            offset_label: Пропустить
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       fields:
         redirect_bulk_form:
-          action_title: 'С выделенным'
+          action_title: 'With selection'
         redirect_source__path:
-          label: От
+          label: From
           separator: ', '
         created:
-          label: Создано
+          label: Created
       filters:
         redirect_source__path:
           expose:
-            label: От
+            label: From
         redirect_redirect__uri:
           expose:
-            label: Кому
+            label: To
         status_code:
           expose:
-            label: 'Код состояния'
+            label: 'Status code'
           group_info:
-            label: 'Код состояния'
+            label: 'Status code'
             group_items:
               1:
-                title: '300 Множество Выборов'
+                title: '300 Multiple Choices'
               2:
-                title: '301 Перемещёно Окончательно'
+                title: '301 Moved Permanently'
               3:
-                title: '302 Найдено'
+                title: '302 Found'
               4:
-                title: '303 Смотреть Другое'
+                title: '303 See Other'
               5:
-                title: '304 Не Изменялось'
+                title: '304 Not Modified'
               6:
-                title: '305 Использовать Прокси'
+                title: '305 Use Proxy'
               7:
-                title: '307 - Временно перемещено'
+                title: '307 Temporary Redirect'
         language:
           expose:
-            label: 'Язык оригинала'
-      title: Переадресация
+            label: 'Original language'
+      title: Redirect
       empty:
         area_text_custom:
-          content: 'Перенаправлений пока нет.'
+          content: 'There is no redirect yet.'
   page_1:
-    display_title: Страница
+    display_title: Page
diff --git a/conf/cmi/language/ru/views.view.scheduler_scheduled_content.yml b/conf/cmi/language/ru/views.view.scheduler_scheduled_content.yml
index a0d67512d..c70767c88 100644
--- a/conf/cmi/language/ru/views.view.scheduler_scheduled_content.yml
+++ b/conf/cmi/language/ru/views.view.scheduler_scheduled_content.yml
@@ -4,18 +4,18 @@ display:
     display_options:
       exposed_form:
         options:
-          submit_button: Фильтр
-          reset_button_label: Сбросить
-          exposed_sorts_label: 'Сортировать по'
-          sort_asc_label: 'По возрастанию'
-          sort_desc_label: 'По убыванию'
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       pager:
         options:
           tags:
-            previous: '‹ предыдущая'
-            next: 'следующая ›'
-            first: '« первая'
-            last: 'последняя »'
+            previous: '‹ previous'
+            next: 'next ›'
+            first: '« first'
+            last: 'last »'
       fields:
         node_bulk_form:
           action_title: Действие
@@ -63,7 +63,7 @@ display:
           expose:
             label: Язык
       title: 'Запланированные материалы'
-    display_title: Основной
+    display_title: Master
   overview:
     display_options:
       menu:
diff --git a/conf/cmi/language/ru/views.view.taxonomy_term.yml b/conf/cmi/language/ru/views.view.taxonomy_term.yml
index e1174d354..e42fb9d24 100644
--- a/conf/cmi/language/ru/views.view.taxonomy_term.yml
+++ b/conf/cmi/language/ru/views.view.taxonomy_term.yml
@@ -10,16 +10,16 @@ display:
             next: ››
             previous: ‹‹
           expose:
-            items_per_page_label: 'Элементов на страницу'
-            items_per_page_options_all_label: '- Все -'
-            offset_label: Пропустить
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
           submit_button: Применить
-          reset_button_label: Сбросить
-          exposed_sorts_label: 'Сортировать по'
-          sort_asc_label: 'По возрастанию'
-          sort_desc_label: 'По убыванию'
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       arguments:
         tid:
           exception:
@@ -28,4 +28,4 @@ display:
   feed_1:
     display_title: 'Поток данных'
   page_1:
-    display_title: Страница
+    display_title: Page
diff --git a/conf/cmi/language/ru/views.view.user_admin_people.yml b/conf/cmi/language/ru/views.view.user_admin_people.yml
index 485aed363..fa88bbf53 100644
--- a/conf/cmi/language/ru/views.view.user_admin_people.yml
+++ b/conf/cmi/language/ru/views.view.user_admin_people.yml
@@ -39,16 +39,16 @@ display:
             first: '« Первая'
             last: 'Последняя »'
           expose:
-            items_per_page_label: 'Элементов на страницу'
-            items_per_page_options_all_label: '- Все -'
-            offset_label: Пропустить
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
-          submit_button: Фильтр
-          reset_button_label: Сбросить
-          exposed_sorts_label: 'Сортировать по'
-          sort_asc_label: 'По возрастанию'
-          sort_desc_label: 'По убыванию'
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       filters:
         combine:
           expose:
@@ -72,7 +72,7 @@ display:
         area_text_custom:
           content: 'No people available.'
   page_1:
-    display_title: Страница
+    display_title: Page
     display_options:
       menu:
         title: Список
diff --git a/conf/cmi/language/ru/views.view.who_s_new.yml b/conf/cmi/language/ru/views.view.who_s_new.yml
index daf06478b..a75a588d5 100644
--- a/conf/cmi/language/ru/views.view.who_s_new.yml
+++ b/conf/cmi/language/ru/views.view.who_s_new.yml
@@ -8,10 +8,10 @@ display:
       exposed_form:
         options:
           submit_button: Применить
-          reset_button_label: Сбросить
-          exposed_sorts_label: 'Сортировать по'
-          sort_asc_label: 'По возрастанию'
-          sort_desc_label: 'По убыванию'
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
   block_1:
     display_title: 'Новые пользователи'
     display_options:
diff --git a/conf/cmi/language/ru/views.view.who_s_online.yml b/conf/cmi/language/ru/views.view.who_s_online.yml
index 729f66fe6..842a89ffe 100644
--- a/conf/cmi/language/ru/views.view.who_s_online.yml
+++ b/conf/cmi/language/ru/views.view.who_s_online.yml
@@ -8,10 +8,10 @@ display:
       exposed_form:
         options:
           submit_button: Применить
-          reset_button_label: Сбросить
-          exposed_sorts_label: 'Сортировать по'
-          sort_asc_label: 'По возрастанию'
-          sort_desc_label: 'По убыванию'
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       empty:
         area_text_custom:
           content: 'Сейчас 0 пользователей онлайн.'
diff --git a/conf/cmi/language/se/views.view.archive.yml b/conf/cmi/language/se/views.view.archive.yml
index 9033f05cb..e8cf9e51b 100644
--- a/conf/cmi/language/se/views.view.archive.yml
+++ b/conf/cmi/language/se/views.view.archive.yml
@@ -4,6 +4,6 @@ display:
     display_options:
       exposed_form:
         options:
-          exposed_sorts_label: Sirre
+          exposed_sorts_label: 'Sort by'
   page_1:
-    display_title: Siidu
+    display_title: Page
diff --git a/conf/cmi/language/se/views.view.content.yml b/conf/cmi/language/se/views.view.content.yml
index 678378350..269dcc40d 100644
--- a/conf/cmi/language/se/views.view.content.yml
+++ b/conf/cmi/language/se/views.view.content.yml
@@ -19,7 +19,7 @@ display:
           label: Giella
       exposed_form:
         options:
-          exposed_sorts_label: Sirre
+          exposed_sorts_label: 'Sort by'
       filters:
         title:
           expose:
@@ -36,7 +36,7 @@ display:
           expose:
             label: Giella
   page_1:
-    display_title: Siidu
+    display_title: Page
     display_options:
       menu:
         title: Sisdoallu
diff --git a/conf/cmi/language/se/views.view.content_recent.yml b/conf/cmi/language/se/views.view.content_recent.yml
index 16cfcd037..0a48b83fa 100644
--- a/conf/cmi/language/se/views.view.content_recent.yml
+++ b/conf/cmi/language/se/views.view.content_recent.yml
@@ -3,4 +3,4 @@ display:
     display_options:
       exposed_form:
         options:
-          exposed_sorts_label: Sirre
+          exposed_sorts_label: 'Sort by'
diff --git a/conf/cmi/language/se/views.view.files.yml b/conf/cmi/language/se/views.view.files.yml
index 6115a55e7..8c3bb5790 100644
--- a/conf/cmi/language/se/views.view.files.yml
+++ b/conf/cmi/language/se/views.view.files.yml
@@ -6,7 +6,7 @@ display:
           label: Namma
       exposed_form:
         options:
-          exposed_sorts_label: Sirre
+          exposed_sorts_label: 'Sort by'
   page_2:
     display_options:
       arguments:
diff --git a/conf/cmi/language/se/views.view.glossary.yml b/conf/cmi/language/se/views.view.glossary.yml
index 9369f184a..35d6d1597 100644
--- a/conf/cmi/language/se/views.view.glossary.yml
+++ b/conf/cmi/language/se/views.view.glossary.yml
@@ -8,8 +8,8 @@ display:
           label: Čálli
       exposed_form:
         options:
-          exposed_sorts_label: Sirre
+          exposed_sorts_label: 'Sort by'
   attachment_1:
     display_title: Mielddus
   page_1:
-    display_title: Siidu
+    display_title: Page
diff --git a/conf/cmi/language/se/views.view.helfi_redirect.yml b/conf/cmi/language/se/views.view.helfi_redirect.yml
new file mode 100644
index 000000000..a2a3cd782
--- /dev/null
+++ b/conf/cmi/language/se/views.view.helfi_redirect.yml
@@ -0,0 +1,23 @@
+display:
+  default:
+    display_title: Master
+    display_options:
+      fields:
+        created:
+          label: Created
+      pager:
+        options:
+          tags:
+            next: 'next ›'
+            previous: '‹ previous'
+            first: '« first'
+            last: 'last »'
+      exposed_form:
+        options:
+          exposed_sorts_label: 'Sort by'
+      filters:
+        status:
+          expose:
+            label: Almmuhuvvon
+  page_1:
+    display_title: Page
diff --git a/conf/cmi/language/se/views.view.locked_content.yml b/conf/cmi/language/se/views.view.locked_content.yml
index c6c7071f2..cd1dc4b9c 100644
--- a/conf/cmi/language/se/views.view.locked_content.yml
+++ b/conf/cmi/language/se/views.view.locked_content.yml
@@ -3,7 +3,7 @@ display:
     display_options:
       exposed_form:
         options:
-          exposed_sorts_label: Sirre
+          exposed_sorts_label: 'Sort by'
       fields:
         title:
           label: Bajilčala
@@ -21,6 +21,6 @@ display:
         title:
           expose:
             label: Bajilčala
-    display_title: Default
+    display_title: Master
   page_1:
-    display_title: Siidu
+    display_title: Page
diff --git a/conf/cmi/language/se/views.view.media.yml b/conf/cmi/language/se/views.view.media.yml
index 4613dd58b..764545fd6 100644
--- a/conf/cmi/language/se/views.view.media.yml
+++ b/conf/cmi/language/se/views.view.media.yml
@@ -13,7 +13,7 @@ display:
           label: Ođastuvvon
       exposed_form:
         options:
-          exposed_sorts_label: Sirre
+          exposed_sorts_label: 'Sort by'
       filters:
         bundle:
           expose:
diff --git a/conf/cmi/language/se/views.view.media_library.yml b/conf/cmi/language/se/views.view.media_library.yml
index c21453894..8dc935446 100644
--- a/conf/cmi/language/se/views.view.media_library.yml
+++ b/conf/cmi/language/se/views.view.media_library.yml
@@ -3,7 +3,7 @@ display:
     display_options:
       exposed_form:
         options:
-          exposed_sorts_label: Sirre
+          exposed_sorts_label: 'Sort by'
       filters:
         status:
           group_info:
@@ -18,7 +18,7 @@ display:
           expose:
             label: Giella
   page:
-    display_title: Siidu
+    display_title: Page
     display_options:
       fields:
         edit_media:
diff --git a/conf/cmi/language/se/views.view.news.yml b/conf/cmi/language/se/views.view.news.yml
index 764a5ade8..80e39acfd 100644
--- a/conf/cmi/language/se/views.view.news.yml
+++ b/conf/cmi/language/se/views.view.news.yml
@@ -3,7 +3,7 @@ display:
     display_options:
       exposed_form:
         options:
-          exposed_sorts_label: Sirre
+          exposed_sorts_label: 'Sort by'
       arguments:
         nid:
           exception:
diff --git a/conf/cmi/language/se/views.view.paragraphs_library.yml b/conf/cmi/language/se/views.view.paragraphs_library.yml
index e1b2fc42e..2cc1d214c 100644
--- a/conf/cmi/language/se/views.view.paragraphs_library.yml
+++ b/conf/cmi/language/se/views.view.paragraphs_library.yml
@@ -3,7 +3,7 @@ display:
     display_options:
       exposed_form:
         options:
-          exposed_sorts_label: Sirre
+          exposed_sorts_label: 'Sort by'
       fields:
         type:
           label: Šládja
@@ -13,6 +13,6 @@ display:
         type:
           expose:
             label: Šládja
-    display_title: Default
+    display_title: Master
   page_1:
-    display_title: Siidu
+    display_title: Page
diff --git a/conf/cmi/language/se/views.view.redirect.yml b/conf/cmi/language/se/views.view.redirect.yml
index b50f10be9..c1717a2d3 100644
--- a/conf/cmi/language/se/views.view.redirect.yml
+++ b/conf/cmi/language/se/views.view.redirect.yml
@@ -3,17 +3,17 @@ display:
     display_options:
       exposed_form:
         options:
-          exposed_sorts_label: Sirre
+          exposed_sorts_label: 'Sort by'
       pager:
         options:
           tags:
-            previous: '‹ ovddit'
-            next: 'boahtte ›'
-            first: '« vuosttaš'
-            last: 'maŋemuš »'
+            previous: '‹ previous'
+            next: 'next ›'
+            first: '« first'
+            last: 'last »'
       fields:
         created:
-          label: Almmuhuvvon
-    display_title: Default
+          label: Created
+    display_title: Master
   page_1:
-    display_title: Siidu
+    display_title: Page
diff --git a/conf/cmi/language/se/views.view.scheduler_scheduled_content.yml b/conf/cmi/language/se/views.view.scheduler_scheduled_content.yml
index 4d1f8cac2..cb309502d 100644
--- a/conf/cmi/language/se/views.view.scheduler_scheduled_content.yml
+++ b/conf/cmi/language/se/views.view.scheduler_scheduled_content.yml
@@ -3,14 +3,14 @@ display:
     display_options:
       exposed_form:
         options:
-          exposed_sorts_label: Sirre
+          exposed_sorts_label: 'Sort by'
       pager:
         options:
           tags:
-            previous: '‹ ovddit'
-            next: 'boahtte ›'
-            first: '« vuosttaš'
-            last: 'maŋemuš »'
+            previous: '‹ previous'
+            next: 'next ›'
+            first: '« first'
+            last: 'last »'
       fields:
         title:
           label: Bajilčala
@@ -34,7 +34,7 @@ display:
         langcode:
           expose:
             label: Giella
-    display_title: Default
+    display_title: Master
   overview:
     display_options:
       tab_options:
diff --git a/conf/cmi/language/se/views.view.taxonomy_term.yml b/conf/cmi/language/se/views.view.taxonomy_term.yml
index 7ee85d73b..643014639 100644
--- a/conf/cmi/language/se/views.view.taxonomy_term.yml
+++ b/conf/cmi/language/se/views.view.taxonomy_term.yml
@@ -3,10 +3,10 @@ display:
     display_options:
       exposed_form:
         options:
-          exposed_sorts_label: Sirre
+          exposed_sorts_label: 'Sort by'
       arguments:
         tid:
           exception:
             title: Buot
   page_1:
-    display_title: Siidu
+    display_title: Page
diff --git a/conf/cmi/language/se/views.view.user_admin_people.yml b/conf/cmi/language/se/views.view.user_admin_people.yml
index 11b53e87a..cc132e25a 100644
--- a/conf/cmi/language/se/views.view.user_admin_people.yml
+++ b/conf/cmi/language/se/views.view.user_admin_people.yml
@@ -8,6 +8,6 @@ display:
           label: 'Miellahttu leamaš'
       exposed_form:
         options:
-          exposed_sorts_label: Sirre
+          exposed_sorts_label: 'Sort by'
   page_1:
-    display_title: Siidu
+    display_title: Page
diff --git a/conf/cmi/language/se/views.view.who_s_new.yml b/conf/cmi/language/se/views.view.who_s_new.yml
index a9c83f33f..8250a202d 100644
--- a/conf/cmi/language/se/views.view.who_s_new.yml
+++ b/conf/cmi/language/se/views.view.who_s_new.yml
@@ -3,7 +3,7 @@ display:
     display_options:
       exposed_form:
         options:
-          exposed_sorts_label: Sirre
+          exposed_sorts_label: 'Sort by'
   block_1:
     display_options:
       block_category: Geavaheaddji
diff --git a/conf/cmi/language/se/views.view.who_s_online.yml b/conf/cmi/language/se/views.view.who_s_online.yml
index 16cfcd037..0a48b83fa 100644
--- a/conf/cmi/language/se/views.view.who_s_online.yml
+++ b/conf/cmi/language/se/views.view.who_s_online.yml
@@ -3,4 +3,4 @@ display:
     display_options:
       exposed_form:
         options:
-          exposed_sorts_label: Sirre
+          exposed_sorts_label: 'Sort by'
diff --git a/conf/cmi/language/sv/views.view.helfi_redirect.yml b/conf/cmi/language/sv/views.view.helfi_redirect.yml
index aef24d5d4..08b9bf6d3 100644
--- a/conf/cmi/language/sv/views.view.helfi_redirect.yml
+++ b/conf/cmi/language/sv/views.view.helfi_redirect.yml
@@ -16,6 +16,9 @@ display:
           separator: ', '
         created:
           label: Skapad
+        status:
+          label: Publicerad
+          separator: ', '
       pager:
         options:
           tags:
@@ -58,6 +61,9 @@ display:
         is_custom:
           expose:
             label: Anpassad
+        status:
+          expose:
+            label: Publicerad
   page_1:
     display_title: Sida
     display_options:
diff --git a/conf/cmi/language/uk/views.view.archive.yml b/conf/cmi/language/uk/views.view.archive.yml
index 4ab179e1b..9011a2d86 100644
--- a/conf/cmi/language/uk/views.view.archive.yml
+++ b/conf/cmi/language/uk/views.view.archive.yml
@@ -11,16 +11,16 @@ display:
             next: ››
             previous: ‹‹
           expose:
-            items_per_page_label: 'Елементів на сторінку'
-            items_per_page_options_all_label: '- Усе -'
-            offset_label: Зміщення
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
           submit_button: Apply
-          reset_button_label: Скинути
-          exposed_sorts_label: 'Впорядкувати за'
-          sort_asc_label: Зрост
-          sort_desc_label: Спад
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       arguments:
         created_year_month:
           title: '{{ arguments.created_year_month }}'
@@ -31,4 +31,4 @@ display:
         created_year_month:
           title: '{{ arguments.created_year_month }}'
   page_1:
-    display_title: Сторінка
+    display_title: Page
diff --git a/conf/cmi/language/uk/views.view.content.yml b/conf/cmi/language/uk/views.view.content.yml
index 58260e0e7..527ca7a99 100644
--- a/conf/cmi/language/uk/views.view.content.yml
+++ b/conf/cmi/language/uk/views.view.content.yml
@@ -34,11 +34,11 @@ display:
             last: 'Остання »'
       exposed_form:
         options:
-          submit_button: Фільтр
-          reset_button_label: Скинути
-          exposed_sorts_label: 'Впорядкувати за'
-          sort_asc_label: Зрост
-          sort_desc_label: Спад
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       empty:
         area_text_custom:
           content: 'Матеріали відсутні.'
@@ -61,7 +61,7 @@ display:
           expose:
             label: Мова
   page_1:
-    display_title: Сторінка
+    display_title: Page
     display_options:
       menu:
         title: Вміст
diff --git a/conf/cmi/language/uk/views.view.content_recent.yml b/conf/cmi/language/uk/views.view.content_recent.yml
index aa8b6eea9..189ff6ee1 100644
--- a/conf/cmi/language/uk/views.view.content_recent.yml
+++ b/conf/cmi/language/uk/views.view.content_recent.yml
@@ -11,10 +11,10 @@ display:
       exposed_form:
         options:
           submit_button: Apply
-          reset_button_label: Скинути
-          exposed_sorts_label: 'Впорядкувати за'
-          sort_asc_label: Зрост
-          sort_desc_label: Спад
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       empty:
         area_text_custom:
           content: 'Матеріали відсутні.'
diff --git a/conf/cmi/language/uk/views.view.files.yml b/conf/cmi/language/uk/views.view.files.yml
index e01c14e2a..813aebaeb 100644
--- a/conf/cmi/language/uk/views.view.files.yml
+++ b/conf/cmi/language/uk/views.view.files.yml
@@ -35,16 +35,16 @@ display:
             next: 'Наступна ›'
             previous: '‹ Попередня'
           expose:
-            items_per_page_label: 'Елементів на сторінку'
-            items_per_page_options_all_label: '- Усе -'
-            offset_label: Зміщення
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
-          submit_button: Фільтр
-          reset_button_label: Скинути
-          exposed_sorts_label: 'Впорядкувати за'
-          sort_asc_label: Зрост
-          sort_desc_label: Спад
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       empty:
         area_text_custom:
           content: 'Файли відсутні.'
@@ -83,9 +83,9 @@ display:
             next: 'Наступна ›'
             previous: '‹ Попередня'
           expose:
-            items_per_page_label: 'Елементів на сторінку'
-            items_per_page_options_all_label: '- Усе -'
-            offset_label: Зміщення
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       arguments:
         fid:
           exception:
diff --git a/conf/cmi/language/uk/views.view.glossary.yml b/conf/cmi/language/uk/views.view.glossary.yml
index fb1938bef..4a407e2e7 100644
--- a/conf/cmi/language/uk/views.view.glossary.yml
+++ b/conf/cmi/language/uk/views.view.glossary.yml
@@ -17,20 +17,20 @@ display:
             next: ››
             previous: ‹‹
           expose:
-            items_per_page_label: 'Елементів на сторінку'
-            items_per_page_options_all_label: '- Усе -'
-            offset_label: Зміщення
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
           submit_button: Apply
-          reset_button_label: Скинути
-          exposed_sorts_label: 'Впорядкувати за'
-          sort_asc_label: Зрост
-          sort_desc_label: Спад
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
   attachment_1:
     display_title: Долучення
   page_1:
-    display_title: Сторінка
+    display_title: Page
     display_options:
       menu:
         title: Глосарій
diff --git a/conf/cmi/language/uk/views.view.helfi_redirect.yml b/conf/cmi/language/uk/views.view.helfi_redirect.yml
new file mode 100644
index 000000000..d33d72f36
--- /dev/null
+++ b/conf/cmi/language/uk/views.view.helfi_redirect.yml
@@ -0,0 +1,76 @@
+label: Redirect
+display:
+  default:
+    display_title: Master
+    display_options:
+      title: Redirect
+      fields:
+        redirect_bulk_form:
+          action_title: 'With selection'
+        redirect_source__path:
+          label: From
+          separator: ', '
+        is_custom:
+          label: Custom
+          separator: ', '
+        created:
+          label: Created
+      pager:
+        options:
+          tags:
+            next: 'next ›'
+            previous: '‹ previous'
+            first: '« first'
+            last: 'last »'
+          expose:
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
+      exposed_form:
+        options:
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      filters:
+        redirect_source__path:
+          expose:
+            label: From
+        redirect_redirect__uri:
+          expose:
+            label: To
+        status_code:
+          expose:
+            label: 'Status code'
+          group_info:
+            label: 'Status code'
+            group_items:
+              1:
+                title: '300 Multiple Choices'
+              2:
+                title: '301 Moved Permanently'
+              3:
+                title: '302 Found'
+              4:
+                title: '303 See Other'
+              5:
+                title: '304 Not Modified'
+              6:
+                title: '305 Use Proxy'
+              7:
+                title: '307 Temporary Redirect'
+        language:
+          expose:
+            label: 'Original language'
+        is_custom:
+          expose:
+            label: Custom
+        status:
+          expose:
+            label: Опубліковано
+  page_1:
+    display_title: Page
+    display_options:
+      menu:
+        title: Redirect
diff --git a/conf/cmi/language/uk/views.view.locked_content.yml b/conf/cmi/language/uk/views.view.locked_content.yml
index 01eda9af7..284b8b061 100644
--- a/conf/cmi/language/uk/views.view.locked_content.yml
+++ b/conf/cmi/language/uk/views.view.locked_content.yml
@@ -1,14 +1,14 @@
 display:
   default:
-    display_title: Головне
+    display_title: Master
     display_options:
       exposed_form:
         options:
           submit_button: Apply
-          reset_button_label: Скинути
-          exposed_sorts_label: 'Впорядкувати за'
-          sort_asc_label: Зрост
-          sort_desc_label: Спад
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       pager:
         options:
           tags:
@@ -17,9 +17,9 @@ display:
             first: '« Перша'
             last: 'Остання »'
           expose:
-            items_per_page_label: 'Елементів на сторінку'
-            items_per_page_options_all_label: '- Усе -'
-            offset_label: Зміщення
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       fields:
         node_bulk_form:
           label: 'Пакетна форма операцій з матеріалом'
@@ -50,4 +50,4 @@ display:
           expose:
             label: Заголовок
   page_1:
-    display_title: Сторінка
+    display_title: Page
diff --git a/conf/cmi/language/uk/views.view.media.yml b/conf/cmi/language/uk/views.view.media.yml
index ac7851658..f895f1f15 100644
--- a/conf/cmi/language/uk/views.view.media.yml
+++ b/conf/cmi/language/uk/views.view.media.yml
@@ -39,16 +39,16 @@ display:
             first: '« Перша'
             last: 'Остання »'
           expose:
-            items_per_page_label: 'Елементів на сторінку'
-            items_per_page_options_all_label: '- Усе -'
-            offset_label: Зміщення
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
-          submit_button: Фільтр
-          reset_button_label: Скинути
-          exposed_sorts_label: 'Впорядкувати за'
-          sort_asc_label: Зрост
-          sort_desc_label: Спад
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       empty:
         area_text_custom:
           content: 'Мультимедійних файлів не знайдено.'
diff --git a/conf/cmi/language/uk/views.view.media_library.yml b/conf/cmi/language/uk/views.view.media_library.yml
index b4dd85a10..171b2d35c 100644
--- a/conf/cmi/language/uk/views.view.media_library.yml
+++ b/conf/cmi/language/uk/views.view.media_library.yml
@@ -14,16 +14,16 @@ display:
             next: ››
             previous: ‹‹
           expose:
-            items_per_page_label: 'Елементів на сторінку'
-            items_per_page_options_all_label: '- Усе -'
-            offset_label: Зміщення
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
           submit_button: 'Застосувати фільтри'
-          reset_button_label: Скинути
-          exposed_sorts_label: 'Впорядкувати за'
-          sort_asc_label: Зрост
-          sort_desc_label: Спад
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       empty:
         area_text_custom:
           content: 'Мультимедійних файлів не знайдено.'
@@ -58,7 +58,7 @@ display:
           expose:
             label: Мова
   page:
-    display_title: Сторінка
+    display_title: Page
     display_options:
       fields:
         media_bulk_form:
diff --git a/conf/cmi/language/uk/views.view.news.yml b/conf/cmi/language/uk/views.view.news.yml
index 52f554097..5f9df8055 100644
--- a/conf/cmi/language/uk/views.view.news.yml
+++ b/conf/cmi/language/uk/views.view.news.yml
@@ -12,10 +12,10 @@ display:
       exposed_form:
         options:
           submit_button: Apply
-          reset_button_label: Скинути
-          exposed_sorts_label: 'Впорядкувати за'
-          sort_asc_label: Зрост
-          sort_desc_label: Спад
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       arguments:
         nid:
           exception:
diff --git a/conf/cmi/language/uk/views.view.paragraphs_library.yml b/conf/cmi/language/uk/views.view.paragraphs_library.yml
index 9f202a596..09a19f23e 100644
--- a/conf/cmi/language/uk/views.view.paragraphs_library.yml
+++ b/conf/cmi/language/uk/views.view.paragraphs_library.yml
@@ -1,23 +1,23 @@
 display:
   default:
-    display_title: Головне
+    display_title: Master
     display_options:
       exposed_form:
         options:
-          submit_button: Фільтр
-          reset_button_label: Скинути
-          exposed_sorts_label: 'Впорядкувати за'
-          sort_asc_label: Зрост
-          sort_desc_label: Спад
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       pager:
         options:
           tags:
             previous: ‹‹
             next: ››
           expose:
-            items_per_page_label: 'Елементів на сторінку'
-            items_per_page_options_all_label: '- Усе -'
-            offset_label: Зміщення
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       fields:
         label:
           label: Мітка
@@ -52,4 +52,4 @@ display:
           expose:
             label: Тип
   page_1:
-    display_title: Сторінка
+    display_title: Page
diff --git a/conf/cmi/language/uk/views.view.redirect.yml b/conf/cmi/language/uk/views.view.redirect.yml
index 3cfe80171..9720a087a 100644
--- a/conf/cmi/language/uk/views.view.redirect.yml
+++ b/conf/cmi/language/uk/views.view.redirect.yml
@@ -1,64 +1,64 @@
-label: Переспрямувати
+label: Redirect
 display:
   default:
-    display_title: Головне
+    display_title: Master
     display_options:
       exposed_form:
         options:
-          submit_button: Фільтр
-          reset_button_label: Скинути
-          exposed_sorts_label: 'Впорядкувати за'
-          sort_asc_label: Зрост
-          sort_desc_label: Спад
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       pager:
         options:
           tags:
-            previous: '‹ попередня'
-            next: 'наступна ›'
-            first: '« перша'
-            last: 'остання »'
+            previous: '‹ previous'
+            next: 'next ›'
+            first: '« first'
+            last: 'last »'
           expose:
-            items_per_page_label: 'Елементів на сторінку'
-            items_per_page_options_all_label: '- Усе -'
-            offset_label: Зміщення
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       fields:
         redirect_bulk_form:
-          action_title: 'З вибраним'
+          action_title: 'With selection'
         redirect_source__path:
-          label: Від
+          label: From
           separator: ', '
         created:
-          label: Створено
+          label: Created
       filters:
         redirect_source__path:
           expose:
-            label: Від
+            label: From
         redirect_redirect__uri:
           expose:
-            label: До
+            label: To
         status_code:
           expose:
-            label: 'Код стану'
+            label: 'Status code'
           group_info:
-            label: 'Код стану'
+            label: 'Status code'
             group_items:
               1:
-                title: '300 Безліч Виборів'
+                title: '300 Multiple Choices'
               2:
-                title: '301 Переміщене Остаточно'
+                title: '301 Moved Permanently'
               3:
-                title: '302 Знайдене'
+                title: '302 Found'
               4:
-                title: '303 Дивитися Інше'
+                title: '303 See Other'
               5:
-                title: '304 Не Змінювалося'
+                title: '304 Not Modified'
               6:
-                title: '305 Використовувати Проксі'
+                title: '305 Use Proxy'
               7:
-                title: '307 - Тимчасово переміщене'
+                title: '307 Temporary Redirect'
         language:
           expose:
-            label: 'Мова оригіналу'
-      title: Переспрямувати
+            label: 'Original language'
+      title: Redirect
   page_1:
-    display_title: Сторінка
+    display_title: Page
diff --git a/conf/cmi/language/uk/views.view.scheduler_scheduled_content.yml b/conf/cmi/language/uk/views.view.scheduler_scheduled_content.yml
index 458702bac..9bca45b89 100644
--- a/conf/cmi/language/uk/views.view.scheduler_scheduled_content.yml
+++ b/conf/cmi/language/uk/views.view.scheduler_scheduled_content.yml
@@ -3,18 +3,18 @@ display:
     display_options:
       exposed_form:
         options:
-          submit_button: Фільтр
-          reset_button_label: Скинути
-          exposed_sorts_label: 'Впорядкувати за'
-          sort_asc_label: Зрост
-          sort_desc_label: Спад
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       pager:
         options:
           tags:
-            previous: '‹ попередня'
-            next: 'наступна ›'
-            first: '« перша'
-            last: 'остання »'
+            previous: '‹ previous'
+            next: 'next ›'
+            first: '« first'
+            last: 'last »'
       fields:
         node_bulk_form:
           action_title: Дія
@@ -61,7 +61,7 @@ display:
         langcode:
           expose:
             label: Мова
-    display_title: Головне
+    display_title: Master
   overview:
     display_options:
       menu:
diff --git a/conf/cmi/language/uk/views.view.taxonomy_term.yml b/conf/cmi/language/uk/views.view.taxonomy_term.yml
index 926d62f45..0f5a98b7b 100644
--- a/conf/cmi/language/uk/views.view.taxonomy_term.yml
+++ b/conf/cmi/language/uk/views.view.taxonomy_term.yml
@@ -10,16 +10,16 @@ display:
             next: ››
             previous: ‹‹
           expose:
-            items_per_page_label: 'Елементів на сторінку'
-            items_per_page_options_all_label: '- Усе -'
-            offset_label: Зміщення
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
           submit_button: Apply
-          reset_button_label: Скинути
-          exposed_sorts_label: 'Впорядкувати за'
-          sort_asc_label: Зрост
-          sort_desc_label: Спад
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       arguments:
         tid:
           exception:
@@ -28,4 +28,4 @@ display:
   feed_1:
     display_title: Канал
   page_1:
-    display_title: Сторінка
+    display_title: Page
diff --git a/conf/cmi/language/uk/views.view.user_admin_people.yml b/conf/cmi/language/uk/views.view.user_admin_people.yml
index fb48229d4..ee3d2120c 100644
--- a/conf/cmi/language/uk/views.view.user_admin_people.yml
+++ b/conf/cmi/language/uk/views.view.user_admin_people.yml
@@ -39,16 +39,16 @@ display:
             first: '« Перша'
             last: 'Остання »'
           expose:
-            items_per_page_label: 'Елементів на сторінку'
-            items_per_page_options_all_label: '- Усе -'
-            offset_label: Зміщення
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
-          submit_button: Фільтр
-          reset_button_label: Скинути
-          exposed_sorts_label: 'Впорядкувати за'
-          sort_asc_label: Зрост
-          sort_desc_label: Спад
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       empty:
         area_text_custom:
           content: 'Люди відсутні.'
@@ -72,7 +72,7 @@ display:
             label: Повноваження
       use_more_text: ще
   page_1:
-    display_title: Сторінка
+    display_title: Page
     display_options:
       menu:
         title: Список
diff --git a/conf/cmi/language/uk/views.view.who_s_new.yml b/conf/cmi/language/uk/views.view.who_s_new.yml
index 70ef77ab2..80eca0614 100644
--- a/conf/cmi/language/uk/views.view.who_s_new.yml
+++ b/conf/cmi/language/uk/views.view.who_s_new.yml
@@ -8,10 +8,10 @@ display:
       exposed_form:
         options:
           submit_button: Apply
-          reset_button_label: Скинути
-          exposed_sorts_label: 'Впорядкувати за'
-          sort_asc_label: Зрост
-          sort_desc_label: Спад
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
   block_1:
     display_title: 'Хто новенький'
     display_options:
diff --git a/conf/cmi/language/uk/views.view.who_s_online.yml b/conf/cmi/language/uk/views.view.who_s_online.yml
index f26881491..7d9a0252d 100644
--- a/conf/cmi/language/uk/views.view.who_s_online.yml
+++ b/conf/cmi/language/uk/views.view.who_s_online.yml
@@ -8,10 +8,10 @@ display:
       exposed_form:
         options:
           submit_button: Apply
-          reset_button_label: Скинути
-          exposed_sorts_label: 'Впорядкувати за'
-          sort_asc_label: Зрост
-          sort_desc_label: Спад
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       empty:
         area_text_custom:
           content: 'Зараз 0 користувачів в мережі.'
diff --git a/conf/cmi/language/zh-hans/views.view.archive.yml b/conf/cmi/language/zh-hans/views.view.archive.yml
index cc0220707..4b111817a 100644
--- a/conf/cmi/language/zh-hans/views.view.archive.yml
+++ b/conf/cmi/language/zh-hans/views.view.archive.yml
@@ -11,16 +11,16 @@ display:
             next: ››
             previous: ‹‹
           expose:
-            items_per_page_label: 每页条目数
-            items_per_page_options_all_label: '- 全部 -'
-            offset_label: 偏移量
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
           submit_button: 应用
-          reset_button_label: 重置
-          exposed_sorts_label: 排序依据
-          sort_asc_label: 升序
-          sort_desc_label: 降序
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       arguments:
         created_year_month:
           title: '{{ arguments.created_year_month }}'
@@ -31,4 +31,4 @@ display:
         created_year_month:
           title: '{{ arguments.created_year_month }}'
   page_1:
-    display_title: 页面
+    display_title: Page
diff --git a/conf/cmi/language/zh-hans/views.view.content.yml b/conf/cmi/language/zh-hans/views.view.content.yml
index e82ab62ed..38e23899e 100644
--- a/conf/cmi/language/zh-hans/views.view.content.yml
+++ b/conf/cmi/language/zh-hans/views.view.content.yml
@@ -34,11 +34,11 @@ display:
             last: '末页 »'
       exposed_form:
         options:
-          submit_button: 过滤
-          reset_button_label: 重置
-          exposed_sorts_label: 排序依据
-          sort_asc_label: 升序
-          sort_desc_label: 降序
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       empty:
         area_text_custom:
           content: 没有可用的内容。
@@ -61,7 +61,7 @@ display:
           expose:
             label: 语言
   page_1:
-    display_title: 页面
+    display_title: Page
     display_options:
       menu:
         title: 内容
diff --git a/conf/cmi/language/zh-hans/views.view.content_recent.yml b/conf/cmi/language/zh-hans/views.view.content_recent.yml
index f49f98c98..863e6f414 100644
--- a/conf/cmi/language/zh-hans/views.view.content_recent.yml
+++ b/conf/cmi/language/zh-hans/views.view.content_recent.yml
@@ -11,10 +11,10 @@ display:
       exposed_form:
         options:
           submit_button: 应用
-          reset_button_label: 重置
-          exposed_sorts_label: 排序依据
-          sort_asc_label: 升序
-          sort_desc_label: 降序
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       empty:
         area_text_custom:
           content: 没有可用的内容。
diff --git a/conf/cmi/language/zh-hans/views.view.files.yml b/conf/cmi/language/zh-hans/views.view.files.yml
index 769183413..b570ac1e0 100644
--- a/conf/cmi/language/zh-hans/views.view.files.yml
+++ b/conf/cmi/language/zh-hans/views.view.files.yml
@@ -35,16 +35,16 @@ display:
             next: '下一个 ›'
             previous: '‹ 上一个'
           expose:
-            items_per_page_label: 每页条目数
-            items_per_page_options_all_label: '- 全部 -'
-            offset_label: 偏移量
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
-          submit_button: 过滤
-          reset_button_label: 重置
-          exposed_sorts_label: 排序依据
-          sort_asc_label: 升序
-          sort_desc_label: 降序
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       empty:
         area_text_custom:
           content: 无可用的文件。
@@ -83,9 +83,9 @@ display:
             next: '下一个 ›'
             previous: '‹ 上一个'
           expose:
-            items_per_page_label: 每页条目数
-            items_per_page_options_all_label: '- 全部 -'
-            offset_label: 偏移量
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       arguments:
         fid:
           exception:
diff --git a/conf/cmi/language/zh-hans/views.view.glossary.yml b/conf/cmi/language/zh-hans/views.view.glossary.yml
index d5f9098cc..62478f9bb 100644
--- a/conf/cmi/language/zh-hans/views.view.glossary.yml
+++ b/conf/cmi/language/zh-hans/views.view.glossary.yml
@@ -17,20 +17,20 @@ display:
             next: ››
             previous: ‹‹
           expose:
-            items_per_page_label: 每页条目数
-            items_per_page_options_all_label: '- 全部 -'
-            offset_label: 偏移量
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
           submit_button: 应用
-          reset_button_label: 重置
-          exposed_sorts_label: 排序依据
-          sort_asc_label: 升序
-          sort_desc_label: 降序
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
   attachment_1:
     display_title: 附件
   page_1:
-    display_title: 页面
+    display_title: Page
     display_options:
       menu:
         title: 术语表
diff --git a/conf/cmi/language/zh-hans/views.view.helfi_redirect.yml b/conf/cmi/language/zh-hans/views.view.helfi_redirect.yml
new file mode 100644
index 000000000..73512ee26
--- /dev/null
+++ b/conf/cmi/language/zh-hans/views.view.helfi_redirect.yml
@@ -0,0 +1,73 @@
+label: Redirect
+display:
+  default:
+    display_title: Master
+    display_options:
+      title: Redirect
+      fields:
+        redirect_bulk_form:
+          action_title: 'With selection'
+        redirect_source__path:
+          label: From
+          separator: ', '
+        is_custom:
+          label: Custom
+          separator: ', '
+        created:
+          label: Created
+      pager:
+        options:
+          tags:
+            next: 'next ›'
+            previous: '‹ previous'
+            first: '« first'
+            last: 'last »'
+          expose:
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
+      exposed_form:
+        options:
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      filters:
+        redirect_source__path:
+          expose:
+            label: From
+        redirect_redirect__uri:
+          expose:
+            label: To
+        status_code:
+          group_info:
+            group_items:
+              1:
+                title: '300 Multiple Choices'
+              2:
+                title: '301 Moved Permanently'
+              3:
+                title: '302 Found'
+              4:
+                title: '303 See Other'
+              5:
+                title: '304 Not Modified'
+              6:
+                title: '305 Use Proxy'
+              7:
+                title: '307 Temporary Redirect'
+        language:
+          expose:
+            label: 'Original language'
+        is_custom:
+          expose:
+            label: Custom
+        status:
+          expose:
+            label: 已发布
+  page_1:
+    display_title: Page
+    display_options:
+      menu:
+        title: Redirect
diff --git a/conf/cmi/language/zh-hans/views.view.locked_content.yml b/conf/cmi/language/zh-hans/views.view.locked_content.yml
index 7875d9151..4e3ec6f21 100644
--- a/conf/cmi/language/zh-hans/views.view.locked_content.yml
+++ b/conf/cmi/language/zh-hans/views.view.locked_content.yml
@@ -1,14 +1,14 @@
 display:
   default:
-    display_title: 主
+    display_title: Master
     display_options:
       exposed_form:
         options:
           submit_button: 应用
-          reset_button_label: 重置
-          exposed_sorts_label: 排序依据
-          sort_asc_label: 升序
-          sort_desc_label: 降序
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       pager:
         options:
           tags:
@@ -17,9 +17,9 @@ display:
             first: '« 首页'
             last: '末页 »'
           expose:
-            items_per_page_label: 每页条目数
-            items_per_page_options_all_label: '- 全部 -'
-            offset_label: 偏移量
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       fields:
         node_bulk_form:
           label: 节点操作批量表单
@@ -50,4 +50,4 @@ display:
           expose:
             label: 标题
   page_1:
-    display_title: 页面
+    display_title: Page
diff --git a/conf/cmi/language/zh-hans/views.view.media.yml b/conf/cmi/language/zh-hans/views.view.media.yml
index f7c2678b9..6cd1c0491 100644
--- a/conf/cmi/language/zh-hans/views.view.media.yml
+++ b/conf/cmi/language/zh-hans/views.view.media.yml
@@ -39,16 +39,16 @@ display:
             first: '« 首页'
             last: '末页 »'
           expose:
-            items_per_page_label: 每页条目数
-            items_per_page_options_all_label: '- 全部 -'
-            offset_label: 偏移量
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
-          submit_button: 过滤
-          reset_button_label: 重置
-          exposed_sorts_label: 排序依据
-          sort_asc_label: 升序
-          sort_desc_label: 降序
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       empty:
         area_text_custom:
           content: 没有可用媒体
diff --git a/conf/cmi/language/zh-hans/views.view.media_library.yml b/conf/cmi/language/zh-hans/views.view.media_library.yml
index 05533cccf..be9b7262a 100644
--- a/conf/cmi/language/zh-hans/views.view.media_library.yml
+++ b/conf/cmi/language/zh-hans/views.view.media_library.yml
@@ -14,16 +14,16 @@ display:
             next: ››
             previous: ‹‹
           expose:
-            items_per_page_label: 每页条目数
-            items_per_page_options_all_label: '- 全部 -'
-            offset_label: 偏移量
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
           submit_button: 应用过滤器
-          reset_button_label: 重置
-          exposed_sorts_label: 排序依据
-          sort_asc_label: 升序
-          sort_desc_label: 降序
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       empty:
         area_text_custom:
           content: 没有可用媒体
@@ -58,7 +58,7 @@ display:
           expose:
             label: 语言
   page:
-    display_title: 页面
+    display_title: Page
     display_options:
       fields:
         media_bulk_form:
diff --git a/conf/cmi/language/zh-hans/views.view.news.yml b/conf/cmi/language/zh-hans/views.view.news.yml
index 7fe99375a..9d001c0bf 100644
--- a/conf/cmi/language/zh-hans/views.view.news.yml
+++ b/conf/cmi/language/zh-hans/views.view.news.yml
@@ -12,10 +12,10 @@ display:
       exposed_form:
         options:
           submit_button: 应用
-          reset_button_label: 重置
-          exposed_sorts_label: 排序依据
-          sort_asc_label: 升序
-          sort_desc_label: 降序
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       arguments:
         nid:
           exception:
diff --git a/conf/cmi/language/zh-hans/views.view.paragraphs_library.yml b/conf/cmi/language/zh-hans/views.view.paragraphs_library.yml
index 48623aefe..0534554b6 100644
--- a/conf/cmi/language/zh-hans/views.view.paragraphs_library.yml
+++ b/conf/cmi/language/zh-hans/views.view.paragraphs_library.yml
@@ -1,23 +1,23 @@
 display:
   default:
-    display_title: 主
+    display_title: Master
     display_options:
       exposed_form:
         options:
-          submit_button: 过滤
-          reset_button_label: 重置
-          exposed_sorts_label: 排序依据
-          sort_asc_label: 升序
-          sort_desc_label: 降序
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       pager:
         options:
           tags:
             previous: ‹‹
             next: ››
           expose:
-            items_per_page_label: 每页条目数
-            items_per_page_options_all_label: '- 全部 -'
-            offset_label: 偏移量
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       fields:
         label:
           label: 标签
@@ -51,4 +51,4 @@ display:
           expose:
             label: 类型
   page_1:
-    display_title: 页面
+    display_title: Page
diff --git a/conf/cmi/language/zh-hans/views.view.redirect.yml b/conf/cmi/language/zh-hans/views.view.redirect.yml
index df2e163c3..ba67640b7 100644
--- a/conf/cmi/language/zh-hans/views.view.redirect.yml
+++ b/conf/cmi/language/zh-hans/views.view.redirect.yml
@@ -1,61 +1,61 @@
-label: 重定向
+label: Redirect
 display:
   default:
-    display_title: 主
+    display_title: Master
     display_options:
       exposed_form:
         options:
-          submit_button: 过滤
-          reset_button_label: 重置
-          exposed_sorts_label: 排序依据
-          sort_asc_label: 升序
-          sort_desc_label: 降序
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       pager:
         options:
           tags:
-            previous: '‹ 上一页'
-            next: '下一页 ›'
-            first: '« 第一页'
-            last: '末页 »'
+            previous: '‹ previous'
+            next: 'next ›'
+            first: '« first'
+            last: 'last »'
           expose:
-            items_per_page_label: 每页条目数
-            items_per_page_options_all_label: '- 全部 -'
-            offset_label: 偏移量
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       fields:
         redirect_bulk_form:
-          action_title: 对所选项目
+          action_title: 'With selection'
         redirect_source__path:
-          label: 源自
+          label: From
           separator: ', '
         created:
-          label: 已建立
+          label: Created
       filters:
         redirect_source__path:
           expose:
-            label: 源自
+            label: From
         redirect_redirect__uri:
           expose:
-            label: 到
+            label: To
         status_code:
           group_info:
             group_items:
               1:
-                title: 300多种选择
+                title: '300 Multiple Choices'
               2:
-                title: 301永久移动
+                title: '301 Moved Permanently'
               3:
-                title: 302临时重定向
+                title: '302 Found'
               4:
-                title: 303查看其它位置
+                title: '303 See Other'
               5:
-                title: 304未修改
+                title: '304 Not Modified'
               6:
-                title: 305使用代理
+                title: '305 Use Proxy'
               7:
-                title: 307临时重定向
+                title: '307 Temporary Redirect'
         language:
           expose:
-            label: 原始语言
-      title: 重定向
+            label: 'Original language'
+      title: Redirect
   page_1:
-    display_title: 页面
+    display_title: Page
diff --git a/conf/cmi/language/zh-hans/views.view.scheduler_scheduled_content.yml b/conf/cmi/language/zh-hans/views.view.scheduler_scheduled_content.yml
index 0ee05ccea..1b0dd716b 100644
--- a/conf/cmi/language/zh-hans/views.view.scheduler_scheduled_content.yml
+++ b/conf/cmi/language/zh-hans/views.view.scheduler_scheduled_content.yml
@@ -3,18 +3,18 @@ display:
     display_options:
       exposed_form:
         options:
-          submit_button: 过滤
-          reset_button_label: 重置
-          exposed_sorts_label: 排序依据
-          sort_asc_label: 升序
-          sort_desc_label: 降序
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       pager:
         options:
           tags:
-            previous: '‹ 上一页'
-            next: '下一页 ›'
-            first: '« 第一页'
-            last: '末页 »'
+            previous: '‹ previous'
+            next: 'next ›'
+            first: '« first'
+            last: 'last »'
       fields:
         node_bulk_form:
           action_title: 动作
@@ -61,7 +61,7 @@ display:
         langcode:
           expose:
             label: 语言
-    display_title: 主
+    display_title: Master
   overview:
     display_options:
       menu:
diff --git a/conf/cmi/language/zh-hans/views.view.taxonomy_term.yml b/conf/cmi/language/zh-hans/views.view.taxonomy_term.yml
index 5595470e1..59089b770 100644
--- a/conf/cmi/language/zh-hans/views.view.taxonomy_term.yml
+++ b/conf/cmi/language/zh-hans/views.view.taxonomy_term.yml
@@ -10,16 +10,16 @@ display:
             next: ››
             previous: ‹‹
           expose:
-            items_per_page_label: 每页条目数
-            items_per_page_options_all_label: '- 全部 -'
-            offset_label: 偏移量
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
           submit_button: 应用
-          reset_button_label: 重置
-          exposed_sorts_label: 排序依据
-          sort_asc_label: 升序
-          sort_desc_label: 降序
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       arguments:
         tid:
           exception:
@@ -28,4 +28,4 @@ display:
   feed_1:
     display_title: Feed
   page_1:
-    display_title: 页面
+    display_title: Page
diff --git a/conf/cmi/language/zh-hans/views.view.user_admin_people.yml b/conf/cmi/language/zh-hans/views.view.user_admin_people.yml
index 48bf97866..4e8936b8a 100644
--- a/conf/cmi/language/zh-hans/views.view.user_admin_people.yml
+++ b/conf/cmi/language/zh-hans/views.view.user_admin_people.yml
@@ -39,16 +39,16 @@ display:
             first: '« 首页'
             last: '末页 »'
           expose:
-            items_per_page_label: 每页条目数
-            items_per_page_options_all_label: '- 全部 -'
-            offset_label: 偏移量
+            items_per_page_label: 'Items per page'
+            items_per_page_options_all_label: '- All -'
+            offset_label: Offset
       exposed_form:
         options:
-          submit_button: 过滤
-          reset_button_label: 重置
-          exposed_sorts_label: 排序依据
-          sort_asc_label: 升序
-          sort_desc_label: 降序
+          submit_button: Filter
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       empty:
         area_text_custom:
           content: 没有用户可用。
@@ -72,7 +72,7 @@ display:
             label: 权限
       use_more_text: 更多
   page_1:
-    display_title: 页面
+    display_title: Page
     display_options:
       menu:
         title: 列表
diff --git a/conf/cmi/language/zh-hans/views.view.who_s_new.yml b/conf/cmi/language/zh-hans/views.view.who_s_new.yml
index 491e9a0e4..5847c7578 100644
--- a/conf/cmi/language/zh-hans/views.view.who_s_new.yml
+++ b/conf/cmi/language/zh-hans/views.view.who_s_new.yml
@@ -8,10 +8,10 @@ display:
       exposed_form:
         options:
           submit_button: 应用
-          reset_button_label: 重置
-          exposed_sorts_label: 排序依据
-          sort_asc_label: 升序
-          sort_desc_label: 降序
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
   block_1:
     display_title: 新进用户
     display_options:
diff --git a/conf/cmi/language/zh-hans/views.view.who_s_online.yml b/conf/cmi/language/zh-hans/views.view.who_s_online.yml
index fc9f59910..f874957ca 100644
--- a/conf/cmi/language/zh-hans/views.view.who_s_online.yml
+++ b/conf/cmi/language/zh-hans/views.view.who_s_online.yml
@@ -8,10 +8,10 @@ display:
       exposed_form:
         options:
           submit_button: 应用
-          reset_button_label: 重置
-          exposed_sorts_label: 排序依据
-          sort_asc_label: 升序
-          sort_desc_label: 降序
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       empty:
         area_text_custom:
           content: 目前没有用户在线。
diff --git a/conf/cmi/views.view.helfi_redirect.yml b/conf/cmi/views.view.helfi_redirect.yml
index a3f968da8..cb34781c6 100644
--- a/conf/cmi/views.view.helfi_redirect.yml
+++ b/conf/cmi/views.view.helfi_redirect.yml
@@ -9,7 +9,7 @@ dependencies:
     - redirect
     - user
 _core:
-  default_config_hash: h9PYX1gxwmkwfgZUv0BJ_Js6-woWmUbyPSK0INlm538
+  default_config_hash: T8ZZY-2rwfH9QPXho30lLjOnPsWsLzhy6YGOTix228k
 id: helfi_redirect
 label: Redirect
 module: views
@@ -224,6 +224,73 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
+        status:
+          id: status
+          table: redirect
+          field: status
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: redirect
+          entity_field: status
+          plugin_id: field
+          label: Published
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: boolean
+          settings:
+            format: default
+            format_custom_false: ''
+            format_custom_true: ''
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
         language:
           id: language
           table: redirect
@@ -631,14 +698,14 @@ display:
           exposed: true
           expose:
             operator_id: ''
-            label: Julkaistu
+            label: Published
             description: ''
             use_operator: false
             operator: status_op
             operator_limit_selection: false
             operator_list: {  }
             identifier: status
-            required: true
+            required: false
             remember: false
             multiple: false
             remember_roles:
@@ -675,14 +742,22 @@ display:
           row_class: ''
           default_row_class: true
           columns:
+            redirect_bulk_form: redirect_bulk_form
             redirect_source__path: redirect_source__path
             redirect_redirect__uri: redirect_redirect__uri
             status_code: status_code
+            is_custom: is_custom
+            status: status
             language: language
             created: created
             operations: operations
           default: created
           info:
+            redirect_bulk_form:
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
             redirect_source__path:
               sortable: true
               default_sort_order: asc
@@ -704,6 +779,20 @@ display:
               separator: ''
               empty_column: false
               responsive: ''
+            is_custom:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            status:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
             language:
               sortable: true
               default_sort_order: asc
@@ -719,8 +808,6 @@ display:
               empty_column: false
               responsive: ''
             operations:
-              sortable: false
-              default_sort_order: asc
               align: ''
               separator: ''
               empty_column: false
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 22d88d297..7c1efa6e2 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -15,11 +15,11 @@
   <ini name="error_reporting" value="32767"/>
     <!-- Do not limit the amount of memory tests take to run. -->
   <ini name="memory_limit" value="-1"/>
-  <env name="MINK_DRIVER_ARGS_WEBDRIVER" value='["chrome", {"browserName":"chrome","chromeOptions":{"w3c": false}}, "http://chromium:4444"]' />
-  <env name="DTT_MINK_DRIVER_ARGS" value='["chrome", {"chromeOptions":{"w3c": false }}, "http://chromium:4444"]'/>
+  <env name="MINK_DRIVER_ARGS_WEBDRIVER" value='["chrome", {"browserName":"chrome", "goog:chromeOptions":{"w3c": true, "args":["--no-sandbox", "--ignore-certificate-errors", "--allow-insecure-localhost", "--headless", "--dns-prefetch-disable"]}}, "http://chromium:4444"]' />
+  <env name="DTT_MINK_DRIVER_ARGS" value='["chrome", {"browserName":"chrome", "goog:chromeOptions":{"w3c": true, "args":["--no-sandbox","--ignore-certificate-errors", "--allow-insecure-localhost", "--headless", "--dns-prefetch-disable"]}}, "http://chromium:4444"]'/>
   <env name="DTT_API_OPTIONS" value='{"socketTimeout": 360, "domWaitTimeout": 3600000}' />
   <env name="DTT_API_URL" value="http://chromium:9222"/>
-  <env name="DTT_BASE_URL" value="http://app:8888"/>
+  <env name="DTT_BASE_URL" value="https://app"/>
 </php>
 <testsuites>
   <testsuite name="unit">
diff --git a/tools/make/override.mk b/tools/make/override.mk
index 6f4a034bd..df8baac5e 100644
--- a/tools/make/override.mk
+++ b/tools/make/override.mk
@@ -1,4 +1,3 @@
 # Docker CLI container
 CLI_SERVICE=app
-CLI_USER=druid
 CLI_SHELL=bash
diff --git a/tools/make/project/db-sync.sh b/tools/make/project/db-sync.sh
new file mode 100644
index 000000000..2d69f38ed
--- /dev/null
+++ b/tools/make/project/db-sync.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+set -e
+
+if [ ! -n "$OC_PROJECT_NAME" ]; then
+  echo "OC_PROJECT_NAME not set."
+  exit 1;
+fi
+
+oc login --token=${1} --server=https://api.arodevtest.hel.fi:6443
+oc project ${OC_PROJECT_NAME}
+
+OC_POD_NAME=$(oc get pods -o name | grep drupal-cron | grep -v deploy)
+
+if [ ! -n "$OC_POD_NAME" ]; then
+  echo "Failed to parse pod name."
+  exit 1
+fi
+
+oc rsh $OC_POD_NAME rm -f /tmp/dump.sql
+oc rsh $OC_POD_NAME drush sql:dump --structure-tables-key=common \
+  --extra-dump='--no-tablespaces --hex-blob' \
+  --result-file=/tmp/dump.sql
+
+oc rsync $OC_POD_NAME:/tmp/dump.sql /app
diff --git a/tools/make/project/git.mk b/tools/make/project/git.mk
index 9ef1f3d9e..50b03e875 100644
--- a/tools/make/project/git.mk
+++ b/tools/make/project/git.mk
@@ -1,3 +1,3 @@
 PHONY += copy-commit-message-script
 copy-commit-message-script:
-	@$(foreach name,$(shell find public/modules/custom public/themes/custom public/modules/contrib public/themes/contrib -type d -name ".git" -exec dirname {} \; 2> /dev/null ) .,cp tools/commit-msg $(name)/.git/hooks;)
+	@$(foreach name,$(shell find public/modules/custom public/themes/custom public/modules/contrib public/themes/contrib -type d -name ".git" -exec dirname {} \; 2> /dev/null ) .,cp tools/commit-msg $(name)/.git/hooks || true;)
diff --git a/tools/make/project/install.mk b/tools/make/project/install.mk
index 483d64f7e..4328f6532 100644
--- a/tools/make/project/install.mk
+++ b/tools/make/project/install.mk
@@ -10,18 +10,14 @@ OC_LOGIN_TOKEN ?= $(shell bash -c 'read -s -p "You must obtain an API token by v
 SYNC_TARGETS := drush-sync-db
 
 ifneq ($(DUMP_SQL_EXISTS),yes)
-SYNC_TARGETS := oc-login oc-sync
+SYNC_TARGETS := oc-sync
 endif
 
-PHONY += oc-login
-oc-login:
-	$(call drush,helfi:oc:login $(OC_LOGIN_TOKEN))
-
 PHONY += oc-sync
 oc-sync:
-	$(call drush,helfi:oc:get-dump)
+	docker run --env-file .env -it --rm -v .:/app --name helfi-oc ghcr.io/city-of-helsinki/drupal-oc-cli:latest sh -c "chmod +x /app/tools/make/project/db-sync.sh && /app/tools/make/project/db-sync.sh $(OC_LOGIN_TOKEN)"
 	$(call drush,sql-query --file=${DOCKER_PROJECT_ROOT}/$(DUMP_SQL_FILENAME),SQL dump imported)
-	$(call drush,helfi:oc:sanitize-database)
+	$(call drush,sql-query \"UPDATE file_managed SET uri = REPLACE(uri, 'azure://', 'public://');\",Sanitized Azure URIs)
 	$(call drush,cr)
 	$(call drush,cim -y)
 	$(call drush,cr)