yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'temp8' into temp8-3087-tree-grouping

Browse Source 
# Conflicts:
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/es.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/nb.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/zh_tw.xml
#	src/Umbraco.Web/Trees/DictionaryTreeController.cs
This commit is contained in:
Warren Buckley
2018-10-09 09:25:00 +01:00
parent f63a9e93b0 e15992a66b
commit 31b616f0ae
117 changed files with 5600 additions and 11532 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js
View File

@@ -644,24 +644,14 @@ angular.module('umbraco.mocks').
"templateEditor_usedIfAllEmpty": "Will only be used when the field values above are empty",
"templateEditor_usedIfEmpty": "This field will only be used if the primary field is empty",
"templateEditor_withTime": "Yes, with time. Seperator: ",
"translation_assignedTasks": "Tasks assigned to you",
"translation_assignedTasksHelp": " The list below shows translation tasks <strong>assigned to you</strong>. To see a detailed view including comments, click on 'Details' or just the page name. You can also download the page as XML directly by clicking the 'Download Xml' link. <br/> To close a translation task, please go to the Details view and click the 'Close' button. ",
"translation_closeTask": "close task",
"translation_details": "Translation details",
"translation_downloadAllAsXml": "Download all translation tasks as xml",
"translation_downloadTaskAsXml": "Download xml",
"translation_DownloadXmlDTD": "Download xml DTD",
"translation_fields": "Fields",
"translation_includeSubpages": "Include subpages",
"translation_mailBody": " Hi %0% This is an automated mail to inform you that the document '%1%' has been requested for translation into '%5%' by %2%. Go to http://%3%/translation/details.aspx?id=%4% to edit. Or log into Umbraco to get an overview of your translation tasks http://%3% Have a nice day! Cheers from the Umbraco robot ",
"translation_mailSubject": "[%0%] Translation task for %1%",
"translation_noTranslators": "No translator users found. Please create a translator user before you start sending content to translation",
"translation_ownedTasks": "Tasks created by you",
"translation_ownedTasksHelp": " The list below shows pages <strong>created by you</strong>. To see a detailed view including comments, click on 'Details' or just the page name. You can also download the page as XML directly by clicking the 'Download Xml' link. To close a translation task, please go to the Details view and click the 'Close' button. ",
"translation_pageHasBeenSendToTranslation": "The page '%0%' has been send to translation",
"translation_pageHasBeenSendToTranslation": "The page '%0%' has been send to translation",
"translation_sendToTranslate": "Send the page '%0%' to translation",
"translation_taskAssignedBy": "Assigned by",
"translation_taskOpened": "Task opened",
"translation_totalWords": "Total words",
"translation_translateTo": "Translate to",
"translation_translationDone": "Translation completed.",