126632 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
125496 gbroadbent: ES-PT_BR-FR-DE-NB-JA-ZH_CN: Improved files to display a colon before variable instead of period at the end of a string. (Just comestic)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126983 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
102457: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
102342: NORWEGIAN: Updated Norwegian (Bokmal) files based on EN-rev101823. Also this commit is a fix for ACE-3931.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@102570 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
102442: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
102342: NORWEGIAN: Updated Norwegian (Bokmal) files based on EN-rev101823. Also this commit is a fix for ACE-3931.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@102552 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261