Merged 5.2.N_REBRANDING (5.2.1) to 5.2.N (5.2.1)

133140 adavis: REPO-1458 English property file changes (From Andy H)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133232 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/messages/action-config.properties

@@ -162,8 +162,8 @@ export.title=Export Space
 export.description=Exports a Space and optionally its children to an Alfresco export package.
 export.package.description=Alfresco content package for Space ''{0}''.
 export.root.package.description=Alfresco content package for complete Repository.
-export.store.package.description=Alfresco Repository export of store ''{0}''.
+export.store.package.description=Repository export of store ''{0}''.
-export.generic.package.description=Alfresco Repository export.
+export.generic.package.description=Repository export.
 export.package.error=Failed to find temporary file for export
 
 script.title=Execute script

config/alfresco/messages/activiti-engine-messages.properties

@@ -35,10 +35,10 @@ activiti.engine.get.pooled.tasks.error=Failed to retrieve pooled tasks for autho
 activiti.engine.query.tasks.error=Failed to query tasks. Query: {0}.
 activiti.engine.get.task.instance.error=Task instance {0} does not exist.
 activiti.engine.update.task.error=Failed to update workflow task {0}.
-activiti.engine.update.task.unexisting.error=Failed to update workflow task {0}, the task doesn't exist.
+activiti.engine.update.task.unexisting.error=Failed to update workflow task {0}, the task doesn''t exist.
 activiti.engine.update.starttask.illegal.error=Failed to update workflow task {0}, start tasks cannot be updated in activiti.
 activiti.engine.end.task.invalid.transition=Transition {0} is invalid for Workflow task {1}, only transition {2} is allowed.
-activiti.engine.end.task.unexisting.error=Failed to signal transition on task {0}, the task doesn't exist.
+activiti.engine.end.task.unexisting.error=Failed to signal transition on task {0}, the task doesn''t exist.
 activiti.engine.end.task.error=Failed to signal transition {0} from workflow task {1}.
 activiti.engine.get.task.by.id.error=Failed to retrieve task {0}.
 activiti.engine.compile.process.definition.zip.error=Failed to parse process definition from activiti zip archive stream.
@@ -49,6 +49,6 @@ activiti.engine.get.workflow.token.invalid=Invalid workflow path {0}.
 activiti.engine.get.workflow.token.is.null=Workflow path {0} does not exist.
 activiti.engine.set.task.properties.invalid.value=The value {0} is invalid for the task property {1}.
 activiti.engine.package.already.associated.error=Cannot associate workflow package {0} with workflow instance {1} as it is already associated with workflow instance {2}.
-activiti.engine.convert.value.error=Unable to convert activiti value {0} to Alfresco Value since it is not Serializable.
+activiti.engine.convert.value.error=Unable to convert value {0} to Alfresco Content Services value as it isn''t serializable.
 activiti.engine.get.company.home.invalid=Invalid company home path {0}.
 activiti.engine.get.company.home.multiple=Invalid company home path {0}. Expected 1 match but found {1} matches.

config/alfresco/messages/activity-list.properties

@@ -4,8 +4,8 @@ title.generic=New Activity
 more.activities={0} more
 
 ## ATOM feed messages
-atom.title.site=Alfresco Activities Site Feed for {0}
+atom.title.site=Activities Site Feed for {0}
-atom.title.user=Alfresco Activities User Feed for {0}
+atom.title.user=Activities User Feed for {0}
 
 ## Optional Site link
 in.site={0} in {1}

config/alfresco/messages/bootstrap-example-javascripts.properties

@@ -10,5 +10,5 @@ javascripts.example.appendcopyright.title=Append Copyright to file
 javascripts.example.appendcopyright.description=Append Copyright line to text or HTML files
 javascripts.example.testreturnvalue.title=Return Value Example
 javascripts.example.testreturnvalue.description=Return a value from a script - for the command servlet
-javascripts.example.alfrescodocs.title=Alfresco Lucene Search
+javascripts.example.alfrescodocs.title=Lucene Search
-javascripts.example.alfrescodocs.description=Search and log all docs containing Alfresco text
+javascripts.example.alfrescodocs.description=Search and log all docs containing text

config/alfresco/messages/bootstrap-javascripts.properties

@@ -1,7 +1,7 @@
 javascripts.backup.description=Simple document backup script
 javascripts.backup.title=Backup Script
 
-javascripts.examle_test.description=Example of various Alfresco API calls
+javascripts.examle_test.description=Example of various API calls
 javascripts.examle_test.title=Example Test Script
 
 javascripts.backup_and_log.description=Backup files and log the date and time
@@ -10,8 +10,8 @@ javascripts.backup_and_log.title=Backup and logging Script
 javascripts.append_copyright.description=Append Copyright line to text or HTML files
 javascripts.append_copyright.title=Append Copyright to file
 
-javascripts.lucene_search.description=Search and log all docs containing Alfresco text
+javascripts.lucene_search.description=Search and log all docs containing text
-javascripts.lucene_search.title=Alfresco Lucene Search
+javascripts.lucene_search.title=Lucene Search
 
 javascripts.return_value.description=Return a value from a script - for the command servlet
 javascripts.return_value.title=Return Value Example

config/alfresco/messages/bootstrap-spaces.properties

@@ -20,10 +20,10 @@ spaces.imap_templates.description=Templates for IMAP generated messages
 
 spaces.imap_templates.emailbody_textplain.description=Email template used to generate the "multipart/alternative" IMAP message body ("text/plain" part)
 spaces.imap_templates.emailbody_texthtml.description=Email template used to generate the "multipart/alternative" IMAP message body ("text/html" part)
-spaces.imap_templates.alfresco.emailbody_textplain.description=Email template used to generate the "multipart/alternative" IMAP message body ("text/plain" part) for Alfresco
+spaces.imap_templates.alfresco.emailbody_textplain.description=Email template used to generate the "multipart/alternative" IMAP message body ("text/plain" part)
-spaces.imap_templates.alfresco.emailbody_texthtml.description=Email template used to generate the "multipart/alternative" IMAP message body ("text/html" part) for Alfresco
+spaces.imap_templates.alfresco.emailbody_texthtml.description=Email template used to generate the "multipart/alternative" IMAP message body ("text/html" part)
-spaces.imap_templates.share.emailbody_textplain.description=Email template used to generate the "multipart/alternative" IMAP message body ("text/plain" part) for Share
+spaces.imap_templates.share.emailbody_textplain.description=Email template used to generate the "multipart/alternative" IMAP message body ("text/plain" part) for Alfresco Share
-spaces.imap_templates.share.emailbody_texthtml.description=Email template used to generate the "multipart/alternative" IMAP message body ("text/html" part) for Share
+spaces.imap_templates.share.emailbody_texthtml.description=Email template used to generate the "multipart/alternative" IMAP message body ("text/html" part) for Alfresco Share
 
 spaces.emailActions.name=Email Actions
 spaces.emailActions.description=Email Actions

config/alfresco/messages/bootstrap-tutorial.properties

@@ -1,9 +1,9 @@
 # Labels used in bootstrap Tutorial definitions
 
-tutorial.space.name=Alfresco Tutorial
+tutorial.space.name=Alfresco Content Services Tutorial
-tutorial.space.description=Step by step guide to the Alfresco application
+tutorial.space.description=Step by step guide to the Alfresco Content Services application
 
 tutorial.document.name=Alfresco-Tutorial.pdf
-tutorial.document.title=Alfresco Tutorial
+tutorial.document.title=Alfresco Content Services Tutorial
 tutorial.document.description=Getting started guide
 

config/alfresco/messages/custommodel-service.properties

@@ -1,7 +1,7 @@
 # CustomModel service externalised strings
 cmm.service.name_already_in_use=We couldn''t create a model as the model name ''{0}'' is already in use.
-cmm.service.create_model_err=We couldn''t create the model right now. Try sharing the following details with your Alfresco administrator. {0}
+cmm.service.create_model_err=We couldn''t create the model right now. Try sharing the following details with your IT team. {0}
-cmm.service.update_model_err=We couldn''t update the model right now. Try sharing the following details with your Alfresco administrator. {0}
+cmm.service.update_model_err=We couldn''t update the model right now. Try sharing the following details with your IT team. {0}
 cmm.service.multiple_models=Found multiple models with the name ''{0}''. Try deactivating then deleting one of the models.
 cmm.service.retrieve_model=We couldn''t access model ''{0}''. Please try again.
 cmm.service.model_not_exists=The model ''{0}'' doesn''t exist. It may have been deactivated by another user.
@@ -13,7 +13,7 @@ cmm.service.unable_delete_active_model=You can't delete an active model. You nee
 cmm.service.unable_model_delete=We couldn''t delete model ''{0}''.
 cmm.service.unable_model_deactivate=We couldn''t deactivate model ''{0}''.
 cmm.service.unable_model_activate=We couldn''t activate model ''{0}''.
-cmm.service.invalid_model=The model isn''t valid. Try sharing the following details with your Alfresco administrator. {0}
+cmm.service.invalid_model=The model isn''t valid. Try sharing the following details with your IT team. {0}
 cmm.service.namespace_active_model=You can't update the namespace URI or namespace prefix of an active model.
 cmm.service.failed.deactivation.type.dependency=Model ''{0}'' couldn''t be deactivated because it''s ''{0}'' type is the parent of type ''{1}'' in model ''{2}''.
 cmm.service.failed.deactivation.aspect.dependency=Model ''{0}'' couldn''t be deactivated because it''s ''{0}'' property group is the parent of property group ''{1}'' in model ''{2}''.

config/alfresco/messages/email-service.properties

@@ -1,10 +1,10 @@
 email.server.msg.received_by_smtp=Received by SMTP from ''{0}''.
 email.server.msg.default_subject=Email-{0}
 
-email.server.err.duplicate_alias=Node with email alias ''{0}'' already exists. Duplicate isn't allowed.
+email.server.err.duplicate_alias=Node with email alias ''{0}'' already exists. Duplicate isn''t allowed.
 email.server.err.sender_blocked=''{0}'' has been denied access.
 email.server.err.from_syntax=Syntax: MAIL FROM: <address>  Error in parameters
-email.server.err.inbound_mail_disabled=The Alfresco server is not configured to accept inbound emails.
+email.server.err.inbound_mail_disabled=The server isn't configured to accept inbound emails.
 email.server.err.access_denied=''{0}'' has been denied access to ''{1}''.
 email.server.err.invalid_subject=The subject line must be a valid file name.
 email.server.err.unknown_source_address=The ''from'' email address was not recognised: {0}.

config/alfresco/messages/invitation-service.properties

@@ -7,7 +7,7 @@ invitation.error.not_found="Invitation not found, invitationId: {0}"
 invitation.error.not_found_by_invitee="Invitation not found for site: {0}, invitee: {1}"
 invitation.error.invalid_inviteId_format="Invitation Id not valid format, valid formats are <engine>$<id> : {0}"
 invitation.invite.already_member="The user, {0} is already a member of {1} and cannot be invited again"
-invitation.invite.user_disabled="{0} has been deactivated and can't be invited"
+invitation.invite.user_disabled="{0} has been deactivated and can''t be invited"
 invitation.cancel.not_site_manager="Current user, {0}, cannot cancel invitation: {1} because they are not a Site Manager for site: {2}"
 invitation.invite.not_site_manager="Current user, {0}, is not a Site Manager for site: {1}"
 invitation.invite.unable_generate_id="Unable to generate a user name for invitee, which doesn''t already belong to someone else firstName:{0} lastName:{1} email:{2}"

config/alfresco/messages/publishing-model.properties

@@ -1,6 +1,6 @@
 # Display labels for Publishing Model (publishingModel.xml)
 
-pub_publishingmodel.description=Alfresco Publishing Content Model
+pub_publishingmodel.description=Publishing Content Model
 
 pub_publishingmodel.type.pub_DeliveryChannel.title=Delivery Channel
 pub_publishingmodel.type.pub_DeliveryChannel.description=The base type for all delivery channels

config/alfresco/messages/subscription-service.properties

@@ -1,6 +1,6 @@
 # Subscription service messages
 
-subscription.notification.email.subject={0} is now following you on Alfresco
+subscription.notification.email.subject={0} is now following you
 
 subscription_service.err.disabled=The subscription is disabled
 subscription_service.err.write-denied=No permissions to update

config/alfresco/messages/system-messages.properties

@@ -9,14 +9,14 @@ system.err.lucene_not_supported=The lucene search subsystem is not supported. Pl
 
 # Bootstrap configuration check messages
 
-system.config_check.warn.dir_root=The Alfresco ''dir.root'' property is set to a relative path ''{0}''.  ''dir.root'' should be overridden to point to a specific folder.
+system.config_check.warn.dir_root=The ''dir.root'' property is set to a relative path ''{0}''.  ''dir.root'' should be overridden to point to a specific folder.
-system.config_check.msg.dir_root=The Alfresco root data directory (''dir.root'') is: {0}
+system.config_check.msg.dir_root=The root data directory (''dir.root'') is: {0}
 system.config_check.err.indexes.duplicate_root_node=The store ''{0}'' has a duplicate root node entry.
 system.config_check.err.missing_index=CONTENT INTEGRITY ERROR: Indexes not found for {0} stores.
 system.config_check.err.missing_content=CONTENT INTEGRITY ERROR: System content not found in content store.
 system.config_check.err.fix_dir_root=Ensure that the ''dir.root'' property ''{0}'' is pointing to the correct data location.
 system.config_check.msg.howto_index_recover=You may set 'index.recovery.mode=FULL' if you need to rebuild the indexes.
-system.config_check.warn.starting_with_errors=Alfresco is starting with errors.
+system.config_check.warn.starting_with_errors=Alfresco Content Services is starting with errors.
 system.config_check.err.wrong_transaction_isolation_sql_server=The transaction isolation is set to {0}, but should be set to {1} for MS SQL Server
 system.config_check.info.db_connection=Using database URL ''{0}'' with user ''{1}''.
 system.config_check.info.db_version=Connected to database {0} version {1}
@@ -91,8 +91,8 @@ system.usage.err.limit_users_exceeded_verbose=The allowable user limit of {0} as
 system.usage.warn.limit_users_overage=The allowable user limit of {0} for your license agreement has been reached. There are {1} users in the system, {2} are temporarily permitted. Please contact your Alfresco sales representative to purchase additional user licenses.
 
 system.usage.err.limit_documents_exceeded=The allowable content limit of {0} has been exceeded.  There are currently {1} content objects in the system.
-system.usage.err.limit_license_expiring=The Alfresco license will expire in {0} days.
+system.usage.err.limit_license_expiring=The Alfresco Content Services license will expire in {0} days.
-system.usage.err.limit_license_expired=The Alfresco license has expired.
+system.usage.err.limit_license_expired=The Alfresco Content Services license has expired.
 
 # Subsystems error messages
 system.portcheck.err.empty_port=The value for {0} port property cannot be empty.
@@ -110,10 +110,10 @@ system.portcheck.err.ports_with_networking_errors=The following ports chosen for
 system.license.msg.unknown=Unknown
 system.license.msg.unlimited=Unlimited
 system.license.msg.does_not_expire=Does not expire
-system.license.msg.reloaded=The Alfresco license has been reloaded.
+system.license.msg.reloaded=The Alfresco Content Services license has been reloaded.
 system.license.err.reloadFailed=Failed to reload license: {0}
 # END TRANSLATION
 
 # Startup message
-system.info.startup=Alfresco started ({0}{1}{2}). Current version: {3} schema {4}. Originally installed version: {5} schema {6}.
+system.info.startup=Alfresco Content Services started ({0}{1}{2}). Current version: {3} schema {4}. Originally installed version: {5} schema {6}.
-system.warn.readonly=Alfresco is currently in read-only mode.  Please check your license.
+system.warn.readonly=Alfresco Content Services is currently in read-only mode. Check your license.

config/alfresco/messages/system-model.properties

@@ -1,6 +1,6 @@
 # Display labels for System Model
 
-sys_systemmodel.description=Alfresco System Model
+sys_systemmodel.description=Alfresco Content Services System Model
 
 sys_systemmodel.type.sys_base.title=Base
 sys_systemmodel.type.sys_base.description=Base

config/alfresco/messages/templates-messages.properties

@@ -73,7 +73,7 @@ templates.doc_info.no_document_found=No document found!
 #invite_user_email.ftl
 templates.invite_user_email.invited_to_space=You have been invited to ''{0}'' by {1}
 templates.invite_user_email.role=You will have the role of: {0}
-templates.invite_user_email.you_can_view_the_space=You can view the space through the Alfresco client
+templates.invite_user_email.you_can_view_the_space=You can view the space through the Alfresco Content Services client
 templates.invite_user_email.regards=Regards
 
 #invite-email-add-direct.html
@@ -81,9 +81,9 @@ templates.invite-email-add-direct.html.header=You have been added to the ''{0}''
 templates.invite-email-add-direct.html.salutation=Hi {0},
 templates.invite-email-add-direct.html.detail={0} {1} has added you to the <b>{2}</b> site with the role of {3}.
 templates.invite-email-add-direct.html.navigate=Go to {0}
-templates.invite-email-add-direct.html.closing=Sincerely,<br />Alfresco {0}
+templates.invite-email-add-direct.html.closing=
-templates.invite-email-add-direct.html.leave=<span>Don''t want to be a part of this site?</span><br/><a href=\"{0}\">Leave site</a>
+templates.invite-email-add-direct.html.leave=<span>Don''t want to be a part of this site?</span><br/><a href="{0}">Leave site</a>
-templates.invite-email-add-direct.html.alfresco_info=To find out more about Alfresco {0} visit <a href=\"http://www.alfresco.com\">http://www.alfresco.com</a>
+templates.invite-email-add-direct.html.alfresco_info=To find out more about Alfresco Content Services {0} visit <a href="http://www.alfresco.com">http://www.alfresco.com</a>
 
 #invite-email-moderated.ftl
 templates.invite-email-moderated.html.header=A new user wants to join ''{0}''

config/alfresco/messages/transfer-model.properties

@@ -1,6 +1,6 @@
 # Display labels for Transfer Model
 
-trx_applicationmodel.description=Alfresco Transfer Application Model
+trx_applicationmodel.description=Alfresco Content Services Transfer Application Model
 
 trx_applicationmodel.type.trx_transferGroup.title=Transfer Group
 trx_applicationmodel.type.trx_transferGroup.description=The definition of a transfer group

config/alfresco/messages/webdav-messages.properties

@@ -1,6 +1,6 @@
 # webdav HTML page messages
 
-webdav.repository_title=Alfresco Content Repository
+webdav.repository_title=Content Repository
 webdav.directory_listing=Directory listing for
 webdav.column.name=Name
 webdav.column.size=Size