Index: ApplicationResources.properties =================================================================== --- ApplicationResources.properties (revision 34635) +++ ApplicationResources.properties (working copy) @@ -33,7 +33,7 @@ diff=History edit=Edit editcontent=Edit Content -edithtmlcontent=Edit Wysiwyg +edithtmlcontent=Edit WYSIWYG editinline=Form editrights=Page Access Rights editobject=Objects @@ -78,9 +78,9 @@ default=default confirmobjectremove=Are you sure you want to remove this object? confirmdelete=This action is not reversible. Are you sure you want to delete this document? -confirmdelete2=Please confirm you want to delete this document? +confirmdelete2=Are you sure you want to delete this attachment? backlinkswarningdelete=There are pages that link here! -confirmdelattachment=Please confirm you want to delete this attachment? +confirmdelattachment=Are you sure you want to delete this attachment? deleted=The document has been deleted. editincludepagemsg=This document contains (an) included page(s). To edit this page, click on the following links: youareediting=You are editing the following translation @@ -104,7 +104,7 @@ welcometorightseditor=Welcome to the Access Rights editor. Choose a right entry to edit or add a new right entry: removethisrightentry=remove this right entry saverights=Save Access Rights -accountdisabled=Your account has been disabled. Please contact the administrator if you think this is a problem. +accountdisabled=Your account has been disabled. Please contact the administrator if you think this is a mistake. accountnotactive=Your account is not yet active, because your email has not yet been confirmed. accountnotactive_email=You should have received an email with a link to confirm your email address. You can also copy-paste the activation code in the same email in the following field. confirmaccount=Confirm Account @@ -430,7 +430,7 @@ listofallattachments=List of all attachments listofrecentlyviewedpages=List of recently viewed pages listofrecentlymodifiedpages=List of recently modified pages -warningstartspluginisnotactivated=The stats plugin isn't activated. You have to activate stats plugin as default (xwiki.stats=1 in xwiki.cfg) to active this function. +warningstartspluginisnotactivated=The stats plugin isn't activated. You have to activate stats plugin as default (xwiki.stats=1 in xwiki.cfg) to activate this function. listofresultspages= List of result choosespace=Choose space inspace=in @@ -459,7 +459,7 @@ export_author=Author export_version=Version export_addhistory=With history -export_backuppack=Backup Pack +export_backuppack=Backup package export_authorpreserved=Author preserved import=Import @@ -481,7 +481,7 @@ import_documenterrors=Document(s) with error import_listofinstalledfiles=List of installed documents import_listofskippedfiles=List of skipped documents -import_listoferrorfiles=List of documents with errors +import_listoferrorfiles=List of erroneous documents core.importer.uploadPackage=Upload a new package core.importer.availableDocuments=Package Content @@ -491,7 +491,7 @@ core.importer.packageInformationExtract=Added by {0} on {1} core.importer.import=Import core.importer.selectionEmptyWarning=Please select at least one document to import -core.importer.importHistory=Import history +core.importer.importHistory=Import the history core.importer.package=Package core.importer.package.description=Description core.importer.package.version=Version @@ -728,7 +728,7 @@ # For example the comment messages for the XAR importer are in core.importer.* keys. # TODO: Do the same for the other keys core.comment=Version summary -core.comment.details=(enter a brief description of your changes) +core.comment.details=(Enter a brief description of your changes) core.comment.tooltip=Enter a brief description of your changes core.comment.prompt=Enter a brief description of your changes core.comment.addComment=Added comment @@ -979,9 +979,9 @@ core.editors.object.newObjectForClass=New {0} object core.editors.object.newObjectForClass.tooltip=New {0} object core.editors.object.editAllObjects=\u00ABEdit all the objects defined in this document -core.editors.object.editSingleObject=[edit only this object] +core.editors.object.editSingleObject=[Edit only this object] core.editors.object.editSingleObject.tooltip=Edit only this object -core.editors.object.removeObject=[remove this object] +core.editors.object.removeObject=[Remove this object] core.editors.object.removeObject.tooltip=Remove this object core.editors.object.invalidPropertyName=No such property: {0} core.editors.object.delete.confirm=Are you sure you want to delete this object? Canceling the modifications will not restore deleted objects. @@ -1093,9 +1093,9 @@ activitystream.event.addAttachment=The attachment "{1}" has been added to the document "{0}" activitystream.event.addAttachment.rss.title=The attachment "{1}" has been added to the document "{0}" activitystream.event.addAttachment.rss.body=The attachment "{1}" has been added to the document "{0}" -activitystream.event.updateAttachment=The attachment "{1}" has been modified for the document "{0}" -activitystream.event.updateAttachment.rss.title=The attachment "{1}" has been modified for the document "{0}" -activitystream.event.updateAttachment.rss.body=The attachment "{1}" has been modified for the document "{0}" +activitystream.event.updateAttachment=The attachment "{1}" has been modified in the document "{0}" +activitystream.event.updateAttachment.rss.title=The attachment "{1}" has been modified in the document "{0}" +activitystream.event.updateAttachment.rss.body=The attachment "{1}" has been modified in the document "{0}" activitystream.event.deleteAttachment=The attachment "{1}" has been deleted from the document "{0}" activitystream.event.deleteAttachment.rss.title=The attachment "{1}" has been deleted from the document "{0}" activitystream.event.deleteAttachment.rss.body=The attachment "{1}" has been deleted from the document "{0}" @@ -1103,9 +1103,9 @@ activitystream.event.addAnnotation=An annotation has been added to the document "{0}" activitystream.event.addAnnotation.rss.title=An annotation has been added to the document "{0}" activitystream.event.addAnnotation.rss.body=An annotation has been added to the document "{0}" -activitystream.event.updateAnnotation=An annotation has been modified for the document "{0}" -activitystream.event.updateAnnotation.rss.title=An annotation has been modified for the document "{0}" -activitystream.event.updateAnnotation.rss.body=An annotation has been modified for the document "{0}" +activitystream.event.updateAnnotation=An annotation has been modified in the document "{0}" +activitystream.event.updateAnnotation.rss.title=An annotation has been modified in the document "{0}" +activitystream.event.updateAnnotation.rss.body=An annotation has been modified in the document "{0}" activitystream.event.deleteAnnotation=An annotation has been deleted from the document "{0}" activitystream.event.deleteAnnotation.rss.title=An annotation has been deleted from the document "{0}" activitystream.event.deleteAnnotation.rss.body=An annotation has been deleted from the document "{0}" @@ -1113,9 +1113,9 @@ activitystream.event.addComment=A comment has been added to the document "{0}" activitystream.event.addComment.rss.title=A comment has been added to the document "{0}" activitystream.event.addComment.rss.body=A comment has been added to the document "{0}" -activitystream.event.updateComment=A comment has been modified for the document "{0}" -activitystream.event.updateComment.rss.title=A comment has been modified for the document "{0}" -activitystream.event.updateComment.rss.body=A comment has been modified for the document "{0}" +activitystream.event.updateComment=A comment has been modified in the document "{0}" +activitystream.event.updateComment.rss.title=A comment has been modified in the document "{0}" +activitystream.event.updateComment.rss.body=A comment has been modified in the document "{0}" activitystream.event.deleteComment=A comment has been deleted from the document "{0}" activitystream.event.deleteComment.rss.title=A comment has been deleted from the document "{0}" activitystream.event.deleteComment.rss.body=A comment has been deleted from the document "{0}" @@ -1182,7 +1182,7 @@ panelwizard.needadminright=You need to have administrative rights to use the Panel Wizard. panelwizard.paneleditor=Panel Editor panelwizard.tip=To drag a panel, use your mouse and click on the header of the panel. Keep your left mouse button down while you move your mouse and the panel at the same time. While you move the panel you will see in real-time where the panel will be dropped when you release your left mouse button. -panelwizard.draganddrop=Drag and drop panels to rearrange them inside a column or between columns. To add or remove panels, drag them from the list of available panels to one of the columns or from the column into the list, respectively. +panelwizard.draganddrop=Drag and drop panels to rearrange them inside a column or between columns. To add or remove panels, drag them from the list of available panels to one of the columns or from the column into the list, respectively. #tooltip for fullscreen editing fullScreenTooltip=Edit in Full Screen @@ -1193,7 +1193,7 @@ core.register.welcome=Welcome to the registration form. This will allow you to edit pages, once the admin gives you appropriate rights. core.register.passwordMismatch=Passwords are different or password is empty. core.register.userAlreadyExists=User already exists. -core.register.invalidUsername=Invalid username provided. Please use only letters from the latin alphabet, numbers, and the underscore character. +core.register.invalidUsername=Invalid username provided. Please use only letters from the latin alphabet, numbers, and the underscore character '_'. core.register.registerFailed=Registration has failed due to unknown reasons. (Error code: {0}) core.register.successful={0} ({1}): Registration successful. core.register.firstName=First Name @@ -1452,28 +1452,28 @@ rendering.macro.useravatar.parameter.width.description=the image's width rendering.macro.chart.name=Chart rendering.macro.chart.description=Displays a graphical chart generated from miscellaneous data sources -rendering.macro.chart.content.description=Input data for the chart macro (Ex. for 'inline' source mode) +rendering.macro.chart.content.description=Input data for the chart macro (e.g. for 'inline' source mode) rendering.macro.chart.parameter.height.name=height rendering.macro.chart.parameter.height.description=The height of the generated chart image rendering.macro.chart.parameter.params.name=params rendering.macro.chart.parameter.params.description=Additional parameters for the data source rendering.macro.chart.parameter.source.name=source -rendering.macro.chart.parameter.source.description=The string describing the type of input data source (Ex. xdom or inline) +rendering.macro.chart.parameter.source.description=The string describing the type of input data source (e.g. xdom or inline) rendering.macro.chart.parameter.title.name=title rendering.macro.chart.parameter.title.description=The title of the chart (appears on top of the chart image) rendering.macro.chart.parameter.type.name=type -rendering.macro.chart.parameter.type.description=The type of the chart (Ex. pie, line, area or bar) +rendering.macro.chart.parameter.type.description=The type of the chart (e.g. pie, line, area or bar) rendering.macro.chart.parameter.width.name=width rendering.macro.chart.parameter.width.description=The width of the generated chart image rendering.macro.info.name=Info Message rendering.macro.info.description=Displays an info message note. -rendering.macro.info.content.description= +rendering.macro.info.content.description=The content to put in the box. rendering.macro.error.name=Error Message rendering.macro.error.description=Displays an error message note. -rendering.macro.error.content.description= +rendering.macro.error.content.description=The content to put in the box. rendering.macro.warning.name=Warning Message rendering.macro.warning.description=Displays a warning message note. -rendering.macro.warning.content.description= +rendering.macro.warning.content.description=The content to put in the box. rendering.macro.box.name=Box rendering.macro.box.description=Draw a box around provided content. rendering.macro.box.content.description=the content to put in the box @@ -1934,8 +1934,8 @@ xe.admin.configurable.noViewAccessSomeApplications=Some sections may not be displayed because you do not have view access to some configurable applications including: {0} # XWiki.Registration xe.admin.registration.passwordTooShort=Please use a longer password. -xe.admin.registration.passwordMismatch=Your passwords aren't the same. -xe.admin.registration.invalidEmail=Please give a valid email address. +xe.admin.registration.passwordMismatch=The passwords do not match. +xe.admin.registration.invalidEmail=Please enter a valid email address. xe.admin.registration.youCanConfigureRegistrationHere=You can configure this application by clicking here. xe.admin.registration.youCanConfigureRegistrationFieldsHere=You can add, remove and change fields in this form by clicking here. @@ -2126,7 +2126,7 @@ xe.invitation.doAction.accept.heading=Accept invitation xe.invitation.doAction.accept.saveComment=Invitation accepted. -xe.invitation.doAction.accept.noMessageFound=No message was found by that ID, maybe it was deleted accidentally or the system is experiencing problems. +xe.invitation.doAction.accept.noMessageFound=No message was found by the given ID. It might have been deleted or maybe the system is experiencing difficulties. xe.invitation.doAction.accept.invitationCanceled=We're sorry but this invitation has been rescinded. xe.invitation.doAction.accept.alreadyReportedAsSpam=This invitation has been reported as spam and is no longer valid. xe.invitation.doAction.accept.alreadyDeclined=This invitation has been declined and cannot be accepted now. @@ -2164,9 +2164,9 @@ xe.invitation.doUserActionOnMultipleMessages.cancel.areYouSure.OneMessagePerGroup=Are you sure you want to rescind these {0} invitations? xe.invitation.doUserActionOnMultipleMessages.cancel.areYouSure.multipleMessagesMultipleGroups=Are you sure you want to rescind these {0} invitations to {1} recipients? -xe.invitation.displayMessage.anAddressesIsInvalid=One of the given email addresses is invalid and will not be sent to. -xe.invitation.displayMessage.someAddressesAreInvalid={0} of the given email addresses are invalid and will not be sent to. -xe.invitation.displayMessage.theAddressIsInvalid=The email address given is invalid and will not be sent to. +xe.invitation.displayMessage.anAddressesIsInvalid=One of the given email addresses is invalid and will not receive a message. +xe.invitation.displayMessage.someAddressesAreInvalid={0} of the given email addresses are invalid and will not receive a message. +xe.invitation.displayMessage.theAddressIsInvalid=The email address given is invalid and will not receive a message. xe.invitation.displayForm.sendMail=Send Mail xe.invitation.displayForm.backToEdit=Back To Edit xe.invitation.displayForm.preview=Preview @@ -2501,7 +2501,7 @@ xe.index.trash.attachments.actions= xe.index.trash.attachments.actions.restore.tooltip=Restore attachment xe.index.trash.attachments.actions.restore.text=[restore] -xe.index.trash.attachments.actions.cannotRestore.tooltip=The attachment cannot be restored to its original location because another file with the same name has been attached +xe.index.trash.attachments.actions.cannotRestore.tooltip=The attachment cannot be restored to its original location because another file with the same name has been attached. xe.index.trash.attachments.actions.cannotRestore.text=[cannot restore] xe.index.trash.attachments.actions.delete.tooltip=Permanently delete attachment xe.index.trash.attachments.actions.delete.text=[delete]