inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
126614 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      125212 gcornwell: RA-868: Updated localised messages as a result of them being reviewed by the user assistance team. Next step is to have the new/updated strings localised.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126959 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 12:32:06 +00:00
parent c96077f7c5
commit c6e507cb3d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/alfresco/messages/admin-console.properties
View File

@@ -19,10 +19,10 @@ admin-console.yesno.false=No
admin-console.close=Close admin-console.close=Close
admin-console.password.show=Show Password admin-console.password.show=Show Password
admin-console.password.hide=Hide Password admin-console.password.hide=Hide Password
admin-console.unavailable=Information is currently unavailable! admin-console.unavailable=Information is currently unavailable
admin-console.not.installed=Not Installed admin-console.not.installed=Not Installed
admin-console.requesterror=Request failed due to error. admin-console.requesterror=We couldn't complete the request.
# Admin Tool Group labels # Admin Tool Group labels
admin-console.tool.group.general=General admin-console.tool.group.general=General

4
config/alfresco/messages/rest-framework-messages.properties
View File

@@ -1,4 +1,4 @@
# Messages returned by the Rest API framework # Messages returned by the REST API framework
framework.exception.ApiDefault=Unknown error calling the Rest API framework.exception.ApiDefault=Unknown error calling the Rest API
framework.exception.ConstraintViolated=A constraint was violated framework.exception.ConstraintViolated=A constraint was violated
framework.exception.InvalidArgument=An invalid argument was received {0} framework.exception.InvalidArgument=An invalid argument was received {0}
@@ -10,7 +10,7 @@ framework.exception.RelationshipNotFound=The relationship resource was not found
framework.exception.PermissionDenied=Permission was denied framework.exception.PermissionDenied=Permission was denied
framework.exception.StaleEntity=Attempt to update a stale entity framework.exception.StaleEntity=Attempt to update a stale entity
framework.exception.UnsupportedResourceOperation=The operation is unsupported framework.exception.UnsupportedResourceOperation=The operation is unsupported
framework.exception.DeletedResource=In this version of the API resource {0} has been deleted framework.exception.DeletedResource=In this version of the REST API resource {0} has been deleted
framework.exception.RequestEntityTooLarge=Request entity too large framework.exception.RequestEntityTooLarge=Request entity too large
framework.exception.InsufficientStorage=Content storage quota exceeded framework.exception.InsufficientStorage=Content storage quota exceeded