Merge Translations

Author: exo-swf

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

@@ -1,4 +1,4 @@
 layout.portletInstance.Notes.name=Notes
 layout.portletInstance.Notes.description=Notes of the space
-layout.portletInstance.NotePageView.name=Single Content
+layout.portletInstance.NotePageView.name=Block of content
 layout.portletInstance.NotePageView.description=Add text with simple or advanced editor

notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_en.properties

@@ -100,7 +100,7 @@ notes.confirmCancelExport=Are you sure you want to cancel the current export ope
 notes.button.yes=Yes
 notes.button.no=No
 notes.alert.success.label.notes.imported=Import succeeded. Your notes have been replaced
-notes.alert.warning.label.notification=Only redactors and admins can Add or Edit a Note. Please get in touch with the space admin.
+notes.alert.warning.label.notification=Only content writers and admins can Add or Edit a Note. Please get in touch with the space admin.
 notes.button.export=Export
 notes.label.movePageSpace=Space:
 notes.label.movePageCurrentPosition=Current position:
@@ -113,7 +113,7 @@ notes.untitled.title=Untitled
 notes.label.no-content=There is no content for this note...
 notes.label.no-content-manager=Admin
 notes.label.or=or
-notes.label.no-content-redactor=Redactor
+notes.label.no-content-redactor=Content Writer
 notes.label.no-content-redactor-title=Welcome to {0}
 notes.label.no-content.redactor.content.first=Please contact the space
 notes.label.no-content.redactor.content.last=to take a note for you.