Merge branch 'staging' of git://github.com/joomla/joomla-cms into sta…

…ging # Conflicts: # administrator/language/en-GB/en-GB.ini
joomla · Apr 5, 2017 · 7851231 · 7851231
1 parent 8c0bf52
commit 7851231
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/administrator/language/en-GB/en-GB.ini b/administrator/language/en-GB/en-GB.ini
@@ -321,6 +321,8 @@ JGLOBAL_CREATED_DATE="Created Date"
 JGLOBAL_CUSTOM_CATEGORY="New Categories"
 JGLOBAL_CUSTOM_FIELDS_ENABLE_DESC="Enable the creation of custom fields."
 JGLOBAL_CUSTOM_FIELDS_ENABLE_LABEL="Enable Custom Fields"
+JGLOBAL_CUSTOM_FIELDS_ENABLED_CONTEXTS_LABEL="Where should custom fields appear"
+JGLOBAL_CUSTOM_FIELDS_ENABLED_CONTEXTS_DESC="Select one or more output views where custom fields should appear"
 JGLOBAL_DATE_FORMAT_DESC="Optional format string for showing the date. For example, D M Y for day month year or you can use d-m-y for a short version eg. 28-12-16. See http://www.php.net/manual/en/function.date.php. If left blank, it uses DATE_FORMAT_LC1 from your language file."
 JGLOBAL_DATE_FORMAT_LABEL="Date Format"
 JGLOBAL_DESCRIPTION="Description"