Merge Translations

notes-webapp/src/main/resources/locale/navigation/portal/global_en.properties

@@ -17,5 +17,5 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 #
 portal.global.wiki=Notes
-portal.global.notes-editor=Notes Editor 
+portal.global.notes-editor=Notes Editor
 portal.global.notes=Notes

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

@@ -10,7 +10,7 @@ notes.menu.label.delete=Delete
 notes.menu.label.copyLink=Copy Link
 notes.menu.label.movePage=Move
 notes.menu.label.exportPdf=Print to PDF
-notes.menu.label.export=Export 
+notes.menu.label.export=Export
 notes.menu.label.noteHistory=Note History
 notes.button.import=Import
 
@@ -24,9 +24,9 @@ notes.label.importRules1=Replace all notes
 notes.label.importRules2=Update existing notes
 notes.label.importRules3=Duplicate existing notes
 notes.label.importRules4=Replace existing notes
-notes.label.importRulesMessage.title=Conflict management rules
+notes.label.importRulesMessage.title=Replace existing notes
 notes.label.importRulesMessage.text=An update conflict will occur for an imported note with the same name and parent of an exiting note in the destination tree
-notes.label.importRulesAlert.text=Warning : the chosen rule applies for all conflicts of this import\n
+notes.label.importRulesAlert.text=Warning: the chosen rule applies for all conflicts of this import
 notes.label.button.continue=Continue
 notes.label.button.back=Back
 notes.label.importNotes.upload=Upload
@@ -45,7 +45,7 @@ notes.button.updateAndPost=Update and Post
 notes.button.ok=Ok
 notes.button.loadMore=Load more
 notes.label.drop.draft=Drop it
-notes.composer.createNotes=Write a note for {0}
+notes.composer.createNotes=Create
 notes.edit.editNotes=Edit note
 notes.edit.editTextFor=Edit text box {0}
 
@@ -66,7 +66,7 @@ notes.label.breadcrumbTitle=Notes Tree
 notes.label.filter=Filter by name
 notes.label.includePageTitle=Include Notes
 notes.label.movePageTitle=Move Page
-notes.label.exportNotesTitle=Export notes
+notes.label.exportNotesTitle=Export Notes
 notes.label.export.selectAll=Select all
 notes.label.export.deselectAll=Deselect all
 notes.alert.success.label.exported=Your notes have been exported
@@ -83,7 +83,7 @@ notes.confirmCancelExport.title=Cancel export?
 notes.confirmCancelExport=Are you sure you want to cancel the current export operation?
 notes.button.yes=Yes
 notes.button.no=No
-notes.alert.success.label.notes.imported=Import succeeded. Your notes has been replaced
+notes.alert.success.label.notes.imported=Import succeeded. Your notes have been replaced
 notes.alert.warning.label.notification=Only redactors and hosts can Add or Edit a Note, please contact the space host.
 notes.button.export=Export
 notes.label.movePageSpace=Space:
@@ -104,7 +104,7 @@ notes.label.no-content.redactor.content.last=to take a note for you.
 notes.label.no-content-no-redactor.content.first=Add content for this note
 notes.label.no-content.no-redactor.content.last=Or create a new note
 notes.label.noteNotFound=We could not find this note.
-notes.label.noteSearchNotFound=No notes found for :
+notes.label.noteSearchNotFound=No notes found for:
 notes.label.noteNotFound.button=Back to Notes App
 notes.message.missingImportNotes=Import Notes is mandatory.
 import.drawer.maxFileSize.error=You can’t upload files larger than {0} MB
@@ -113,8 +113,8 @@ notes.message.missingTitle=Note title is mandatory
 notes.message.numericTitle=Note’s title should not be a number. Please choose another title for your note.
 notes.message.missingLengthTitle=Note title must be between 3 and 1000 characters
 notes.message.error.duplicate.title=Note with same title already exists
-notes.alert.success.label.linkCopied=Note Link copied to clipboard
-notes.alert.success.label.noteMoved=Note page Moved successfully
+notes.alert.success.label.linkCopied=Note link copied to clipboard
+notes.alert.success.label.noteMoved=Note page moved successfully
 notes.alert.warning.label.draft.drop=You are editing a draft created on
 notes.alert.warning.label.original.draft.drop=You are editing a draft created on
 notes.message.error=An error is occurred
@@ -134,7 +134,7 @@ notes.plugin.table.adjustment=Adjustment
 notes.plugin.table.alignment=Alignment
 notes.plugin.table.header=Header:
 notes.plugin.table.border=Border size:
-notes.plugin.table.spacing=Cell spacing : 
+notes.plugin.table.spacing=Cell spacing: 
 notes.plugin.table.internal=Internal margin of cells:
 label.table.ok=Ok
 label.alignment.=Undefined