diff --git a/component/service/src/main/resources/locale/social/Webui_en.properties b/component/service/src/main/resources/locale/social/Webui_en.properties
index 8fd3c257b64..b48ef5f1fea 100644
--- a/component/service/src/main/resources/locale/social/Webui_en.properties
+++ b/component/service/src/main/resources/locale/social/Webui_en.properties
@@ -453,7 +453,7 @@ UIExperienceSection.msg.Invalid-enddate-format=Invalid End Date. The End Date mu
 UIExperienceSection.msg.Invalid-company-mandatory=The Organization field must not be empty.
 UIExperienceSection.msg.Invalid-company-stringlength=Organization name must be between 3 and 90 characters and only letters, digits, underscore, dash, space are allowed.
 UIExperienceSection.msg.Invalid-position-mandatory=The Position field must not be empty.
-UIExperienceSection.msg.Invalid-position-stringlength=Position must be between 3 and 90 characters and only letters, digits, underscore, dash and space are allowed.
+UIExperienceSection.msg.Invalid-position-stringlength=Invalid input Position. Position must be between 3 and 90 characters and only alpha, digit, underscore, dash and space are allowed.
 UIExperienceSection.msg.startDateBeforeEndDate=The Start Date must be before the End Date.
 UIExperienceSection.msg.StartDateAfterToday=The Start Date must be before today.
 UIExperienceSection.msg.EndDateAfterToday=The End Date must be before today.
@@ -570,7 +570,7 @@ UIManageAllSpaces.status.visible=This space can be seen by anyone and
 UIManageAllSpaces.status.hidden=This space can only be seen by its members, and users can only become members after accepting the space host's invitation.
 UIManageAllSpaces.status.open=users can join this space without any validation.
 UIManageAllSpaces.status.validation=users can join this space after the space's host validates the users' request to join.
-UIManageAllSpaces.status.close=users cannot request to join this space because it's closed to requests to join.
+UIManageAllSpaces.status.close=users can not request to join this space because it's close to request to join.
 UIManageAllSpaces.title.SpaceAvatar=Space Avatar
 UIManageAllSpaces.label.SearchAll=All
 UIManageAllSpaces.label.All_Space=All Spaces
@@ -599,7 +599,7 @@ UIManageInvitationSpaces.status.visible=This space can be seen by anyone and
 UIManageInvitationSpaces.status.hidden=This space can only be seen by its members, and users can only become members after accepting the space host's invitation.
 UIManageInvitationSpaces.status.open=users can join this space without any validation.
 UIManageInvitationSpaces.status.validation=users can join this space after the space's host validates the users' request to join.
-UIManageInvitationSpaces.status.close=users cannot request to join this space because it's closed to requests to join.
+UIManageInvitationSpaces.status.close=users can not request to join this space because it's close to request to join.
 UIManageInvitationSpaces.title.SpaceAvatar=Space Avatar
 UIManageInvitationSpaces.label.SearchAll=All
 UIManageInvitationSpaces.label.All_Space=All Spaces
@@ -637,7 +637,7 @@ UIManageMySpaces.status.visible=This space can be seen by anyone and
 UIManageMySpaces.status.hidden=This space can only be seen by its members, and users can only become members after accepting the space host's invitation.
 UIManageMySpaces.status.open=users can join this space without any validation.
 UIManageMySpaces.status.validation=users can join this space after the space's host validates the users' request to join.
-UIManageMySpaces.status.close=users cannot request to join this space because it's closed to requests to join.
+UIManageMySpaces.status.close=users can not request to join this space because it's close to request to join.
 UIManageMySpaces.msg.warning_leave_space=You are the last admin of the space. Please, promote another member to space admin before you can leave it.
 UIManageMySpaces.msg.error_leave_space=Sorry, there is something wrong when you leave a space. Please try again later.
 UIManageMySpaces.msg.error_accept_invitation=Sorry, there is something wrong when you accept an invitation. Please try again later.
@@ -767,7 +767,7 @@ UISpaceInfo.label.SpaceId=Space ID
 UISpaceInfo.msg.name-invalid=Please enter a valid space name: letters,  digits, '&' character and space characters only
 UISpaceInfo.msg.update-success=Updated space information successfully.
 UISpaceInfo.msg.current-name-exist=This name is already taken.
-UISpaceInfo.label.ChangeAvatar=Change Avatar
+UISpaceInfo.label.ChangeAvatar=Change avatar
 UISpaceInfo.label.Public=Public
 UISpaceInfo.title.SpaceAvatar=Space Avatar
 UISpaceInfo.label.ChangePicture=Change Picture
@@ -935,7 +935,7 @@ Mentions.msg.foundNoMatch=Found no matching users for
 Notification.label.Close=OK
 
 Notification.feedback.title.ConnectionRequestRefuse=Connection request refused
-Notification.feedback.message.ConnectionRequestRefuse=You refused {0}'s connection request.
+Notification.feedback.message.ConnectionRequestRefuse=You refused {0} connection request.
 
 Notification.feedback.title.SpaceInvitationRefuse=Invitation refused
 Notification.feedback.message.SpaceInvitationRefuse=You refused to join {1}.
diff --git a/component/service/src/main/resources/locale/social/Webui_fil.properties b/component/service/src/main/resources/locale/social/Webui_fil.properties
index ce973f5f0fa..6abe232e21a 100644
--- a/component/service/src/main/resources/locale/social/Webui_fil.properties
+++ b/component/service/src/main/resources/locale/social/Webui_fil.properties
@@ -154,7 +154,7 @@ UIActivity.msg.DeleteActivity=OK
 UIActivity.msg.LikeActivity=Ang gusto
 UIActivity.msg.UnlikeActivity=Remove Like
 UIActivity.msg.LikeComment=Ang gusto
-UIActivity.msg.UnlikeComment=Hindi Gusto
+UIActivity.msg.UnlikeComment=Ang hindi gusto
 UIActivity.title.PopupCommentLikers=Mga taong nagustuhan
 UIActivity.msg.MoreLikers={0} higit pa...
 
@@ -858,7 +858,7 @@ SpaceNavigationNodePopupMenu.event.CloneNode=Kopyahin ang Node
 SpaceNavigationNodePopupMenu.event.CutNode=Gupitin ang Node
 SpaceNavigationNodePopupMenu.event.MoveUp=Ilipat Pataas
 SpaceNavigationNodePopupMenu.event.MoveDown=Ilipat Pababa
-SpaceNavigationNodePopupMenu.event.PasteNode=Idikit ang Node
+SpaceNavigationNodePopupMenu.event.PasteNode=Ang Idikit ang Node
 SpaceNavigationNodePopupMenu.event.SaveNavigation=I-save ang Nabigasyon
 SpaceNavigationNodePopupMenu.event.DeleteNode=Burahin ang Node
 
diff --git a/component/service/src/main/resources/locale/social/Webui_id.properties b/component/service/src/main/resources/locale/social/Webui_id.properties
index c5d483cb1ab..4a02cb1c6e7 100644
--- a/component/service/src/main/resources/locale/social/Webui_id.properties
+++ b/component/service/src/main/resources/locale/social/Webui_id.properties
@@ -154,7 +154,7 @@ UIActivity.msg.DeleteActivity=Hapus
 UIActivity.msg.LikeActivity=Suka
 UIActivity.msg.UnlikeActivity=Tidak sama
 UIActivity.msg.LikeComment=Seperti
-UIActivity.msg.UnlikeComment=Tidak seperti
+UIActivity.msg.UnlikeComment=Tidak sama
 UIActivity.title.PopupCommentLikers=Orang yang suka
 UIActivity.msg.MoreLikers={0} lebih banyak...
 
@@ -858,7 +858,7 @@ SpaceNavigationNodePopupMenu.event.CloneNode=Duakan Node
 SpaceNavigationNodePopupMenu.event.CutNode=Potong node
 SpaceNavigationNodePopupMenu.event.MoveUp=Pindah ke atas
 SpaceNavigationNodePopupMenu.event.MoveDown=Pindah ke bawah
-SpaceNavigationNodePopupMenu.event.PasteNode=Tempel Node
+SpaceNavigationNodePopupMenu.event.PasteNode=Tempel node
 SpaceNavigationNodePopupMenu.event.SaveNavigation=Simpan Navigasi
 SpaceNavigationNodePopupMenu.event.DeleteNode=Hapus node
 
diff --git a/component/service/src/main/resources/locale/social/Webui_it.properties b/component/service/src/main/resources/locale/social/Webui_it.properties
index 2bff3beeaf7..9ab70557ed0 100644
--- a/component/service/src/main/resources/locale/social/Webui_it.properties
+++ b/component/service/src/main/resources/locale/social/Webui_it.properties
@@ -858,7 +858,7 @@ SpaceNavigationNodePopupMenu.event.CloneNode=Duplicare il Nodo
 SpaceNavigationNodePopupMenu.event.CutNode=Tagliare il Nodo
 SpaceNavigationNodePopupMenu.event.MoveUp=Spostare in Alto
 SpaceNavigationNodePopupMenu.event.MoveDown=Spostare in Basso
-SpaceNavigationNodePopupMenu.event.PasteNode=Incollare Nodo
+SpaceNavigationNodePopupMenu.event.PasteNode=Incolla Nodo
 SpaceNavigationNodePopupMenu.event.SaveNavigation=Salvare Navigazione
 SpaceNavigationNodePopupMenu.event.DeleteNode=Cancellare Nodo
 
diff --git a/component/service/src/main/resources/locale/social/Webui_pl.properties b/component/service/src/main/resources/locale/social/Webui_pl.properties
index b4ece8bf92b..516d102929b 100644
--- a/component/service/src/main/resources/locale/social/Webui_pl.properties
+++ b/component/service/src/main/resources/locale/social/Webui_pl.properties
@@ -154,7 +154,7 @@ UIActivity.msg.DeleteActivity=Usuń
 UIActivity.msg.LikeActivity=Polub
 UIActivity.msg.UnlikeActivity=Remove Like
 UIActivity.msg.LikeComment=Polub
-UIActivity.msg.UnlikeComment=Nie lubię
+UIActivity.msg.UnlikeComment=Odlub
 UIActivity.title.PopupCommentLikers=Ludzie, którzy polubili
 UIActivity.msg.MoreLikers={0} więcej...
 
diff --git a/component/service/src/main/resources/locale/social/Webui_pt_PT.properties b/component/service/src/main/resources/locale/social/Webui_pt_PT.properties
index 6b8916950bf..aae295ca8c5 100644
--- a/component/service/src/main/resources/locale/social/Webui_pt_PT.properties
+++ b/component/service/src/main/resources/locale/social/Webui_pt_PT.properties
@@ -154,7 +154,7 @@ UIActivity.msg.DeleteActivity=Eliminar
 UIActivity.msg.LikeActivity=Gosto
 UIActivity.msg.UnlikeActivity=Remove Like
 UIActivity.msg.LikeComment=Gosto
-UIActivity.msg.UnlikeComment=Não gosto
+UIActivity.msg.UnlikeComment=Remover Gosto
 UIActivity.title.PopupCommentLikers=Pessoas que gostaram
 UIActivity.msg.MoreLikers={0} mais...
 
diff --git a/component/service/src/main/resources/locale/social/Webui_tr.properties b/component/service/src/main/resources/locale/social/Webui_tr.properties
index 15e7f156c17..4c01c0b9e28 100644
--- a/component/service/src/main/resources/locale/social/Webui_tr.properties
+++ b/component/service/src/main/resources/locale/social/Webui_tr.properties
@@ -154,7 +154,7 @@ UIActivity.msg.DeleteActivity=Sil
 UIActivity.msg.LikeActivity=Beğen
 UIActivity.msg.UnlikeActivity=Remove Like
 UIActivity.msg.LikeComment=Beğen
-UIActivity.msg.UnlikeComment=Beğenme
+UIActivity.msg.UnlikeComment=Beğenmekten vazgeç
 UIActivity.title.PopupCommentLikers=Bunu beğenenler
 UIActivity.msg.MoreLikers={0} daha fazla...
 
diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_en.properties b/extension/war/src/main/resources/locale/notification/template/Notification_en.properties
index d148152f295..a9910a6984f 100644
--- a/extension/war/src/main/resources/locale/notification/template/Notification_en.properties
+++ b/extension/war/src/main/resources/locale/notification/template/Notification_en.properties
@@ -46,7 +46,7 @@ Notification.subject.RelationshipReceivedRequestPlugin=$USER wants to connect wi
 # For template
 Notification.title.RelationshipReceivedRequestPlugin=New connection request
 Notification.message.RelationshipReceivedRequestPlugin={0} has sent you a connection request. Accept the connection request and start collaborating with {0}?
-Notification.feedback.RelationshipReceivedRequestPlugin=You refused {0}'s connection request.
+Notification.feedback.RelationshipReceivedRequestPlugin=You refused {0} connection request.
 Notification.intranet.message.RelationshipReceivedRequestPlugin={0} wants to connect with you
 Notification.intranet.message.accept.RelationshipReceivedRequestPlugin=You are connected with {0}
 # For Digest
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 05a2e7a0844..6617834bd01 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_az.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_az.properties
@@ -420,8 +420,8 @@ UsersManagement.selection.onboard=Onboard
 UsersManagement.selection.enable=Enable
 UsersManagement.selection.disable=Deactivate
 UsersManagement.selection.success.onboard=Onboarding emails sent to the selected users
-UsersManagement.selection.success.enable=Selected users are enabled
-UsersManagement.selection.success.disable=Selected users are disabled
+UsersManagement.selection.success.enable=Selected users are activated
+UsersManagement.selection.success.disable=Selected users are deactivated
 UsersManagement.filter=Filter
 UsersManagement.filter.reset=Reset
 
@@ -437,7 +437,7 @@ UsersManagement.type.internal=Internal
 UsersManagement.type.external=Guest
 UsersManagement.status.all=All
 UsersManagement.status.enabled=Enabled
-UsersManagement.status.enabledDescription=User account is enabled
+UsersManagement.status.enabledDescription=User account is activated
 UsersManagement.status.disabled=Deactivated
 UsersManagement.status.disabledDescription=User account is disabled
 UsersManagement.delete=Delete
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 d85c0c77235..9fe8f46cba4 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_ca.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_ca.properties
@@ -420,8 +420,8 @@ UsersManagement.selection.onboard=Onboard
 UsersManagement.selection.enable=Activa
 UsersManagement.selection.disable=Deactivate
 UsersManagement.selection.success.onboard=Onboarding emails sent to the selected users
-UsersManagement.selection.success.enable=Selected users are enabled
-UsersManagement.selection.success.disable=Selected users are disabled
+UsersManagement.selection.success.enable=Selected users are activated
+UsersManagement.selection.success.disable=Selected users are deactivated
 UsersManagement.filter=Filtre
 UsersManagement.filter.reset=Restablir
 
@@ -437,7 +437,7 @@ UsersManagement.type.internal=Internal
 UsersManagement.type.external=Guest
 UsersManagement.status.all=Tots
 UsersManagement.status.enabled=Activat
-UsersManagement.status.enabledDescription=User account is enabled
+UsersManagement.status.enabledDescription=User account is activated
 UsersManagement.status.disabled=Deactivated
 UsersManagement.status.disabledDescription=User account is disabled
 UsersManagement.delete=Suprimeix
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 fc68cb2038a..ccf246797c2 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_ceb.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_ceb.properties
@@ -420,8 +420,8 @@ UsersManagement.selection.onboard=Onboard
 UsersManagement.selection.enable=Enable
 UsersManagement.selection.disable=Deactivate
 UsersManagement.selection.success.onboard=Onboarding emails sent to the selected users
-UsersManagement.selection.success.enable=Selected users are enabled
-UsersManagement.selection.success.disable=Selected users are disabled
+UsersManagement.selection.success.enable=Selected users are activated
+UsersManagement.selection.success.disable=Selected users are deactivated
 UsersManagement.filter=Filter
 UsersManagement.filter.reset=Reset
 
@@ -437,7 +437,7 @@ UsersManagement.type.internal=Internal
 UsersManagement.type.external=Guest
 UsersManagement.status.all=All
 UsersManagement.status.enabled=Enabled
-UsersManagement.status.enabledDescription=User account is enabled
+UsersManagement.status.enabledDescription=User account is activated
 UsersManagement.status.disabled=Deactivated
 UsersManagement.status.disabledDescription=User account is disabled
 UsersManagement.delete=Delete
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 5175a72baeb..33817bd5fd1 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_co.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_co.properties
@@ -420,8 +420,8 @@ UsersManagement.selection.onboard=Onboard
 UsersManagement.selection.enable=Enable
 UsersManagement.selection.disable=Deactivate
 UsersManagement.selection.success.onboard=Onboarding emails sent to the selected users
-UsersManagement.selection.success.enable=Selected users are enabled
-UsersManagement.selection.success.disable=Selected users are disabled
+UsersManagement.selection.success.enable=Selected users are activated
+UsersManagement.selection.success.disable=Selected users are deactivated
 UsersManagement.filter=Filter
 UsersManagement.filter.reset=Reset
 
@@ -437,7 +437,7 @@ UsersManagement.type.internal=Internal
 UsersManagement.type.external=Guest
 UsersManagement.status.all=All
 UsersManagement.status.enabled=Enabled
-UsersManagement.status.enabledDescription=User account is enabled
+UsersManagement.status.enabledDescription=User account is activated
 UsersManagement.status.disabled=Deactivated
 UsersManagement.status.disabledDescription=User account is disabled
 UsersManagement.delete=Delete
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 965b697b7ca..9b8800f3582 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_cs.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_cs.properties
@@ -420,8 +420,8 @@ UsersManagement.selection.onboard=Onboard
 UsersManagement.selection.enable=Povolit
 UsersManagement.selection.disable=Deactivate
 UsersManagement.selection.success.onboard=Onboarding emails sent to the selected users
-UsersManagement.selection.success.enable=Selected users are enabled
-UsersManagement.selection.success.disable=Selected users are disabled
+UsersManagement.selection.success.enable=Selected users are activated
+UsersManagement.selection.success.disable=Selected users are deactivated
 UsersManagement.filter=Filtrovat
 UsersManagement.filter.reset=Resetovat
 
@@ -437,7 +437,7 @@ UsersManagement.type.internal=Internal
 UsersManagement.type.external=Guest
 UsersManagement.status.all=Všechny
 UsersManagement.status.enabled=Povoleno
-UsersManagement.status.enabledDescription=User account is enabled
+UsersManagement.status.enabledDescription=User account is activated
 UsersManagement.status.disabled=Deactivated
 UsersManagement.status.disabledDescription=User account is disabled
 UsersManagement.delete=Odstranit
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 28230eeb147..60d5ede1535 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_el.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_el.properties
@@ -420,8 +420,8 @@ UsersManagement.selection.onboard=Onboard
 UsersManagement.selection.enable=Ενεργοποίηση
 UsersManagement.selection.disable=Deactivate
 UsersManagement.selection.success.onboard=Onboarding emails sent to the selected users
-UsersManagement.selection.success.enable=Selected users are enabled
-UsersManagement.selection.success.disable=Selected users are disabled
+UsersManagement.selection.success.enable=Selected users are activated
+UsersManagement.selection.success.disable=Selected users are deactivated
 UsersManagement.filter=Φίλτρο
 UsersManagement.filter.reset=Επαναφορά
 
@@ -437,7 +437,7 @@ UsersManagement.type.internal=Internal
 UsersManagement.type.external=Guest
 UsersManagement.status.all=Όλα
 UsersManagement.status.enabled=Ενεργοποιημένο
-UsersManagement.status.enabledDescription=User account is enabled
+UsersManagement.status.enabledDescription=User account is activated
 UsersManagement.status.disabled=Deactivated
 UsersManagement.status.disabledDescription=User account is disabled
 UsersManagement.delete=Διαγραφή
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 c175769e5da..2aedf19c11a 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_en.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_en.properties
@@ -177,7 +177,7 @@ UITabPane.title.UISpaceNavigationManagement=Navigations
 UIPopupAvatarUploader.title.UIPopupAvatarUploader=Avatar Uploader
 UIPopupAvatarUploader.title.UIAvatarUploader=Upload an Image
 UIPopupAvatarUploader.title.UIAvatarUploadContent=Image Preview
-UIChangeAvatarContainer.label.ChangeAvatar=Change Avatar
+UIChangeAvatarContainer.label.ChangeAvatar=Change avatar
 UIChangeAvatarContainer.label.AvatarUpdated=Avatar successfully updated
 
 #####################################################################################
@@ -398,13 +398,13 @@ SpaceSettings.application.space.setting.description=Space Setting Portlet
 #####################################################################################
 
 UsersManagement.addUser=Add user
-UsersManagement.editUser=Edit user
+UsersManagement.editUser=Sửa thông tin
 UsersManagement.importCSV=Import CSV
 UsersManagement.userName=Login
 UsersManagement.firstName=First name
 UsersManagement.lastName=Last name
 UsersManagement.email=Email
-UsersManagement.lastConnection=Last connection
+UsersManagement.lastConnection=Last synchronization
 UsersManagement.lastConnection.neverConnected=Never connected
 UsersManagement.lastConnection.connected=Connected
 UsersManagement.enrollment=Enrollment
@@ -417,7 +417,7 @@ UsersManagement.enrollment.alreadyConnected=User already connected to the platfo
 UsersManagement.enrollment.invitationAccepted=Email sent on {0}. This user already connected to the platform
 UsersManagement.enrollment.cannotBeEnrolled=Guest User: Cannot be enrolled
 UsersManagement.selection.onboard=Onboard
-UsersManagement.selection.enable=Enable
+UsersManagement.selection.enable=Activate
 UsersManagement.selection.disable=Deactivate
 UsersManagement.selection.success.onboard=Onboarding emails sent to the selected users
 UsersManagement.selection.success.enable=Selected users are activated
@@ -436,7 +436,7 @@ UsersManagement.type=Type
 UsersManagement.type.internal=Internal
 UsersManagement.type.external=Guest
 UsersManagement.status.all=All
-UsersManagement.status.enabled=Enabled
+UsersManagement.status.enabled=Activated
 UsersManagement.status.enabledDescription=User account is activated
 UsersManagement.status.disabled=Deactivated
 UsersManagement.status.disabledDescription=User account is disabled
@@ -444,7 +444,7 @@ UsersManagement.delete=Delete
 UsersManagement.edit=Edit
 UsersManagement.role=Role
 UsersManagement.actions=Actions
-UsersManagement.button.enabled=Enabled
+UsersManagement.button.enabled=Activated
 UsersManagement.button.disabled=Deactivated
 UsersManagement.filterBy=Filter by name or email
 UsersManagement.button.cancel=Cancel
@@ -458,7 +458,7 @@ UsersManagement.button.userMemberships=User roles
 UsersManagement.button.membershipsOfUser=Roles of {0}
 UsersManagement.button.ok=OK
 UsersManagement.title.confirmDelete=Delete user?
-UsersManagement.message.confirmDelete=Are you sure you want to delete {0} user account?
+UsersManagement.message.confirmDelete=Are you sure you want to delete {0} user?
 UsersManagement.title.deleteCurrentUserWarning=Can't delete user
 UsersManagement.message.deleteCurrentUserWarning=You can’t delete your user account while being logged in with it.
 UsersManagement.message.userWithSameNameAlreadyExists=A user account with the same name already exists.
@@ -557,7 +557,7 @@ GroupsManagement.title.confirmDeleteMembership=Remove user from role?
 GroupsManagement.message.confirmDeleteMembership=Would you like to remove user {0} from role {1}?
 GroupsManagement.user=User
 GroupsManagement.label.addMembers=Search user to add in group
-GroupsManagement.label.noDataLabel=No user found
+GroupsManagement.label.noDataLabel=User not found
 GroupsManagement.error.MandatoryGroup=Group {0} can't be deleted because it's mandatory.
 GroupsManagement.error.invalidField=The "{0}" field must start with a character and must not contain special characters.
 
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 5175a72baeb..33817bd5fd1 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_eu.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_eu.properties
@@ -420,8 +420,8 @@ UsersManagement.selection.onboard=Onboard
 UsersManagement.selection.enable=Enable
 UsersManagement.selection.disable=Deactivate
 UsersManagement.selection.success.onboard=Onboarding emails sent to the selected users
-UsersManagement.selection.success.enable=Selected users are enabled
-UsersManagement.selection.success.disable=Selected users are disabled
+UsersManagement.selection.success.enable=Selected users are activated
+UsersManagement.selection.success.disable=Selected users are deactivated
 UsersManagement.filter=Filter
 UsersManagement.filter.reset=Reset
 
@@ -437,7 +437,7 @@ UsersManagement.type.internal=Internal
 UsersManagement.type.external=Guest
 UsersManagement.status.all=All
 UsersManagement.status.enabled=Enabled
-UsersManagement.status.enabledDescription=User account is enabled
+UsersManagement.status.enabledDescription=User account is activated
 UsersManagement.status.disabled=Deactivated
 UsersManagement.status.disabledDescription=User account is disabled
 UsersManagement.delete=Delete
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 70f8fddef32..52ddfe0de52 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_fa.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_fa.properties
@@ -420,8 +420,8 @@ UsersManagement.selection.onboard=Onboard
 UsersManagement.selection.enable=فعال کردن
 UsersManagement.selection.disable=Deactivate
 UsersManagement.selection.success.onboard=Onboarding emails sent to the selected users
-UsersManagement.selection.success.enable=Selected users are enabled
-UsersManagement.selection.success.disable=Selected users are disabled
+UsersManagement.selection.success.enable=Selected users are activated
+UsersManagement.selection.success.disable=Selected users are deactivated
 UsersManagement.filter=فیلتر
 UsersManagement.filter.reset=تنظیم مجدد
 
@@ -437,7 +437,7 @@ UsersManagement.type.internal=Internal
 UsersManagement.type.external=Guest
 UsersManagement.status.all=همه
 UsersManagement.status.enabled=فعال
-UsersManagement.status.enabledDescription=User account is enabled
+UsersManagement.status.enabledDescription=User account is activated
 UsersManagement.status.disabled=Deactivated
 UsersManagement.status.disabledDescription=User account is disabled
 UsersManagement.delete=حذف
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 5175a72baeb..33817bd5fd1 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_fi.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_fi.properties
@@ -420,8 +420,8 @@ UsersManagement.selection.onboard=Onboard
 UsersManagement.selection.enable=Enable
 UsersManagement.selection.disable=Deactivate
 UsersManagement.selection.success.onboard=Onboarding emails sent to the selected users
-UsersManagement.selection.success.enable=Selected users are enabled
-UsersManagement.selection.success.disable=Selected users are disabled
+UsersManagement.selection.success.enable=Selected users are activated
+UsersManagement.selection.success.disable=Selected users are deactivated
 UsersManagement.filter=Filter
 UsersManagement.filter.reset=Reset
 
@@ -437,7 +437,7 @@ UsersManagement.type.internal=Internal
 UsersManagement.type.external=Guest
 UsersManagement.status.all=All
 UsersManagement.status.enabled=Enabled
-UsersManagement.status.enabledDescription=User account is enabled
+UsersManagement.status.enabledDescription=User account is activated
 UsersManagement.status.disabled=Deactivated
 UsersManagement.status.disabledDescription=User account is disabled
 UsersManagement.delete=Delete
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 2cac3694cfd..d99bbd96ce1 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_fil.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_fil.properties
@@ -175,7 +175,7 @@ UITabPane.title.UISpaceNavigationManagement=Ang Mga Nabigasyon
 #                            UIPopupAvatarUploader                                  #
 #####################################################################################
 UIPopupAvatarUploader.title.UIPopupAvatarUploader=Ang Taga-upload ng Avatar
-UIPopupAvatarUploader.title.UIAvatarUploader=Ang Mag-upload ng Larawan
+UIPopupAvatarUploader.title.UIAvatarUploader=Mag-upload ng Imahe
 UIPopupAvatarUploader.title.UIAvatarUploadContent=Ipakita ang imahe
 UIChangeAvatarContainer.label.ChangeAvatar=Ang Avatar ay Palitan
 UIChangeAvatarContainer.label.AvatarUpdated=Avatar successfully updated
@@ -420,8 +420,8 @@ UsersManagement.selection.onboard=Onboard
 UsersManagement.selection.enable=Ang Paganahin
 UsersManagement.selection.disable=Deactivate
 UsersManagement.selection.success.onboard=Onboarding emails sent to the selected users
-UsersManagement.selection.success.enable=Selected users are enabled
-UsersManagement.selection.success.disable=Selected users are disabled
+UsersManagement.selection.success.enable=Selected users are activated
+UsersManagement.selection.success.disable=Selected users are deactivated
 UsersManagement.filter=Ang Salain
 UsersManagement.filter.reset=I-reset
 
@@ -437,7 +437,7 @@ UsersManagement.type.internal=Internal
 UsersManagement.type.external=Guest
 UsersManagement.status.all=Lahat
 UsersManagement.status.enabled=Ang Paganahin
-UsersManagement.status.enabledDescription=User account is enabled
+UsersManagement.status.enabledDescription=User account is activated
 UsersManagement.status.disabled=Deactivated
 UsersManagement.status.disabledDescription=User account is disabled
 UsersManagement.delete=OK
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 5175a72baeb..33817bd5fd1 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_hi.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_hi.properties
@@ -420,8 +420,8 @@ UsersManagement.selection.onboard=Onboard
 UsersManagement.selection.enable=Enable
 UsersManagement.selection.disable=Deactivate
 UsersManagement.selection.success.onboard=Onboarding emails sent to the selected users
-UsersManagement.selection.success.enable=Selected users are enabled
-UsersManagement.selection.success.disable=Selected users are disabled
+UsersManagement.selection.success.enable=Selected users are activated
+UsersManagement.selection.success.disable=Selected users are deactivated
 UsersManagement.filter=Filter
 UsersManagement.filter.reset=Reset
 
@@ -437,7 +437,7 @@ UsersManagement.type.internal=Internal
 UsersManagement.type.external=Guest
 UsersManagement.status.all=All
 UsersManagement.status.enabled=Enabled
-UsersManagement.status.enabledDescription=User account is enabled
+UsersManagement.status.enabledDescription=User account is activated
 UsersManagement.status.disabled=Deactivated
 UsersManagement.status.disabledDescription=User account is disabled
 UsersManagement.delete=Delete
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 5175a72baeb..33817bd5fd1 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_hu.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_hu.properties
@@ -420,8 +420,8 @@ UsersManagement.selection.onboard=Onboard
 UsersManagement.selection.enable=Enable
 UsersManagement.selection.disable=Deactivate
 UsersManagement.selection.success.onboard=Onboarding emails sent to the selected users
-UsersManagement.selection.success.enable=Selected users are enabled
-UsersManagement.selection.success.disable=Selected users are disabled
+UsersManagement.selection.success.enable=Selected users are activated
+UsersManagement.selection.success.disable=Selected users are deactivated
 UsersManagement.filter=Filter
 UsersManagement.filter.reset=Reset
 
@@ -437,7 +437,7 @@ UsersManagement.type.internal=Internal
 UsersManagement.type.external=Guest
 UsersManagement.status.all=All
 UsersManagement.status.enabled=Enabled
-UsersManagement.status.enabledDescription=User account is enabled
+UsersManagement.status.enabledDescription=User account is activated
 UsersManagement.status.disabled=Deactivated
 UsersManagement.status.disabledDescription=User account is disabled
 UsersManagement.delete=Delete
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 59477f80e94..58529349f71 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_ja.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_ja.properties
@@ -420,8 +420,8 @@ UsersManagement.selection.onboard=Onboard
 UsersManagement.selection.enable=有効化
 UsersManagement.selection.disable=Deactivate
 UsersManagement.selection.success.onboard=Onboarding emails sent to the selected users
-UsersManagement.selection.success.enable=Selected users are enabled
-UsersManagement.selection.success.disable=Selected users are disabled
+UsersManagement.selection.success.enable=Selected users are activated
+UsersManagement.selection.success.disable=Selected users are deactivated
 UsersManagement.filter=フィルター
 UsersManagement.filter.reset=リセット
 
@@ -437,7 +437,7 @@ UsersManagement.type.internal=Internal
 UsersManagement.type.external=Guest
 UsersManagement.status.all=すべて
 UsersManagement.status.enabled=有効
-UsersManagement.status.enabledDescription=User account is enabled
+UsersManagement.status.enabledDescription=User account is activated
 UsersManagement.status.disabled=Deactivated
 UsersManagement.status.disabledDescription=User account is disabled
 UsersManagement.delete=削除
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 5175a72baeb..33817bd5fd1 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_ko.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_ko.properties
@@ -420,8 +420,8 @@ UsersManagement.selection.onboard=Onboard
 UsersManagement.selection.enable=Enable
 UsersManagement.selection.disable=Deactivate
 UsersManagement.selection.success.onboard=Onboarding emails sent to the selected users
-UsersManagement.selection.success.enable=Selected users are enabled
-UsersManagement.selection.success.disable=Selected users are disabled
+UsersManagement.selection.success.enable=Selected users are activated
+UsersManagement.selection.success.disable=Selected users are deactivated
 UsersManagement.filter=Filter
 UsersManagement.filter.reset=Reset
 
@@ -437,7 +437,7 @@ UsersManagement.type.internal=Internal
 UsersManagement.type.external=Guest
 UsersManagement.status.all=All
 UsersManagement.status.enabled=Enabled
-UsersManagement.status.enabledDescription=User account is enabled
+UsersManagement.status.enabledDescription=User account is activated
 UsersManagement.status.disabled=Deactivated
 UsersManagement.status.disabledDescription=User account is disabled
 UsersManagement.delete=Delete
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 a22ddfdb3b9..4a8356e2361 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_lt.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_lt.properties
@@ -420,8 +420,8 @@ UsersManagement.selection.onboard=Onboard
 UsersManagement.selection.enable=Įgalinti
 UsersManagement.selection.disable=Deactivate
 UsersManagement.selection.success.onboard=Onboarding emails sent to the selected users
-UsersManagement.selection.success.enable=Selected users are enabled
-UsersManagement.selection.success.disable=Selected users are disabled
+UsersManagement.selection.success.enable=Selected users are activated
+UsersManagement.selection.success.disable=Selected users are deactivated
 UsersManagement.filter=Filtras
 UsersManagement.filter.reset=Atstatyti
 
@@ -437,7 +437,7 @@ UsersManagement.type.internal=Internal
 UsersManagement.type.external=Guest
 UsersManagement.status.all=Visi
 UsersManagement.status.enabled=Įjungta
-UsersManagement.status.enabledDescription=User account is enabled
+UsersManagement.status.enabledDescription=User account is activated
 UsersManagement.status.disabled=Deactivated
 UsersManagement.status.disabledDescription=User account is disabled
 UsersManagement.delete=Ištrinti
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 31e182da3ab..60bd7c1dd3b 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_ms.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_ms.properties
@@ -420,8 +420,8 @@ UsersManagement.selection.onboard=Onboard
 UsersManagement.selection.enable=Enable
 UsersManagement.selection.disable=Deactivate
 UsersManagement.selection.success.onboard=Onboarding emails sent to the selected users
-UsersManagement.selection.success.enable=Selected users are enabled
-UsersManagement.selection.success.disable=Selected users are disabled
+UsersManagement.selection.success.enable=Selected users are activated
+UsersManagement.selection.success.disable=Selected users are deactivated
 UsersManagement.filter=Filter
 UsersManagement.filter.reset=Reset
 
@@ -437,7 +437,7 @@ UsersManagement.type.internal=Internal
 UsersManagement.type.external=Guest
 UsersManagement.status.all=All
 UsersManagement.status.enabled=Enabled
-UsersManagement.status.enabledDescription=User account is enabled
+UsersManagement.status.enabledDescription=User account is activated
 UsersManagement.status.disabled=Deactivated
 UsersManagement.status.disabledDescription=User account is disabled
 UsersManagement.delete=Padam
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 4b6ec01faa2..312aad3ac8a 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_nl.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_nl.properties
@@ -420,8 +420,8 @@ UsersManagement.selection.onboard=Onboard
 UsersManagement.selection.enable=Inschakelen
 UsersManagement.selection.disable=Deactivate
 UsersManagement.selection.success.onboard=Onboarding emails sent to the selected users
-UsersManagement.selection.success.enable=Selected users are enabled
-UsersManagement.selection.success.disable=Selected users are disabled
+UsersManagement.selection.success.enable=Selected users are activated
+UsersManagement.selection.success.disable=Selected users are deactivated
 UsersManagement.filter=Filter
 UsersManagement.filter.reset=#{word.reset}
 
@@ -437,7 +437,7 @@ UsersManagement.type.internal=Internal
 UsersManagement.type.external=Guest
 UsersManagement.status.all=Alle
 UsersManagement.status.enabled=Ingeschakeld
-UsersManagement.status.enabledDescription=User account is enabled
+UsersManagement.status.enabledDescription=User account is activated
 UsersManagement.status.disabled=Deactivated
 UsersManagement.status.disabledDescription=User account is disabled
 UsersManagement.delete=Verwijderen
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 31cdab82dc6..92bdae2c2d3 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_no.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_no.properties
@@ -420,8 +420,8 @@ UsersManagement.selection.onboard=Onboard
 UsersManagement.selection.enable=Aktiver
 UsersManagement.selection.disable=Deactivate
 UsersManagement.selection.success.onboard=Onboarding emails sent to the selected users
-UsersManagement.selection.success.enable=Selected users are enabled
-UsersManagement.selection.success.disable=Selected users are disabled
+UsersManagement.selection.success.enable=Selected users are activated
+UsersManagement.selection.success.disable=Selected users are deactivated
 UsersManagement.filter=Filtrer
 UsersManagement.filter.reset=Tilbakestill
 
@@ -437,7 +437,7 @@ UsersManagement.type.internal=Internal
 UsersManagement.type.external=Guest
 UsersManagement.status.all=Alle
 UsersManagement.status.enabled=Aktivert
-UsersManagement.status.enabledDescription=User account is enabled
+UsersManagement.status.enabledDescription=User account is activated
 UsersManagement.status.disabled=Deactivated
 UsersManagement.status.disabledDescription=User account is disabled
 UsersManagement.delete=Slette
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 a2a351a90b7..4781789c0eb 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_pcm.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_pcm.properties
@@ -420,8 +420,8 @@ UsersManagement.selection.onboard=Onboard
 UsersManagement.selection.enable=Enable
 UsersManagement.selection.disable=Deactivate
 UsersManagement.selection.success.onboard=Onboarding emails sent to the selected users
-UsersManagement.selection.success.enable=Selected users are enabled
-UsersManagement.selection.success.disable=Selected users are disabled
+UsersManagement.selection.success.enable=Selected users are activated
+UsersManagement.selection.success.disable=Selected users are deactivated
 UsersManagement.filter=Filter
 UsersManagement.filter.reset=Reset
 
@@ -437,7 +437,7 @@ UsersManagement.type.internal=Internal
 UsersManagement.type.external=Guest
 UsersManagement.status.all=All
 UsersManagement.status.enabled=Enabled
-UsersManagement.status.enabledDescription=User account is enabled
+UsersManagement.status.enabledDescription=User account is activated
 UsersManagement.status.disabled=Deactivated
 UsersManagement.status.disabledDescription=User account is disabled
 UsersManagement.delete=Delete
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 05adf080bc8..9383f0a6a2a 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_pl.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_pl.properties
@@ -420,8 +420,8 @@ UsersManagement.selection.onboard=Onboard
 UsersManagement.selection.enable=Włącz
 UsersManagement.selection.disable=Deactivate
 UsersManagement.selection.success.onboard=Onboarding emails sent to the selected users
-UsersManagement.selection.success.enable=Selected users are enabled
-UsersManagement.selection.success.disable=Selected users are disabled
+UsersManagement.selection.success.enable=Selected users are activated
+UsersManagement.selection.success.disable=Selected users are deactivated
 UsersManagement.filter=Filtruj
 UsersManagement.filter.reset=Resetowanie
 
@@ -437,7 +437,7 @@ UsersManagement.type.internal=Internal
 UsersManagement.type.external=Guest
 UsersManagement.status.all=Wszystkie
 UsersManagement.status.enabled=Włączony
-UsersManagement.status.enabledDescription=User account is enabled
+UsersManagement.status.enabledDescription=User account is activated
 UsersManagement.status.disabled=Deactivated
 UsersManagement.status.disabledDescription=User account is disabled
 UsersManagement.delete=Usuń
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 cd7ee00d8f5..9fe36d0381e 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
@@ -175,7 +175,7 @@ UITabPane.title.UISpaceNavigationManagement=Navegações
 #                            UIPopupAvatarUploader                                  #
 #####################################################################################
 UIPopupAvatarUploader.title.UIPopupAvatarUploader=Fazer upload de avatar
-UIPopupAvatarUploader.title.UIAvatarUploader=Fazer upload de uma imagem
+UIPopupAvatarUploader.title.UIAvatarUploader=Carregar uma imagem
 UIPopupAvatarUploader.title.UIAvatarUploadContent=Pré-visualização da imagem
 UIChangeAvatarContainer.label.ChangeAvatar=Alterar avatar
 UIChangeAvatarContainer.label.AvatarUpdated=Avatar successfully updated
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 479e6336e58..f00a336441d 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
@@ -420,8 +420,8 @@ UsersManagement.selection.onboard=Onboard
 UsersManagement.selection.enable=Habilitar
 UsersManagement.selection.disable=Deactivate
 UsersManagement.selection.success.onboard=Onboarding emails sent to the selected users
-UsersManagement.selection.success.enable=Selected users are enabled
-UsersManagement.selection.success.disable=Selected users are disabled
+UsersManagement.selection.success.enable=Selected users are activated
+UsersManagement.selection.success.disable=Selected users are deactivated
 UsersManagement.filter=Filtro
 UsersManagement.filter.reset=Limpar
 
@@ -437,7 +437,7 @@ UsersManagement.type.internal=Internal
 UsersManagement.type.external=Guest
 UsersManagement.status.all=Todos
 UsersManagement.status.enabled=Habilitado
-UsersManagement.status.enabledDescription=User account is enabled
+UsersManagement.status.enabledDescription=User account is activated
 UsersManagement.status.disabled=Deactivated
 UsersManagement.status.disabledDescription=User account is disabled
 UsersManagement.delete=Eliminar
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 1fd64f9d04c..62d6294dd82 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_ro.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_ro.properties
@@ -420,8 +420,8 @@ UsersManagement.selection.onboard=Onboard
 UsersManagement.selection.enable=Activează
 UsersManagement.selection.disable=Deactivate
 UsersManagement.selection.success.onboard=Onboarding emails sent to the selected users
-UsersManagement.selection.success.enable=Selected users are enabled
-UsersManagement.selection.success.disable=Selected users are disabled
+UsersManagement.selection.success.enable=Selected users are activated
+UsersManagement.selection.success.disable=Selected users are deactivated
 UsersManagement.filter=Filtru
 UsersManagement.filter.reset=Reset
 
@@ -437,7 +437,7 @@ UsersManagement.type.internal=Internal
 UsersManagement.type.external=Guest
 UsersManagement.status.all=Toate
 UsersManagement.status.enabled=Activat
-UsersManagement.status.enabledDescription=User account is enabled
+UsersManagement.status.enabledDescription=User account is activated
 UsersManagement.status.disabled=Deactivated
 UsersManagement.status.disabledDescription=User account is disabled
 UsersManagement.delete=Şterge
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 d5476d89162..73350e82769 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_ru.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_ru.properties
@@ -420,8 +420,8 @@ UsersManagement.selection.onboard=Onboard
 UsersManagement.selection.enable=Включить
 UsersManagement.selection.disable=Deactivate
 UsersManagement.selection.success.onboard=Onboarding emails sent to the selected users
-UsersManagement.selection.success.enable=Selected users are enabled
-UsersManagement.selection.success.disable=Selected users are disabled
+UsersManagement.selection.success.enable=Selected users are activated
+UsersManagement.selection.success.disable=Selected users are deactivated
 UsersManagement.filter=Фильтр
 UsersManagement.filter.reset=Сброс
 
@@ -437,7 +437,7 @@ UsersManagement.type.internal=Internal
 UsersManagement.type.external=Guest
 UsersManagement.status.all=Все
 UsersManagement.status.enabled=Включено
-UsersManagement.status.enabledDescription=User account is enabled
+UsersManagement.status.enabledDescription=User account is activated
 UsersManagement.status.disabled=Deactivated
 UsersManagement.status.disabledDescription=User account is disabled
 UsersManagement.delete=Удалить
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 5175a72baeb..33817bd5fd1 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_sk.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_sk.properties
@@ -420,8 +420,8 @@ UsersManagement.selection.onboard=Onboard
 UsersManagement.selection.enable=Enable
 UsersManagement.selection.disable=Deactivate
 UsersManagement.selection.success.onboard=Onboarding emails sent to the selected users
-UsersManagement.selection.success.enable=Selected users are enabled
-UsersManagement.selection.success.disable=Selected users are disabled
+UsersManagement.selection.success.enable=Selected users are activated
+UsersManagement.selection.success.disable=Selected users are deactivated
 UsersManagement.filter=Filter
 UsersManagement.filter.reset=Reset
 
@@ -437,7 +437,7 @@ UsersManagement.type.internal=Internal
 UsersManagement.type.external=Guest
 UsersManagement.status.all=All
 UsersManagement.status.enabled=Enabled
-UsersManagement.status.enabledDescription=User account is enabled
+UsersManagement.status.enabledDescription=User account is activated
 UsersManagement.status.disabled=Deactivated
 UsersManagement.status.disabledDescription=User account is disabled
 UsersManagement.delete=Delete
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 e3d9d254228..72d37c131db 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
@@ -420,8 +420,8 @@ UsersManagement.selection.onboard=Onboard
 UsersManagement.selection.enable=Enable
 UsersManagement.selection.disable=Deactivate
 UsersManagement.selection.success.onboard=Onboarding emails sent to the selected users
-UsersManagement.selection.success.enable=Selected users are enabled
-UsersManagement.selection.success.disable=Selected users are disabled
+UsersManagement.selection.success.enable=Selected users are activated
+UsersManagement.selection.success.disable=Selected users are deactivated
 UsersManagement.filter=Filtrera
 UsersManagement.filter.reset=Återställ
 
@@ -437,7 +437,7 @@ UsersManagement.type.internal=Internal
 UsersManagement.type.external=Guest
 UsersManagement.status.all=Alla
 UsersManagement.status.enabled=Aktiverad
-UsersManagement.status.enabledDescription=User account is enabled
+UsersManagement.status.enabledDescription=User account is activated
 UsersManagement.status.disabled=Deactivated
 UsersManagement.status.disabledDescription=User account is disabled
 UsersManagement.delete=Ta bort
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 5175a72baeb..33817bd5fd1 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_th.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_th.properties
@@ -420,8 +420,8 @@ UsersManagement.selection.onboard=Onboard
 UsersManagement.selection.enable=Enable
 UsersManagement.selection.disable=Deactivate
 UsersManagement.selection.success.onboard=Onboarding emails sent to the selected users
-UsersManagement.selection.success.enable=Selected users are enabled
-UsersManagement.selection.success.disable=Selected users are disabled
+UsersManagement.selection.success.enable=Selected users are activated
+UsersManagement.selection.success.disable=Selected users are deactivated
 UsersManagement.filter=Filter
 UsersManagement.filter.reset=Reset
 
@@ -437,7 +437,7 @@ UsersManagement.type.internal=Internal
 UsersManagement.type.external=Guest
 UsersManagement.status.all=All
 UsersManagement.status.enabled=Enabled
-UsersManagement.status.enabledDescription=User account is enabled
+UsersManagement.status.enabledDescription=User account is activated
 UsersManagement.status.disabled=Deactivated
 UsersManagement.status.disabledDescription=User account is disabled
 UsersManagement.delete=Delete
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 d794b77d056..5db75c9fb0a 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_tl.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_tl.properties
@@ -420,8 +420,8 @@ UsersManagement.selection.onboard=Onboard
 UsersManagement.selection.enable=Paganahin
 UsersManagement.selection.disable=Deactivate
 UsersManagement.selection.success.onboard=Onboarding emails sent to the selected users
-UsersManagement.selection.success.enable=Selected users are enabled
-UsersManagement.selection.success.disable=Selected users are disabled
+UsersManagement.selection.success.enable=Selected users are activated
+UsersManagement.selection.success.disable=Selected users are deactivated
 UsersManagement.filter=Salain
 UsersManagement.filter.reset=Reset
 
@@ -437,7 +437,7 @@ UsersManagement.type.internal=Internal
 UsersManagement.type.external=Guest
 UsersManagement.status.all=Lahat
 UsersManagement.status.enabled=Enabled
-UsersManagement.status.enabledDescription=User account is enabled
+UsersManagement.status.enabledDescription=User account is activated
 UsersManagement.status.disabled=Deactivated
 UsersManagement.status.disabledDescription=User account is disabled
 UsersManagement.delete=Delete
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 e5bb15be99c..5756337c927 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_tr.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_tr.properties
@@ -420,8 +420,8 @@ UsersManagement.selection.onboard=Onboard
 UsersManagement.selection.enable=Etkinleştir
 UsersManagement.selection.disable=Deactivate
 UsersManagement.selection.success.onboard=Onboarding emails sent to the selected users
-UsersManagement.selection.success.enable=Selected users are enabled
-UsersManagement.selection.success.disable=Selected users are disabled
+UsersManagement.selection.success.enable=Selected users are activated
+UsersManagement.selection.success.disable=Selected users are deactivated
 UsersManagement.filter=Süz
 UsersManagement.filter.reset=Sıfırla
 
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 1226a00c8ac..932d9277195 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_uk.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_uk.properties
@@ -420,8 +420,8 @@ UsersManagement.selection.onboard=Onboard
 UsersManagement.selection.enable=Увімкнути
 UsersManagement.selection.disable=Deactivate
 UsersManagement.selection.success.onboard=Onboarding emails sent to the selected users
-UsersManagement.selection.success.enable=Selected users are enabled
-UsersManagement.selection.success.disable=Selected users are disabled
+UsersManagement.selection.success.enable=Selected users are activated
+UsersManagement.selection.success.disable=Selected users are deactivated
 UsersManagement.filter=Фільтр
 UsersManagement.filter.reset=Скинути
 
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 7f67be97313..e9f93bb4757 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
@@ -420,8 +420,8 @@ UsersManagement.selection.onboard=Onboard
 UsersManagement.selection.enable=قابل کریں
 UsersManagement.selection.disable=Deactivate
 UsersManagement.selection.success.onboard=Onboarding emails sent to the selected users
-UsersManagement.selection.success.enable=Selected users are enabled
-UsersManagement.selection.success.disable=Selected users are disabled
+UsersManagement.selection.success.enable=Selected users are activated
+UsersManagement.selection.success.disable=Selected users are deactivated
 UsersManagement.filter=فلٹر
 UsersManagement.filter.reset=پھر سیٹ کریں
 
@@ -437,7 +437,7 @@ UsersManagement.type.internal=Internal
 UsersManagement.type.external=Guest
 UsersManagement.status.all=All
 UsersManagement.status.enabled=Enabled
-UsersManagement.status.enabledDescription=User account is enabled
+UsersManagement.status.enabledDescription=User account is activated
 UsersManagement.status.disabled=Deactivated
 UsersManagement.status.disabledDescription=User account is disabled
 UsersManagement.delete=حذف کریں
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 d430cef160a..41ec0c18f10 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/Portlets_vi.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/Portlets_vi.properties
@@ -420,8 +420,8 @@ UsersManagement.selection.onboard=Onboard
 UsersManagement.selection.enable=Kích hoạt
 UsersManagement.selection.disable=Deactivate
 UsersManagement.selection.success.onboard=Onboarding emails sent to the selected users
-UsersManagement.selection.success.enable=Selected users are enabled
-UsersManagement.selection.success.disable=Selected users are disabled
+UsersManagement.selection.success.enable=Selected users are activated
+UsersManagement.selection.success.disable=Selected users are deactivated
 UsersManagement.filter=Bộ lọc
 UsersManagement.filter.reset=Làm lại
 
@@ -437,7 +437,7 @@ UsersManagement.type.internal=Internal
 UsersManagement.type.external=Guest
 UsersManagement.status.all=Tất cả
 UsersManagement.status.enabled=Bật
-UsersManagement.status.enabledDescription=User account is enabled
+UsersManagement.status.enabledDescription=User account is activated
 UsersManagement.status.disabled=Deactivated
 UsersManagement.status.disabledDescription=User account is disabled
 UsersManagement.delete=Xóa
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 380a44a0eba..22c0124db2d 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
@@ -420,8 +420,8 @@ UsersManagement.selection.onboard=Onboard
 UsersManagement.selection.enable=Enable
 UsersManagement.selection.disable=Deactivate
 UsersManagement.selection.success.onboard=Onboarding emails sent to the selected users
-UsersManagement.selection.success.enable=Selected users are enabled
-UsersManagement.selection.success.disable=Selected users are disabled
+UsersManagement.selection.success.enable=Selected users are activated
+UsersManagement.selection.success.disable=Selected users are deactivated
 UsersManagement.filter=筛选器
 UsersManagement.filter.reset=重置
 
@@ -437,7 +437,7 @@ UsersManagement.type.internal=Internal
 UsersManagement.type.external=Guest
 UsersManagement.status.all=所有
 UsersManagement.status.enabled=已启用
-UsersManagement.status.enabledDescription=User account is enabled
+UsersManagement.status.enabledDescription=User account is activated
 UsersManagement.status.disabled=Deactivated
 UsersManagement.status.disabledDescription=User account is disabled
 UsersManagement.delete=删除
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 fc7377a6e08..5df2e143a0a 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
@@ -420,8 +420,8 @@ UsersManagement.selection.onboard=Onboard
 UsersManagement.selection.enable=啟用
 UsersManagement.selection.disable=Deactivate
 UsersManagement.selection.success.onboard=Onboarding emails sent to the selected users
-UsersManagement.selection.success.enable=Selected users are enabled
-UsersManagement.selection.success.disable=Selected users are disabled
+UsersManagement.selection.success.enable=Selected users are activated
+UsersManagement.selection.success.disable=Selected users are deactivated
 UsersManagement.filter=篩選器
 UsersManagement.filter.reset=重置
 
@@ -437,7 +437,7 @@ UsersManagement.type.internal=Internal
 UsersManagement.type.external=Guest
 UsersManagement.status.all=全部
 UsersManagement.status.enabled=已啟用
-UsersManagement.status.enabledDescription=User account is enabled
+UsersManagement.status.enabledDescription=User account is activated
 UsersManagement.status.disabled=Deactivated
 UsersManagement.status.disabledDescription=User account is disabled
 UsersManagement.delete=刪除
diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_en.properties b/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_en.properties
index 7b760b23ad3..133e5d89eb0 100644
--- a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_en.properties
+++ b/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_en.properties
@@ -22,7 +22,7 @@ spacesList.label.noSpacesLink=adding your first space.
 spacesList.label.addNewSpace=Add Space
 spacesList.label.editSpace=Edit Space {0}
 spacesList.label.spaceDetails=Space details
-spacesList.label.spaceAccess=Space access
+spacesList.label.spaceAccess=Password
 spacesList.label.inviteUsers=Invite users
 spacesList.label.displayName=Display name
 spacesList.label.description=Description