From 4b19889771a5846ce53054f7077cfe354a9d181b Mon Sep 17 00:00:00 2001
From: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com>
Date: Mon, 21 Aug 2023 12:08:08 +1200
Subject: [PATCH 1/2] ENH Update translations (#1083)

---
 client/lang/cs.js       | 42 +++++++++++++++++++--------------------
 client/lang/de.js       | 42 +++++++++++++++++++--------------------
 client/lang/en.js       | 32 +++++++++++++++---------------
 client/lang/fi.js       | 44 ++++++++++++++++++++---------------------
 client/lang/fr.js       | 42 +++++++++++++++++++--------------------
 client/lang/it.js       | 44 ++++++++++++++++++++---------------------
 client/lang/nl.js       | 42 +++++++++++++++++++--------------------
 client/lang/pl.js       | 38 +++++++++++++++++------------------
 client/lang/sl.js       | 38 +++++++++++++++++------------------
 client/lang/src/cs.json | 42 +++++++++++++++++++--------------------
 client/lang/src/de.json | 42 +++++++++++++++++++--------------------
 client/lang/src/en.json | 32 +++++++++++++++---------------
 client/lang/src/fi.json | 44 ++++++++++++++++++++---------------------
 client/lang/src/fr.json | 42 +++++++++++++++++++--------------------
 client/lang/src/it.json | 44 ++++++++++++++++++++---------------------
 client/lang/src/nl.json | 42 +++++++++++++++++++--------------------
 client/lang/src/pl.json | 38 +++++++++++++++++------------------
 client/lang/src/sl.json | 38 +++++++++++++++++------------------
 lang/cs.yml             | 12 +++++------
 lang/de.yml             |  6 +++---
 lang/en.yml             |  4 ++--
 lang/fi.yml             |  6 +++---
 lang/fr.yml             | 16 +++++++--------
 lang/hr.yml             | 10 +++++-----
 lang/it.yml             | 12 +++++------
 lang/nl.yml             | 12 +++++------
 lang/pl.yml             |  6 +++---
 lang/sl.yml             | 14 ++++++-------
 28 files changed, 413 insertions(+), 413 deletions(-)

diff --git a/client/lang/cs.js b/client/lang/cs.js
index 75d10a2b..c9977bbe 100644
--- a/client/lang/cs.js
+++ b/client/lang/cs.js
@@ -6,39 +6,39 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
   }
 } else {
   ss.i18n.addDictionary('cs', {
+    "ElementAddElementPopover.SEARCH_BLOCKS": "Prohledat bloky",
+    "ElementAddNewButton.ADD_BLOCK": "Přidat blok",
+    "ElementArchiveAction.ARCHIVE": "Archiv",
+    "ElementArchiveAction.ARCHIVE_PERMISSION_DENY": "Archive, insufficient permissions",
     "ElementArchiveAction.CONFIRM_DELETE": "Jste si jistí, že chcete blok odeslat do archivu?",
     "ElementArchiveAction.CONFIRM_DELETE_AND_UNPUBLISH": "Varování: Tento blok bude před odesláním do archivu označen jako nezveřejněný. Opravdu chcete pokračovat?",
-    "ElementArchiveAction.ARCHIVE": "Archiv",
     "ElementArchiveAction.DUPLICATE": "Duplicate",
+    "ElementArchiveAction.DUPLICATE_PERMISSION_DENY": "Duplicate, insufficient permissions",
+    "ElementEditForm.ERROR_NOTIFICATION": "Chyba při zobrazení formuláře úprav tohoto bloku",
+    "ElementHeader.BROKEN": "This element is of obsolete type {type}.",
+    "ElementHeader.EXPAND": "Zobrazit editovatelná pole",
     "ElementHeader.NOTITLE": "Nepojmenovaný {type} blok",
-    "ElementPublishAction.SUCCESS_NOTIFICATION": "Úspěšně zveřejněno '{title}'",
+    "ElementHeader.STATE_DRAFT": "Položka dosud nebyla zveřejněna",
+    "ElementHeader.STATE_MODIFIED": "Položka obsahuje nezveřejněné úpravy",
+    "ElementList.ADD_BLOCKS": "Přidat bloky a umístit obsah",
     "ElementPublishAction.ERROR_NOTIFICATION": "Chyba při zveřejnění '{title}'",
     "ElementPublishAction.PUBLISH": "Zveřejnit",
-    "ElementSaveAction.SUCCESS_NOTIFICATION": "Úspěšně uloženo '{title}'",
+    "ElementPublishAction.PUBLISH_PERMISSION_DENY": "Publish, insufficient permissions",
+    "ElementPublishAction.SUCCESS_NOTIFICATION": "Úspěšně zveřejněno '{title}'",
     "ElementSaveAction.ERROR_NOTIFICATION": "Chyba při ukládání '{title}'",
     "ElementSaveAction.SAVE": "Uložit",
-    "ElementUnpublishAction.SUCCESS_NOTIFICATION": "'{title}' odstraněno ze zveřejněných stránek",
+    "ElementSaveAction.SUCCESS_NOTIFICATION": "Úspěšně uloženo '{title}'",
+    "ElementSummary.NO_PREVIEW": "Náhled není k dispozici",
     "ElementUnpublishAction.ERROR_NOTIFICATION": "Chyba při zrušení zveřejnění '{title}'",
+    "ElementUnpublishAction.SUCCESS_NOTIFICATION": "'{title}' odstraněno ze zveřejněných stránek",
     "ElementUnpublishAction.UNPUBLISH": "Nezveřejnit",
-    "ElementAddElementPopover.SEARCH_BLOCKS": "Prohledat bloky",
-    "ElementAddNewButton.ADD_BLOCK": "Přidat blok",
-    "ElementalElement.TITLE": "Upravit blok {type}",
-    "ElementList.ADD_BLOCKS": "Přidat bloky a umístit obsah",
-    "ElementHeader.STATE_DRAFT": "Položka dosud nebyla zveřejněna",
-    "ElementHeader.STATE_MODIFIED": "Položka obsahuje nezveřejněné úpravy",
-    "ElementHeader.EXPAND": "Zobrazit editovatelná pole",
-    "ElementEditForm.ERROR_NOTIFICATION": "Chyba při zobrazení formuláře úprav tohoto bloku",
-    "ElementSummary.NO_PREVIEW": "Náhled není k dispozici",
-    "HistoricElementView.BLOCK_HISTORY": "Zobrazit blok",
-    "ElementArchiveAction.ARCHIVE_PERMISSION_DENY": "Archive, insufficient permissions",
-    "ElementArchiveAction.DUPLICATE_PERMISSION_DENY": "Duplicate, insufficient permissions",
-    "ElementPublishAction.PUBLISH_PERMISSION_DENY": "Publish, insufficient permissions",
     "ElementUnpublishAction.UNPUBLISH_PERMISSION_DENY": "Unpublish, insufficient permissions",
-    "ElementalElement.CHILD_RENDERING_ERROR": "Something went wrong with this block. Please try saving and refreshing the CMS.",
-    "HistoricElementView.VIEW_BLOCK_HISTORY": "Block history",
-    "ElementHeader.BROKEN": "This element is of obsolete type {type}.",
     "ElementalElement.ARCHIVE_BROKEN": "Archive this block",
     "ElementalElement.BROKEN_DESCRIPTION": "This block is broken and will not display on the front-end. You can archive it to remove it from this elemental area.",
-    "ElementalElement.BROKEN_DESCRIPTION_TITLE": "This block had the title \"{title}\". It is broken and will not display on the front-end. You can archive it to remove it from this elemental area."
+    "ElementalElement.BROKEN_DESCRIPTION_TITLE": "This block had the title \"{title}\". It is broken and will not display on the front-end. You can archive it to remove it from this elemental area.",
+    "ElementalElement.CHILD_RENDERING_ERROR": "Something went wrong with this block. Please try saving and refreshing the CMS.",
+    "ElementalElement.TITLE": "Upravit blok {type}",
+    "HistoricElementView.BLOCK_HISTORY": "Zobrazit blok",
+    "HistoricElementView.VIEW_BLOCK_HISTORY": "Block history"
 });
 }
\ No newline at end of file
diff --git a/client/lang/de.js b/client/lang/de.js
index 58259049..5bfd8637 100644
--- a/client/lang/de.js
+++ b/client/lang/de.js
@@ -6,39 +6,39 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
   }
 } else {
   ss.i18n.addDictionary('de', {
+    "ElementAddElementPopover.SEARCH_BLOCKS": "Blöcke suchen",
+    "ElementAddNewButton.ADD_BLOCK": "Block hinzufügen",
+    "ElementArchiveAction.ARCHIVE": "Archiv",
+    "ElementArchiveAction.ARCHIVE_PERMISSION_DENY": "Archive, insufficient permissions",
     "ElementArchiveAction.CONFIRM_DELETE": "Sind Sie sicher, dass Sie diesen Block archivieren wollen?",
     "ElementArchiveAction.CONFIRM_DELETE_AND_UNPUBLISH": "Warnung: Dieser Block wird von der veröffentlichten Seite entfernt, bevor er archiviert wird. Wollen Sie fortfahren?",
-    "ElementArchiveAction.ARCHIVE": "Archiv",
     "ElementArchiveAction.DUPLICATE": "Duplicate",
+    "ElementArchiveAction.DUPLICATE_PERMISSION_DENY": "Duplicate, insufficient permissions",
+    "ElementEditForm.ERROR_NOTIFICATION": "Fehler beim Bearbeitungsformular für diesen Block",
+    "ElementHeader.BROKEN": "This element is of obsolete type {type}.",
+    "ElementHeader.EXPAND": "Zeige editierbare Felder",
     "ElementHeader.NOTITLE": "{type} block ohne Titel",
-    "ElementPublishAction.SUCCESS_NOTIFICATION": "'{title}' erfolgreich veröffentlicht",
+    "ElementHeader.STATE_DRAFT": "Dieses Element wurde noch nicht veröffentlicht",
+    "ElementHeader.STATE_MODIFIED": "Dieses Element hat noch nicht veröffentlichte Änderungen",
+    "ElementList.ADD_BLOCKS": "Fügen Sie Blöcke für den Inhalt hinzu",
     "ElementPublishAction.ERROR_NOTIFICATION": "Fehler beim Veröffentlichen von '{title}'",
     "ElementPublishAction.PUBLISH": "Veröffentlichen",
-    "ElementSaveAction.SUCCESS_NOTIFICATION": "'{title}' erfolgreich gespeichert",
+    "ElementPublishAction.PUBLISH_PERMISSION_DENY": "Publish, insufficient permissions",
+    "ElementPublishAction.SUCCESS_NOTIFICATION": "'{title}' erfolgreich veröffentlicht",
     "ElementSaveAction.ERROR_NOTIFICATION": "Fehler beim Speichern von '{title}'",
     "ElementSaveAction.SAVE": "Speichern",
-    "ElementUnpublishAction.SUCCESS_NOTIFICATION": "'{title}' wurde von der veröffentlichten Seite entfernt.",
+    "ElementSaveAction.SUCCESS_NOTIFICATION": "'{title}' erfolgreich gespeichert",
+    "ElementSummary.NO_PREVIEW": "Keine Vorschau verfügbar",
     "ElementUnpublishAction.ERROR_NOTIFICATION": "Fehler beim zurücknehmen der Veröffentlichung von '{title}'",
+    "ElementUnpublishAction.SUCCESS_NOTIFICATION": "'{title}' wurde von der veröffentlichten Seite entfernt.",
     "ElementUnpublishAction.UNPUBLISH": "Veröffentlichung zurücknehmen",
-    "ElementAddElementPopover.SEARCH_BLOCKS": "Blöcke suchen",
-    "ElementAddNewButton.ADD_BLOCK": "Block hinzufügen",
-    "ElementalElement.TITLE": "Diesen {type} Block bearbeiten",
-    "ElementList.ADD_BLOCKS": "Fügen Sie Blöcke für den Inhalt hinzu",
-    "ElementHeader.STATE_DRAFT": "Dieses Element wurde noch nicht veröffentlicht",
-    "ElementHeader.STATE_MODIFIED": "Dieses Element hat noch nicht veröffentlichte Änderungen",
-    "ElementHeader.EXPAND": "Zeige editierbare Felder",
-    "ElementEditForm.ERROR_NOTIFICATION": "Fehler beim Bearbeitungsformular für diesen Block",
-    "ElementSummary.NO_PREVIEW": "Keine Vorschau verfügbar",
-    "HistoricElementView.BLOCK_HISTORY": "Block anzeigen",
-    "ElementArchiveAction.ARCHIVE_PERMISSION_DENY": "Archive, insufficient permissions",
-    "ElementArchiveAction.DUPLICATE_PERMISSION_DENY": "Duplicate, insufficient permissions",
-    "ElementPublishAction.PUBLISH_PERMISSION_DENY": "Publish, insufficient permissions",
     "ElementUnpublishAction.UNPUBLISH_PERMISSION_DENY": "Unpublish, insufficient permissions",
-    "ElementalElement.CHILD_RENDERING_ERROR": "Something went wrong with this block. Please try saving and refreshing the CMS.",
-    "HistoricElementView.VIEW_BLOCK_HISTORY": "Block history",
-    "ElementHeader.BROKEN": "This element is of obsolete type {type}.",
     "ElementalElement.ARCHIVE_BROKEN": "Archive this block",
     "ElementalElement.BROKEN_DESCRIPTION": "This block is broken and will not display on the front-end. You can archive it to remove it from this elemental area.",
-    "ElementalElement.BROKEN_DESCRIPTION_TITLE": "This block had the title \"{title}\". It is broken and will not display on the front-end. You can archive it to remove it from this elemental area."
+    "ElementalElement.BROKEN_DESCRIPTION_TITLE": "This block had the title \"{title}\". It is broken and will not display on the front-end. You can archive it to remove it from this elemental area.",
+    "ElementalElement.CHILD_RENDERING_ERROR": "Something went wrong with this block. Please try saving and refreshing the CMS.",
+    "ElementalElement.TITLE": "Diesen {type} Block bearbeiten",
+    "HistoricElementView.BLOCK_HISTORY": "Block anzeigen",
+    "HistoricElementView.VIEW_BLOCK_HISTORY": "Block history"
 });
 }
\ No newline at end of file
diff --git a/client/lang/en.js b/client/lang/en.js
index b4b55685..7f6ff347 100644
--- a/client/lang/en.js
+++ b/client/lang/en.js
@@ -6,39 +6,39 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
   }
 } else {
   ss.i18n.addDictionary('en', {
-    "ElementArchiveAction.CONFIRM_DELETE": "Are you sure you want to send this block to the archive?",
-    "ElementArchiveAction.CONFIRM_DELETE_AND_UNPUBLISH": "Warning: This block will be unpublished before being sent to the archive. Are you sure you want to proceed?",
+    "ElementAddElementPopover.SEARCH_BLOCKS": "Search blocks",
+    "ElementAddNewButton.ADD_BLOCK": "Add block",
     "ElementArchiveAction.ARCHIVE": "Archive",
     "ElementArchiveAction.ARCHIVE_PERMISSION_DENY": "Archive, insufficient permissions",
+    "ElementArchiveAction.CONFIRM_DELETE": "Are you sure you want to send this block to the archive?",
+    "ElementArchiveAction.CONFIRM_DELETE_AND_UNPUBLISH": "Warning: This block will be unpublished before being sent to the archive. Are you sure you want to proceed?",
     "ElementArchiveAction.DUPLICATE": "Duplicate",
     "ElementArchiveAction.DUPLICATE_PERMISSION_DENY": "Duplicate, insufficient permissions",
+    "ElementEditForm.ERROR_NOTIFICATION": "Error displaying the edit form for this block",
     "ElementHeader.BROKEN": "This element is of obsolete type {type}.",
+    "ElementHeader.EXPAND": "Show editable fields",
     "ElementHeader.NOTITLE": "Untitled {type} block",
-    "ElementPublishAction.SUCCESS_NOTIFICATION": "Published '{title}' successfully",
+    "ElementHeader.STATE_DRAFT": "Item has not been published yet",
+    "ElementHeader.STATE_MODIFIED": "Item has unpublished changes",
+    "ElementList.ADD_BLOCKS": "Add blocks to place your content",
     "ElementPublishAction.ERROR_NOTIFICATION": "Error publishing '{title}'",
     "ElementPublishAction.PUBLISH": "Publish",
     "ElementPublishAction.PUBLISH_PERMISSION_DENY": "Publish, insufficient permissions",
-    "ElementSaveAction.SUCCESS_NOTIFICATION": "Saved '{title}' successfully",
+    "ElementPublishAction.SUCCESS_NOTIFICATION": "Published '{title}' successfully",
     "ElementSaveAction.ERROR_NOTIFICATION": "Error saving '{title}'",
     "ElementSaveAction.SAVE": "Save",
-    "ElementUnpublishAction.SUCCESS_NOTIFICATION": "Removed '{title}' from the published page",
+    "ElementSaveAction.SUCCESS_NOTIFICATION": "Saved '{title}' successfully",
+    "ElementSummary.NO_PREVIEW": "No preview available",
     "ElementUnpublishAction.ERROR_NOTIFICATION": "Error unpublishing '{title}'",
+    "ElementUnpublishAction.SUCCESS_NOTIFICATION": "Removed '{title}' from the published page",
     "ElementUnpublishAction.UNPUBLISH": "Unpublish",
     "ElementUnpublishAction.UNPUBLISH_PERMISSION_DENY": "Unpublish, insufficient permissions",
-    "ElementAddElementPopover.SEARCH_BLOCKS": "Search blocks",
-    "ElementAddNewButton.ADD_BLOCK": "Add block",
     "ElementalElement.ARCHIVE_BROKEN": "Archive this block",
     "ElementalElement.BROKEN_DESCRIPTION": "This block is broken and will not display on the front-end. You can archive it to remove it from this elemental area.",
     "ElementalElement.BROKEN_DESCRIPTION_TITLE": "This block had the title \"{title}\". It is broken and will not display on the front-end. You can archive it to remove it from this elemental area.",
-    "ElementalElement.TITLE": "Edit this {type} block",
     "ElementalElement.CHILD_RENDERING_ERROR": "Something went wrong with this block. Please try saving and refreshing the CMS.",
-    "ElementList.ADD_BLOCKS": "Add blocks to place your content",
-    "ElementHeader.STATE_DRAFT": "Item has not been published yet",
-    "ElementHeader.STATE_MODIFIED": "Item has unpublished changes",
-    "ElementHeader.EXPAND": "Show editable fields",
-    "ElementEditForm.ERROR_NOTIFICATION": "Error displaying the edit form for this block",
-    "ElementSummary.NO_PREVIEW": "No preview available",
-    "HistoricElementView.VIEW_BLOCK_HISTORY": "Block history",
-    "HistoricElementView.BLOCK_HISTORY": "View block"
+    "ElementalElement.TITLE": "Edit this {type} block",
+    "HistoricElementView.BLOCK_HISTORY": "View block",
+    "HistoricElementView.VIEW_BLOCK_HISTORY": "Block history"
 });
 }
\ No newline at end of file
diff --git a/client/lang/fi.js b/client/lang/fi.js
index 673bfafb..37cbce70 100644
--- a/client/lang/fi.js
+++ b/client/lang/fi.js
@@ -6,39 +6,39 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
   }
 } else {
   ss.i18n.addDictionary('fi', {
+    "ElementAddElementPopover.SEARCH_BLOCKS": "Etsi palikoita",
+    "ElementAddNewButton.ADD_BLOCK": "Lisää palikka",
+    "ElementArchiveAction.ARCHIVE": "Arkistoi",
+    "ElementArchiveAction.ARCHIVE_PERMISSION_DENY": "Archive, insufficient permissions",
     "ElementArchiveAction.CONFIRM_DELETE": "Haluatko varmasti siirtää tämän palikan arkistoon?",
     "ElementArchiveAction.CONFIRM_DELETE_AND_UNPUBLISH": "Varoitus: tämä palikka poistetaan julkaisusta ennen kuin se siirretään arkistoon. Haluatko varmasti jatkaa?",
-    "ElementArchiveAction.ARCHIVE": "Arkistoi",
+    "ElementArchiveAction.DUPLICATE": "Duplicate",
+    "ElementArchiveAction.DUPLICATE_PERMISSION_DENY": "Duplicate, insufficient permissions",
+    "ElementEditForm.ERROR_NOTIFICATION": "Virhe näytettäessä muokkauskenttää tälle palikalle",
+    "ElementHeader.BROKEN": "This element is of obsolete type {type}.",
+    "ElementHeader.EXPAND": "Näytä muokattavat kentät",
     "ElementHeader.NOTITLE": "Nimetön {type} palikka",
-    "ElementPublishAction.SUCCESS_NOTIFICATION": "Julkaistiin '{title}' onnistuneesti",
+    "ElementHeader.STATE_DRAFT": "Kohdetta ei ole vielä julkaistu",
+    "ElementHeader.STATE_MODIFIED": "Kohteella on tallentamattomia muutoksia",
+    "ElementList.ADD_BLOCKS": "Lisää palikoita julkaistaksesi sisältöä",
     "ElementPublishAction.ERROR_NOTIFICATION": "Virhe julkaistaessa '{title}'",
     "ElementPublishAction.PUBLISH": "Julkaise",
-    "ElementSaveAction.SUCCESS_NOTIFICATION": "Tallennettiin '{title}' onnistuneesti",
+    "ElementPublishAction.PUBLISH_PERMISSION_DENY": "Publish, insufficient permissions",
+    "ElementPublishAction.SUCCESS_NOTIFICATION": "Julkaistiin '{title}' onnistuneesti",
     "ElementSaveAction.ERROR_NOTIFICATION": "Virhe tallennettaessa '{title}'",
     "ElementSaveAction.SAVE": "Tallenna",
-    "ElementUnpublishAction.SUCCESS_NOTIFICATION": "Poistettiin '{title}' julkaistulta sivulta",
+    "ElementSaveAction.SUCCESS_NOTIFICATION": "Tallennettiin '{title}' onnistuneesti",
+    "ElementSummary.NO_PREVIEW": "Ei esikatselua",
     "ElementUnpublishAction.ERROR_NOTIFICATION": "Virhe poistettaessa julkaisua » '{title}'",
+    "ElementUnpublishAction.SUCCESS_NOTIFICATION": "Poistettiin '{title}' julkaistulta sivulta",
     "ElementUnpublishAction.UNPUBLISH": "Poista julkaisusta",
-    "ElementAddElementPopover.SEARCH_BLOCKS": "Etsi palikoita",
-    "ElementAddNewButton.ADD_BLOCK": "Lisää palikka",
-    "ElementalElement.TITLE": "Muokkaa {type} palikkaa",
-    "ElementList.ADD_BLOCKS": "Lisää palikoita julkaistaksesi sisältöä",
-    "ElementHeader.STATE_DRAFT": "Kohdetta ei ole vielä julkaistu",
-    "ElementHeader.STATE_MODIFIED": "Kohteella on tallentamattomia muutoksia",
-    "ElementHeader.EXPAND": "Näytä muokattavat kentät",
-    "ElementEditForm.ERROR_NOTIFICATION": "Virhe näytettäessä muokkauskenttää tälle palikalle",
-    "ElementSummary.NO_PREVIEW": "Ei esikatselua",
-    "HistoricElementView.BLOCK_HISTORY": "Näytä palikka",
-    "ElementArchiveAction.ARCHIVE_PERMISSION_DENY": "Archive, insufficient permissions",
-    "ElementArchiveAction.DUPLICATE": "Duplicate",
-    "ElementArchiveAction.DUPLICATE_PERMISSION_DENY": "Duplicate, insufficient permissions",
-    "ElementPublishAction.PUBLISH_PERMISSION_DENY": "Publish, insufficient permissions",
     "ElementUnpublishAction.UNPUBLISH_PERMISSION_DENY": "Unpublish, insufficient permissions",
-    "ElementalElement.CHILD_RENDERING_ERROR": "Something went wrong with this block. Please try saving and refreshing the CMS.",
-    "HistoricElementView.VIEW_BLOCK_HISTORY": "Block history",
-    "ElementHeader.BROKEN": "This element is of obsolete type {type}.",
     "ElementalElement.ARCHIVE_BROKEN": "Archive this block",
     "ElementalElement.BROKEN_DESCRIPTION": "This block is broken and will not display on the front-end. You can archive it to remove it from this elemental area.",
-    "ElementalElement.BROKEN_DESCRIPTION_TITLE": "This block had the title \"{title}\". It is broken and will not display on the front-end. You can archive it to remove it from this elemental area."
+    "ElementalElement.BROKEN_DESCRIPTION_TITLE": "This block had the title \"{title}\". It is broken and will not display on the front-end. You can archive it to remove it from this elemental area.",
+    "ElementalElement.CHILD_RENDERING_ERROR": "Something went wrong with this block. Please try saving and refreshing the CMS.",
+    "ElementalElement.TITLE": "Muokkaa {type} palikkaa",
+    "HistoricElementView.BLOCK_HISTORY": "Näytä palikka",
+    "HistoricElementView.VIEW_BLOCK_HISTORY": "Block history"
 });
 }
\ No newline at end of file
diff --git a/client/lang/fr.js b/client/lang/fr.js
index a81c8f53..cd8e9a96 100644
--- a/client/lang/fr.js
+++ b/client/lang/fr.js
@@ -6,39 +6,39 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
   }
 } else {
   ss.i18n.addDictionary('fr', {
+    "ElementAddElementPopover.SEARCH_BLOCKS": "Chercher blocs",
+    "ElementAddNewButton.ADD_BLOCK": "Ajouter bloc",
+    "ElementArchiveAction.ARCHIVE": "Archive",
+    "ElementArchiveAction.ARCHIVE_PERMISSION_DENY": "Archive, insufficient permissions",
     "ElementArchiveAction.CONFIRM_DELETE": "Êtes-vous sûr de vouloir envoyer ce bloc aux archives ?",
     "ElementArchiveAction.CONFIRM_DELETE_AND_UNPUBLISH": "Attention: Ce bloc sera dépublié avant d'être envoyé aux archives. Êtes-vous sûr de vouloir continuer ?",
-    "ElementArchiveAction.ARCHIVE": "Archive",
     "ElementArchiveAction.DUPLICATE": "Duplicate",
+    "ElementArchiveAction.DUPLICATE_PERMISSION_DENY": "Duplicate, insufficient permissions",
+    "ElementEditForm.ERROR_NOTIFICATION": "Erreur à l'affichage du formulaire d'édition pour ce bloc",
+    "ElementHeader.BROKEN": "This element is of obsolete type {type}.",
+    "ElementHeader.EXPAND": "Montrer les champs éditables",
     "ElementHeader.NOTITLE": "Bloc {type} sans titre",
-    "ElementPublishAction.SUCCESS_NOTIFICATION": "'{title}' publié avec succès",
+    "ElementHeader.STATE_DRAFT": "L'élément n'a pas encore été publié",
+    "ElementHeader.STATE_MODIFIED": "L'élément a des changements non publiés",
+    "ElementList.ADD_BLOCKS": "Ajouter des blocs pour placer votre contenu",
     "ElementPublishAction.ERROR_NOTIFICATION": "Erreur à la publication de '{title}'",
     "ElementPublishAction.PUBLISH": "Publier",
-    "ElementSaveAction.SUCCESS_NOTIFICATION": "'{title}' sauvegardé avec succès",
+    "ElementPublishAction.PUBLISH_PERMISSION_DENY": "Publish, insufficient permissions",
+    "ElementPublishAction.SUCCESS_NOTIFICATION": "'{title}' publié avec succès",
     "ElementSaveAction.ERROR_NOTIFICATION": "Erreur à la sauvegarde de '{title}'",
     "ElementSaveAction.SAVE": "Sauvegarder",
-    "ElementUnpublishAction.SUCCESS_NOTIFICATION": "'{title}' retiré de la page publiée",
+    "ElementSaveAction.SUCCESS_NOTIFICATION": "'{title}' sauvegardé avec succès",
+    "ElementSummary.NO_PREVIEW": "Aucune prévisualisation disponible",
     "ElementUnpublishAction.ERROR_NOTIFICATION": "Erreur à la dépublication de '{title}'",
+    "ElementUnpublishAction.SUCCESS_NOTIFICATION": "'{title}' retiré de la page publiée",
     "ElementUnpublishAction.UNPUBLISH": "Dépublier",
-    "ElementAddElementPopover.SEARCH_BLOCKS": "Chercher blocs",
-    "ElementAddNewButton.ADD_BLOCK": "Ajouter bloc",
-    "ElementalElement.TITLE": "Éditer ce bloc {type}",
-    "ElementList.ADD_BLOCKS": "Ajouter des blocs pour placer votre contenu",
-    "ElementHeader.STATE_DRAFT": "L'élément n'a pas encore été publié",
-    "ElementHeader.STATE_MODIFIED": "L'élément a des changements non publiés",
-    "ElementHeader.EXPAND": "Montrer les champs éditables",
-    "ElementEditForm.ERROR_NOTIFICATION": "Erreur à l'affichage du formulaire d'édition pour ce bloc",
-    "ElementSummary.NO_PREVIEW": "Aucune prévisualisation disponible",
-    "HistoricElementView.BLOCK_HISTORY": "Voir bloc",
-    "ElementArchiveAction.ARCHIVE_PERMISSION_DENY": "Archive, insufficient permissions",
-    "ElementArchiveAction.DUPLICATE_PERMISSION_DENY": "Duplicate, insufficient permissions",
-    "ElementPublishAction.PUBLISH_PERMISSION_DENY": "Publish, insufficient permissions",
     "ElementUnpublishAction.UNPUBLISH_PERMISSION_DENY": "Unpublish, insufficient permissions",
-    "ElementalElement.CHILD_RENDERING_ERROR": "Something went wrong with this block. Please try saving and refreshing the CMS.",
-    "HistoricElementView.VIEW_BLOCK_HISTORY": "Block history",
-    "ElementHeader.BROKEN": "This element is of obsolete type {type}.",
     "ElementalElement.ARCHIVE_BROKEN": "Archive this block",
     "ElementalElement.BROKEN_DESCRIPTION": "This block is broken and will not display on the front-end. You can archive it to remove it from this elemental area.",
-    "ElementalElement.BROKEN_DESCRIPTION_TITLE": "This block had the title \"{title}\". It is broken and will not display on the front-end. You can archive it to remove it from this elemental area."
+    "ElementalElement.BROKEN_DESCRIPTION_TITLE": "This block had the title \"{title}\". It is broken and will not display on the front-end. You can archive it to remove it from this elemental area.",
+    "ElementalElement.CHILD_RENDERING_ERROR": "Something went wrong with this block. Please try saving and refreshing the CMS.",
+    "ElementalElement.TITLE": "Éditer ce bloc {type}",
+    "HistoricElementView.BLOCK_HISTORY": "Voir bloc",
+    "HistoricElementView.VIEW_BLOCK_HISTORY": "Block history"
 });
 }
\ No newline at end of file
diff --git a/client/lang/it.js b/client/lang/it.js
index e543f448..13b9e669 100644
--- a/client/lang/it.js
+++ b/client/lang/it.js
@@ -6,39 +6,39 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
   }
 } else {
   ss.i18n.addDictionary('it', {
+    "ElementAddElementPopover.SEARCH_BLOCKS": "Cerca blocchi",
+    "ElementAddNewButton.ADD_BLOCK": "Aggiungi blocco",
+    "ElementArchiveAction.ARCHIVE": "Archivio",
+    "ElementArchiveAction.ARCHIVE_PERMISSION_DENY": "Archive, insufficient permissions",
     "ElementArchiveAction.CONFIRM_DELETE": "Sei sicuro di voler inviare questo blocco all'archivio?",
     "ElementArchiveAction.CONFIRM_DELETE_AND_UNPUBLISH": "Attenzione: questo blocco non sarà pubblicato prima di essere inviato all'archivio. Sei sicuro di voler procedere?",
-    "ElementArchiveAction.ARCHIVE": "Archivio",
+    "ElementArchiveAction.DUPLICATE": "Duplicate",
+    "ElementArchiveAction.DUPLICATE_PERMISSION_DENY": "Duplicate, insufficient permissions",
+    "ElementEditForm.ERROR_NOTIFICATION": "Errore durante la visualizzazione del modulo di modifica per questo blocco",
+    "ElementHeader.BROKEN": "This element is of obsolete type {type}.",
+    "ElementHeader.EXPAND": "Mostra campi modificabili",
     "ElementHeader.NOTITLE": "Blocco {type} senza titolo",
-    "ElementPublishAction.SUCCESS_NOTIFICATION": "Pubblicato '{title}' con successo",
+    "ElementHeader.STATE_DRAFT": "L'articolo non è stato ancora pubblicato",
+    "ElementHeader.STATE_MODIFIED": "L'articolo ha modifiche non pubblicate",
+    "ElementList.ADD_BLOCKS": "Aggiungi blocchi per posizionare il tuo contenuto",
     "ElementPublishAction.ERROR_NOTIFICATION": "Errore di pubblicazione '{title}'",
     "ElementPublishAction.PUBLISH": "Pubblica",
-    "ElementSaveAction.SUCCESS_NOTIFICATION": "Salvato '{title}' con successo",
+    "ElementPublishAction.PUBLISH_PERMISSION_DENY": "Publish, insufficient permissions",
+    "ElementPublishAction.SUCCESS_NOTIFICATION": "Pubblicato '{title}' con successo",
     "ElementSaveAction.ERROR_NOTIFICATION": "Errore durante il salvataggio '{title}'",
     "ElementSaveAction.SAVE": "Salva",
-    "ElementUnpublishAction.SUCCESS_NOTIFICATION": "Rimosso '{title}' dalla pagina pubblicata",
+    "ElementSaveAction.SUCCESS_NOTIFICATION": "Salvato '{title}' con successo",
+    "ElementSummary.NO_PREVIEW": "Nessuna anteprima disponibile",
     "ElementUnpublishAction.ERROR_NOTIFICATION": "Errore di annullamento della pubblicazione '{title}'",
+    "ElementUnpublishAction.SUCCESS_NOTIFICATION": "Rimosso '{title}' dalla pagina pubblicata",
     "ElementUnpublishAction.UNPUBLISH": "Non pubblicato",
-    "ElementAddElementPopover.SEARCH_BLOCKS": "Cerca blocchi",
-    "ElementAddNewButton.ADD_BLOCK": "Aggiungi blocco",
-    "ElementalElement.TITLE": "Modifica questo blocco {type} ",
-    "ElementList.ADD_BLOCKS": "Aggiungi blocchi per posizionare il tuo contenuto",
-    "ElementHeader.STATE_DRAFT": "L'articolo non è stato ancora pubblicato",
-    "ElementHeader.STATE_MODIFIED": "L'articolo ha modifiche non pubblicate",
-    "ElementHeader.EXPAND": "Mostra campi modificabili",
-    "ElementEditForm.ERROR_NOTIFICATION": "Errore durante la visualizzazione del modulo di modifica per questo blocco",
-    "ElementSummary.NO_PREVIEW": "Nessuna anteprima disponibile",
-    "HistoricElementView.BLOCK_HISTORY": "Visualizza il blocco",
-    "ElementArchiveAction.ARCHIVE_PERMISSION_DENY": "Archive, insufficient permissions",
-    "ElementArchiveAction.DUPLICATE": "Duplicate",
-    "ElementArchiveAction.DUPLICATE_PERMISSION_DENY": "Duplicate, insufficient permissions",
-    "ElementPublishAction.PUBLISH_PERMISSION_DENY": "Publish, insufficient permissions",
     "ElementUnpublishAction.UNPUBLISH_PERMISSION_DENY": "Unpublish, insufficient permissions",
-    "ElementalElement.CHILD_RENDERING_ERROR": "Something went wrong with this block. Please try saving and refreshing the CMS.",
-    "HistoricElementView.VIEW_BLOCK_HISTORY": "Block history",
-    "ElementHeader.BROKEN": "This element is of obsolete type {type}.",
     "ElementalElement.ARCHIVE_BROKEN": "Archive this block",
     "ElementalElement.BROKEN_DESCRIPTION": "This block is broken and will not display on the front-end. You can archive it to remove it from this elemental area.",
-    "ElementalElement.BROKEN_DESCRIPTION_TITLE": "This block had the title \"{title}\". It is broken and will not display on the front-end. You can archive it to remove it from this elemental area."
+    "ElementalElement.BROKEN_DESCRIPTION_TITLE": "This block had the title \"{title}\". It is broken and will not display on the front-end. You can archive it to remove it from this elemental area.",
+    "ElementalElement.CHILD_RENDERING_ERROR": "Something went wrong with this block. Please try saving and refreshing the CMS.",
+    "ElementalElement.TITLE": "Modifica questo blocco {type} ",
+    "HistoricElementView.BLOCK_HISTORY": "Visualizza il blocco",
+    "HistoricElementView.VIEW_BLOCK_HISTORY": "Block history"
 });
 }
\ No newline at end of file
diff --git a/client/lang/nl.js b/client/lang/nl.js
index 930f948e..94341313 100644
--- a/client/lang/nl.js
+++ b/client/lang/nl.js
@@ -6,39 +6,39 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
   }
 } else {
   ss.i18n.addDictionary('nl', {
+    "ElementAddElementPopover.SEARCH_BLOCKS": "Zoek binnen blokken",
+    "ElementAddNewButton.ADD_BLOCK": "Voeg blok toe",
+    "ElementArchiveAction.ARCHIVE": "Archiveren",
+    "ElementArchiveAction.ARCHIVE_PERMISSION_DENY": "Geen rechten om te archiveren",
     "ElementArchiveAction.CONFIRM_DELETE": "Weet je zeker dat je dit blok wil archiveren?",
     "ElementArchiveAction.CONFIRM_DELETE_AND_UNPUBLISH": "Waarschuwing: Dit blok wordt teruggezet naar draft voordat het gearchiveerd word. Wilt u doorgaan?",
-    "ElementArchiveAction.ARCHIVE": "Archiveren",
     "ElementArchiveAction.DUPLICATE": "Dupliceren",
+    "ElementArchiveAction.DUPLICATE_PERMISSION_DENY": "Geen rechten om te dupliceren",
+    "ElementEditForm.ERROR_NOTIFICATION": "Fout bij het laten zien van het bewerkformulier van dit blok",
+    "ElementHeader.BROKEN": "Dit element is van het verouderde type {type}.",
+    "ElementHeader.EXPAND": "Toon bewerkbare velden",
     "ElementHeader.NOTITLE": "Nieuw: {type}",
-    "ElementPublishAction.SUCCESS_NOTIFICATION": "'{title}' succesvol gepubliceerd",
+    "ElementHeader.STATE_DRAFT": "Item is nog niet gepubliceerd",
+    "ElementHeader.STATE_MODIFIED": "Item heeft ongepubliceerde veranderingen",
+    "ElementList.ADD_BLOCKS": "Voeg blokken toe om je inhoud te plaatsen",
     "ElementPublishAction.ERROR_NOTIFICATION": "Fout bij het publiceren van '{title}'",
     "ElementPublishAction.PUBLISH": "Publiceer",
-    "ElementSaveAction.SUCCESS_NOTIFICATION": " '{title}' succesvol opgeslagen",
+    "ElementPublishAction.PUBLISH_PERMISSION_DENY": "Geen rechten om te publiceren",
+    "ElementPublishAction.SUCCESS_NOTIFICATION": "'{title}' succesvol gepubliceerd",
     "ElementSaveAction.ERROR_NOTIFICATION": "Fout bij opslaan '{title}'",
     "ElementSaveAction.SAVE": "Opslaan",
-    "ElementUnpublishAction.SUCCESS_NOTIFICATION": " '{title}' verwijderd van gepubliceerde pagina",
+    "ElementSaveAction.SUCCESS_NOTIFICATION": " '{title}' succesvol opgeslagen",
+    "ElementSummary.NO_PREVIEW": "Geen voorbeeld beschikbaar",
     "ElementUnpublishAction.ERROR_NOTIFICATION": "Fout bij het terugzetten van '{title}' naar ongepubliceerd  ",
+    "ElementUnpublishAction.SUCCESS_NOTIFICATION": " '{title}' verwijderd van gepubliceerde pagina",
     "ElementUnpublishAction.UNPUBLISH": "Ga terug naar draft",
-    "ElementAddElementPopover.SEARCH_BLOCKS": "Zoek binnen blokken",
-    "ElementAddNewButton.ADD_BLOCK": "Voeg blok toe",
-    "ElementalElement.TITLE": "Bewerk dit {type} blok",
-    "ElementList.ADD_BLOCKS": "Voeg blokken toe om je inhoud te plaatsen",
-    "ElementHeader.STATE_DRAFT": "Item is nog niet gepubliceerd",
-    "ElementHeader.STATE_MODIFIED": "Item heeft ongepubliceerde veranderingen",
-    "ElementHeader.EXPAND": "Toon bewerkbare velden",
-    "ElementEditForm.ERROR_NOTIFICATION": "Fout bij het laten zien van het bewerkformulier van dit blok",
-    "ElementSummary.NO_PREVIEW": "Geen voorbeeld beschikbaar",
-    "HistoricElementView.BLOCK_HISTORY": "Toon blok",
-    "ElementArchiveAction.ARCHIVE_PERMISSION_DENY": "Geen rechten om te archiveren",
-    "ElementArchiveAction.DUPLICATE_PERMISSION_DENY": "Geen rechten om te dupliceren",
-    "ElementPublishAction.PUBLISH_PERMISSION_DENY": "Geen rechten om te publiceren",
     "ElementUnpublishAction.UNPUBLISH_PERMISSION_DENY": "Geen rechten om te depubliceren",
-    "ElementalElement.CHILD_RENDERING_ERROR": "Er is iets misgegaan met dit blok. Probeer het op te slaan en het CMS te verversen.",
-    "HistoricElementView.VIEW_BLOCK_HISTORY": "Bewerk-historie van blok",
-    "ElementHeader.BROKEN": "Dit element is van het verouderde type {type}.",
     "ElementalElement.ARCHIVE_BROKEN": "Archiveer dit blok",
     "ElementalElement.BROKEN_DESCRIPTION": "Dit blok werkt niet meer en wordt niet weergegeven op de site. Het kan gearchiveerd worden om het ook uit deze lijst te verwijderen.",
-    "ElementalElement.BROKEN_DESCRIPTION_TITLE": "Dit blok had de titel \"{title}\". Het blok werkt niet meer en wordt niet weergegeven op de site. Het kan gearchiveerd worden om het ook uit deze lijst te verwijderen."
+    "ElementalElement.BROKEN_DESCRIPTION_TITLE": "Dit blok had de titel \"{title}\". Het blok werkt niet meer en wordt niet weergegeven op de site. Het kan gearchiveerd worden om het ook uit deze lijst te verwijderen.",
+    "ElementalElement.CHILD_RENDERING_ERROR": "Er is iets misgegaan met dit blok. Probeer het op te slaan en het CMS te verversen.",
+    "ElementalElement.TITLE": "Bewerk dit {type} blok",
+    "HistoricElementView.BLOCK_HISTORY": "Toon blok",
+    "HistoricElementView.VIEW_BLOCK_HISTORY": "Bewerk-historie van blok"
 });
 }
\ No newline at end of file
diff --git a/client/lang/pl.js b/client/lang/pl.js
index 99f3d89e..a8471d49 100644
--- a/client/lang/pl.js
+++ b/client/lang/pl.js
@@ -6,39 +6,39 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
   }
 } else {
   ss.i18n.addDictionary('pl', {
-    "ElementArchiveAction.CONFIRM_DELETE": "Czy na pewno chcesz wysłać ten blok do archiwum?",
-    "ElementArchiveAction.CONFIRM_DELETE_AND_UNPUBLISH": "Ostrzeżenie: ten blok będzie szkicem przed wysłaniem do archiwum. Na pewno chcesz kontynuować?",
+    "ElementAddElementPopover.SEARCH_BLOCKS": "Wyszukaj",
+    "ElementAddNewButton.ADD_BLOCK": "Dodaj blok",
     "ElementArchiveAction.ARCHIVE": "Archiwum",
     "ElementArchiveAction.ARCHIVE_PERMISSION_DENY": "Archiwum, niewystarczające uprawnienia",
+    "ElementArchiveAction.CONFIRM_DELETE": "Czy na pewno chcesz wysłać ten blok do archiwum?",
+    "ElementArchiveAction.CONFIRM_DELETE_AND_UNPUBLISH": "Ostrzeżenie: ten blok będzie szkicem przed wysłaniem do archiwum. Na pewno chcesz kontynuować?",
     "ElementArchiveAction.DUPLICATE": "Duplikat",
     "ElementArchiveAction.DUPLICATE_PERMISSION_DENY": "Duplikat, niewystarczające uprawnienia",
+    "ElementEditForm.ERROR_NOTIFICATION": "Błąd podczas wyświetlania formularza edycji dla tego bloku",
+    "ElementHeader.BROKEN": "This element is of obsolete type {type}.",
+    "ElementHeader.EXPAND": "Pokaż pola możliwe do edycji",
     "ElementHeader.NOTITLE": "Nienazwany {type} blok",
-    "ElementPublishAction.SUCCESS_NOTIFICATION": "Opublikowano „{title}” pomyślnie",
+    "ElementHeader.STATE_DRAFT": "Przedmiot nie został jeszcze opublikowany",
+    "ElementHeader.STATE_MODIFIED": "Element ma nieopublikowane zmiany",
+    "ElementList.ADD_BLOCKS": "Dodaj bloki, aby umieścić swoją treść",
     "ElementPublishAction.ERROR_NOTIFICATION": "Błąd podczas publikowania „{title}”",
     "ElementPublishAction.PUBLISH": "Publikuj",
     "ElementPublishAction.PUBLISH_PERMISSION_DENY": "Publikuj, niewystarczające uprawnienia",
-    "ElementSaveAction.SUCCESS_NOTIFICATION": "Opublikowano „{title}” pomyślnie",
+    "ElementPublishAction.SUCCESS_NOTIFICATION": "Opublikowano „{title}” pomyślnie",
     "ElementSaveAction.ERROR_NOTIFICATION": "Błąd podczas zapisywania „{title}”",
     "ElementSaveAction.SAVE": "Zapisz",
-    "ElementUnpublishAction.SUCCESS_NOTIFICATION": "Usunięto „{title}” z opublikowanej strony",
+    "ElementSaveAction.SUCCESS_NOTIFICATION": "Opublikowano „{title}” pomyślnie",
+    "ElementSummary.NO_PREVIEW": "Brak możliwego podglądu",
     "ElementUnpublishAction.ERROR_NOTIFICATION": "Błąd podczas cofania publikacji „{title}”",
+    "ElementUnpublishAction.SUCCESS_NOTIFICATION": "Usunięto „{title}” z opublikowanej strony",
     "ElementUnpublishAction.UNPUBLISH": "Cofnij publikację",
     "ElementUnpublishAction.UNPUBLISH_PERMISSION_DENY": "Cofnij publikację, niewystarczające uprawnienia",
-    "ElementAddElementPopover.SEARCH_BLOCKS": "Wyszukaj",
-    "ElementAddNewButton.ADD_BLOCK": "Dodaj blok",
-    "ElementalElement.TITLE": "Edytuj {type} blok",
-    "ElementalElement.CHILD_RENDERING_ERROR": "Coś poszło nie tak z tym blokiem. Prosimy raz jeszcze zapisz, potem odświeżmy przeglądarkę – zakładkę z CMSem.",
-    "ElementList.ADD_BLOCKS": "Dodaj bloki, aby umieścić swoją treść",
-    "ElementHeader.STATE_DRAFT": "Przedmiot nie został jeszcze opublikowany",
-    "ElementHeader.STATE_MODIFIED": "Element ma nieopublikowane zmiany",
-    "ElementHeader.EXPAND": "Pokaż pola możliwe do edycji",
-    "ElementEditForm.ERROR_NOTIFICATION": "Błąd podczas wyświetlania formularza edycji dla tego bloku",
-    "ElementSummary.NO_PREVIEW": "Brak możliwego podglądu",
-    "HistoricElementView.VIEW_BLOCK_HISTORY": "Historia",
-    "HistoricElementView.BLOCK_HISTORY": "Widok bloku",
-    "ElementHeader.BROKEN": "This element is of obsolete type {type}.",
     "ElementalElement.ARCHIVE_BROKEN": "Archive this block",
     "ElementalElement.BROKEN_DESCRIPTION": "This block is broken and will not display on the front-end. You can archive it to remove it from this elemental area.",
-    "ElementalElement.BROKEN_DESCRIPTION_TITLE": "This block had the title \"{title}\". It is broken and will not display on the front-end. You can archive it to remove it from this elemental area."
+    "ElementalElement.BROKEN_DESCRIPTION_TITLE": "This block had the title \"{title}\". It is broken and will not display on the front-end. You can archive it to remove it from this elemental area.",
+    "ElementalElement.CHILD_RENDERING_ERROR": "Coś poszło nie tak z tym blokiem. Prosimy raz jeszcze zapisz, potem odświeżmy przeglądarkę – zakładkę z CMSem.",
+    "ElementalElement.TITLE": "Edytuj {type} blok",
+    "HistoricElementView.BLOCK_HISTORY": "Widok bloku",
+    "HistoricElementView.VIEW_BLOCK_HISTORY": "Historia"
 });
 }
\ No newline at end of file
diff --git a/client/lang/sl.js b/client/lang/sl.js
index be422a73..998b9811 100644
--- a/client/lang/sl.js
+++ b/client/lang/sl.js
@@ -6,39 +6,39 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
   }
 } else {
   ss.i18n.addDictionary('sl', {
-    "ElementArchiveAction.CONFIRM_DELETE": "Želite arhivirati izbrani gradnik?",
-    "ElementArchiveAction.CONFIRM_DELETE_AND_UNPUBLISH": "Opozorilo: Gradnik bo umaknjen iz objave preden ga bomo arhivirali. Želite nadaljevati?",
+    "ElementAddElementPopover.SEARCH_BLOCKS": "Najdi gradnik",
+    "ElementAddNewButton.ADD_BLOCK": "Dodaj gradnik",
     "ElementArchiveAction.ARCHIVE": "Arhiv",
     "ElementArchiveAction.ARCHIVE_PERMISSION_DENY": "Archive, insufficient permissions",
+    "ElementArchiveAction.CONFIRM_DELETE": "Želite arhivirati izbrani gradnik?",
+    "ElementArchiveAction.CONFIRM_DELETE_AND_UNPUBLISH": "Opozorilo: Gradnik bo umaknjen iz objave preden ga bomo arhivirali. Želite nadaljevati?",
     "ElementArchiveAction.DUPLICATE": "Duplicate",
     "ElementArchiveAction.DUPLICATE_PERMISSION_DENY": "Duplicate, insufficient permissions",
+    "ElementEditForm.ERROR_NOTIFICATION": "Napaka pri prikazu obrazca za urejanje tega gradnika",
+    "ElementHeader.BROKEN": "This element is of obsolete type {type}.",
+    "ElementHeader.EXPAND": "Prikaži polja, ki jih je mogoče urejati",
     "ElementHeader.NOTITLE": "{type} gradnik brez naslova",
-    "ElementPublishAction.SUCCESS_NOTIFICATION": "Objavili smo '{title}'",
+    "ElementHeader.STATE_DRAFT": "Ta gradnik še ni objavljen",
+    "ElementHeader.STATE_MODIFIED": "Spremembe za ta gradnik še niso shranjene ",
+    "ElementList.ADD_BLOCKS": "Dodajte gradnik z vsebino",
     "ElementPublishAction.ERROR_NOTIFICATION": "Napaka pri objavi '{title}'",
     "ElementPublishAction.PUBLISH": "Objavi",
     "ElementPublishAction.PUBLISH_PERMISSION_DENY": "Publish, insufficient permissions",
-    "ElementSaveAction.SUCCESS_NOTIFICATION": "Shranili smo '{title}'",
+    "ElementPublishAction.SUCCESS_NOTIFICATION": "Objavili smo '{title}'",
     "ElementSaveAction.ERROR_NOTIFICATION": "Napaka pri shranjevanju '{title}'",
     "ElementSaveAction.SAVE": "Shrani",
-    "ElementUnpublishAction.SUCCESS_NOTIFICATION": "Z objavljene strani smo odstranili '{title}'",
+    "ElementSaveAction.SUCCESS_NOTIFICATION": "Shranili smo '{title}'",
+    "ElementSummary.NO_PREVIEW": "Predogled ni na voljo",
     "ElementUnpublishAction.ERROR_NOTIFICATION": "Napaka pri umiku '{title}' iz objave",
+    "ElementUnpublishAction.SUCCESS_NOTIFICATION": "Z objavljene strani smo odstranili '{title}'",
     "ElementUnpublishAction.UNPUBLISH": "Umakni iz objave",
     "ElementUnpublishAction.UNPUBLISH_PERMISSION_DENY": "Unpublish, insufficient permissions",
-    "ElementAddElementPopover.SEARCH_BLOCKS": "Najdi gradnik",
-    "ElementAddNewButton.ADD_BLOCK": "Dodaj gradnik",
-    "ElementalElement.TITLE": "Urejanje gradnika {type}",
-    "ElementalElement.CHILD_RENDERING_ERROR": "Something went wrong with this block. Please try saving and refreshing the CMS.",
-    "ElementList.ADD_BLOCKS": "Dodajte gradnik z vsebino",
-    "ElementHeader.STATE_DRAFT": "Ta gradnik še ni objavljen",
-    "ElementHeader.STATE_MODIFIED": "Spremembe za ta gradnik še niso shranjene ",
-    "ElementHeader.EXPAND": "Prikaži polja, ki jih je mogoče urejati",
-    "ElementEditForm.ERROR_NOTIFICATION": "Napaka pri prikazu obrazca za urejanje tega gradnika",
-    "ElementSummary.NO_PREVIEW": "Predogled ni na voljo",
-    "HistoricElementView.VIEW_BLOCK_HISTORY": "Block history",
-    "HistoricElementView.BLOCK_HISTORY": "Prikaži gradnik",
-    "ElementHeader.BROKEN": "This element is of obsolete type {type}.",
     "ElementalElement.ARCHIVE_BROKEN": "Archive this block",
     "ElementalElement.BROKEN_DESCRIPTION": "This block is broken and will not display on the front-end. You can archive it to remove it from this elemental area.",
-    "ElementalElement.BROKEN_DESCRIPTION_TITLE": "This block had the title \"{title}\". It is broken and will not display on the front-end. You can archive it to remove it from this elemental area."
+    "ElementalElement.BROKEN_DESCRIPTION_TITLE": "This block had the title \"{title}\". It is broken and will not display on the front-end. You can archive it to remove it from this elemental area.",
+    "ElementalElement.CHILD_RENDERING_ERROR": "Something went wrong with this block. Please try saving and refreshing the CMS.",
+    "ElementalElement.TITLE": "Urejanje gradnika {type}",
+    "HistoricElementView.BLOCK_HISTORY": "Prikaži gradnik",
+    "HistoricElementView.VIEW_BLOCK_HISTORY": "Block history"
 });
 }
\ No newline at end of file
diff --git a/client/lang/src/cs.json b/client/lang/src/cs.json
index c1aa7002..91047738 100644
--- a/client/lang/src/cs.json
+++ b/client/lang/src/cs.json
@@ -1,36 +1,36 @@
 {
+    "ElementAddElementPopover.SEARCH_BLOCKS": "Prohledat bloky",
+    "ElementAddNewButton.ADD_BLOCK": "Přidat blok",
+    "ElementArchiveAction.ARCHIVE": "Archiv",
+    "ElementArchiveAction.ARCHIVE_PERMISSION_DENY": "Archive, insufficient permissions",
     "ElementArchiveAction.CONFIRM_DELETE": "Jste si jistí, že chcete blok odeslat do archivu?",
     "ElementArchiveAction.CONFIRM_DELETE_AND_UNPUBLISH": "Varování: Tento blok bude před odesláním do archivu označen jako nezveřejněný. Opravdu chcete pokračovat?",
-    "ElementArchiveAction.ARCHIVE": "Archiv",
     "ElementArchiveAction.DUPLICATE": "Duplicate",
+    "ElementArchiveAction.DUPLICATE_PERMISSION_DENY": "Duplicate, insufficient permissions",
+    "ElementEditForm.ERROR_NOTIFICATION": "Chyba při zobrazení formuláře úprav tohoto bloku",
+    "ElementHeader.BROKEN": "This element is of obsolete type {type}.",
+    "ElementHeader.EXPAND": "Zobrazit editovatelná pole",
     "ElementHeader.NOTITLE": "Nepojmenovaný {type} blok",
-    "ElementPublishAction.SUCCESS_NOTIFICATION": "Úspěšně zveřejněno '{title}'",
+    "ElementHeader.STATE_DRAFT": "Položka dosud nebyla zveřejněna",
+    "ElementHeader.STATE_MODIFIED": "Položka obsahuje nezveřejněné úpravy",
+    "ElementList.ADD_BLOCKS": "Přidat bloky a umístit obsah",
     "ElementPublishAction.ERROR_NOTIFICATION": "Chyba při zveřejnění '{title}'",
     "ElementPublishAction.PUBLISH": "Zveřejnit",
-    "ElementSaveAction.SUCCESS_NOTIFICATION": "Úspěšně uloženo '{title}'",
+    "ElementPublishAction.PUBLISH_PERMISSION_DENY": "Publish, insufficient permissions",
+    "ElementPublishAction.SUCCESS_NOTIFICATION": "Úspěšně zveřejněno '{title}'",
     "ElementSaveAction.ERROR_NOTIFICATION": "Chyba při ukládání '{title}'",
     "ElementSaveAction.SAVE": "Uložit",
-    "ElementUnpublishAction.SUCCESS_NOTIFICATION": "'{title}' odstraněno ze zveřejněných stránek",
+    "ElementSaveAction.SUCCESS_NOTIFICATION": "Úspěšně uloženo '{title}'",
+    "ElementSummary.NO_PREVIEW": "Náhled není k dispozici",
     "ElementUnpublishAction.ERROR_NOTIFICATION": "Chyba při zrušení zveřejnění '{title}'",
+    "ElementUnpublishAction.SUCCESS_NOTIFICATION": "'{title}' odstraněno ze zveřejněných stránek",
     "ElementUnpublishAction.UNPUBLISH": "Nezveřejnit",
-    "ElementAddElementPopover.SEARCH_BLOCKS": "Prohledat bloky",
-    "ElementAddNewButton.ADD_BLOCK": "Přidat blok",
-    "ElementalElement.TITLE": "Upravit blok {type}",
-    "ElementList.ADD_BLOCKS": "Přidat bloky a umístit obsah",
-    "ElementHeader.STATE_DRAFT": "Položka dosud nebyla zveřejněna",
-    "ElementHeader.STATE_MODIFIED": "Položka obsahuje nezveřejněné úpravy",
-    "ElementHeader.EXPAND": "Zobrazit editovatelná pole",
-    "ElementEditForm.ERROR_NOTIFICATION": "Chyba při zobrazení formuláře úprav tohoto bloku",
-    "ElementSummary.NO_PREVIEW": "Náhled není k dispozici",
-    "HistoricElementView.BLOCK_HISTORY": "Zobrazit blok",
-    "ElementArchiveAction.ARCHIVE_PERMISSION_DENY": "Archive, insufficient permissions",
-    "ElementArchiveAction.DUPLICATE_PERMISSION_DENY": "Duplicate, insufficient permissions",
-    "ElementPublishAction.PUBLISH_PERMISSION_DENY": "Publish, insufficient permissions",
     "ElementUnpublishAction.UNPUBLISH_PERMISSION_DENY": "Unpublish, insufficient permissions",
-    "ElementalElement.CHILD_RENDERING_ERROR": "Something went wrong with this block. Please try saving and refreshing the CMS.",
-    "HistoricElementView.VIEW_BLOCK_HISTORY": "Block history",
-    "ElementHeader.BROKEN": "This element is of obsolete type {type}.",
     "ElementalElement.ARCHIVE_BROKEN": "Archive this block",
     "ElementalElement.BROKEN_DESCRIPTION": "This block is broken and will not display on the front-end. You can archive it to remove it from this elemental area.",
-    "ElementalElement.BROKEN_DESCRIPTION_TITLE": "This block had the title \"{title}\". It is broken and will not display on the front-end. You can archive it to remove it from this elemental area."
+    "ElementalElement.BROKEN_DESCRIPTION_TITLE": "This block had the title \"{title}\". It is broken and will not display on the front-end. You can archive it to remove it from this elemental area.",
+    "ElementalElement.CHILD_RENDERING_ERROR": "Something went wrong with this block. Please try saving and refreshing the CMS.",
+    "ElementalElement.TITLE": "Upravit blok {type}",
+    "HistoricElementView.BLOCK_HISTORY": "Zobrazit blok",
+    "HistoricElementView.VIEW_BLOCK_HISTORY": "Block history"
 }
\ No newline at end of file
diff --git a/client/lang/src/de.json b/client/lang/src/de.json
index 0d1564fe..122c9f0e 100644
--- a/client/lang/src/de.json
+++ b/client/lang/src/de.json
@@ -1,36 +1,36 @@
 {
+    "ElementAddElementPopover.SEARCH_BLOCKS": "Blöcke suchen",
+    "ElementAddNewButton.ADD_BLOCK": "Block hinzufügen",
+    "ElementArchiveAction.ARCHIVE": "Archiv",
+    "ElementArchiveAction.ARCHIVE_PERMISSION_DENY": "Archive, insufficient permissions",
     "ElementArchiveAction.CONFIRM_DELETE": "Sind Sie sicher, dass Sie diesen Block archivieren wollen?",
     "ElementArchiveAction.CONFIRM_DELETE_AND_UNPUBLISH": "Warnung: Dieser Block wird von der veröffentlichten Seite entfernt, bevor er archiviert wird. Wollen Sie fortfahren?",
-    "ElementArchiveAction.ARCHIVE": "Archiv",
     "ElementArchiveAction.DUPLICATE": "Duplicate",
+    "ElementArchiveAction.DUPLICATE_PERMISSION_DENY": "Duplicate, insufficient permissions",
+    "ElementEditForm.ERROR_NOTIFICATION": "Fehler beim Bearbeitungsformular für diesen Block",
+    "ElementHeader.BROKEN": "This element is of obsolete type {type}.",
+    "ElementHeader.EXPAND": "Zeige editierbare Felder",
     "ElementHeader.NOTITLE": "{type} block ohne Titel",
-    "ElementPublishAction.SUCCESS_NOTIFICATION": "'{title}' erfolgreich veröffentlicht",
+    "ElementHeader.STATE_DRAFT": "Dieses Element wurde noch nicht veröffentlicht",
+    "ElementHeader.STATE_MODIFIED": "Dieses Element hat noch nicht veröffentlichte Änderungen",
+    "ElementList.ADD_BLOCKS": "Fügen Sie Blöcke für den Inhalt hinzu",
     "ElementPublishAction.ERROR_NOTIFICATION": "Fehler beim Veröffentlichen von '{title}'",
     "ElementPublishAction.PUBLISH": "Veröffentlichen",
-    "ElementSaveAction.SUCCESS_NOTIFICATION": "'{title}' erfolgreich gespeichert",
+    "ElementPublishAction.PUBLISH_PERMISSION_DENY": "Publish, insufficient permissions",
+    "ElementPublishAction.SUCCESS_NOTIFICATION": "'{title}' erfolgreich veröffentlicht",
     "ElementSaveAction.ERROR_NOTIFICATION": "Fehler beim Speichern von '{title}'",
     "ElementSaveAction.SAVE": "Speichern",
-    "ElementUnpublishAction.SUCCESS_NOTIFICATION": "'{title}' wurde von der veröffentlichten Seite entfernt.",
+    "ElementSaveAction.SUCCESS_NOTIFICATION": "'{title}' erfolgreich gespeichert",
+    "ElementSummary.NO_PREVIEW": "Keine Vorschau verfügbar",
     "ElementUnpublishAction.ERROR_NOTIFICATION": "Fehler beim zurücknehmen der Veröffentlichung von '{title}'",
+    "ElementUnpublishAction.SUCCESS_NOTIFICATION": "'{title}' wurde von der veröffentlichten Seite entfernt.",
     "ElementUnpublishAction.UNPUBLISH": "Veröffentlichung zurücknehmen",
-    "ElementAddElementPopover.SEARCH_BLOCKS": "Blöcke suchen",
-    "ElementAddNewButton.ADD_BLOCK": "Block hinzufügen",
-    "ElementalElement.TITLE": "Diesen {type} Block bearbeiten",
-    "ElementList.ADD_BLOCKS": "Fügen Sie Blöcke für den Inhalt hinzu",
-    "ElementHeader.STATE_DRAFT": "Dieses Element wurde noch nicht veröffentlicht",
-    "ElementHeader.STATE_MODIFIED": "Dieses Element hat noch nicht veröffentlichte Änderungen",
-    "ElementHeader.EXPAND": "Zeige editierbare Felder",
-    "ElementEditForm.ERROR_NOTIFICATION": "Fehler beim Bearbeitungsformular für diesen Block",
-    "ElementSummary.NO_PREVIEW": "Keine Vorschau verfügbar",
-    "HistoricElementView.BLOCK_HISTORY": "Block anzeigen",
-    "ElementArchiveAction.ARCHIVE_PERMISSION_DENY": "Archive, insufficient permissions",
-    "ElementArchiveAction.DUPLICATE_PERMISSION_DENY": "Duplicate, insufficient permissions",
-    "ElementPublishAction.PUBLISH_PERMISSION_DENY": "Publish, insufficient permissions",
     "ElementUnpublishAction.UNPUBLISH_PERMISSION_DENY": "Unpublish, insufficient permissions",
-    "ElementalElement.CHILD_RENDERING_ERROR": "Something went wrong with this block. Please try saving and refreshing the CMS.",
-    "HistoricElementView.VIEW_BLOCK_HISTORY": "Block history",
-    "ElementHeader.BROKEN": "This element is of obsolete type {type}.",
     "ElementalElement.ARCHIVE_BROKEN": "Archive this block",
     "ElementalElement.BROKEN_DESCRIPTION": "This block is broken and will not display on the front-end. You can archive it to remove it from this elemental area.",
-    "ElementalElement.BROKEN_DESCRIPTION_TITLE": "This block had the title \"{title}\". It is broken and will not display on the front-end. You can archive it to remove it from this elemental area."
+    "ElementalElement.BROKEN_DESCRIPTION_TITLE": "This block had the title \"{title}\". It is broken and will not display on the front-end. You can archive it to remove it from this elemental area.",
+    "ElementalElement.CHILD_RENDERING_ERROR": "Something went wrong with this block. Please try saving and refreshing the CMS.",
+    "ElementalElement.TITLE": "Diesen {type} Block bearbeiten",
+    "HistoricElementView.BLOCK_HISTORY": "Block anzeigen",
+    "HistoricElementView.VIEW_BLOCK_HISTORY": "Block history"
 }
\ No newline at end of file
diff --git a/client/lang/src/en.json b/client/lang/src/en.json
index 78d314ef..314e4c8a 100644
--- a/client/lang/src/en.json
+++ b/client/lang/src/en.json
@@ -1,36 +1,36 @@
 {
-    "ElementArchiveAction.CONFIRM_DELETE": "Are you sure you want to send this block to the archive?",
-    "ElementArchiveAction.CONFIRM_DELETE_AND_UNPUBLISH": "Warning: This block will be unpublished before being sent to the archive. Are you sure you want to proceed?",
+    "ElementAddElementPopover.SEARCH_BLOCKS": "Search blocks",
+    "ElementAddNewButton.ADD_BLOCK": "Add block",
     "ElementArchiveAction.ARCHIVE": "Archive",
     "ElementArchiveAction.ARCHIVE_PERMISSION_DENY": "Archive, insufficient permissions",
+    "ElementArchiveAction.CONFIRM_DELETE": "Are you sure you want to send this block to the archive?",
+    "ElementArchiveAction.CONFIRM_DELETE_AND_UNPUBLISH": "Warning: This block will be unpublished before being sent to the archive. Are you sure you want to proceed?",
     "ElementArchiveAction.DUPLICATE": "Duplicate",
     "ElementArchiveAction.DUPLICATE_PERMISSION_DENY": "Duplicate, insufficient permissions",
+    "ElementEditForm.ERROR_NOTIFICATION": "Error displaying the edit form for this block",
     "ElementHeader.BROKEN": "This element is of obsolete type {type}.",
+    "ElementHeader.EXPAND": "Show editable fields",
     "ElementHeader.NOTITLE": "Untitled {type} block",
-    "ElementPublishAction.SUCCESS_NOTIFICATION": "Published '{title}' successfully",
+    "ElementHeader.STATE_DRAFT": "Item has not been published yet",
+    "ElementHeader.STATE_MODIFIED": "Item has unpublished changes",
+    "ElementList.ADD_BLOCKS": "Add blocks to place your content",
     "ElementPublishAction.ERROR_NOTIFICATION": "Error publishing '{title}'",
     "ElementPublishAction.PUBLISH": "Publish",
     "ElementPublishAction.PUBLISH_PERMISSION_DENY": "Publish, insufficient permissions",
-    "ElementSaveAction.SUCCESS_NOTIFICATION": "Saved '{title}' successfully",
+    "ElementPublishAction.SUCCESS_NOTIFICATION": "Published '{title}' successfully",
     "ElementSaveAction.ERROR_NOTIFICATION": "Error saving '{title}'",
     "ElementSaveAction.SAVE": "Save",
-    "ElementUnpublishAction.SUCCESS_NOTIFICATION": "Removed '{title}' from the published page",
+    "ElementSaveAction.SUCCESS_NOTIFICATION": "Saved '{title}' successfully",
+    "ElementSummary.NO_PREVIEW": "No preview available",
     "ElementUnpublishAction.ERROR_NOTIFICATION": "Error unpublishing '{title}'",
+    "ElementUnpublishAction.SUCCESS_NOTIFICATION": "Removed '{title}' from the published page",
     "ElementUnpublishAction.UNPUBLISH": "Unpublish",
     "ElementUnpublishAction.UNPUBLISH_PERMISSION_DENY": "Unpublish, insufficient permissions",
-    "ElementAddElementPopover.SEARCH_BLOCKS": "Search blocks",
-    "ElementAddNewButton.ADD_BLOCK": "Add block",
     "ElementalElement.ARCHIVE_BROKEN": "Archive this block",
     "ElementalElement.BROKEN_DESCRIPTION": "This block is broken and will not display on the front-end. You can archive it to remove it from this elemental area.",
     "ElementalElement.BROKEN_DESCRIPTION_TITLE": "This block had the title \"{title}\". It is broken and will not display on the front-end. You can archive it to remove it from this elemental area.",
-    "ElementalElement.TITLE": "Edit this {type} block",
     "ElementalElement.CHILD_RENDERING_ERROR": "Something went wrong with this block. Please try saving and refreshing the CMS.",
-    "ElementList.ADD_BLOCKS": "Add blocks to place your content",
-    "ElementHeader.STATE_DRAFT": "Item has not been published yet",
-    "ElementHeader.STATE_MODIFIED": "Item has unpublished changes",
-    "ElementHeader.EXPAND": "Show editable fields",
-    "ElementEditForm.ERROR_NOTIFICATION": "Error displaying the edit form for this block",
-    "ElementSummary.NO_PREVIEW": "No preview available",
-    "HistoricElementView.VIEW_BLOCK_HISTORY": "Block history",
-    "HistoricElementView.BLOCK_HISTORY": "View block"
+    "ElementalElement.TITLE": "Edit this {type} block",
+    "HistoricElementView.BLOCK_HISTORY": "View block",
+    "HistoricElementView.VIEW_BLOCK_HISTORY": "Block history"
 }
\ No newline at end of file
diff --git a/client/lang/src/fi.json b/client/lang/src/fi.json
index 64ed2372..06f7369f 100644
--- a/client/lang/src/fi.json
+++ b/client/lang/src/fi.json
@@ -1,36 +1,36 @@
 {
+    "ElementAddElementPopover.SEARCH_BLOCKS": "Etsi palikoita",
+    "ElementAddNewButton.ADD_BLOCK": "Lisää palikka",
+    "ElementArchiveAction.ARCHIVE": "Arkistoi",
+    "ElementArchiveAction.ARCHIVE_PERMISSION_DENY": "Archive, insufficient permissions",
     "ElementArchiveAction.CONFIRM_DELETE": "Haluatko varmasti siirtää tämän palikan arkistoon?",
     "ElementArchiveAction.CONFIRM_DELETE_AND_UNPUBLISH": "Varoitus: tämä palikka poistetaan julkaisusta ennen kuin se siirretään arkistoon. Haluatko varmasti jatkaa?",
-    "ElementArchiveAction.ARCHIVE": "Arkistoi",
+    "ElementArchiveAction.DUPLICATE": "Duplicate",
+    "ElementArchiveAction.DUPLICATE_PERMISSION_DENY": "Duplicate, insufficient permissions",
+    "ElementEditForm.ERROR_NOTIFICATION": "Virhe näytettäessä muokkauskenttää tälle palikalle",
+    "ElementHeader.BROKEN": "This element is of obsolete type {type}.",
+    "ElementHeader.EXPAND": "Näytä muokattavat kentät",
     "ElementHeader.NOTITLE": "Nimetön {type} palikka",
-    "ElementPublishAction.SUCCESS_NOTIFICATION": "Julkaistiin '{title}' onnistuneesti",
+    "ElementHeader.STATE_DRAFT": "Kohdetta ei ole vielä julkaistu",
+    "ElementHeader.STATE_MODIFIED": "Kohteella on tallentamattomia muutoksia",
+    "ElementList.ADD_BLOCKS": "Lisää palikoita julkaistaksesi sisältöä",
     "ElementPublishAction.ERROR_NOTIFICATION": "Virhe julkaistaessa '{title}'",
     "ElementPublishAction.PUBLISH": "Julkaise",
-    "ElementSaveAction.SUCCESS_NOTIFICATION": "Tallennettiin '{title}' onnistuneesti",
+    "ElementPublishAction.PUBLISH_PERMISSION_DENY": "Publish, insufficient permissions",
+    "ElementPublishAction.SUCCESS_NOTIFICATION": "Julkaistiin '{title}' onnistuneesti",
     "ElementSaveAction.ERROR_NOTIFICATION": "Virhe tallennettaessa '{title}'",
     "ElementSaveAction.SAVE": "Tallenna",
-    "ElementUnpublishAction.SUCCESS_NOTIFICATION": "Poistettiin '{title}' julkaistulta sivulta",
+    "ElementSaveAction.SUCCESS_NOTIFICATION": "Tallennettiin '{title}' onnistuneesti",
+    "ElementSummary.NO_PREVIEW": "Ei esikatselua",
     "ElementUnpublishAction.ERROR_NOTIFICATION": "Virhe poistettaessa julkaisua » '{title}'",
+    "ElementUnpublishAction.SUCCESS_NOTIFICATION": "Poistettiin '{title}' julkaistulta sivulta",
     "ElementUnpublishAction.UNPUBLISH": "Poista julkaisusta",
-    "ElementAddElementPopover.SEARCH_BLOCKS": "Etsi palikoita",
-    "ElementAddNewButton.ADD_BLOCK": "Lisää palikka",
-    "ElementalElement.TITLE": "Muokkaa {type} palikkaa",
-    "ElementList.ADD_BLOCKS": "Lisää palikoita julkaistaksesi sisältöä",
-    "ElementHeader.STATE_DRAFT": "Kohdetta ei ole vielä julkaistu",
-    "ElementHeader.STATE_MODIFIED": "Kohteella on tallentamattomia muutoksia",
-    "ElementHeader.EXPAND": "Näytä muokattavat kentät",
-    "ElementEditForm.ERROR_NOTIFICATION": "Virhe näytettäessä muokkauskenttää tälle palikalle",
-    "ElementSummary.NO_PREVIEW": "Ei esikatselua",
-    "HistoricElementView.BLOCK_HISTORY": "Näytä palikka",
-    "ElementArchiveAction.ARCHIVE_PERMISSION_DENY": "Archive, insufficient permissions",
-    "ElementArchiveAction.DUPLICATE": "Duplicate",
-    "ElementArchiveAction.DUPLICATE_PERMISSION_DENY": "Duplicate, insufficient permissions",
-    "ElementPublishAction.PUBLISH_PERMISSION_DENY": "Publish, insufficient permissions",
     "ElementUnpublishAction.UNPUBLISH_PERMISSION_DENY": "Unpublish, insufficient permissions",
-    "ElementalElement.CHILD_RENDERING_ERROR": "Something went wrong with this block. Please try saving and refreshing the CMS.",
-    "HistoricElementView.VIEW_BLOCK_HISTORY": "Block history",
-    "ElementHeader.BROKEN": "This element is of obsolete type {type}.",
     "ElementalElement.ARCHIVE_BROKEN": "Archive this block",
     "ElementalElement.BROKEN_DESCRIPTION": "This block is broken and will not display on the front-end. You can archive it to remove it from this elemental area.",
-    "ElementalElement.BROKEN_DESCRIPTION_TITLE": "This block had the title \"{title}\". It is broken and will not display on the front-end. You can archive it to remove it from this elemental area."
+    "ElementalElement.BROKEN_DESCRIPTION_TITLE": "This block had the title \"{title}\". It is broken and will not display on the front-end. You can archive it to remove it from this elemental area.",
+    "ElementalElement.CHILD_RENDERING_ERROR": "Something went wrong with this block. Please try saving and refreshing the CMS.",
+    "ElementalElement.TITLE": "Muokkaa {type} palikkaa",
+    "HistoricElementView.BLOCK_HISTORY": "Näytä palikka",
+    "HistoricElementView.VIEW_BLOCK_HISTORY": "Block history"
 }
\ No newline at end of file
diff --git a/client/lang/src/fr.json b/client/lang/src/fr.json
index 039cd993..dfb2a38d 100644
--- a/client/lang/src/fr.json
+++ b/client/lang/src/fr.json
@@ -1,36 +1,36 @@
 {
+    "ElementAddElementPopover.SEARCH_BLOCKS": "Chercher blocs",
+    "ElementAddNewButton.ADD_BLOCK": "Ajouter bloc",
+    "ElementArchiveAction.ARCHIVE": "Archive",
+    "ElementArchiveAction.ARCHIVE_PERMISSION_DENY": "Archive, insufficient permissions",
     "ElementArchiveAction.CONFIRM_DELETE": "Êtes-vous sûr de vouloir envoyer ce bloc aux archives ?",
     "ElementArchiveAction.CONFIRM_DELETE_AND_UNPUBLISH": "Attention: Ce bloc sera dépublié avant d'être envoyé aux archives. Êtes-vous sûr de vouloir continuer ?",
-    "ElementArchiveAction.ARCHIVE": "Archive",
     "ElementArchiveAction.DUPLICATE": "Duplicate",
+    "ElementArchiveAction.DUPLICATE_PERMISSION_DENY": "Duplicate, insufficient permissions",
+    "ElementEditForm.ERROR_NOTIFICATION": "Erreur à l'affichage du formulaire d'édition pour ce bloc",
+    "ElementHeader.BROKEN": "This element is of obsolete type {type}.",
+    "ElementHeader.EXPAND": "Montrer les champs éditables",
     "ElementHeader.NOTITLE": "Bloc {type} sans titre",
-    "ElementPublishAction.SUCCESS_NOTIFICATION": "'{title}' publié avec succès",
+    "ElementHeader.STATE_DRAFT": "L'élément n'a pas encore été publié",
+    "ElementHeader.STATE_MODIFIED": "L'élément a des changements non publiés",
+    "ElementList.ADD_BLOCKS": "Ajouter des blocs pour placer votre contenu",
     "ElementPublishAction.ERROR_NOTIFICATION": "Erreur à la publication de '{title}'",
     "ElementPublishAction.PUBLISH": "Publier",
-    "ElementSaveAction.SUCCESS_NOTIFICATION": "'{title}' sauvegardé avec succès",
+    "ElementPublishAction.PUBLISH_PERMISSION_DENY": "Publish, insufficient permissions",
+    "ElementPublishAction.SUCCESS_NOTIFICATION": "'{title}' publié avec succès",
     "ElementSaveAction.ERROR_NOTIFICATION": "Erreur à la sauvegarde de '{title}'",
     "ElementSaveAction.SAVE": "Sauvegarder",
-    "ElementUnpublishAction.SUCCESS_NOTIFICATION": "'{title}' retiré de la page publiée",
+    "ElementSaveAction.SUCCESS_NOTIFICATION": "'{title}' sauvegardé avec succès",
+    "ElementSummary.NO_PREVIEW": "Aucune prévisualisation disponible",
     "ElementUnpublishAction.ERROR_NOTIFICATION": "Erreur à la dépublication de '{title}'",
+    "ElementUnpublishAction.SUCCESS_NOTIFICATION": "'{title}' retiré de la page publiée",
     "ElementUnpublishAction.UNPUBLISH": "Dépublier",
-    "ElementAddElementPopover.SEARCH_BLOCKS": "Chercher blocs",
-    "ElementAddNewButton.ADD_BLOCK": "Ajouter bloc",
-    "ElementalElement.TITLE": "Éditer ce bloc {type}",
-    "ElementList.ADD_BLOCKS": "Ajouter des blocs pour placer votre contenu",
-    "ElementHeader.STATE_DRAFT": "L'élément n'a pas encore été publié",
-    "ElementHeader.STATE_MODIFIED": "L'élément a des changements non publiés",
-    "ElementHeader.EXPAND": "Montrer les champs éditables",
-    "ElementEditForm.ERROR_NOTIFICATION": "Erreur à l'affichage du formulaire d'édition pour ce bloc",
-    "ElementSummary.NO_PREVIEW": "Aucune prévisualisation disponible",
-    "HistoricElementView.BLOCK_HISTORY": "Voir bloc",
-    "ElementArchiveAction.ARCHIVE_PERMISSION_DENY": "Archive, insufficient permissions",
-    "ElementArchiveAction.DUPLICATE_PERMISSION_DENY": "Duplicate, insufficient permissions",
-    "ElementPublishAction.PUBLISH_PERMISSION_DENY": "Publish, insufficient permissions",
     "ElementUnpublishAction.UNPUBLISH_PERMISSION_DENY": "Unpublish, insufficient permissions",
-    "ElementalElement.CHILD_RENDERING_ERROR": "Something went wrong with this block. Please try saving and refreshing the CMS.",
-    "HistoricElementView.VIEW_BLOCK_HISTORY": "Block history",
-    "ElementHeader.BROKEN": "This element is of obsolete type {type}.",
     "ElementalElement.ARCHIVE_BROKEN": "Archive this block",
     "ElementalElement.BROKEN_DESCRIPTION": "This block is broken and will not display on the front-end. You can archive it to remove it from this elemental area.",
-    "ElementalElement.BROKEN_DESCRIPTION_TITLE": "This block had the title \"{title}\". It is broken and will not display on the front-end. You can archive it to remove it from this elemental area."
+    "ElementalElement.BROKEN_DESCRIPTION_TITLE": "This block had the title \"{title}\". It is broken and will not display on the front-end. You can archive it to remove it from this elemental area.",
+    "ElementalElement.CHILD_RENDERING_ERROR": "Something went wrong with this block. Please try saving and refreshing the CMS.",
+    "ElementalElement.TITLE": "Éditer ce bloc {type}",
+    "HistoricElementView.BLOCK_HISTORY": "Voir bloc",
+    "HistoricElementView.VIEW_BLOCK_HISTORY": "Block history"
 }
\ No newline at end of file
diff --git a/client/lang/src/it.json b/client/lang/src/it.json
index e007a25c..d3250fc1 100644
--- a/client/lang/src/it.json
+++ b/client/lang/src/it.json
@@ -1,36 +1,36 @@
 {
+    "ElementAddElementPopover.SEARCH_BLOCKS": "Cerca blocchi",
+    "ElementAddNewButton.ADD_BLOCK": "Aggiungi blocco",
+    "ElementArchiveAction.ARCHIVE": "Archivio",
+    "ElementArchiveAction.ARCHIVE_PERMISSION_DENY": "Archive, insufficient permissions",
     "ElementArchiveAction.CONFIRM_DELETE": "Sei sicuro di voler inviare questo blocco all'archivio?",
     "ElementArchiveAction.CONFIRM_DELETE_AND_UNPUBLISH": "Attenzione: questo blocco non sarà pubblicato prima di essere inviato all'archivio. Sei sicuro di voler procedere?",
-    "ElementArchiveAction.ARCHIVE": "Archivio",
+    "ElementArchiveAction.DUPLICATE": "Duplicate",
+    "ElementArchiveAction.DUPLICATE_PERMISSION_DENY": "Duplicate, insufficient permissions",
+    "ElementEditForm.ERROR_NOTIFICATION": "Errore durante la visualizzazione del modulo di modifica per questo blocco",
+    "ElementHeader.BROKEN": "This element is of obsolete type {type}.",
+    "ElementHeader.EXPAND": "Mostra campi modificabili",
     "ElementHeader.NOTITLE": "Blocco {type} senza titolo",
-    "ElementPublishAction.SUCCESS_NOTIFICATION": "Pubblicato '{title}' con successo",
+    "ElementHeader.STATE_DRAFT": "L'articolo non è stato ancora pubblicato",
+    "ElementHeader.STATE_MODIFIED": "L'articolo ha modifiche non pubblicate",
+    "ElementList.ADD_BLOCKS": "Aggiungi blocchi per posizionare il tuo contenuto",
     "ElementPublishAction.ERROR_NOTIFICATION": "Errore di pubblicazione '{title}'",
     "ElementPublishAction.PUBLISH": "Pubblica",
-    "ElementSaveAction.SUCCESS_NOTIFICATION": "Salvato '{title}' con successo",
+    "ElementPublishAction.PUBLISH_PERMISSION_DENY": "Publish, insufficient permissions",
+    "ElementPublishAction.SUCCESS_NOTIFICATION": "Pubblicato '{title}' con successo",
     "ElementSaveAction.ERROR_NOTIFICATION": "Errore durante il salvataggio '{title}'",
     "ElementSaveAction.SAVE": "Salva",
-    "ElementUnpublishAction.SUCCESS_NOTIFICATION": "Rimosso '{title}' dalla pagina pubblicata",
+    "ElementSaveAction.SUCCESS_NOTIFICATION": "Salvato '{title}' con successo",
+    "ElementSummary.NO_PREVIEW": "Nessuna anteprima disponibile",
     "ElementUnpublishAction.ERROR_NOTIFICATION": "Errore di annullamento della pubblicazione '{title}'",
+    "ElementUnpublishAction.SUCCESS_NOTIFICATION": "Rimosso '{title}' dalla pagina pubblicata",
     "ElementUnpublishAction.UNPUBLISH": "Non pubblicato",
-    "ElementAddElementPopover.SEARCH_BLOCKS": "Cerca blocchi",
-    "ElementAddNewButton.ADD_BLOCK": "Aggiungi blocco",
-    "ElementalElement.TITLE": "Modifica questo blocco {type} ",
-    "ElementList.ADD_BLOCKS": "Aggiungi blocchi per posizionare il tuo contenuto",
-    "ElementHeader.STATE_DRAFT": "L'articolo non è stato ancora pubblicato",
-    "ElementHeader.STATE_MODIFIED": "L'articolo ha modifiche non pubblicate",
-    "ElementHeader.EXPAND": "Mostra campi modificabili",
-    "ElementEditForm.ERROR_NOTIFICATION": "Errore durante la visualizzazione del modulo di modifica per questo blocco",
-    "ElementSummary.NO_PREVIEW": "Nessuna anteprima disponibile",
-    "HistoricElementView.BLOCK_HISTORY": "Visualizza il blocco",
-    "ElementArchiveAction.ARCHIVE_PERMISSION_DENY": "Archive, insufficient permissions",
-    "ElementArchiveAction.DUPLICATE": "Duplicate",
-    "ElementArchiveAction.DUPLICATE_PERMISSION_DENY": "Duplicate, insufficient permissions",
-    "ElementPublishAction.PUBLISH_PERMISSION_DENY": "Publish, insufficient permissions",
     "ElementUnpublishAction.UNPUBLISH_PERMISSION_DENY": "Unpublish, insufficient permissions",
-    "ElementalElement.CHILD_RENDERING_ERROR": "Something went wrong with this block. Please try saving and refreshing the CMS.",
-    "HistoricElementView.VIEW_BLOCK_HISTORY": "Block history",
-    "ElementHeader.BROKEN": "This element is of obsolete type {type}.",
     "ElementalElement.ARCHIVE_BROKEN": "Archive this block",
     "ElementalElement.BROKEN_DESCRIPTION": "This block is broken and will not display on the front-end. You can archive it to remove it from this elemental area.",
-    "ElementalElement.BROKEN_DESCRIPTION_TITLE": "This block had the title \"{title}\". It is broken and will not display on the front-end. You can archive it to remove it from this elemental area."
+    "ElementalElement.BROKEN_DESCRIPTION_TITLE": "This block had the title \"{title}\". It is broken and will not display on the front-end. You can archive it to remove it from this elemental area.",
+    "ElementalElement.CHILD_RENDERING_ERROR": "Something went wrong with this block. Please try saving and refreshing the CMS.",
+    "ElementalElement.TITLE": "Modifica questo blocco {type} ",
+    "HistoricElementView.BLOCK_HISTORY": "Visualizza il blocco",
+    "HistoricElementView.VIEW_BLOCK_HISTORY": "Block history"
 }
\ No newline at end of file
diff --git a/client/lang/src/nl.json b/client/lang/src/nl.json
index bc21c5f0..1fd92cda 100644
--- a/client/lang/src/nl.json
+++ b/client/lang/src/nl.json
@@ -1,36 +1,36 @@
 {
+    "ElementAddElementPopover.SEARCH_BLOCKS": "Zoek binnen blokken",
+    "ElementAddNewButton.ADD_BLOCK": "Voeg blok toe",
+    "ElementArchiveAction.ARCHIVE": "Archiveren",
+    "ElementArchiveAction.ARCHIVE_PERMISSION_DENY": "Geen rechten om te archiveren",
     "ElementArchiveAction.CONFIRM_DELETE": "Weet je zeker dat je dit blok wil archiveren?",
     "ElementArchiveAction.CONFIRM_DELETE_AND_UNPUBLISH": "Waarschuwing: Dit blok wordt teruggezet naar draft voordat het gearchiveerd word. Wilt u doorgaan?",
-    "ElementArchiveAction.ARCHIVE": "Archiveren",
     "ElementArchiveAction.DUPLICATE": "Dupliceren",
+    "ElementArchiveAction.DUPLICATE_PERMISSION_DENY": "Geen rechten om te dupliceren",
+    "ElementEditForm.ERROR_NOTIFICATION": "Fout bij het laten zien van het bewerkformulier van dit blok",
+    "ElementHeader.BROKEN": "Dit element is van het verouderde type {type}.",
+    "ElementHeader.EXPAND": "Toon bewerkbare velden",
     "ElementHeader.NOTITLE": "Nieuw: {type}",
-    "ElementPublishAction.SUCCESS_NOTIFICATION": "'{title}' succesvol gepubliceerd",
+    "ElementHeader.STATE_DRAFT": "Item is nog niet gepubliceerd",
+    "ElementHeader.STATE_MODIFIED": "Item heeft ongepubliceerde veranderingen",
+    "ElementList.ADD_BLOCKS": "Voeg blokken toe om je inhoud te plaatsen",
     "ElementPublishAction.ERROR_NOTIFICATION": "Fout bij het publiceren van '{title}'",
     "ElementPublishAction.PUBLISH": "Publiceer",
-    "ElementSaveAction.SUCCESS_NOTIFICATION": " '{title}' succesvol opgeslagen",
+    "ElementPublishAction.PUBLISH_PERMISSION_DENY": "Geen rechten om te publiceren",
+    "ElementPublishAction.SUCCESS_NOTIFICATION": "'{title}' succesvol gepubliceerd",
     "ElementSaveAction.ERROR_NOTIFICATION": "Fout bij opslaan '{title}'",
     "ElementSaveAction.SAVE": "Opslaan",
-    "ElementUnpublishAction.SUCCESS_NOTIFICATION": " '{title}' verwijderd van gepubliceerde pagina",
+    "ElementSaveAction.SUCCESS_NOTIFICATION": " '{title}' succesvol opgeslagen",
+    "ElementSummary.NO_PREVIEW": "Geen voorbeeld beschikbaar",
     "ElementUnpublishAction.ERROR_NOTIFICATION": "Fout bij het terugzetten van '{title}' naar ongepubliceerd  ",
+    "ElementUnpublishAction.SUCCESS_NOTIFICATION": " '{title}' verwijderd van gepubliceerde pagina",
     "ElementUnpublishAction.UNPUBLISH": "Ga terug naar draft",
-    "ElementAddElementPopover.SEARCH_BLOCKS": "Zoek binnen blokken",
-    "ElementAddNewButton.ADD_BLOCK": "Voeg blok toe",
-    "ElementalElement.TITLE": "Bewerk dit {type} blok",
-    "ElementList.ADD_BLOCKS": "Voeg blokken toe om je inhoud te plaatsen",
-    "ElementHeader.STATE_DRAFT": "Item is nog niet gepubliceerd",
-    "ElementHeader.STATE_MODIFIED": "Item heeft ongepubliceerde veranderingen",
-    "ElementHeader.EXPAND": "Toon bewerkbare velden",
-    "ElementEditForm.ERROR_NOTIFICATION": "Fout bij het laten zien van het bewerkformulier van dit blok",
-    "ElementSummary.NO_PREVIEW": "Geen voorbeeld beschikbaar",
-    "HistoricElementView.BLOCK_HISTORY": "Toon blok",
-    "ElementArchiveAction.ARCHIVE_PERMISSION_DENY": "Geen rechten om te archiveren",
-    "ElementArchiveAction.DUPLICATE_PERMISSION_DENY": "Geen rechten om te dupliceren",
-    "ElementPublishAction.PUBLISH_PERMISSION_DENY": "Geen rechten om te publiceren",
     "ElementUnpublishAction.UNPUBLISH_PERMISSION_DENY": "Geen rechten om te depubliceren",
-    "ElementalElement.CHILD_RENDERING_ERROR": "Er is iets misgegaan met dit blok. Probeer het op te slaan en het CMS te verversen.",
-    "HistoricElementView.VIEW_BLOCK_HISTORY": "Bewerk-historie van blok",
-    "ElementHeader.BROKEN": "Dit element is van het verouderde type {type}.",
     "ElementalElement.ARCHIVE_BROKEN": "Archiveer dit blok",
     "ElementalElement.BROKEN_DESCRIPTION": "Dit blok werkt niet meer en wordt niet weergegeven op de site. Het kan gearchiveerd worden om het ook uit deze lijst te verwijderen.",
-    "ElementalElement.BROKEN_DESCRIPTION_TITLE": "Dit blok had de titel \"{title}\". Het blok werkt niet meer en wordt niet weergegeven op de site. Het kan gearchiveerd worden om het ook uit deze lijst te verwijderen."
+    "ElementalElement.BROKEN_DESCRIPTION_TITLE": "Dit blok had de titel \"{title}\". Het blok werkt niet meer en wordt niet weergegeven op de site. Het kan gearchiveerd worden om het ook uit deze lijst te verwijderen.",
+    "ElementalElement.CHILD_RENDERING_ERROR": "Er is iets misgegaan met dit blok. Probeer het op te slaan en het CMS te verversen.",
+    "ElementalElement.TITLE": "Bewerk dit {type} blok",
+    "HistoricElementView.BLOCK_HISTORY": "Toon blok",
+    "HistoricElementView.VIEW_BLOCK_HISTORY": "Bewerk-historie van blok"
 }
\ No newline at end of file
diff --git a/client/lang/src/pl.json b/client/lang/src/pl.json
index 624a16a8..c9391f51 100644
--- a/client/lang/src/pl.json
+++ b/client/lang/src/pl.json
@@ -1,36 +1,36 @@
 {
-    "ElementArchiveAction.CONFIRM_DELETE": "Czy na pewno chcesz wysłać ten blok do archiwum?",
-    "ElementArchiveAction.CONFIRM_DELETE_AND_UNPUBLISH": "Ostrzeżenie: ten blok będzie szkicem przed wysłaniem do archiwum. Na pewno chcesz kontynuować?",
+    "ElementAddElementPopover.SEARCH_BLOCKS": "Wyszukaj",
+    "ElementAddNewButton.ADD_BLOCK": "Dodaj blok",
     "ElementArchiveAction.ARCHIVE": "Archiwum",
     "ElementArchiveAction.ARCHIVE_PERMISSION_DENY": "Archiwum, niewystarczające uprawnienia",
+    "ElementArchiveAction.CONFIRM_DELETE": "Czy na pewno chcesz wysłać ten blok do archiwum?",
+    "ElementArchiveAction.CONFIRM_DELETE_AND_UNPUBLISH": "Ostrzeżenie: ten blok będzie szkicem przed wysłaniem do archiwum. Na pewno chcesz kontynuować?",
     "ElementArchiveAction.DUPLICATE": "Duplikat",
     "ElementArchiveAction.DUPLICATE_PERMISSION_DENY": "Duplikat, niewystarczające uprawnienia",
+    "ElementEditForm.ERROR_NOTIFICATION": "Błąd podczas wyświetlania formularza edycji dla tego bloku",
+    "ElementHeader.BROKEN": "This element is of obsolete type {type}.",
+    "ElementHeader.EXPAND": "Pokaż pola możliwe do edycji",
     "ElementHeader.NOTITLE": "Nienazwany {type} blok",
-    "ElementPublishAction.SUCCESS_NOTIFICATION": "Opublikowano „{title}” pomyślnie",
+    "ElementHeader.STATE_DRAFT": "Przedmiot nie został jeszcze opublikowany",
+    "ElementHeader.STATE_MODIFIED": "Element ma nieopublikowane zmiany",
+    "ElementList.ADD_BLOCKS": "Dodaj bloki, aby umieścić swoją treść",
     "ElementPublishAction.ERROR_NOTIFICATION": "Błąd podczas publikowania „{title}”",
     "ElementPublishAction.PUBLISH": "Publikuj",
     "ElementPublishAction.PUBLISH_PERMISSION_DENY": "Publikuj, niewystarczające uprawnienia",
-    "ElementSaveAction.SUCCESS_NOTIFICATION": "Opublikowano „{title}” pomyślnie",
+    "ElementPublishAction.SUCCESS_NOTIFICATION": "Opublikowano „{title}” pomyślnie",
     "ElementSaveAction.ERROR_NOTIFICATION": "Błąd podczas zapisywania „{title}”",
     "ElementSaveAction.SAVE": "Zapisz",
-    "ElementUnpublishAction.SUCCESS_NOTIFICATION": "Usunięto „{title}” z opublikowanej strony",
+    "ElementSaveAction.SUCCESS_NOTIFICATION": "Opublikowano „{title}” pomyślnie",
+    "ElementSummary.NO_PREVIEW": "Brak możliwego podglądu",
     "ElementUnpublishAction.ERROR_NOTIFICATION": "Błąd podczas cofania publikacji „{title}”",
+    "ElementUnpublishAction.SUCCESS_NOTIFICATION": "Usunięto „{title}” z opublikowanej strony",
     "ElementUnpublishAction.UNPUBLISH": "Cofnij publikację",
     "ElementUnpublishAction.UNPUBLISH_PERMISSION_DENY": "Cofnij publikację, niewystarczające uprawnienia",
-    "ElementAddElementPopover.SEARCH_BLOCKS": "Wyszukaj",
-    "ElementAddNewButton.ADD_BLOCK": "Dodaj blok",
-    "ElementalElement.TITLE": "Edytuj {type} blok",
-    "ElementalElement.CHILD_RENDERING_ERROR": "Coś poszło nie tak z tym blokiem. Prosimy raz jeszcze zapisz, potem odświeżmy przeglądarkę – zakładkę z CMSem.",
-    "ElementList.ADD_BLOCKS": "Dodaj bloki, aby umieścić swoją treść",
-    "ElementHeader.STATE_DRAFT": "Przedmiot nie został jeszcze opublikowany",
-    "ElementHeader.STATE_MODIFIED": "Element ma nieopublikowane zmiany",
-    "ElementHeader.EXPAND": "Pokaż pola możliwe do edycji",
-    "ElementEditForm.ERROR_NOTIFICATION": "Błąd podczas wyświetlania formularza edycji dla tego bloku",
-    "ElementSummary.NO_PREVIEW": "Brak możliwego podglądu",
-    "HistoricElementView.VIEW_BLOCK_HISTORY": "Historia",
-    "HistoricElementView.BLOCK_HISTORY": "Widok bloku",
-    "ElementHeader.BROKEN": "This element is of obsolete type {type}.",
     "ElementalElement.ARCHIVE_BROKEN": "Archive this block",
     "ElementalElement.BROKEN_DESCRIPTION": "This block is broken and will not display on the front-end. You can archive it to remove it from this elemental area.",
-    "ElementalElement.BROKEN_DESCRIPTION_TITLE": "This block had the title \"{title}\". It is broken and will not display on the front-end. You can archive it to remove it from this elemental area."
+    "ElementalElement.BROKEN_DESCRIPTION_TITLE": "This block had the title \"{title}\". It is broken and will not display on the front-end. You can archive it to remove it from this elemental area.",
+    "ElementalElement.CHILD_RENDERING_ERROR": "Coś poszło nie tak z tym blokiem. Prosimy raz jeszcze zapisz, potem odświeżmy przeglądarkę – zakładkę z CMSem.",
+    "ElementalElement.TITLE": "Edytuj {type} blok",
+    "HistoricElementView.BLOCK_HISTORY": "Widok bloku",
+    "HistoricElementView.VIEW_BLOCK_HISTORY": "Historia"
 }
\ No newline at end of file
diff --git a/client/lang/src/sl.json b/client/lang/src/sl.json
index d59a8ced..8d73a346 100644
--- a/client/lang/src/sl.json
+++ b/client/lang/src/sl.json
@@ -1,36 +1,36 @@
 {
-    "ElementArchiveAction.CONFIRM_DELETE": "Želite arhivirati izbrani gradnik?",
-    "ElementArchiveAction.CONFIRM_DELETE_AND_UNPUBLISH": "Opozorilo: Gradnik bo umaknjen iz objave preden ga bomo arhivirali. Želite nadaljevati?",
+    "ElementAddElementPopover.SEARCH_BLOCKS": "Najdi gradnik",
+    "ElementAddNewButton.ADD_BLOCK": "Dodaj gradnik",
     "ElementArchiveAction.ARCHIVE": "Arhiv",
     "ElementArchiveAction.ARCHIVE_PERMISSION_DENY": "Archive, insufficient permissions",
+    "ElementArchiveAction.CONFIRM_DELETE": "Želite arhivirati izbrani gradnik?",
+    "ElementArchiveAction.CONFIRM_DELETE_AND_UNPUBLISH": "Opozorilo: Gradnik bo umaknjen iz objave preden ga bomo arhivirali. Želite nadaljevati?",
     "ElementArchiveAction.DUPLICATE": "Duplicate",
     "ElementArchiveAction.DUPLICATE_PERMISSION_DENY": "Duplicate, insufficient permissions",
+    "ElementEditForm.ERROR_NOTIFICATION": "Napaka pri prikazu obrazca za urejanje tega gradnika",
+    "ElementHeader.BROKEN": "This element is of obsolete type {type}.",
+    "ElementHeader.EXPAND": "Prikaži polja, ki jih je mogoče urejati",
     "ElementHeader.NOTITLE": "{type} gradnik brez naslova",
-    "ElementPublishAction.SUCCESS_NOTIFICATION": "Objavili smo '{title}'",
+    "ElementHeader.STATE_DRAFT": "Ta gradnik še ni objavljen",
+    "ElementHeader.STATE_MODIFIED": "Spremembe za ta gradnik še niso shranjene ",
+    "ElementList.ADD_BLOCKS": "Dodajte gradnik z vsebino",
     "ElementPublishAction.ERROR_NOTIFICATION": "Napaka pri objavi '{title}'",
     "ElementPublishAction.PUBLISH": "Objavi",
     "ElementPublishAction.PUBLISH_PERMISSION_DENY": "Publish, insufficient permissions",
-    "ElementSaveAction.SUCCESS_NOTIFICATION": "Shranili smo '{title}'",
+    "ElementPublishAction.SUCCESS_NOTIFICATION": "Objavili smo '{title}'",
     "ElementSaveAction.ERROR_NOTIFICATION": "Napaka pri shranjevanju '{title}'",
     "ElementSaveAction.SAVE": "Shrani",
-    "ElementUnpublishAction.SUCCESS_NOTIFICATION": "Z objavljene strani smo odstranili '{title}'",
+    "ElementSaveAction.SUCCESS_NOTIFICATION": "Shranili smo '{title}'",
+    "ElementSummary.NO_PREVIEW": "Predogled ni na voljo",
     "ElementUnpublishAction.ERROR_NOTIFICATION": "Napaka pri umiku '{title}' iz objave",
+    "ElementUnpublishAction.SUCCESS_NOTIFICATION": "Z objavljene strani smo odstranili '{title}'",
     "ElementUnpublishAction.UNPUBLISH": "Umakni iz objave",
     "ElementUnpublishAction.UNPUBLISH_PERMISSION_DENY": "Unpublish, insufficient permissions",
-    "ElementAddElementPopover.SEARCH_BLOCKS": "Najdi gradnik",
-    "ElementAddNewButton.ADD_BLOCK": "Dodaj gradnik",
-    "ElementalElement.TITLE": "Urejanje gradnika {type}",
-    "ElementalElement.CHILD_RENDERING_ERROR": "Something went wrong with this block. Please try saving and refreshing the CMS.",
-    "ElementList.ADD_BLOCKS": "Dodajte gradnik z vsebino",
-    "ElementHeader.STATE_DRAFT": "Ta gradnik še ni objavljen",
-    "ElementHeader.STATE_MODIFIED": "Spremembe za ta gradnik še niso shranjene ",
-    "ElementHeader.EXPAND": "Prikaži polja, ki jih je mogoče urejati",
-    "ElementEditForm.ERROR_NOTIFICATION": "Napaka pri prikazu obrazca za urejanje tega gradnika",
-    "ElementSummary.NO_PREVIEW": "Predogled ni na voljo",
-    "HistoricElementView.VIEW_BLOCK_HISTORY": "Block history",
-    "HistoricElementView.BLOCK_HISTORY": "Prikaži gradnik",
-    "ElementHeader.BROKEN": "This element is of obsolete type {type}.",
     "ElementalElement.ARCHIVE_BROKEN": "Archive this block",
     "ElementalElement.BROKEN_DESCRIPTION": "This block is broken and will not display on the front-end. You can archive it to remove it from this elemental area.",
-    "ElementalElement.BROKEN_DESCRIPTION_TITLE": "This block had the title \"{title}\". It is broken and will not display on the front-end. You can archive it to remove it from this elemental area."
+    "ElementalElement.BROKEN_DESCRIPTION_TITLE": "This block had the title \"{title}\". It is broken and will not display on the front-end. You can archive it to remove it from this elemental area.",
+    "ElementalElement.CHILD_RENDERING_ERROR": "Something went wrong with this block. Please try saving and refreshing the CMS.",
+    "ElementalElement.TITLE": "Urejanje gradnika {type}",
+    "HistoricElementView.BLOCK_HISTORY": "Prikaži gradnik",
+    "HistoricElementView.VIEW_BLOCK_HISTORY": "Block history"
 }
\ No newline at end of file
diff --git a/lang/cs.yml b/lang/cs.yml
index 9bda1d53..93c5ffbd 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -2,10 +2,10 @@ cs:
   DNADesign\Elemental\Controllers\ElementalAreaController:
     MENUTITLE: 'Upravit stránku'
   DNADesign\Elemental\Forms\TextCheckboxGroupField:
-    ShowTitleLabel: Zobrazeno
-    TitleLabel: 'Titulek (zobrazený, pokud zaškrtnuto)'
     DISPLAYED: Zobrazeno
+    ShowTitleLabel: Zobrazeno
     Title: Titulek
+    TitleLabel: 'Titulek (zobrazený, pokud zaškrtnuto)'
   DNADesign\Elemental\Models\BaseElement:
     BlockType: Blok
     CUSTOM_STYLES: 'Vybrat styl'
@@ -14,30 +14,30 @@ cs:
     MainTabLabel: Obsah
     PLURALNAME: bloky
     PLURALS:
-      one: Blok
       few: '{count} bloky'
       many: '{count} bloků'
+      one: Blok
       other: '{count} bloků'
-    SettingsTabLabel: Nastavení
     SINGULARNAME: blok
     STYLE: 'Varianta stylu'
+    SettingsTabLabel: Nastavení
     db_Title: Titulek
   DNADesign\Elemental\Models\ElementContent:
     BlockType: Obsah
     ContentLabel: Obsah
     PLURALNAME: 'blok obsahu'
     PLURALS:
-      one: 'Blok obsahu'
       few: '{count} bloků obsahu'
       many: '{count} bloků obsahu'
+      one: 'Blok obsahu'
       other: '{count} bloků obsahu'
     SINGULARNAME: 'blok obsahu'
   DNADesign\Elemental\Models\ElementalArea:
     PLURALNAME: 'Elemental oblasti'
     PLURALS:
-      one: 'Elemental oblast'
       few: '{count} Elemental oblasti'
       many: '{count} Elemental oblastí'
+      one: 'Elemental oblast'
       other: '{count} Elemental oblastí'
     SINGULARNAME: 'Elemental oblast'
   DNADesign\Elemental\Reports\ElementTypeReport:
diff --git a/lang/de.yml b/lang/de.yml
index fa9539d1..6e307752 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -2,11 +2,11 @@ de:
   DNADesign\Elemental\Controllers\ElementalAreaController:
     MENUTITLE: 'Seite bearbeiten'
   DNADesign\Elemental\Forms\TextCheckboxGroupField:
-    ShowTitleLabel: 'Wird angezeigt'
-    TitleLabel: 'Titel (angezeigt, wenn ausgewählt)'
     DISPLAYED: 'Wird angezeigt'
     NOT_DISPLAYED: 'Wird nicht angezeigt'
+    ShowTitleLabel: 'Wird angezeigt'
     Title: Titel
+    TitleLabel: 'Titel (angezeigt, wenn ausgewählt)'
   DNADesign\Elemental\Models\BaseElement:
     BlockType: Block
     CUSTOM_STYLES: 'Stil auswählen...'
@@ -17,9 +17,9 @@ de:
     PLURALS:
       one: 'Ein Block'
       other: '{count} Blöcke'
-    SettingsTabLabel: Einstellungen
     SINGULARNAME: Block
     STYLE: Stilvariation
+    SettingsTabLabel: Einstellungen
     db_Title: Titel
   DNADesign\Elemental\Models\ElementContent:
     BlockType: Inhalt
diff --git a/lang/en.yml b/lang/en.yml
index 732fa0c7..13f5399f 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -1,6 +1,8 @@
 en:
   DNADesign\Elemental\Controllers\ElementalAreaController:
     MENUTITLE: 'Edit Page'
+  DNADesign\Elemental\Extensions\ElementalPageExtension:
+    has_one_ElementalArea: 'Elemental area'
   DNADesign\Elemental\Forms\TextCheckboxGroupField:
     DISPLAYED: Displayed
     NOT_DISPLAYED: 'Not displayed'
@@ -58,8 +60,6 @@ en:
     Summary: Summary
     Title: Title
     Type: Type
-  DNADesign\Elemental\Extensions\ElementalPageExtension:
-    has_one_ElementalArea: 'Elemental area'
   DNADesign\Elemental\TopPage\DataExtension:
     has_one_TopPage: 'Top page'
   DNADesign\Elemental\TopPage\FluentExtension:
diff --git a/lang/fi.yml b/lang/fi.yml
index cdc27491..7fc9b640 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -2,11 +2,11 @@ fi:
   DNADesign\Elemental\Controllers\ElementalAreaController:
     MENUTITLE: 'Muokkaa sivua'
   DNADesign\Elemental\Forms\TextCheckboxGroupField:
-    ShowTitleLabel: Näytetään
-    TitleLabel: 'Otsikko (näytetään, jos valittu)'
     DISPLAYED: Näytetään
     NOT_DISPLAYED: 'Ei näytetä'
+    ShowTitleLabel: Näytetään
     Title: Otsikko
+    TitleLabel: 'Otsikko (näytetään, jos valittu)'
   DNADesign\Elemental\Models\BaseElement:
     BlockType: Palikka
     CUSTOM_STYLES: 'Valitse tyyli..'
@@ -17,9 +17,9 @@ fi:
     PLURALS:
       one: Palikka
       other: '{count} palikkaa'
-    SettingsTabLabel: Asetukset
     SINGULARNAME: palikka
     STYLE: Tyylivariaatio
+    SettingsTabLabel: Asetukset
     db_Title: Otsikko
   DNADesign\Elemental\Models\ElementContent:
     BlockType: Sisältö
diff --git a/lang/fr.yml b/lang/fr.yml
index bfefdf2d..3ef259bd 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -1,4 +1,9 @@
 fr:
+  DNADesign\Elemental\Forms\TextCheckboxGroupField:
+    DISPLAYED: Affiché
+    ShowTitleLabel: Affiché
+    Title: Titre
+    TitleLabel: 'Titre (affiché si coché)'
   DNADesign\Elemental\Models\BaseElement:
     BlockType: Bloc
     CUSTOM_STYLES: 'Sélectionner un style..'
@@ -7,9 +12,9 @@ fr:
     MainTabLabel: Contenu
     PLURALNAME: blocs
     PLURALS:
+      many: '{count} blocs'
       one: 'Un bloc'
       other: '{count} blocs'
-      many: '{count} blocs'
     SINGULARNAME: bloc
     STYLE: 'Variation de style'
     db_Title: Titre
@@ -18,16 +23,16 @@ fr:
     ContentLabel: Contenu
     PLURALNAME: 'blocs contenu'
     PLURALS:
+      many: '{count} blocs contenu'
       one: 'Un bloc contenu'
       other: '{count} blocs contenu'
-      many: '{count} blocs contenu'
     SINGULARNAME: 'bloc contenu'
   DNADesign\Elemental\Models\ElementalArea:
     PLURALNAME: 'Elemental Areas'
     PLURALS:
+      many: '{count} Elemental Areas'
       one: 'An Elemental Area'
       other: '{count} Elemental Areas'
-      many: '{count} Elemental Areas'
     SINGULARNAME: 'Elemental Area'
   DNADesign\Elemental\Reports\ElementTypeReport:
     Title: 'Types de blocs'
@@ -40,8 +45,3 @@ fr:
     Summary: Résumé
     Title: Titre
     Type: Type
-  DNADesign\Elemental\Forms\TextCheckboxGroupField:
-    DISPLAYED: Affiché
-    ShowTitleLabel: Affiché
-    Title: Titre
-    TitleLabel: 'Titre (affiché si coché)'
diff --git a/lang/hr.yml b/lang/hr.yml
index a37b128c..b47afe4c 100644
--- a/lang/hr.yml
+++ b/lang/hr.yml
@@ -1,4 +1,9 @@
 hr:
+  DNADesign\Elemental\Forms\TextCheckboxGroupField:
+    DISPLAYED: Prikazano
+    ShowTitleLabel: Prikazano
+    Title: Naslov
+    TitleLabel: 'Naslov (vidljiv ako je odabran)'
   DNADesign\Elemental\Models\BaseElement:
     BlockType: Blok
     CUSTOM_STYLES: 'Odaberi stil...'
@@ -28,8 +33,3 @@ hr:
     Summary: Sažetak
     Title: Naslov
     Type: Tip
-  DNADesign\Elemental\Forms\TextCheckboxGroupField:
-    DISPLAYED: Prikazano
-    ShowTitleLabel: Prikazano
-    Title: Naslov
-    TitleLabel: 'Naslov (vidljiv ako je odabran)'
diff --git a/lang/it.yml b/lang/it.yml
index 1c3efa56..2f2a86d4 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -2,10 +2,10 @@ it:
   DNADesign\Elemental\Controllers\ElementalAreaController:
     MENUTITLE: 'Modifica Pagina'
   DNADesign\Elemental\Forms\TextCheckboxGroupField:
-    ShowTitleLabel: Visualizza
-    TitleLabel: 'Titolo (visualizzato se si seleziona la checkbox)'
     DISPLAYED: Visualizza
+    ShowTitleLabel: Visualizza
     Title: Titolo
+    TitleLabel: 'Titolo (visualizzato se si seleziona la checkbox)'
   DNADesign\Elemental\Models\BaseElement:
     BlockType: Blocco
     CUSTOM_STYLES: 'Seleziona uno stile..'
@@ -14,28 +14,28 @@ it:
     MainTabLabel: Contenuto
     PLURALNAME: blocchi
     PLURALS:
+      many: '{count} blocchi'
       one: 'Un blocco'
       other: '{count} blocchi'
-      many: '{count} blocchi'
-    SettingsTabLabel: Impostazioni
     SINGULARNAME: blocco
     STYLE: 'Variazione di stile'
+    SettingsTabLabel: Impostazioni
     db_Title: Titolo
   DNADesign\Elemental\Models\ElementContent:
     BlockType: Contenuto
     ContentLabel: Contenuto
     PLURALNAME: 'blocchi dei contenuti'
     PLURALS:
+      many: '{count} blocchi dei contenuti'
       one: 'Un blocco di contenuto'
       other: '{count} blocchi dei contenuti'
-      many: '{count} blocchi dei contenuti'
     SINGULARNAME: 'blocchi dei contenuti'
   DNADesign\Elemental\Models\ElementalArea:
     PLURALNAME: 'Aree Elementi'
     PLURALS:
+      many: '{count} Aree Elementali'
       one: 'Un''Area Elementi'
       other: '{count} Aree Elementali'
-      many: '{count} Aree Elementali'
     SINGULARNAME: 'Area Elementi'
   DNADesign\Elemental\Reports\ElementTypeReport:
     Title: 'Tipi di blocchi dei contenuti'
diff --git a/lang/nl.yml b/lang/nl.yml
index 90f41553..d743a29d 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -1,6 +1,12 @@
 nl:
   DNADesign\Elemental\Controllers\ElementalAreaController:
     MENUTITLE: 'Pagina Bewerken'
+  DNADesign\Elemental\Forms\TextCheckboxGroupField:
+    DISPLAYED: Weergegeven
+    NOT_DISPLAYED: 'Niet weergegeven'
+    ShowTitleLabel: Weergegeven
+    Title: Titel
+    TitleLabel: 'Titel (aanvinken om te tonen)'
   DNADesign\Elemental\Models\BaseElement:
     BlockType: Blok
     CUSTOM_STYLES: 'Selecteer een stijl...'
@@ -40,9 +46,3 @@ nl:
     Summary: Samenvatting
     Title: Titel
     Type: Type
-  DNADesign\Elemental\Forms\TextCheckboxGroupField:
-    DISPLAYED: Weergegeven
-    NOT_DISPLAYED: 'Niet weergegeven'
-    ShowTitleLabel: Weergegeven
-    TitleLabel: 'Titel (aanvinken om te tonen)'
-    Title: Titel
diff --git a/lang/pl.yml b/lang/pl.yml
index 0e5ee0a8..09cd2dc6 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -15,9 +15,9 @@ pl:
     MainTabLabel: Zawartość
     PLURALNAME: bloki
     PLURALS:
-      one: Blok
       few: 'Bloków {count}'
       many: 'Bloków {count}'
+      one: Blok
       other: 'Bloki {count}'
     SINGULARNAME: blok
     STYLE: 'Opcje dla style'
@@ -28,17 +28,17 @@ pl:
     ContentLabel: Zawartość
     PLURALNAME: 'zawartość bloków'
     PLURALS:
-      one: 'Blok treści'
       few: 'Bloków treści {count}'
       many: 'Bloków treści {count}'
+      one: 'Blok treści'
       other: 'Bloki treści {count}'
     SINGULARNAME: zawartość
   DNADesign\Elemental\Models\ElementalArea:
     PLURALNAME: 'Elemental Areas'
     PLURALS:
-      one: 'Elemental Areas'
       few: 'Kilka Elemental Areas {count}'
       many: 'Wiele Elemental Areas {count}'
+      one: 'Elemental Areas'
       other: 'Inne Elemental Areas {count}'
     SINGULARNAME: 'Elemental Area'
   DNADesign\Elemental\Reports\ElementTypeReport:
diff --git a/lang/sl.yml b/lang/sl.yml
index a844f5af..4482381c 100644
--- a/lang/sl.yml
+++ b/lang/sl.yml
@@ -5,8 +5,8 @@ sl:
     DISPLAYED: Prikazano
     NOT_DISPLAYED: Skrito
     ShowTitleLabel: Prikazan
-    TitleLabel: 'Naslov (označite)'
     Title: Naslov
+    TitleLabel: 'Naslov (označite)'
   DNADesign\Elemental\Models\BaseElement:
     BlockType: Gradnik
     CUSTOM_STYLES: 'Izberite stil ...'
@@ -15,10 +15,10 @@ sl:
     MainTabLabel: Vsebina
     PLURALNAME: gradniki
     PLURALS:
-      one: Gradnik
-      two: '{count} gradnika'
       few: '{count} gradnikov'
+      one: Gradnik
       other: '{count} gradnikov'
+      two: '{count} gradnika'
     SINGULARNAME: Gradnik
     STYLE: 'Stilna različica'
     SettingsTabLabel: Nastavitve
@@ -28,18 +28,18 @@ sl:
     ContentLabel: Oznaka
     PLURALNAME: Besedila
     PLURALS:
-      one: Besedilo
-      two: '{count} besedili'
       few: '{count} besedil'
+      one: Besedilo
       other: '{count} besedil'
+      two: '{count} besedili'
     SINGULARNAME: Besedilo
   DNADesign\Elemental\Models\ElementalArea:
     PLURALNAME: Bloki
     PLURALS:
-      one: Blok
-      two: '{count} bloka'
       few: '{count} blokov'
+      one: Blok
       other: '{count} blokov'
+      two: '{count} bloka'
     SINGULARNAME: Blok
   DNADesign\Elemental\Reports\ElementTypeReport:
     Title: 'Tipi gradnikov'

From e17dbf10486e1a397fe2586c7ab002fc28167191 Mon Sep 17 00:00:00 2001
From: Loz Calver <lozcalver@bigfork.co.uk>
Date: Mon, 21 Aug 2023 16:38:48 +0100
Subject: [PATCH 2/2] FIX: Save repeated database queries to fetch elemental
 area name (fixes #928)

---
 src/Models/BaseElement.php | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/Models/BaseElement.php b/src/Models/BaseElement.php
index 49b816ee..a3f89c22 100644
--- a/src/Models/BaseElement.php
+++ b/src/Models/BaseElement.php
@@ -894,16 +894,19 @@ public function getAreaRelationName()
         $result = 'ElementalArea';
 
         if ($page) {
-            $has_one = $page->config()->get('has_one');
-            $area = $this->Parent();
-
-            foreach ($has_one as $relationName => $relationClass) {
-                if ($page instanceof BaseElement && $relationName === 'Parent') {
-                    continue;
-                }
-                if ($relationClass === $area->ClassName && $page->{$relationName}()->ID === $area->ID) {
-                    $result = $relationName;
-                    break;
+            $class = DataObject::getSchema()->hasOneComponent($this, 'Parent');
+            $area = $this->ParentID ? DataObject::get_by_id($class, $this->ParentID) : null;
+
+            if ($area) {
+                $has_one = $page->config()->get('has_one');
+                foreach ($has_one as $relationName => $relationClass) {
+                    if ($page instanceof BaseElement && $relationName === 'Parent') {
+                        continue;
+                    }
+                    if ($relationClass === $area->ClassName && $page->{$relationName}()->ID === $area->ID) {
+                        $result = $relationName;
+                        break;
+                    }
                 }
             }
         }