From 46ae38cf4ad72fc7737b328e9cfb950f6569e4dc Mon Sep 17 00:00:00 2001 From: Ancuta Morarasu Date: Thu, 8 Jun 2017 12:40:37 +0000 Subject: [PATCH] Merged 5.2.1 (5.2.1) to 5.2.N (5.2.2) 137187 gbroadbent: Edited EN files from Andy Healey as indicated in ticket LOC-14 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137200 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../reset-password-messages.properties | 4 +-- config/alfresco/messages/slingshot.properties | 28 +++++++++---------- .../workflow/workflow-messages.properties | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/config/alfresco/messages/reset-password-messages.properties b/config/alfresco/messages/reset-password-messages.properties index 518d310305..3412445a97 100644 --- a/config/alfresco/messages/reset-password-messages.properties +++ b/config/alfresco/messages/reset-password-messages.properties @@ -6,10 +6,10 @@ reset-password-confirmation.email.subject=Password reset successful templates.reset-password-email.ftl.title=Reset your password templates.reset-password-email.ftl.detail=You recently requested to change the password for your account. templates.reset-password-email.ftl.ignore_message=If you didn't request a password reset or you don't want to change it, you can ignore and delete this message, and your account will remain secure. -templates.reset-password-email.ftl.having_trouble_clicking_button=If you're having trouble clicking on the Reset Password button, just copy and paste the following URL into your web browser: +templates.reset-password-email.ftl.having_trouble_clicking_button=Either click the Reset Password button, or copy and paste the following address into your web browser: templates.reset-password-email.ftl.reset_password_button=Reset password # Reset password confirmation email templates.reset-password-confirm-email.ftl.title=Password reset successful templates.reset-password-confirm-email.ftl.detail=The password for your Alfresco account was recently changed. -templates.reset-password-confirm-email.ftl.note=If you didn't request a password reset, please contact your administrator immediately. +templates.reset-password-confirm-email.ftl.note=If you didn't request a password reset, then contact your IT Team immediately. diff --git a/config/alfresco/messages/slingshot.properties b/config/alfresco/messages/slingshot.properties index 96fbf3a394..38712f04d4 100644 --- a/config/alfresco/messages/slingshot.properties +++ b/config/alfresco/messages/slingshot.properties @@ -18,22 +18,22 @@ hybridsync.remote-tenant-id-header-label=Cloud Network hybridsync.target-folder-node-ref-header-label=Cloud Destination hybridsync.actions-header-label=Actions -sync.folder.name_clash=Content with the same name already exists in the target folder. -sync.folder.not_found=Cannot find folder. -sync.node.already_synced=Cannot create content: it has already been synchronized from another location. -sync.node.other_sync_set=This content has already been synchronized from another location. +sync.folder.name_clash=Content with this name already exists in the target folder. You need to change the name to sync it. +sync.folder.not_found=Sync folder not found. Try again or check with your IT Team. +sync.node.already_synced=Sync unsuccessful. Content already synced from another location. +sync.node.other_sync_set=Sync unsuccessful. Content already synced from another location. sync.node.no_longer_exists=This content no longer exists on Alfresco Content Services in the Cloud. sync.node.no_longer_exists.description=This content no longer exists on Alfresco Content Services in the Cloud. Click Request Sync to try again. -sync.node.unknown=We hit a problem, please try again. -sync.node.unknown.description=An unexpected error occurred. Cause: {0}. -sync.node.access_denied=Cannot synchronize the content: you don't have permission to access the target file. -sync.node.access_denied_source=Cannot synchronize the content: you don't have permission to access the source file. -sync.node.content_limit_violation=This file exceeds the content limit. The file is too large to perform the action. -sync.node.quota_limit_violation=You have exceeded the content quota. There isn't enough free space to perform the action. -sync.node.authentication_error=Cannot synchronize the content to the cloud: the authentication details are not valid. -sync.node.authentication_error.description=Cannot synchronize the content to the cloud: the authentication details for the user {0} are not valid. -sync.node.owner_not_found=We can't synchronize the content because the owner has been removed or deleted. -sync.node.owner_not_found.description=The user who owns this sync, {0}, no longer exists. Please click Unsync. +sync.node.unknown=We hit a problem, try again. +sync.node.unknown.description=We hit a problem during sync. Try again, or share the following details with your IT Team {0}. +sync.node.access_denied=Content not synced. You don't have access to the target file, ask your IT Team for access. +sync.node.access_denied_source=Content not synced. You don't have access to the source file, ask your IT Team for access. +sync.node.content_limit_violation=This file is to large to sync. +sync.node.quota_limit_violation=There isn't enough free space to sync. +sync.node.authentication_error=Content not synced as the authentication details aren't valid. +sync.node.authentication_error.description=Content not synced as the authentication details for {0} aren't valid. +sync.node.owner_not_found=Content not synced because the owner has been removed or deleted. +sync.node.owner_not_found.description=This was synced by {0}, who has been removed. Click Unsync from Cloud to cancel the sync. sync.communications.error=Unable to communicate with remote system sync.communications.error.description=Unable to communicate with remote system. Sync will automatically work once communications work diff --git a/config/alfresco/workflow/workflow-messages.properties b/config/alfresco/workflow/workflow-messages.properties index a9047101f0..6b63e31bd9 100644 --- a/config/alfresco/workflow/workflow-messages.properties +++ b/config/alfresco/workflow/workflow-messages.properties @@ -149,4 +149,4 @@ workflowtask.already.done.error=This task has already been completed and is no l # Reset password Task Definitions resetpasswordwf_resetpassword.resetpassword.workflow.title=Request Password Reset. -resetpasswordwf_resetpassword.resetpassword.workflow.description=Used to request a password reset for a user's own login. \ No newline at end of file +resetpasswordwf_resetpassword.resetpassword.workflow.description=Used by users to request to reset their password. \ No newline at end of file