Merge Translations

layout-webapp/src/main/resources/locale/portlet/LayoutEditor_en.properties

@@ -204,21 +204,21 @@ layout.portletInstance.SpaceSettingPortlet.description=Settings of the space
 layout.portletInstance.Image.name=Image
 layout.portletInstance.Image.description=Display an image
 layout.portletInstance.GettingStarted.name=Getting Started
-layout.portletInstance.GettingStarted.description=Gadget suggesting first steps to do
+layout.portletInstance.GettingStarted.description=A widget that suggests the first steps to do
 layout.portletInstance.WhoIsOnLinePortlet.name=Who is Online
-layout.portletInstance.WhoIsOnLinePortlet.description=Gadget listing users being online
+layout.portletInstance.WhoIsOnLinePortlet.description=A widget that lists users currently online
 layout.portletInstance.PeopleOverview.name=People Overview
-layout.portletInstance.PeopleOverview.description=Gadget listing requests, invitations to network connections
-layout.portletInstance.SpaceActivityStreamPortlet.name=Space Activity Stream
+layout.portletInstance.PeopleOverview.description=A widget that lists requests and invitations to connect
+layout.portletInstance.SpaceActivityStreamPortlet.name=Space Feed
 layout.portletInstance.SpaceActivityStreamPortlet.description=List of activities of the space
-layout.portletInstance.UserActivityStreamPortlet.name=User Activity Stream
+layout.portletInstance.UserActivityStreamPortlet.name=User Feed
 layout.portletInstance.UserActivityStreamPortlet.description=List of activities of the user
 layout.portletInstance.SuggestionsPeopleAndSpace.name=Suggestions People & Spaces
-layout.portletInstance.SuggestionsPeopleAndSpace.description=Gadget suggesting to grow the network (spaces & people)
+layout.portletInstance.SuggestionsPeopleAndSpace.description=A widget that suggests people to connect to
 layout.portletInstance.SpacesOverview.name=Spaces Overview
 layout.portletInstance.SpacesOverview.description=A widget that lists administered spaces, requests and invitations
 layout.portletInstance.SpaceInfos.name=Space Infos
-layout.portletInstance.SpaceInfos.description=A widget that lists admins, redactors, and contains the description of the space
+layout.portletInstance.SpaceInfos.description=A widget that lists admins, content writers, and contains the description of the space
 layout.portletInstance.VerticalMenu.name=Site Vertical Menu
 layout.portletInstance.VerticalMenu.description=Site Vertical Menu Portlet
 layout.portletInstance.Breadcrumb.name=Breadcrumb

layout-webapp/src/main/resources/locale/portlet/LayoutEditor_fr.properties

@@ -204,14 +204,14 @@ layout.portletInstance.SpaceSettingPortlet.description=Paramètres de l'espace
 layout.portletInstance.Image.name=Image
 layout.portletInstance.Image.description=Afficher une image
 layout.portletInstance.GettingStarted.name=Premiers Pas
-layout.portletInstance.GettingStarted.description=Gadget suggesting first steps to do
+layout.portletInstance.GettingStarted.description=Gadget suggérant les premières étapes à faire
 layout.portletInstance.WhoIsOnLinePortlet.name=Qui est en ligne ?
-layout.portletInstance.WhoIsOnLinePortlet.description=Gadget listing users being online
+layout.portletInstance.WhoIsOnLinePortlet.description=Liste des utilisateurs en ligne
 layout.portletInstance.PeopleOverview.name=Aperçu des personnes
-layout.portletInstance.PeopleOverview.description=Gadget listing requests, invitations to network connections
-layout.portletInstance.SpaceActivityStreamPortlet.name=Space Activity Stream
+layout.portletInstance.PeopleOverview.description=Liste des demandes, invitations aux connexions réseau
+layout.portletInstance.SpaceActivityStreamPortlet.name=Fil d'activités de l'espace
 layout.portletInstance.SpaceActivityStreamPortlet.description=Liste des activités de l'espace
-layout.portletInstance.UserActivityStreamPortlet.name=User Activity Stream
+layout.portletInstance.UserActivityStreamPortlet.name=Fil d'activités de l'utilisateur
 layout.portletInstance.UserActivityStreamPortlet.description=Liste des activités de l'utilisateur
 layout.portletInstance.SuggestionsPeopleAndSpace.name=Suggestions de personnes et d'espaces
 layout.portletInstance.SuggestionsPeopleAndSpace.description=Gadget suggesting to grow the network (spaces & people)

layout-webapp/src/main/resources/locale/portlet/SiteNavigation_en.properties

@@ -28,7 +28,7 @@ siteNavigation.drawer.editNode.title=Edit Properties
 siteNavigation.label.nodeLabel.title=Name
 siteNavigation.label.nodeLabel.placeholder=Give a name to your item
 siteNavigation.label.nodeLabel.description=The node name is also the page name
-siteNavigation.label.nodeId.title=Customize the URL ID of the item
+siteNavigation.label.nodeId.title=Inspect URL Slug
 siteNavigation.label.nodeId.placeholder=Enter an ID that will be reminded in the URL
 siteNavigation.label.icon.title=Icon
 siteNavigation.label.icon.upload=Update
@@ -41,7 +41,7 @@ siteNavigation.btn.showMore.title=Show More
 siteNavigation.label.nodeId.description=Display in the URL
 siteNavigation.label.visibility.title=Visibility
 siteNavigation.label.visibility.info=Switch on the Visibility button to make the node visible to everyone
-siteNavigation.label.visibility.visible=Item is listed in the left menu
+siteNavigation.label.visibility.visible=Display item in menu
 siteNavigation.label.visibility.scheduleVisibility=Schedule the visibility
 siteNavigation.label.nodeType.title=Item Type
 siteNavigation.label.nodeType.group=Group
@@ -57,7 +57,7 @@ siteNavigation.label.membershipType.publisher=Publisher
 siteNavigation.label.membershipType.validator=Validator
 siteNavigation.label.membershipType.webdesigner=Web designer
 siteNavigation.label.membershipType.author=Author
-siteNavigation.label.membershipType.redactor=Redactor
+siteNavigation.label.membershipType.redactor=Content Writer
 siteNavigation.label.updatePermission.error=Error while updating permissions
 siteNavigation.label.updatePermission.success=Item permissions updated successfully
 siteNavigation.label.updatePermission.unauthorized=You do not have the rights to edit this item

layout-webapp/src/main/resources/locale/portlet/SiteNavigation_fr.properties

@@ -41,7 +41,7 @@ siteNavigation.btn.showMore.title=Voir plus
 siteNavigation.label.nodeId.description=Affichage de l'URL :
 siteNavigation.label.visibility.title=Visibilité
 siteNavigation.label.visibility.info=Activer le bouton visibilité pour rendre l'item accessible à tout le monde selon les règles d'accès
-siteNavigation.label.visibility.visible=Item is listed in the left menu
+siteNavigation.label.visibility.visible=Item visible
 siteNavigation.label.visibility.scheduleVisibility=Planifier la visibilité de l'item ?
 siteNavigation.label.nodeType.title=Type d'item
 siteNavigation.label.nodeType.group=Groupe
@@ -57,7 +57,7 @@ siteNavigation.label.membershipType.publisher=Diffuseur
 siteNavigation.label.membershipType.validator=Validateur
 siteNavigation.label.membershipType.webdesigner=Concepteur web
 siteNavigation.label.membershipType.author=Auteur
-siteNavigation.label.membershipType.redactor=Redactor
+siteNavigation.label.membershipType.redactor=Rédacteur
 siteNavigation.label.updatePermission.error=Erreur lors de la mise à jour des permissions
 siteNavigation.label.updatePermission.success=Les règles d'accès et édition du noeud ont été mises à jour avec succès
 siteNavigation.label.updatePermission.unauthorized=Vous n'avez pas les droits suffisants pour éditer cet item