diff --git a/crowdin.yml b/crowdin.yml
index 818ddc187..114bcd3ff 100644
--- a/crowdin.yml
+++ b/crowdin.yml
@@ -69,4 +69,22 @@ files: [
     "escape_special_characters": 0,
     "escape_quotes" : 0,
   },
+  {
+    "source" : "/layout-webapp/src/main/resources/locale/portlet/Analytics_en.properties",
+
+    "translation" : "%original_path%/%file_name%!_%locale_with_underscore%.%file_extension%",
+    "translation_replace" : {
+      "_en!": "","ar_SA": "ar","ar_OM": "aro","az_AZ": "az","ca_ES": "ca","ceb_PH": "ceb",
+      "co_FR": "co","cs_CZ": "cs","de_DE": "de","el_GR": "el","en_US": "en","es_ES": "es_ES","eu_ES": "eu","fa_IR": "fa",
+      "fi_FI": "fi","fil_PH": "fil","fr_FR": "fr","hi_IN": "hi","hu_HU": "hu","id_ID": "id","it_IT": "it","ja_JP": "ja",
+      "kab_KAB": "kab","ko_KR": "ko","lt_LT": "lt","ms_MY": "ms","nl_NL": "nl","no_NO": "no","pcm_NG": "pcm","pl_PL": "pl",
+      "pt_BR": "pt_BR","pt_PT": "pt_PT","ro_RO": "ro","ru_RU": "ru","sk_SK": "sk","sl_SI": "sl","sq_AL": "sq",
+      "sv_SE": "sv_SE","th_TH": "th","tl_PH": "tl","tr_TR": "tr","uk_UA": "uk","ur_IN": "ur_IN","vi_VN": "vi",
+      "zh_CN": "zh_CN","zh_TW": "zh_TW",
+    },
+    "dest" : "add__ons/layout/portlet/Analytics.properties",
+    "update_option" : "update_as_unapproved",
+    "escape_special_characters": 0,
+    "escape_quotes" : 0,
+  },
 ]
\ No newline at end of file
diff --git a/layout-webapp/src/main/resources/locale/portlet/Analytics_en.properties b/layout-webapp/src/main/resources/locale/portlet/Analytics_en.properties
new file mode 100644
index 000000000..a8a372d30
--- /dev/null
+++ b/layout-webapp/src/main/resources/locale/portlet/Analytics_en.properties
@@ -0,0 +1,30 @@
+analytics.field.label.applicationName=Application Name
+
+analytics.field.label.pageTemplateId=Page Template Id
+analytics.field.label.pageTemplateName=Page Template Name
+analytics.field.label.pageTemplateCategory=Page Template Category
+analytics.field.label.pageTemplateDisabled=Is Page Template Disabled
+analytics.field.label.pageTemplateSystem=Is Page Template System
+analytics.field.label.pageTemplateIllustrationId=Page Template illustration id
+analytics.field.label.pageTemplatePage=Page Template originating page
+analytics.field.label.pageReference=Page reference
+analytics.field.label.siteName=Site name
+analytics.field.label.siteType=Site type
+analytics.field.label.pageType=Page type
+analytics.field.label.pageName=Page name
+
+analytics.pageLayout=Page Layout
+analytics.createPageLayout=Create Page Layout
+analytics.createPageTemplate=Create Page Template
+analytics.updatePageTemplate=Update Page Template
+analytics.deletePageTemplate=Delete Page Template
+analytics.enablePageTemplate=Enable Page Template
+analytics.disablePageTemplate=Disable Page Template
+analytics.siteNavigation=Site topbar navigation
+analytics.siteManagement=Sites Management
+analytics.pageTemplateManagement=Page Templates Management
+analytics.pageLayoutEditor=Layout Editor
+
+analytics.customized=Customized
+analytics.blank=Blank
+analytics.analytics=Analytics
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationElementDrawer.vue b/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationElementDrawer.vue
index 2f7b0cba6..e5777c582 100644
--- a/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationElementDrawer.vue
+++ b/layout-webapp/src/main/webapp/vue-app/common-layout-components/components/site-navigation/SiteNavigationElementDrawer.vue
@@ -247,7 +247,8 @@ export default {
           this.navigationNode.siteKey.name,
           this.navigationNode.siteKey.type,
           this.elementType, this.elementType === 'LINK' && this.link || null,
-          this.elementType === 'PAGE' && this.pageTemplate?.id || null)
+          this.elementType === 'PAGE' && this.pageTemplate?.id || null
+        )
           .then((createdPage) => {
             const pageRef = createdPage?.key?.ref || `${createdPage?.key.site.typeName}::${createdPage?.key.site.name}::${createdPage?.pageContext?.key.name}`;
             this.$root.$emit('save-node-with-page', {
@@ -257,6 +258,9 @@ export default {
               'createdPage': createdPage,
               'openEditLayout': this.elementType === 'PAGE',
             });
+            return createdPage;
+          }).then(page => {
+            this.$root.$emit('page-layout-created', page, this.pageTemplate);
           }).catch(() => {
             this.$root.$emit('alert-message', this.$t('siteNavigation.label.pageCreation.error'), 'error');
           }).finally(() => this.loading = false);
diff --git a/layout-webapp/src/main/webapp/vue-app/common/components/LayoutAnalytics.vue b/layout-webapp/src/main/webapp/vue-app/common/components/LayoutAnalytics.vue
new file mode 100644
index 000000000..d7c5312b0
--- /dev/null
+++ b/layout-webapp/src/main/webapp/vue-app/common/components/LayoutAnalytics.vue
@@ -0,0 +1,109 @@
+<script>
+export default {
+  props: {
+    applicationName: {
+      type: String,
+      default: null,
+    },
+  },
+  created() {
+    this.$root.$on('page-templates-created', this.handlePageTemplateCreation);
+    this.$root.$on('page-templates-updated', this.handlePageTemplateUpdate);
+    this.$root.$on('page-templates-deleted', this.handlePageTemplateDeletion);
+    this.$root.$on('page-templates-enabled', this.handlePageTemplateEnabled);
+    this.$root.$on('page-templates-disabled', this.handlePageTemplateDisabled);
+    this.$root.$on('page-layout-created', this.handlePageCreated);
+  },
+  beforeDestroy() {
+    this.$root.$off('page-templates-created', this.handlePageTemplateCreation);
+    this.$root.$off('page-templates-updated', this.handlePageTemplateUpdate);
+    this.$root.$off('page-templates-deleted', this.handlePageTemplateDeletion);
+    this.$root.$off('page-templates-enabled', this.handlePageTemplateEnabled);
+    this.$root.$off('page-templates-disabled', this.handlePageTemplateDisabled);
+    this.$root.$off('page-layout-created', this.handlePageCreated);
+  },
+  methods: {
+    handlePageCreated(page, pageTemplate) {
+      this.sendAnalytics('pageLayout', 'createPageLayout', {
+        pageTemplateId: pageTemplate?.id || null,
+        pageTemplateName: pageTemplate?.name || null,
+        pageTemplateCategory: pageTemplate?.id && (pageTemplate?.category || 'customized') || null,
+        pageTemplateDisabled: pageTemplate?.id && `${pageTemplate.disabled}` || null,
+        pageTemplateSystem: pageTemplate?.id && `${pageTemplate.system}` || null,
+        pageTemplateIllustrationId: pageTemplate?.id && pageTemplate.illustrationId || null,
+        pageName: page?.state?.displayName,
+        pageReference: page?.key?.ref,
+        pageType: page?.state?.type,
+        siteName: page?.key?.site?.name,
+        siteType: page?.key?.site?.type,
+      });
+    },
+    handlePageTemplateCreation(pageTemplate, pageRef) {
+      this.sendAnalytics('pageTemplate', 'createPageTemplate', {
+        pageTemplateId: pageTemplate.id,
+        pageTemplateName: pageTemplate.name,
+        pageTemplateCategory: pageTemplate.category || 'customized',
+        pageTemplateDisabled: `${pageTemplate.disabled}`,
+        pageTemplateSystem: `${pageTemplate.system}`,
+        pageTemplateIllustrationId: pageTemplate.illustrationId,
+        pageTemplatePage: pageRef,
+      });
+    },
+    handlePageTemplateUpdate(pageTemplate) {
+      this.sendAnalytics('pageTemplate', 'updatePageTemplate', {
+        pageTemplateId: pageTemplate.id,
+        pageTemplateName: pageTemplate.name,
+        pageTemplateCategory: pageTemplate.category,
+        pageTemplateDisabled: `${pageTemplate.disabled}`,
+        pageTemplateSystem: `${pageTemplate.system}`,
+        pageTemplateIllustrationId: pageTemplate.illustrationId,
+      });
+    },
+    handlePageTemplateDeletion(pageTemplate) {
+      this.sendAnalytics('pageTemplate', 'deletePageTemplate', {
+        pageTemplateId: pageTemplate.id,
+        pageTemplateName: pageTemplate.name,
+        pageTemplateCategory: pageTemplate.category,
+        pageTemplateDisabled: `${pageTemplate.disabled}`,
+        pageTemplateSystem: `${pageTemplate.system}`,
+        pageTemplateIllustrationId: pageTemplate.illustrationId,
+      });
+    },
+    handlePageTemplateEnabled(pageTemplate) {
+      this.sendAnalytics('pageTemplate', 'enablePageTemplate', {
+        pageTemplateId: pageTemplate.id,
+        pageTemplateName: pageTemplate.name,
+        pageTemplateCategory: pageTemplate.category,
+        pageTemplateDisabled: `${pageTemplate.disabled}`,
+        pageTemplateSystem: `${pageTemplate.system}`,
+        pageTemplateIllustrationId: pageTemplate.illustrationId,
+      });
+    },
+    handlePageTemplateDisabled(pageTemplate) {
+      this.sendAnalytics('pageTemplate', 'disablePageTemplate', {
+        pageTemplateId: pageTemplate.id,
+        pageTemplateName: pageTemplate.name,
+        pageTemplateCategory: pageTemplate.category,
+        pageTemplateDisabled: `${pageTemplate.disabled}`,
+        pageTemplateSystem: `${pageTemplate.system}`,
+        pageTemplateIllustrationId: pageTemplate.illustrationId,
+      });
+    },
+    sendAnalytics(subModule, operation, parameters) {
+      parameters.applicationName = this.applicationName;
+      document.dispatchEvent(new CustomEvent('exo-statistic-message', {
+        detail: {
+          module: 'layout',
+          subModule,
+          userId: eXo.env.portal.userIdentityId,
+          userName: eXo.env.portal.userName,
+          spaceId: eXo.env.portal.spaceId || 0,
+          operation,
+          timestamp: Date.now(),
+          parameters,
+        }
+      }));
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/layout-webapp/src/main/webapp/vue-app/common/initComponents.js b/layout-webapp/src/main/webapp/vue-app/common/initComponents.js
new file mode 100644
index 000000000..aba8b87e3
--- /dev/null
+++ b/layout-webapp/src/main/webapp/vue-app/common/initComponents.js
@@ -0,0 +1,28 @@
+/*
+ * This file is part of the Meeds project (https://meeds.io/).
+ * 
+ * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+import LayoutAnalytics from './components/LayoutAnalytics.vue';
+
+const components = {
+  'layout-analytics': LayoutAnalytics,
+};
+
+for (const key in components) {
+  Vue.component(key, components[key]);
+}
diff --git a/layout-webapp/src/main/webapp/vue-app/layout-editor/components/LayoutEditor.vue b/layout-webapp/src/main/webapp/vue-app/layout-editor/components/LayoutEditor.vue
index 4d73160d1..65dd5127e 100644
--- a/layout-webapp/src/main/webapp/vue-app/layout-editor/components/LayoutEditor.vue
+++ b/layout-webapp/src/main/webapp/vue-app/layout-editor/components/LayoutEditor.vue
@@ -36,6 +36,8 @@
         @modified="modified = true" />
       <layout-editor-cells-selection-box />
     </div>
+    <layout-analytics
+      :application-name="pageTemplateId ? 'pageTemplateManagement' : 'pageLayoutEditor'" />
   </v-app>
 </template>
 <script>
diff --git a/layout-webapp/src/main/webapp/vue-app/layout-editor/components/drawer/PageTemplateDrawer.vue b/layout-webapp/src/main/webapp/vue-app/layout-editor/components/drawer/PageTemplateDrawer.vue
index 18df98b62..9300bcb64 100644
--- a/layout-webapp/src/main/webapp/vue-app/layout-editor/components/drawer/PageTemplateDrawer.vue
+++ b/layout-webapp/src/main/webapp/vue-app/layout-editor/components/drawer/PageTemplateDrawer.vue
@@ -157,14 +157,22 @@ export default {
           this.$pageTemplateService.getPageTemplate(this.templateId)
             .then(pageTemplate => {
               const newTemplate = (this.$root.pageTemplate && !this.$root.pageTemplate.name);
-              const disabled = newTemplate ? false : pageTemplate.disabled;
-              return this.$pageTemplateService.updatePageTemplate({
-                ...pageTemplate,
-                disabled,
-                content: this.pageLayoutContent,
-              });
+              pageTemplate.disabled = newTemplate ? false : pageTemplate.disabled;
+              pageTemplate.content = this.pageLayoutContent;
+              return this.$pageTemplateService.updatePageTemplate(pageTemplate)
+                .then(() => {
+                  if (newTemplate) {
+                    this.$root.$emit('page-templates-created', pageTemplate);
+                  } else {
+                    this.$root.$emit('page-templates-updated', pageTemplate);
+                  }
+                });
             })
-          : this.$pageTemplateService.createPageTemplate(this.pageLayoutContent);
+          : this.$pageTemplateService.createPageTemplate(this.pageLayoutContent)
+            .then(pageTemplate => {
+              this.$root.$emit('page-templates-created', pageTemplate, this.$root.pageRef);
+              return pageTemplate;
+            });
       return savePageRequest
         .then(pageTemplate => {
           if (pageTemplate) {
diff --git a/layout-webapp/src/main/webapp/vue-app/layout-editor/components/toolbar/actions/SaveTemplateButton.vue b/layout-webapp/src/main/webapp/vue-app/layout-editor/components/toolbar/actions/SaveTemplateButton.vue
index 9a9f4909b..135111c98 100644
--- a/layout-webapp/src/main/webapp/vue-app/layout-editor/components/toolbar/actions/SaveTemplateButton.vue
+++ b/layout-webapp/src/main/webapp/vue-app/layout-editor/components/toolbar/actions/SaveTemplateButton.vue
@@ -56,10 +56,14 @@ export default {
         this.$root.$emit('close-alert-message');
         this.loading = true;
         this.$pageTemplateService.getPageTemplate(this.$root.pageTemplateId)
-          .then(pageTemplate => this.$pageTemplateService.updatePageTemplate({
-            ...pageTemplate,
-            content: JSON.stringify(pageLayout),
-          }))
+          .then(pageTemplate => {
+            pageTemplate.content = JSON.stringify(pageLayout);
+            return this.$pageTemplateService.updatePageTemplate(pageTemplate)
+              .then(() => {
+                this.$root.$emit('page-templates-updated', pageTemplate);
+                return pageTemplate;
+              });
+          })
           .then(() => {
             this.$root.$emit('alert-message', this.$t('pageTemplate.layout.update.success'), 'success');
           })
diff --git a/layout-webapp/src/main/webapp/vue-app/layout-editor/main.js b/layout-webapp/src/main/webapp/vue-app/layout-editor/main.js
index e358d5e21..645826c8a 100644
--- a/layout-webapp/src/main/webapp/vue-app/layout-editor/main.js
+++ b/layout-webapp/src/main/webapp/vue-app/layout-editor/main.js
@@ -18,6 +18,7 @@
  */
 
 import './initComponents.js';
+import '../common/initComponents.js';
 import './extensions.js';
 import './services.js';
 
diff --git a/layout-webapp/src/main/webapp/vue-app/page-templates-management/components/PageTemplatesManagement.vue b/layout-webapp/src/main/webapp/vue-app/page-templates-management/components/PageTemplatesManagement.vue
index 1bca737d9..43829a9ec 100644
--- a/layout-webapp/src/main/webapp/vue-app/page-templates-management/components/PageTemplatesManagement.vue
+++ b/layout-webapp/src/main/webapp/vue-app/page-templates-management/components/PageTemplatesManagement.vue
@@ -33,6 +33,7 @@
     </v-card>
     <layout-editor-page-template-drawer />
     <page-templates-management-illustration-preview />
+    <layout-analytics application-name="pageTemplateManagement" />
   </v-app>
 </template>
 <script>
diff --git a/layout-webapp/src/main/webapp/vue-app/page-templates-management/components/list/PageTemplateItem.vue b/layout-webapp/src/main/webapp/vue-app/page-templates-management/components/list/PageTemplateItem.vue
index 1ed7519f8..f08ae6e8c 100644
--- a/layout-webapp/src/main/webapp/vue-app/page-templates-management/components/list/PageTemplateItem.vue
+++ b/layout-webapp/src/main/webapp/vue-app/page-templates-management/components/list/PageTemplateItem.vue
@@ -93,12 +93,14 @@ export default {
       this.$root.$emit('close-alert-message');
       this.loading = true;
       this.$pageTemplateService.getPageTemplate(this.pageTemplate.id)
-        .then(pageTemplate => this.$pageTemplateService.updatePageTemplate({
-          ...pageTemplate,
-          disabled: this.enabled,
-        }))
+        .then(pageTemplate => {
+          pageTemplate.disabled = this.enabled;
+          return this.$pageTemplateService.updatePageTemplate(pageTemplate)
+            .then(() => {
+              this.$root.$emit(`page-templates-${this.enabled && 'disabled' || 'enabled'}`, pageTemplate);
+            });
+        })
         .then(() => {
-          this.$root.$emit('page-templates-refresh');
           this.$root.$emit('alert-message', this.$t('pageTemplate.status.update.success'), 'success');
         })
         .catch(() => this.$root.$emit('alert-message', this.$t('pageTemplate.status.update.error'), 'error'))
diff --git a/layout-webapp/src/main/webapp/vue-app/page-templates-management/components/list/PageTemplates.vue b/layout-webapp/src/main/webapp/vue-app/page-templates-management/components/list/PageTemplates.vue
index 78c4dc65e..18835edf9 100644
--- a/layout-webapp/src/main/webapp/vue-app/page-templates-management/components/list/PageTemplates.vue
+++ b/layout-webapp/src/main/webapp/vue-app/page-templates-management/components/list/PageTemplates.vue
@@ -124,15 +124,21 @@ export default {
     },
   },
   created() {
-    this.$root.$on('page-templates-saved', this.refreshPageTemplates);
-    this.$root.$on('page-templates-refresh', this.refreshPageTemplates);
+    this.$root.$on('page-templates-deleted', this.refreshPageTemplates);
+    this.$root.$on('page-templates-created', this.refreshPageTemplates);
+    this.$root.$on('page-templates-updated', this.refreshPageTemplates);
+    this.$root.$on('page-templates-enabled', this.refreshPageTemplates);
+    this.$root.$on('page-templates-disabled', this.refreshPageTemplates);
     this.$root.$on('page-templates-delete', this.deletePageTemplateConfirm);
     this.$root.$on('page-templates-create', this.createPageTemplate);
     this.refreshPageTemplates();
   },
   beforeDestroy() {
-    this.$root.$off('page-templates-saved', this.refreshPageTemplates);
-    this.$root.$off('page-templates-refresh', this.refreshPageTemplates);
+    this.$root.$off('page-templates-deleted', this.refreshPageTemplates);
+    this.$root.$off('page-templates-created', this.refreshPageTemplates);
+    this.$root.$off('page-templates-updated', this.refreshPageTemplates);
+    this.$root.$off('page-templates-enabled', this.refreshPageTemplates);
+    this.$root.$off('page-templates-disabled', this.refreshPageTemplates);
     this.$root.$off('page-templates-delete', this.deletePageTemplateConfirm);
     this.$root.$off('page-templates-create', this.createPageTemplate);
   },
@@ -153,7 +159,7 @@ export default {
       this.loading = true;
       this.$pageTemplateService.deletePageTemplate(pageTemplate.id)
         .then(() => {
-          this.$root.$emit('page-templates-refresh');
+          this.$root.$emit('page-templates-deleted', pageTemplate);
           this.$root.$emit('alert-message', this.$t('pageTemplate.delete.success'), 'success');
         })
         .catch(() => this.$root.$emit('alert-message', this.$t('pageTemplate.delete.error'), 'error'))
diff --git a/layout-webapp/src/main/webapp/vue-app/page-templates-management/main.js b/layout-webapp/src/main/webapp/vue-app/page-templates-management/main.js
index c7695b344..89d9eaf4e 100644
--- a/layout-webapp/src/main/webapp/vue-app/page-templates-management/main.js
+++ b/layout-webapp/src/main/webapp/vue-app/page-templates-management/main.js
@@ -18,6 +18,7 @@
  */
 
 import './initComponents.js';
+import '../common/initComponents.js';
 
 // get overridden components if exists
 if (extensionRegistry) {
diff --git a/layout-webapp/src/main/webapp/vue-app/site-management/components/SiteManagement.vue b/layout-webapp/src/main/webapp/vue-app/site-management/components/SiteManagement.vue
index 4b82b1615..a55c75b9e 100644
--- a/layout-webapp/src/main/webapp/vue-app/site-management/components/SiteManagement.vue
+++ b/layout-webapp/src/main/webapp/vue-app/site-management/components/SiteManagement.vue
@@ -35,6 +35,7 @@
     <site-navigation-node-drawer />
     <site-navigation-element-drawer />
     <manage-permissions-drawer />
+    <layout-analytics application-name="siteManagement" />
   </v-app>
 </template>
 
diff --git a/layout-webapp/src/main/webapp/vue-app/site-management/main.js b/layout-webapp/src/main/webapp/vue-app/site-management/main.js
index e67a8762b..37981cdd1 100644
--- a/layout-webapp/src/main/webapp/vue-app/site-management/main.js
+++ b/layout-webapp/src/main/webapp/vue-app/site-management/main.js
@@ -18,6 +18,7 @@
  */
 
 import './initComponents.js';
+import '../common/initComponents.js';
 
 // get overridden components if exists
 if (extensionRegistry) {
diff --git a/layout-webapp/src/main/webapp/vue-app/site-navigation/components/SiteNavigation.vue b/layout-webapp/src/main/webapp/vue-app/site-navigation/components/SiteNavigation.vue
index 3828b0286..59047da0f 100644
--- a/layout-webapp/src/main/webapp/vue-app/site-navigation/components/SiteNavigation.vue
+++ b/layout-webapp/src/main/webapp/vue-app/site-navigation/components/SiteNavigation.vue
@@ -22,6 +22,7 @@
       icon-class="text-color"
       embedded />
     <site-navigation-drawers-actions />
+    <layout-analytics application-name="siteNavigation" />
   </v-app>
 </template>
 <script>
diff --git a/layout-webapp/src/main/webapp/vue-app/site-navigation/main.js b/layout-webapp/src/main/webapp/vue-app/site-navigation/main.js
index 53d2770e0..ef2b5dd2e 100644
--- a/layout-webapp/src/main/webapp/vue-app/site-navigation/main.js
+++ b/layout-webapp/src/main/webapp/vue-app/site-navigation/main.js
@@ -18,6 +18,7 @@
  */
 
 import './initComponents.js';
+import '../common/initComponents.js';
 
 // get overridden components if exists
 if (extensionRegistry) {
diff --git a/translations.properties b/translations.properties
index 2d2c74f67..739bf3d49 100644
--- a/translations.properties
+++ b/translations.properties
@@ -24,10 +24,7 @@ baseDir=add-ons/layout/
 # Files
 
 # portlets
-portlet/QuickEditLayoutPortlet.properties=layout-webapp/src/main/resources/locale/portlet/layout/QuickEditLayoutPortlet_en.xml
-portlet/GroupNavigationPortlet.properties=layout-webapp/src/main/resources/locale/portlet/layout/GroupNavigationPortlet_en.properties
-portlet/PortalNavigationPortlet.properties=layout-webapp/src/main/resources/locale/portlet/layout/PortalNavigationPortlet_en.properties
-portlet/SiteNavigationPortlet.properties=layout-webapp/src/main/resources/locale/portlet/layout/SiteNavigationPortlet_en.properties
-portlet/SiteManagementPortlet.properties=layout-webapp/src/main/resources/locale/portlet/layout/SiteManagementPortlet_en.properties
-portlet/ImagesPortlet.properties=layout-webapp/src/main/resources/locale/portlet/layout/ImagesPortlet_en.properties
-portal/webui.properties=layout-webapp/src/main/resources/locale/portal/webui_en.properties
\ No newline at end of file
+SiteNavigation.properties=layout-webapp/src/main/resources/locale/portlet/layout/SiteNavigationPortlet_en.properties
+SiteManagement.properties=layout-webapp/src/main/resources/locale/portlet/layout/SiteManagement_en.properties
+LayoutEditor.properties=layout-webapp/src/main/resources/locale/portlet/layout/LayoutEditor_en.properties
+Analytics.properties=layout-webapp/src/main/resources/locale/portlet/Analytics_en.properties