From b5a0529d63433e9bb045f989241c49962c81afa4 Mon Sep 17 00:00:00 2001
From: hel-platta-automation
 <95360595+hel-platta-automation@users.noreply.github.com>
Date: Wed, 20 Nov 2024 08:09:19 +0000
Subject: [PATCH 1/2] Update configuration

---
 composer.lock                                      | 12 ++++++------
 ....entity_form_display.node.news_item.default.yml | 14 --------------
 ...ookie_compliance.cookie_category.statistics.yml |  2 +-
 ...ookie_compliance.cookie_category.statistics.yml |  2 +-
 ...ookie_compliance.cookie_category.statistics.yml |  2 +-
 ...ookie_compliance.cookie_category.statistics.yml |  2 +-
 ...ookie_compliance.cookie_category.statistics.yml |  2 +-
 .../fi/core.entity_view_mode.media.image.yml       |  2 +-
 ...ookie_compliance.cookie_category.statistics.yml |  2 +-
 .../field.field.media.image.field_media_image.yml  |  2 +-
 ....paragraph.contact_card.field_contact_image.yml |  2 +-
 ...field.field.paragraph.hero.field_hero_image.yml |  2 +-
 ...up_with_image.field_liftup_with_image_image.yml |  2 +-
 ...ist_of_links_item.field_list_of_links_image.yml |  2 +-
 conf/cmi/language/fi/media.type.image.yml          |  2 +-
 .../fi/paragraphs.paragraphs_type.image.yml        |  2 +-
 ...ookie_compliance.cookie_category.statistics.yml |  2 +-
 ...i_eu_cookie_compliance.cookie_consent_intro.yml |  2 +-
 ...ookie_compliance.cookie_category.statistics.yml |  2 +-
 .../sv/core.entity_view_mode.media.image.yml       |  2 +-
 .../field.field.media.image.field_media_image.yml  |  2 +-
 ....paragraph.contact_card.field_contact_image.yml |  2 +-
 ...field.field.paragraph.hero.field_hero_image.yml |  2 +-
 ...up_with_image.field_liftup_with_image_image.yml |  2 +-
 ...ist_of_links_item.field_list_of_links_image.yml |  2 +-
 conf/cmi/language/sv/media.type.image.yml          |  2 +-
 .../sv/paragraphs.paragraphs_type.image.yml        |  2 +-
 ...ookie_compliance.cookie_category.statistics.yml |  2 +-
 ...ookie_compliance.cookie_category.statistics.yml |  2 +-
 29 files changed, 33 insertions(+), 47 deletions(-)

diff --git a/composer.lock b/composer.lock
index e33259960..5672410e8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4255,16 +4255,16 @@
         },
         {
             "name": "drupal/hdbt",
-            "version": "6.8.7",
+            "version": "6.8.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git",
-                "reference": "788a852f02962d5c38be053989b6a18ba00daf0b"
+                "reference": "9ef262cd864f75cf4972075624e5b6415c909999"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/788a852f02962d5c38be053989b6a18ba00daf0b",
-                "reference": "788a852f02962d5c38be053989b6a18ba00daf0b",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/9ef262cd864f75cf4972075624e5b6415c909999",
+                "reference": "9ef262cd864f75cf4972075624e5b6415c909999",
                 "shasum": ""
             },
             "require": {
@@ -4283,10 +4283,10 @@
                 "Drupal"
             ],
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.7",
+                "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.8",
                 "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues"
             },
-            "time": "2024-11-18T15:33:25+00:00"
+            "time": "2024-11-20T08:03:52+00:00"
         },
         {
             "name": "drupal/hdbt_admin",
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 af9126e73..77983f78e 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
@@ -114,20 +114,6 @@ targetEntityType: node
 bundle: news_item
 mode: default
 content:
-  annif_keywords:
-    type: readonly_field_widget
-    weight: 2
-    region: content
-    settings:
-      label: above
-      formatter_type: entity_reference_label
-      formatter_settings:
-        entity_reference_entity_view:
-          view_mode: default
-        entity_reference_label:
-          link: false
-      show_description: false
-    third_party_settings: {  }
   annif_suggested_topics:
     type: suggested_topics_reference
     weight: 26
diff --git a/conf/cmi/language/ar/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/ar/eu_cookie_compliance.cookie_category.statistics.yml
index 298e3d7cd..9a36feffb 100644
--- a/conf/cmi/language/ar/eu_cookie_compliance.cookie_category.statistics.yml
+++ b/conf/cmi/language/ar/eu_cookie_compliance.cookie_category.statistics.yml
@@ -1 +1 @@
-label: Statistics
+label: الإحصائيات
diff --git a/conf/cmi/language/de/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/de/eu_cookie_compliance.cookie_category.statistics.yml
index 298e3d7cd..e124fd327 100644
--- a/conf/cmi/language/de/eu_cookie_compliance.cookie_category.statistics.yml
+++ b/conf/cmi/language/de/eu_cookie_compliance.cookie_category.statistics.yml
@@ -1 +1 @@
-label: Statistics
+label: Statistiken
diff --git a/conf/cmi/language/es/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/es/eu_cookie_compliance.cookie_category.statistics.yml
index 298e3d7cd..48723a806 100644
--- a/conf/cmi/language/es/eu_cookie_compliance.cookie_category.statistics.yml
+++ b/conf/cmi/language/es/eu_cookie_compliance.cookie_category.statistics.yml
@@ -1 +1 @@
-label: Statistics
+label: Estadísticas
diff --git a/conf/cmi/language/et/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/et/eu_cookie_compliance.cookie_category.statistics.yml
index 298e3d7cd..0809efca3 100644
--- a/conf/cmi/language/et/eu_cookie_compliance.cookie_category.statistics.yml
+++ b/conf/cmi/language/et/eu_cookie_compliance.cookie_category.statistics.yml
@@ -1 +1 @@
-label: Statistics
+label: Statistika
diff --git a/conf/cmi/language/fa/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/fa/eu_cookie_compliance.cookie_category.statistics.yml
index 298e3d7cd..01791efcf 100644
--- a/conf/cmi/language/fa/eu_cookie_compliance.cookie_category.statistics.yml
+++ b/conf/cmi/language/fa/eu_cookie_compliance.cookie_category.statistics.yml
@@ -1 +1 @@
-label: Statistics
+label: آمار
diff --git a/conf/cmi/language/fi/core.entity_view_mode.media.image.yml b/conf/cmi/language/fi/core.entity_view_mode.media.image.yml
index 38b204637..22ed4bd44 100644
--- a/conf/cmi/language/fi/core.entity_view_mode.media.image.yml
+++ b/conf/cmi/language/fi/core.entity_view_mode.media.image.yml
@@ -1 +1 @@
-label: 'Kuva (tuettu muilla kielillä)'
+label: Kuva
diff --git a/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.statistics.yml
index b4707d049..661c3acad 100644
--- a/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.statistics.yml
+++ b/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.statistics.yml
@@ -1,4 +1,4 @@
 description:
   value: '<p>Tilastointievästeiden keräämää tietoa käytetään verkkosivuston kehittämiseen.</p><figure class="table" tabindex="0"><table><thead><tr><th>Nimi</th><th>Tarjoaja</th><th>Tarkoitus</th><th>Voimassa</th><th>Tyyppi</th></tr></thead><tbody><tr><td>nmstat</td><td>www.hel.fi</td><td>Siteimproven tilastointieväste kerää tietoa kävijän sivujen käytöstä.</td><td>1000 päivää</td><td>&nbsp;</td></tr><tr><td>_pk_id.*</td><td>www.hel.fi</td><td>Matomo-tilastointijärjestelmän eväste.</td><td>393 päivää</td><td>&nbsp;</td></tr><tr><td>_pk_ses.141.89f6</td><td>www.hel.fi</td><td>-</td><td>1 tunti</td><td>&nbsp;</td></tr><tr><td>_pk_id.*</td><td>kartta.hel.fi</td><td>Matomo-tilastointijärjestelmän eväste.</td><td>393 päivää</td><td>&nbsp;</td></tr><tr><td>_pk_ses.*</td><td>kartta.hel.fi</td><td>Matomo-tilastointijärjestelmän eväste.</td><td>1 tunti</td><td>&nbsp;</td></tr><tr><td>_pk_id.*</td><td>palvelukartta.hel.fi</td><td>Matomo-tilastointijärjestelmän eväste.</td><td>393 päivää</td><td>&nbsp;</td></tr><tr><td>_pk_ses.*</td><td>palvelukartta.hel.fi</td><td>Matomo-tilastointijärjestelmän eväste.</td><td>1 tunti</td><td>&nbsp;</td></tr><tr><td>_pk_id.*</td><td>avustukset.hel.fi</td><td>Matomo-tilastointijärjestelmän eväste.</td><td>393 päivää</td><td>&nbsp;</td></tr><tr><td>_pk_ses.*</td><td>avustukset.hel.fi</td><td>Matomo-tilastointijärjestelmän eväste.</td><td>1 tunti</td><td>&nbsp;</td></tr><tr><td>rnsbid</td><td><span>reactandshare.com</span></td><td><span>Askem-reaktionappien toimintaan liittyvä tietue.</span></td><td>-</td><td>Local storage</td></tr><tr><td>rnsbid_ts</td><td><span>reactandshare.com</span></td><td><span>Askem-reaktionappien toimintaan liittyvä tietue.</span></td><td>-</td><td>Local storage</td></tr><tr><td>rns_reaction_*</td><td><span>reactandshare.com</span></td><td><span>Askem-reaktionappien toimintaan liittyvä tietue.</span></td><td>-</td><td>Local storage</td></tr><tr><td>YSC</td><td>youtube.com</td><td>YouTuben eväste mahdollistaa videoiden upottamisen sivustolle.</td><td>Istunto</td><td>Kolmas osapuoli</td></tr></tbody></table></figure>'
   format: full_html
-label: Tilastointi
+label: Tilastot
diff --git a/conf/cmi/language/fi/field.field.media.image.field_media_image.yml b/conf/cmi/language/fi/field.field.media.image.field_media_image.yml
index 38b204637..22ed4bd44 100644
--- a/conf/cmi/language/fi/field.field.media.image.field_media_image.yml
+++ b/conf/cmi/language/fi/field.field.media.image.field_media_image.yml
@@ -1 +1 @@
-label: 'Kuva (tuettu muilla kielillä)'
+label: Kuva
diff --git a/conf/cmi/language/fi/field.field.paragraph.contact_card.field_contact_image.yml b/conf/cmi/language/fi/field.field.paragraph.contact_card.field_contact_image.yml
index b557868c5..4c1abb8aa 100644
--- a/conf/cmi/language/fi/field.field.paragraph.contact_card.field_contact_image.yml
+++ b/conf/cmi/language/fi/field.field.paragraph.contact_card.field_contact_image.yml
@@ -1,2 +1,2 @@
-label: 'Kuva (tuettu muilla kielillä)'
+label: Kuva
 description: 'Vaaka- ja pystykuvat rajataan neliöiksi. Rajatun kuvan keskipisteen voi valita kuvan latauksen yhteydessä. '
diff --git a/conf/cmi/language/fi/field.field.paragraph.hero.field_hero_image.yml b/conf/cmi/language/fi/field.field.paragraph.hero.field_hero_image.yml
index 3242ced4c..efbe0e1d6 100644
--- a/conf/cmi/language/fi/field.field.paragraph.hero.field_hero_image.yml
+++ b/conf/cmi/language/fi/field.field.paragraph.hero.field_hero_image.yml
@@ -1,2 +1,2 @@
-label: 'Kuva (tuettu muilla kielillä)'
+label: Kuva
 description: 'Heron kuva.'
diff --git a/conf/cmi/language/fi/field.field.paragraph.liftup_with_image.field_liftup_with_image_image.yml b/conf/cmi/language/fi/field.field.paragraph.liftup_with_image.field_liftup_with_image_image.yml
index fae02d7c9..649890cb5 100644
--- a/conf/cmi/language/fi/field.field.paragraph.liftup_with_image.field_liftup_with_image_image.yml
+++ b/conf/cmi/language/fi/field.field.paragraph.liftup_with_image.field_liftup_with_image_image.yml
@@ -1,2 +1,2 @@
-label: 'Kuva (tuettu muilla kielillä)'
+label: Kuva
 description: 'Kuvallisen noston kuva.'
diff --git a/conf/cmi/language/fi/field.field.paragraph.list_of_links_item.field_list_of_links_image.yml b/conf/cmi/language/fi/field.field.paragraph.list_of_links_item.field_list_of_links_image.yml
index 6649dad5d..c29db2ef0 100644
--- a/conf/cmi/language/fi/field.field.paragraph.list_of_links_item.field_list_of_links_image.yml
+++ b/conf/cmi/language/fi/field.field.paragraph.list_of_links_item.field_list_of_links_image.yml
@@ -1,2 +1,2 @@
-label: 'Kuva (tuettu muilla kielillä)'
+label: Kuva
 description: 'Valitse kuva, joka näytetään linkin yhteydessä.'
diff --git a/conf/cmi/language/fi/media.type.image.yml b/conf/cmi/language/fi/media.type.image.yml
index 8ee568726..808a8328c 100644
--- a/conf/cmi/language/fi/media.type.image.yml
+++ b/conf/cmi/language/fi/media.type.image.yml
@@ -1,2 +1,2 @@
-label: 'Kuva (tuettu muilla kielillä)'
+label: Kuva
 description: 'Mediatyyppi kuville.'
diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.image.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.image.yml
index ac17bc3c9..20cc99c34 100644
--- a/conf/cmi/language/fi/paragraphs.paragraphs_type.image.yml
+++ b/conf/cmi/language/fi/paragraphs.paragraphs_type.image.yml
@@ -1,2 +1,2 @@
-label: 'Kuva (tuettu muilla kielillä)'
+label: Kuva
 description: 'Kuva kuvatekstillä'
diff --git a/conf/cmi/language/fr/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/fr/eu_cookie_compliance.cookie_category.statistics.yml
index 298e3d7cd..376852ac7 100644
--- a/conf/cmi/language/fr/eu_cookie_compliance.cookie_category.statistics.yml
+++ b/conf/cmi/language/fr/eu_cookie_compliance.cookie_category.statistics.yml
@@ -1 +1 @@
-label: Statistics
+label: Statistiques
diff --git a/conf/cmi/language/fr/helfi_eu_cookie_compliance.cookie_consent_intro.yml b/conf/cmi/language/fr/helfi_eu_cookie_compliance.cookie_consent_intro.yml
index b20eb7717..dd7368907 100644
--- a/conf/cmi/language/fr/helfi_eu_cookie_compliance.cookie_consent_intro.yml
+++ b/conf/cmi/language/fr/helfi_eu_cookie_compliance.cookie_consent_intro.yml
@@ -1,2 +1,2 @@
 cc:
-  title: 'Cookie settings'
+  title: 'Paramètres de cookie'
diff --git a/conf/cmi/language/ru/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/ru/eu_cookie_compliance.cookie_category.statistics.yml
index 298e3d7cd..a680c536a 100644
--- a/conf/cmi/language/ru/eu_cookie_compliance.cookie_category.statistics.yml
+++ b/conf/cmi/language/ru/eu_cookie_compliance.cookie_category.statistics.yml
@@ -1 +1 @@
-label: Statistics
+label: Статистика
diff --git a/conf/cmi/language/sv/core.entity_view_mode.media.image.yml b/conf/cmi/language/sv/core.entity_view_mode.media.image.yml
index cef092dc9..b7c0a4502 100644
--- a/conf/cmi/language/sv/core.entity_view_mode.media.image.yml
+++ b/conf/cmi/language/sv/core.entity_view_mode.media.image.yml
@@ -1 +1 @@
-label: 'Bild (stöds på andra språk)'
+label: Bild
diff --git a/conf/cmi/language/sv/field.field.media.image.field_media_image.yml b/conf/cmi/language/sv/field.field.media.image.field_media_image.yml
index cef092dc9..b7c0a4502 100644
--- a/conf/cmi/language/sv/field.field.media.image.field_media_image.yml
+++ b/conf/cmi/language/sv/field.field.media.image.field_media_image.yml
@@ -1 +1 @@
-label: 'Bild (stöds på andra språk)'
+label: Bild
diff --git a/conf/cmi/language/sv/field.field.paragraph.contact_card.field_contact_image.yml b/conf/cmi/language/sv/field.field.paragraph.contact_card.field_contact_image.yml
index cef092dc9..b7c0a4502 100644
--- a/conf/cmi/language/sv/field.field.paragraph.contact_card.field_contact_image.yml
+++ b/conf/cmi/language/sv/field.field.paragraph.contact_card.field_contact_image.yml
@@ -1 +1 @@
-label: 'Bild (stöds på andra språk)'
+label: Bild
diff --git a/conf/cmi/language/sv/field.field.paragraph.hero.field_hero_image.yml b/conf/cmi/language/sv/field.field.paragraph.hero.field_hero_image.yml
index cef092dc9..b7c0a4502 100644
--- a/conf/cmi/language/sv/field.field.paragraph.hero.field_hero_image.yml
+++ b/conf/cmi/language/sv/field.field.paragraph.hero.field_hero_image.yml
@@ -1 +1 @@
-label: 'Bild (stöds på andra språk)'
+label: Bild
diff --git a/conf/cmi/language/sv/field.field.paragraph.liftup_with_image.field_liftup_with_image_image.yml b/conf/cmi/language/sv/field.field.paragraph.liftup_with_image.field_liftup_with_image_image.yml
index cef092dc9..b7c0a4502 100644
--- a/conf/cmi/language/sv/field.field.paragraph.liftup_with_image.field_liftup_with_image_image.yml
+++ b/conf/cmi/language/sv/field.field.paragraph.liftup_with_image.field_liftup_with_image_image.yml
@@ -1 +1 @@
-label: 'Bild (stöds på andra språk)'
+label: Bild
diff --git a/conf/cmi/language/sv/field.field.paragraph.list_of_links_item.field_list_of_links_image.yml b/conf/cmi/language/sv/field.field.paragraph.list_of_links_item.field_list_of_links_image.yml
index cef092dc9..b7c0a4502 100644
--- a/conf/cmi/language/sv/field.field.paragraph.list_of_links_item.field_list_of_links_image.yml
+++ b/conf/cmi/language/sv/field.field.paragraph.list_of_links_item.field_list_of_links_image.yml
@@ -1 +1 @@
-label: 'Bild (stöds på andra språk)'
+label: Bild
diff --git a/conf/cmi/language/sv/media.type.image.yml b/conf/cmi/language/sv/media.type.image.yml
index cef092dc9..b7c0a4502 100644
--- a/conf/cmi/language/sv/media.type.image.yml
+++ b/conf/cmi/language/sv/media.type.image.yml
@@ -1 +1 @@
-label: 'Bild (stöds på andra språk)'
+label: Bild
diff --git a/conf/cmi/language/sv/paragraphs.paragraphs_type.image.yml b/conf/cmi/language/sv/paragraphs.paragraphs_type.image.yml
index cef092dc9..b7c0a4502 100644
--- a/conf/cmi/language/sv/paragraphs.paragraphs_type.image.yml
+++ b/conf/cmi/language/sv/paragraphs.paragraphs_type.image.yml
@@ -1 +1 @@
-label: 'Bild (stöds på andra språk)'
+label: Bild
diff --git a/conf/cmi/language/uk/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/uk/eu_cookie_compliance.cookie_category.statistics.yml
index 298e3d7cd..a680c536a 100644
--- a/conf/cmi/language/uk/eu_cookie_compliance.cookie_category.statistics.yml
+++ b/conf/cmi/language/uk/eu_cookie_compliance.cookie_category.statistics.yml
@@ -1 +1 @@
-label: Statistics
+label: Статистика
diff --git a/conf/cmi/language/zh-hans/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/zh-hans/eu_cookie_compliance.cookie_category.statistics.yml
index 298e3d7cd..c46d82555 100644
--- a/conf/cmi/language/zh-hans/eu_cookie_compliance.cookie_category.statistics.yml
+++ b/conf/cmi/language/zh-hans/eu_cookie_compliance.cookie_category.statistics.yml
@@ -1 +1 @@
-label: Statistics
+label: 统计

From 04106eba4b0807eafbfb7c0da5e3c281662de880 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= <markus.kalijarvi@druid.fi>
Date: Wed, 20 Nov 2024 10:18:52 +0200
Subject: [PATCH 2/2] Reverted obsolete configuration changes.

---
 ....entity_form_display.node.news_item.default.yml | 14 ++++++++++++++
 ...ookie_compliance.cookie_category.statistics.yml |  2 +-
 ...ookie_compliance.cookie_category.statistics.yml |  2 +-
 ...ookie_compliance.cookie_category.statistics.yml |  2 +-
 ...ookie_compliance.cookie_category.statistics.yml |  2 +-
 ...ookie_compliance.cookie_category.statistics.yml |  2 +-
 .../fi/core.entity_view_mode.media.image.yml       |  2 +-
 ...ookie_compliance.cookie_category.statistics.yml |  2 +-
 .../field.field.media.image.field_media_image.yml  |  2 +-
 ....paragraph.contact_card.field_contact_image.yml |  2 +-
 ...field.field.paragraph.hero.field_hero_image.yml |  2 +-
 ...up_with_image.field_liftup_with_image_image.yml |  2 +-
 ...ist_of_links_item.field_list_of_links_image.yml |  2 +-
 conf/cmi/language/fi/media.type.image.yml          |  2 +-
 .../fi/paragraphs.paragraphs_type.image.yml        |  2 +-
 ...ookie_compliance.cookie_category.statistics.yml |  2 +-
 ...i_eu_cookie_compliance.cookie_consent_intro.yml |  2 +-
 ...ookie_compliance.cookie_category.statistics.yml |  2 +-
 .../sv/core.entity_view_mode.media.image.yml       |  2 +-
 .../field.field.media.image.field_media_image.yml  |  2 +-
 ....paragraph.contact_card.field_contact_image.yml |  2 +-
 ...field.field.paragraph.hero.field_hero_image.yml |  2 +-
 ...up_with_image.field_liftup_with_image_image.yml |  2 +-
 ...ist_of_links_item.field_list_of_links_image.yml |  2 +-
 conf/cmi/language/sv/media.type.image.yml          |  2 +-
 .../sv/paragraphs.paragraphs_type.image.yml        |  2 +-
 ...ookie_compliance.cookie_category.statistics.yml |  2 +-
 ...ookie_compliance.cookie_category.statistics.yml |  2 +-
 28 files changed, 41 insertions(+), 27 deletions(-)

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 77983f78e..af9126e73 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
@@ -114,6 +114,20 @@ targetEntityType: node
 bundle: news_item
 mode: default
 content:
+  annif_keywords:
+    type: readonly_field_widget
+    weight: 2
+    region: content
+    settings:
+      label: above
+      formatter_type: entity_reference_label
+      formatter_settings:
+        entity_reference_entity_view:
+          view_mode: default
+        entity_reference_label:
+          link: false
+      show_description: false
+    third_party_settings: {  }
   annif_suggested_topics:
     type: suggested_topics_reference
     weight: 26
diff --git a/conf/cmi/language/ar/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/ar/eu_cookie_compliance.cookie_category.statistics.yml
index 9a36feffb..298e3d7cd 100644
--- a/conf/cmi/language/ar/eu_cookie_compliance.cookie_category.statistics.yml
+++ b/conf/cmi/language/ar/eu_cookie_compliance.cookie_category.statistics.yml
@@ -1 +1 @@
-label: الإحصائيات
+label: Statistics
diff --git a/conf/cmi/language/de/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/de/eu_cookie_compliance.cookie_category.statistics.yml
index e124fd327..298e3d7cd 100644
--- a/conf/cmi/language/de/eu_cookie_compliance.cookie_category.statistics.yml
+++ b/conf/cmi/language/de/eu_cookie_compliance.cookie_category.statistics.yml
@@ -1 +1 @@
-label: Statistiken
+label: Statistics
diff --git a/conf/cmi/language/es/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/es/eu_cookie_compliance.cookie_category.statistics.yml
index 48723a806..298e3d7cd 100644
--- a/conf/cmi/language/es/eu_cookie_compliance.cookie_category.statistics.yml
+++ b/conf/cmi/language/es/eu_cookie_compliance.cookie_category.statistics.yml
@@ -1 +1 @@
-label: Estadísticas
+label: Statistics
diff --git a/conf/cmi/language/et/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/et/eu_cookie_compliance.cookie_category.statistics.yml
index 0809efca3..298e3d7cd 100644
--- a/conf/cmi/language/et/eu_cookie_compliance.cookie_category.statistics.yml
+++ b/conf/cmi/language/et/eu_cookie_compliance.cookie_category.statistics.yml
@@ -1 +1 @@
-label: Statistika
+label: Statistics
diff --git a/conf/cmi/language/fa/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/fa/eu_cookie_compliance.cookie_category.statistics.yml
index 01791efcf..298e3d7cd 100644
--- a/conf/cmi/language/fa/eu_cookie_compliance.cookie_category.statistics.yml
+++ b/conf/cmi/language/fa/eu_cookie_compliance.cookie_category.statistics.yml
@@ -1 +1 @@
-label: آمار
+label: Statistics
diff --git a/conf/cmi/language/fi/core.entity_view_mode.media.image.yml b/conf/cmi/language/fi/core.entity_view_mode.media.image.yml
index 22ed4bd44..38b204637 100644
--- a/conf/cmi/language/fi/core.entity_view_mode.media.image.yml
+++ b/conf/cmi/language/fi/core.entity_view_mode.media.image.yml
@@ -1 +1 @@
-label: Kuva
+label: 'Kuva (tuettu muilla kielillä)'
diff --git a/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.statistics.yml
index 661c3acad..b4707d049 100644
--- a/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.statistics.yml
+++ b/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.statistics.yml
@@ -1,4 +1,4 @@
 description:
   value: '<p>Tilastointievästeiden keräämää tietoa käytetään verkkosivuston kehittämiseen.</p><figure class="table" tabindex="0"><table><thead><tr><th>Nimi</th><th>Tarjoaja</th><th>Tarkoitus</th><th>Voimassa</th><th>Tyyppi</th></tr></thead><tbody><tr><td>nmstat</td><td>www.hel.fi</td><td>Siteimproven tilastointieväste kerää tietoa kävijän sivujen käytöstä.</td><td>1000 päivää</td><td>&nbsp;</td></tr><tr><td>_pk_id.*</td><td>www.hel.fi</td><td>Matomo-tilastointijärjestelmän eväste.</td><td>393 päivää</td><td>&nbsp;</td></tr><tr><td>_pk_ses.141.89f6</td><td>www.hel.fi</td><td>-</td><td>1 tunti</td><td>&nbsp;</td></tr><tr><td>_pk_id.*</td><td>kartta.hel.fi</td><td>Matomo-tilastointijärjestelmän eväste.</td><td>393 päivää</td><td>&nbsp;</td></tr><tr><td>_pk_ses.*</td><td>kartta.hel.fi</td><td>Matomo-tilastointijärjestelmän eväste.</td><td>1 tunti</td><td>&nbsp;</td></tr><tr><td>_pk_id.*</td><td>palvelukartta.hel.fi</td><td>Matomo-tilastointijärjestelmän eväste.</td><td>393 päivää</td><td>&nbsp;</td></tr><tr><td>_pk_ses.*</td><td>palvelukartta.hel.fi</td><td>Matomo-tilastointijärjestelmän eväste.</td><td>1 tunti</td><td>&nbsp;</td></tr><tr><td>_pk_id.*</td><td>avustukset.hel.fi</td><td>Matomo-tilastointijärjestelmän eväste.</td><td>393 päivää</td><td>&nbsp;</td></tr><tr><td>_pk_ses.*</td><td>avustukset.hel.fi</td><td>Matomo-tilastointijärjestelmän eväste.</td><td>1 tunti</td><td>&nbsp;</td></tr><tr><td>rnsbid</td><td><span>reactandshare.com</span></td><td><span>Askem-reaktionappien toimintaan liittyvä tietue.</span></td><td>-</td><td>Local storage</td></tr><tr><td>rnsbid_ts</td><td><span>reactandshare.com</span></td><td><span>Askem-reaktionappien toimintaan liittyvä tietue.</span></td><td>-</td><td>Local storage</td></tr><tr><td>rns_reaction_*</td><td><span>reactandshare.com</span></td><td><span>Askem-reaktionappien toimintaan liittyvä tietue.</span></td><td>-</td><td>Local storage</td></tr><tr><td>YSC</td><td>youtube.com</td><td>YouTuben eväste mahdollistaa videoiden upottamisen sivustolle.</td><td>Istunto</td><td>Kolmas osapuoli</td></tr></tbody></table></figure>'
   format: full_html
-label: Tilastot
+label: Tilastointi
diff --git a/conf/cmi/language/fi/field.field.media.image.field_media_image.yml b/conf/cmi/language/fi/field.field.media.image.field_media_image.yml
index 22ed4bd44..38b204637 100644
--- a/conf/cmi/language/fi/field.field.media.image.field_media_image.yml
+++ b/conf/cmi/language/fi/field.field.media.image.field_media_image.yml
@@ -1 +1 @@
-label: Kuva
+label: 'Kuva (tuettu muilla kielillä)'
diff --git a/conf/cmi/language/fi/field.field.paragraph.contact_card.field_contact_image.yml b/conf/cmi/language/fi/field.field.paragraph.contact_card.field_contact_image.yml
index 4c1abb8aa..b557868c5 100644
--- a/conf/cmi/language/fi/field.field.paragraph.contact_card.field_contact_image.yml
+++ b/conf/cmi/language/fi/field.field.paragraph.contact_card.field_contact_image.yml
@@ -1,2 +1,2 @@
-label: Kuva
+label: 'Kuva (tuettu muilla kielillä)'
 description: 'Vaaka- ja pystykuvat rajataan neliöiksi. Rajatun kuvan keskipisteen voi valita kuvan latauksen yhteydessä. '
diff --git a/conf/cmi/language/fi/field.field.paragraph.hero.field_hero_image.yml b/conf/cmi/language/fi/field.field.paragraph.hero.field_hero_image.yml
index efbe0e1d6..3242ced4c 100644
--- a/conf/cmi/language/fi/field.field.paragraph.hero.field_hero_image.yml
+++ b/conf/cmi/language/fi/field.field.paragraph.hero.field_hero_image.yml
@@ -1,2 +1,2 @@
-label: Kuva
+label: 'Kuva (tuettu muilla kielillä)'
 description: 'Heron kuva.'
diff --git a/conf/cmi/language/fi/field.field.paragraph.liftup_with_image.field_liftup_with_image_image.yml b/conf/cmi/language/fi/field.field.paragraph.liftup_with_image.field_liftup_with_image_image.yml
index 649890cb5..fae02d7c9 100644
--- a/conf/cmi/language/fi/field.field.paragraph.liftup_with_image.field_liftup_with_image_image.yml
+++ b/conf/cmi/language/fi/field.field.paragraph.liftup_with_image.field_liftup_with_image_image.yml
@@ -1,2 +1,2 @@
-label: Kuva
+label: 'Kuva (tuettu muilla kielillä)'
 description: 'Kuvallisen noston kuva.'
diff --git a/conf/cmi/language/fi/field.field.paragraph.list_of_links_item.field_list_of_links_image.yml b/conf/cmi/language/fi/field.field.paragraph.list_of_links_item.field_list_of_links_image.yml
index c29db2ef0..6649dad5d 100644
--- a/conf/cmi/language/fi/field.field.paragraph.list_of_links_item.field_list_of_links_image.yml
+++ b/conf/cmi/language/fi/field.field.paragraph.list_of_links_item.field_list_of_links_image.yml
@@ -1,2 +1,2 @@
-label: Kuva
+label: 'Kuva (tuettu muilla kielillä)'
 description: 'Valitse kuva, joka näytetään linkin yhteydessä.'
diff --git a/conf/cmi/language/fi/media.type.image.yml b/conf/cmi/language/fi/media.type.image.yml
index 808a8328c..8ee568726 100644
--- a/conf/cmi/language/fi/media.type.image.yml
+++ b/conf/cmi/language/fi/media.type.image.yml
@@ -1,2 +1,2 @@
-label: Kuva
+label: 'Kuva (tuettu muilla kielillä)'
 description: 'Mediatyyppi kuville.'
diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.image.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.image.yml
index 20cc99c34..ac17bc3c9 100644
--- a/conf/cmi/language/fi/paragraphs.paragraphs_type.image.yml
+++ b/conf/cmi/language/fi/paragraphs.paragraphs_type.image.yml
@@ -1,2 +1,2 @@
-label: Kuva
+label: 'Kuva (tuettu muilla kielillä)'
 description: 'Kuva kuvatekstillä'
diff --git a/conf/cmi/language/fr/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/fr/eu_cookie_compliance.cookie_category.statistics.yml
index 376852ac7..298e3d7cd 100644
--- a/conf/cmi/language/fr/eu_cookie_compliance.cookie_category.statistics.yml
+++ b/conf/cmi/language/fr/eu_cookie_compliance.cookie_category.statistics.yml
@@ -1 +1 @@
-label: Statistiques
+label: Statistics
diff --git a/conf/cmi/language/fr/helfi_eu_cookie_compliance.cookie_consent_intro.yml b/conf/cmi/language/fr/helfi_eu_cookie_compliance.cookie_consent_intro.yml
index dd7368907..b20eb7717 100644
--- a/conf/cmi/language/fr/helfi_eu_cookie_compliance.cookie_consent_intro.yml
+++ b/conf/cmi/language/fr/helfi_eu_cookie_compliance.cookie_consent_intro.yml
@@ -1,2 +1,2 @@
 cc:
-  title: 'Paramètres de cookie'
+  title: 'Cookie settings'
diff --git a/conf/cmi/language/ru/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/ru/eu_cookie_compliance.cookie_category.statistics.yml
index a680c536a..298e3d7cd 100644
--- a/conf/cmi/language/ru/eu_cookie_compliance.cookie_category.statistics.yml
+++ b/conf/cmi/language/ru/eu_cookie_compliance.cookie_category.statistics.yml
@@ -1 +1 @@
-label: Статистика
+label: Statistics
diff --git a/conf/cmi/language/sv/core.entity_view_mode.media.image.yml b/conf/cmi/language/sv/core.entity_view_mode.media.image.yml
index b7c0a4502..cef092dc9 100644
--- a/conf/cmi/language/sv/core.entity_view_mode.media.image.yml
+++ b/conf/cmi/language/sv/core.entity_view_mode.media.image.yml
@@ -1 +1 @@
-label: Bild
+label: 'Bild (stöds på andra språk)'
diff --git a/conf/cmi/language/sv/field.field.media.image.field_media_image.yml b/conf/cmi/language/sv/field.field.media.image.field_media_image.yml
index b7c0a4502..cef092dc9 100644
--- a/conf/cmi/language/sv/field.field.media.image.field_media_image.yml
+++ b/conf/cmi/language/sv/field.field.media.image.field_media_image.yml
@@ -1 +1 @@
-label: Bild
+label: 'Bild (stöds på andra språk)'
diff --git a/conf/cmi/language/sv/field.field.paragraph.contact_card.field_contact_image.yml b/conf/cmi/language/sv/field.field.paragraph.contact_card.field_contact_image.yml
index b7c0a4502..cef092dc9 100644
--- a/conf/cmi/language/sv/field.field.paragraph.contact_card.field_contact_image.yml
+++ b/conf/cmi/language/sv/field.field.paragraph.contact_card.field_contact_image.yml
@@ -1 +1 @@
-label: Bild
+label: 'Bild (stöds på andra språk)'
diff --git a/conf/cmi/language/sv/field.field.paragraph.hero.field_hero_image.yml b/conf/cmi/language/sv/field.field.paragraph.hero.field_hero_image.yml
index b7c0a4502..cef092dc9 100644
--- a/conf/cmi/language/sv/field.field.paragraph.hero.field_hero_image.yml
+++ b/conf/cmi/language/sv/field.field.paragraph.hero.field_hero_image.yml
@@ -1 +1 @@
-label: Bild
+label: 'Bild (stöds på andra språk)'
diff --git a/conf/cmi/language/sv/field.field.paragraph.liftup_with_image.field_liftup_with_image_image.yml b/conf/cmi/language/sv/field.field.paragraph.liftup_with_image.field_liftup_with_image_image.yml
index b7c0a4502..cef092dc9 100644
--- a/conf/cmi/language/sv/field.field.paragraph.liftup_with_image.field_liftup_with_image_image.yml
+++ b/conf/cmi/language/sv/field.field.paragraph.liftup_with_image.field_liftup_with_image_image.yml
@@ -1 +1 @@
-label: Bild
+label: 'Bild (stöds på andra språk)'
diff --git a/conf/cmi/language/sv/field.field.paragraph.list_of_links_item.field_list_of_links_image.yml b/conf/cmi/language/sv/field.field.paragraph.list_of_links_item.field_list_of_links_image.yml
index b7c0a4502..cef092dc9 100644
--- a/conf/cmi/language/sv/field.field.paragraph.list_of_links_item.field_list_of_links_image.yml
+++ b/conf/cmi/language/sv/field.field.paragraph.list_of_links_item.field_list_of_links_image.yml
@@ -1 +1 @@
-label: Bild
+label: 'Bild (stöds på andra språk)'
diff --git a/conf/cmi/language/sv/media.type.image.yml b/conf/cmi/language/sv/media.type.image.yml
index b7c0a4502..cef092dc9 100644
--- a/conf/cmi/language/sv/media.type.image.yml
+++ b/conf/cmi/language/sv/media.type.image.yml
@@ -1 +1 @@
-label: Bild
+label: 'Bild (stöds på andra språk)'
diff --git a/conf/cmi/language/sv/paragraphs.paragraphs_type.image.yml b/conf/cmi/language/sv/paragraphs.paragraphs_type.image.yml
index b7c0a4502..cef092dc9 100644
--- a/conf/cmi/language/sv/paragraphs.paragraphs_type.image.yml
+++ b/conf/cmi/language/sv/paragraphs.paragraphs_type.image.yml
@@ -1 +1 @@
-label: Bild
+label: 'Bild (stöds på andra språk)'
diff --git a/conf/cmi/language/uk/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/uk/eu_cookie_compliance.cookie_category.statistics.yml
index a680c536a..298e3d7cd 100644
--- a/conf/cmi/language/uk/eu_cookie_compliance.cookie_category.statistics.yml
+++ b/conf/cmi/language/uk/eu_cookie_compliance.cookie_category.statistics.yml
@@ -1 +1 @@
-label: Статистика
+label: Statistics
diff --git a/conf/cmi/language/zh-hans/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/zh-hans/eu_cookie_compliance.cookie_category.statistics.yml
index c46d82555..298e3d7cd 100644
--- a/conf/cmi/language/zh-hans/eu_cookie_compliance.cookie_category.statistics.yml
+++ b/conf/cmi/language/zh-hans/eu_cookie_compliance.cookie_category.statistics.yml
@@ -1 +1 @@
-label: 统计
+label: Statistics