diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_ar.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_ar.properties
index bc1f54b85d9..c2cf858e20a 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_ar.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_ar.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=نوع الملف غير مدعوم، يجب ع
# Space Settings #
#####################################################################################
-SpaceSettings.general=عامّ
SpaceSettings.applications=تطبيقات
SpaceSettings.label.ok=موافق
SpaceSettings.label.cancel=الغاء
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_aro.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_aro.properties
index 01bcc90a6c7..ab3c7548822 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_aro.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_aro.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=نوع الملف غير مدعوم، يجب ع
# Space Settings #
#####################################################################################
-SpaceSettings.general=عامّ
SpaceSettings.applications=تطبيقات
SpaceSettings.label.ok=موافق
SpaceSettings.label.cancel=الغاء
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_az.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_az.properties
index be6dc2ba59a..fc52eccd1fd 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_az.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_az.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=File type is not supported, you should upload a
# Space Settings #
#####################################################################################
-SpaceSettings.general=General
SpaceSettings.applications=Applications
SpaceSettings.label.ok=OK
SpaceSettings.label.cancel=Ləğv Et
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_ca.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_ca.properties
index 7c3aa98e745..bf9a2fc2602 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_ca.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_ca.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=File type is not supported, you should upload a
# Space Settings #
#####################################################################################
-SpaceSettings.general=General
SpaceSettings.applications=Aplicacions
SpaceSettings.label.ok=Accepta
SpaceSettings.label.cancel=Cancel·la
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_ceb.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_ceb.properties
index 79669b34ebe..acb9e04701c 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_ceb.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_ceb.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=File type is not supported, you should upload a
# Space Settings #
#####################################################################################
-SpaceSettings.general=General
SpaceSettings.applications=Applications
SpaceSettings.label.ok=OK
SpaceSettings.label.cancel=Cancel
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_co.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_co.properties
index 6b9a7ba4a5a..fd75eb4134f 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_co.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_co.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=File type is not supported, you should upload a
# Space Settings #
#####################################################################################
-SpaceSettings.general=General
SpaceSettings.applications=Applications
SpaceSettings.label.ok=OK
SpaceSettings.label.cancel=Cancel
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_cs.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_cs.properties
index e8ff70c5d99..748e96d333a 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_cs.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_cs.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=File type is not supported, you should upload a
# Space Settings #
#####################################################################################
-SpaceSettings.general=Hlavní
SpaceSettings.applications=Aplikace
SpaceSettings.label.ok=OK
SpaceSettings.label.cancel=Zrušit
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_de.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_de.properties
index 5371409e119..04d3c90c1be 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_de.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_de.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=Der Dateityp wird nicht unterstützt. Sie sollt
# Space Settings #
#####################################################################################
-SpaceSettings.general=Allgemein
SpaceSettings.applications=Anwendungen
SpaceSettings.label.ok=Ok
SpaceSettings.label.cancel=Abbrechen
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_el.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_el.properties
index 650ebcc856f..7f30d2e6025 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_el.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_el.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=File type is not supported, you should upload a
# Space Settings #
#####################################################################################
-SpaceSettings.general=Γενικά
SpaceSettings.applications=Εφαρμογές
SpaceSettings.label.ok=Αποδοχή
SpaceSettings.label.cancel=Ακύρωση
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_en.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_en.properties
index 0d726b1e983..6a1cb923177 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_en.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_en.properties
@@ -179,6 +179,7 @@ UIPopupAvatarUploader.title.UIAvatarUploader=Upload an Image
UIPopupAvatarUploader.title.UIAvatarUploadContent=Image Preview
UIChangeAvatarContainer.label.ChangeAvatar=Change Avatar
UIChangeAvatarContainer.label.AvatarUpdated=Avatar successfully updated
+UIChangeAvatarContainer.title.deleteAvatar=Delete Avatar
#####################################################################################
# UIPopupBannerUploader #
@@ -353,7 +354,12 @@ profile.warning.message.fileType=File type is not supported, you should upload a
# Space Settings #
#####################################################################################
-SpaceSettings.general=General
+SpaceSettings.overview=Overview
+SpaceSettings.roles=Roles
+SpaceSettings.accessAndVisibility=Access & Visibility
+SpaceSettings.backToMain=Back to main
+SpaceSettings.label.avatar=Avatar
+SpaceSettings.label.banner=Banner
SpaceSettings.applications=Applications
SpaceSettings.label.ok=OK
SpaceSettings.label.cancel=Cancel
@@ -394,6 +400,7 @@ SpaceSettings.application.members.title=Members
SpaceSettings.application.space.setting.title=Space Setting
SpaceSettings.application.members.description=Members Portlet
SpaceSettings.application.space.setting.description=Space Setting Portlet
+SpaceSettings.successfullySaved=Space settings updated
#####################################################################################
# User Management #
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_es_ES.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_es_ES.properties
index 34fcf6099f5..a1fa800dbcb 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_es_ES.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_es_ES.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=El tipo de archivo no es compatible, debes subi
# Space Settings #
#####################################################################################
-SpaceSettings.general=General
SpaceSettings.applications=Aplicaciones
SpaceSettings.label.ok=Confirmar
SpaceSettings.label.cancel=Cancelar
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_eu.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_eu.properties
index 6b9a7ba4a5a..fd75eb4134f 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_eu.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_eu.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=File type is not supported, you should upload a
# Space Settings #
#####################################################################################
-SpaceSettings.general=General
SpaceSettings.applications=Applications
SpaceSettings.label.ok=OK
SpaceSettings.label.cancel=Cancel
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_fa.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_fa.properties
index dca0d4df5ce..76c7c7805e6 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_fa.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_fa.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=File type is not supported, you should upload a
# Space Settings #
#####################################################################################
-SpaceSettings.general=عمومی
SpaceSettings.applications=برنامه های کاربردی
SpaceSettings.label.ok=تایید
SpaceSettings.label.cancel=انصراف
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_fi.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_fi.properties
index 6b9a7ba4a5a..fd75eb4134f 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_fi.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_fi.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=File type is not supported, you should upload a
# Space Settings #
#####################################################################################
-SpaceSettings.general=General
SpaceSettings.applications=Applications
SpaceSettings.label.ok=OK
SpaceSettings.label.cancel=Cancel
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_fil.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_fil.properties
index cab52a5347e..1cf99a943b1 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_fil.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_fil.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=File type is not supported, you should upload a
# Space Settings #
#####################################################################################
-SpaceSettings.general=Pangkalahatan
SpaceSettings.applications=Mga Aplikasyon
SpaceSettings.label.ok=OK
SpaceSettings.label.cancel=Kanselahin
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_fr.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_fr.properties
index 42ffca7f591..f87741eb7b6 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_fr.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_fr.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=Ce type de fichier n'est pas pris en charge, vo
# Space Settings #
#####################################################################################
-SpaceSettings.general=Général
SpaceSettings.applications=Applications
SpaceSettings.label.ok=Valider
SpaceSettings.label.cancel=Annuler
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_hi.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_hi.properties
index 6b9a7ba4a5a..fd75eb4134f 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_hi.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_hi.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=File type is not supported, you should upload a
# Space Settings #
#####################################################################################
-SpaceSettings.general=General
SpaceSettings.applications=Applications
SpaceSettings.label.ok=OK
SpaceSettings.label.cancel=Cancel
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_hu.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_hu.properties
index 6b9a7ba4a5a..fd75eb4134f 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_hu.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_hu.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=File type is not supported, you should upload a
# Space Settings #
#####################################################################################
-SpaceSettings.general=General
SpaceSettings.applications=Applications
SpaceSettings.label.ok=OK
SpaceSettings.label.cancel=Cancel
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_id.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_id.properties
index 39454000387..93e7d0ba197 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_id.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_id.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=Tipe file tidak didukung, Anda harus mengunggah
# Space Settings #
#####################################################################################
-SpaceSettings.general=Umum
SpaceSettings.applications=Aplikasi
SpaceSettings.label.ok=Oke
SpaceSettings.label.cancel=membatalkan
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_in.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_in.properties
index bd6122ebbb9..17264960f93 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_in.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_in.properties
@@ -346,7 +346,6 @@ profile.warning.message.fileType=File type is not supported, you should upload a
# Space Settings #
#####################################################################################
-SpaceSettings.general=Umum
SpaceSettings.applications=Aplikasi
SpaceSettings.label.ok=Oke
SpaceSettings.label.cancel=membatalkan
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_it.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_it.properties
index f9f05927040..7d44bb0f43c 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_it.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_it.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=Il tipo del file non è supportato, dovresti ca
# Space Settings #
#####################################################################################
-SpaceSettings.general=Generale
SpaceSettings.applications=Applicazioni
SpaceSettings.label.ok=Ok
SpaceSettings.label.cancel=Annulla
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_ja.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_ja.properties
index d8d977bc4a0..58e496ac5b7 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_ja.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_ja.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=File type is not supported, you should upload a
# Space Settings #
#####################################################################################
-SpaceSettings.general=全般
SpaceSettings.applications=アプリケーション
SpaceSettings.label.ok=OK
SpaceSettings.label.cancel=キャンセル
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_kab.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_kab.properties
index 11524f79c76..59cd7741971 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_kab.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_kab.properties
@@ -289,7 +289,6 @@ profile.warning.message.fileType=File type is not supported, you should upload a
# Space Settings #
#####################################################################################
-SpaceSettings.general=General
SpaceSettings.applications=Applications
SpaceSettings.label.ok=OK
SpaceSettings.label.cancel=Cancel
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_ko.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_ko.properties
index 6b9a7ba4a5a..fd75eb4134f 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_ko.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_ko.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=File type is not supported, you should upload a
# Space Settings #
#####################################################################################
-SpaceSettings.general=General
SpaceSettings.applications=Applications
SpaceSettings.label.ok=OK
SpaceSettings.label.cancel=Cancel
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_lt.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_lt.properties
index 84d989d6a23..46a58a9d0fb 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_lt.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_lt.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=File type is not supported, you should upload a
# Space Settings #
#####################################################################################
-SpaceSettings.general=Bendras
SpaceSettings.applications=Programos
SpaceSettings.label.ok=Gerai
SpaceSettings.label.cancel=Atšaukti
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_ms.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_ms.properties
index 23736e55748..b39175b2ea0 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_ms.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_ms.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=File type is not supported, you should upload a
# Space Settings #
#####################################################################################
-SpaceSettings.general=General
SpaceSettings.applications=Applications
SpaceSettings.label.ok=OK
SpaceSettings.label.cancel=Batal
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_nl.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_nl.properties
index a22b0b8b4bc..a98f0174f00 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_nl.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_nl.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=File type is not supported, you should upload a
# Space Settings #
#####################################################################################
-SpaceSettings.general=Algemeen
SpaceSettings.applications=Applicaties
SpaceSettings.label.ok=OK
SpaceSettings.label.cancel=Annuleren
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_no.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_no.properties
index 7333d6d6ee8..cc1352eb0cf 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_no.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_no.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=File type is not supported, you should upload a
# Space Settings #
#####################################################################################
-SpaceSettings.general=General
SpaceSettings.applications=Applikasjoner
SpaceSettings.label.ok=OK
SpaceSettings.label.cancel=Avbryt
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_pcm.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_pcm.properties
index 988e6baeede..c6f0669640d 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_pcm.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_pcm.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=File type is not supported, you should upload a
# Space Settings #
#####################################################################################
-SpaceSettings.general=General
SpaceSettings.applications=Applications
SpaceSettings.label.ok=OK
SpaceSettings.label.cancel=Cancel
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_pl.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_pl.properties
index 37f29566179..8a813d0695a 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_pl.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_pl.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=File type is not supported, you should upload a
# Space Settings #
#####################################################################################
-SpaceSettings.general=Ogólny
SpaceSettings.applications=Aplikacje
SpaceSettings.label.ok=OK
SpaceSettings.label.cancel=Anuluj
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_pt_BR.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_pt_BR.properties
index 41d93ded522..cf0637061dc 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_pt_BR.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_pt_BR.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=Tipo de arquivo não suportado, tu deverias ter
# Space Settings #
#####################################################################################
-SpaceSettings.general=Geral
SpaceSettings.applications=Aplicativos
SpaceSettings.label.ok=Ok
SpaceSettings.label.cancel=Cancelar
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_pt_PT.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_pt_PT.properties
index 3e3de1d3741..fc0720fcef1 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_pt_PT.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_pt_PT.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=File type is not supported, you should upload a
# Space Settings #
#####################################################################################
-SpaceSettings.general=Geral
SpaceSettings.applications=Aplicações
SpaceSettings.label.ok=Ok
SpaceSettings.label.cancel=Cancelar
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_ro.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_ro.properties
index 4b192d84cfd..947911739d2 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_ro.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_ro.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=File type is not supported,you should upload an
# Space Settings #
#####################################################################################
-SpaceSettings.general=General
SpaceSettings.applications=Aplicaţii
SpaceSettings.label.ok=Ok
SpaceSettings.label.cancel=Renunță
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_ru.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_ru.properties
index 19466139beb..acc8791cf52 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_ru.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_ru.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=File type is not supported, you should upload a
# Space Settings #
#####################################################################################
-SpaceSettings.general=Общие настройки
SpaceSettings.applications=Приложения
SpaceSettings.label.ok=ОК
SpaceSettings.label.cancel=Отмена
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_sk.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_sk.properties
index 6b9a7ba4a5a..fd75eb4134f 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_sk.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_sk.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=File type is not supported, you should upload a
# Space Settings #
#####################################################################################
-SpaceSettings.general=General
SpaceSettings.applications=Applications
SpaceSettings.label.ok=OK
SpaceSettings.label.cancel=Cancel
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_sl.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_sl.properties
index dbf78fcd7fa..f9f035bf9fd 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_sl.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_sl.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=File type is not supported, you should upload a
# Space Settings #
#####################################################################################
-SpaceSettings.general=Splošno
SpaceSettings.applications=Aplikacije
SpaceSettings.label.ok=V redu
SpaceSettings.label.cancel=Prekliči
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_sq.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_sq.properties
index b7fe52aceb0..23ecbbaba42 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_sq.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_sq.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=crwdns40872:0crwdne40872:0
# Space Settings #
#####################################################################################
-SpaceSettings.general=crwdns40874:0crwdne40874:0
SpaceSettings.applications=crwdns40876:0crwdne40876:0
SpaceSettings.label.ok=crwdns40878:0crwdne40878:0
SpaceSettings.label.cancel=crwdns40880:0crwdne40880:0
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_sv_SE.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_sv_SE.properties
index 4b0840312d8..78dd8af2885 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_sv_SE.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_sv_SE.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=File type is not supported, you should upload a
# Space Settings #
#####################################################################################
-SpaceSettings.general=General
SpaceSettings.applications=Program
SpaceSettings.label.ok=OK
SpaceSettings.label.cancel=Avbryt
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_th.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_th.properties
index 6b9a7ba4a5a..fd75eb4134f 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_th.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_th.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=File type is not supported, you should upload a
# Space Settings #
#####################################################################################
-SpaceSettings.general=General
SpaceSettings.applications=Applications
SpaceSettings.label.ok=OK
SpaceSettings.label.cancel=Cancel
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_tl.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_tl.properties
index c25a70b0853..8673f8de323 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_tl.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_tl.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=File type is not supported, you should upload a
# Space Settings #
#####################################################################################
-SpaceSettings.general=General
SpaceSettings.applications=Ang mga aplikasyon
SpaceSettings.label.ok=OK
SpaceSettings.label.cancel=Kanselahin
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_tr.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_tr.properties
index 393f64405e7..42872ea9722 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_tr.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_tr.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=Dosya türü desteklenmiyor, bir resim dosyası
# Space Settings #
#####################################################################################
-SpaceSettings.general=Genel
SpaceSettings.applications=Uygulamalar
SpaceSettings.label.ok=Tamam
SpaceSettings.label.cancel=İptal
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_uk.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_uk.properties
index c160b29a3b2..bd7fbc4463d 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_uk.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_uk.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=Тип файлу не підтримуєтьс
# Space Settings #
#####################################################################################
-SpaceSettings.general=Загальні
SpaceSettings.applications=Додатки
SpaceSettings.label.ok=Гаразд
SpaceSettings.label.cancel=Скасувати
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_ur_IN.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_ur_IN.properties
index be195270f8d..0347dc62858 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_ur_IN.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_ur_IN.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=File type is not supported, you should upload a
# Space Settings #
#####################################################################################
-SpaceSettings.general=عمومی
SpaceSettings.applications=درخواستیں
SpaceSettings.label.ok=ٹھیک ہے
SpaceSettings.label.cancel=منسوخ
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_vi.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_vi.properties
index 40206f099d0..6634d26ed2e 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_vi.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_vi.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=File type is not supported, you should upload a
# Space Settings #
#####################################################################################
-SpaceSettings.general=Chung
SpaceSettings.applications=Ứng dụng
SpaceSettings.label.ok=Đồng ý
SpaceSettings.label.cancel=Hủy bỏ
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_zh_CN.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_zh_CN.properties
index 3f991902245..854978cf87f 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_zh_CN.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_zh_CN.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=File type is not supported, you should upload a
# Space Settings #
#####################################################################################
-SpaceSettings.general=常规
SpaceSettings.applications=应用程序
SpaceSettings.label.ok=Ok
SpaceSettings.label.cancel=取消
diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_zh_TW.properties b/webapp/portlet/src/main/resources/locale/portlet/Portlets_zh_TW.properties
index 2385a4d6bb1..7a1c4095d7e 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_zh_TW.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_zh_TW.properties
@@ -353,7 +353,6 @@ profile.warning.message.fileType=File type is not supported, you should upload a
# Space Settings #
#####################################################################################
-SpaceSettings.general=一般
SpaceSettings.applications=應用程式
SpaceSettings.label.ok=OK
SpaceSettings.label.cancel=取消
diff --git a/webapp/portlet/src/main/webapp/WEB-INF/gatein-resources.xml b/webapp/portlet/src/main/webapp/WEB-INF/gatein-resources.xml
index 556258c6b94..c2a49d5594a 100644
--- a/webapp/portlet/src/main/webapp/WEB-INF/gatein-resources.xml
+++ b/webapp/portlet/src/main/webapp/WEB-INF/gatein-resources.xml
@@ -799,10 +799,6 @@