diff --git a/frappe/core/doctype/user/user.json b/frappe/core/doctype/user/user.json index 51fc55df99..78cd7451aa 100644 --- a/frappe/core/doctype/user/user.json +++ b/frappe/core/doctype/user/user.json @@ -154,7 +154,7 @@ "permlevel": 0 }, { - "description": "Get your globally recognized avatar from Gravatar.com", + "description": "Get your globally recognized avatar from Gravatar.com", "fieldname": "user_image", "fieldtype": "Attach", "hidden": 0, @@ -326,7 +326,7 @@ "width": "50%" }, { - "description": "Enter default value fields (keys) and values. If you add multiple values for a field, the first one will be picked. These defaults are also used to set \"match\" permission rules. To see list of fields, go to Customize Form.", + "description": "Enter default value fields (keys) and values. If you add multiple values for a field, the first one will be picked. These defaults are also used to set \"match\" permission rules. To see list of fields, go to \"Customize Form\".", "fieldname": "defaults", "fieldtype": "Table", "hidden": 1, @@ -516,4 +516,4 @@ ], "read_only": 0, "search_fields": "first_name, last_name" -} \ No newline at end of file +} diff --git a/frappe/custom/doctype/custom_field/custom_field.js b/frappe/custom/doctype/custom_field/custom_field.js index 6e154f6520..81c37ec3fc 100644 --- a/frappe/custom/doctype/custom_field/custom_field.js +++ b/frappe/custom/doctype/custom_field/custom_field.js @@ -52,7 +52,7 @@ cur_frm.cscript.fieldtype = function(doc, dt, dn) { __('Name of the Document Type (DocType) you want this field to be linked to. e.g. Customer'); } else if(doc.fieldtype == 'Select') { cur_frm.fields_dict['options_help'].disp_area.innerHTML = - __('Options for select. Each option on a new line. e.g.:
Option 1
Option 2
Option 3
'); + __('Options for select. Each option on a new line.')+' '+__('e.g.:')+'
'+__('Option 1')+'
'+__('Option 2')+'
'+__('Option 3')+'
'; } else if(doc.fieldtype == 'Dynamic Link') { cur_frm.fields_dict['options_help'].disp_area.innerHTML = __('Fieldname which will be the DocType for this link field.'); diff --git a/frappe/custom/doctype/customize_form/customize_form.json b/frappe/custom/doctype/customize_form/customize_form.json index 2334905ac4..5b0a3ec64a 100644 --- a/frappe/custom/doctype/customize_form/customize_form.json +++ b/frappe/custom/doctype/customize_form/customize_form.json @@ -33,7 +33,7 @@ "search_index": 0 }, { - "description": "Fields separated by comma (,) will be included in the
Search By list of Search dialog box", + "description": "Fields separated by comma (,) will be included in the \"Search By\" list of Search dialog box", "fieldname": "search_fields", "fieldtype": "Data", "in_list_view": 1, @@ -133,4 +133,4 @@ } ], "search_fields": "doc_type" -} \ No newline at end of file +} diff --git a/frappe/custom/doctype/customize_form_field/customize_form_field.json b/frappe/custom/doctype/customize_form_field/customize_form_field.json index 539178832d..6f7775385a 100644 --- a/frappe/custom/doctype/customize_form_field/customize_form_field.json +++ b/frappe/custom/doctype/customize_form_field/customize_form_field.json @@ -119,7 +119,7 @@ "precision": "" }, { - "description": "This field will appear only if the fieldname defined here has value OR the rules are true (examples):
\nmyfield\neval:doc.myfield=='My Value'
\neval:doc.age>18", + "description": "This field will appear only if the fieldname defined here has value OR the rules are true (examples): \nmyfield\neval:doc.myfield=='My Value'\neval:doc.age>18", "fieldname": "depends_on", "fieldtype": "Data", "hidden": 0, @@ -301,4 +301,4 @@ "owner": "Administrator", "permissions": [], "read_only": 0 -} \ No newline at end of file +} diff --git a/frappe/public/js/frappe/ui/toolbar/awesome_bar.js b/frappe/public/js/frappe/ui/toolbar/awesome_bar.js index ff4955f084..c236e226c5 100644 --- a/frappe/public/js/frappe/ui/toolbar/awesome_bar.js +++ b/frappe/public/js/frappe/ui/toolbar/awesome_bar.js @@ -84,15 +84,15 @@ frappe.search = { onclick: function() { var txt = '\ \ + __("new type of document")+'\ \ + __("document type..., e.g. customer")+'\ \ + __("text in document type")+'\ \ + __("module name...")+'\ \ + __("e.g. (55 + 434) / 4 or =Math.sin(Math.PI/2)...")+'\
'+__("Make a new record")+''+ - __("new type of document")+'
'+__("List a document type")+''+ - __("document type..., e.g. customer")+'
'+__("Search in a document type")+''+ - __("text in document type")+'
'+__("Open a module or tool")+''+ - __("module name...")+'
'+__("Calculate")+''+ - __("e.g. (55 + 434) / 4 or =Math.sin(Math.PI/2)...")+'
' msgprint(txt, "Search Help"); } diff --git a/frappe/website/doctype/website_settings/website_settings.json b/frappe/website/doctype/website_settings/website_settings.json index 9df4654b72..ecb6f234bc 100644 --- a/frappe/website/doctype/website_settings/website_settings.json +++ b/frappe/website/doctype/website_settings/website_settings.json @@ -231,7 +231,7 @@ "permlevel": 0 }, { - "description": "An icon file with .ico extension. Should be 16 x 16 px. Generated using a favicon generator. [favicon-generator.org]", + "description": "An icon file with .ico extension. Should be 16 x 16 px. Generated using a favicon generator. [favicon-generator.org]", "fieldname": "favicon", "fieldtype": "Attach", "label": "FavIcon", @@ -296,4 +296,4 @@ "submit": 0 } ] -} \ No newline at end of file +} diff --git a/frappe/website/doctype/website_theme/website_theme.json b/frappe/website/doctype/website_theme/website_theme.json index 5b8293ebce..8613ac9f65 100644 --- a/frappe/website/doctype/website_theme/website_theme.json +++ b/frappe/website/doctype/website_theme/website_theme.json @@ -110,7 +110,7 @@ "precision": "" }, { - "description": "Add the name of a Google Web Font e.g. \"Open Sans\"", + "description": "Add the name of a \"Google Web Font\" e.g. \"Open Sans\"", "fieldname": "text_webfont", "fieldtype": "Data", "label": "Google Font (Text)", @@ -118,7 +118,7 @@ "precision": "" }, { - "description": "Add the name of a Google Web Font e.g. \"Open Sans\"", + "description": "Add the name of a \"Google Web Font\" e.g. \"Open Sans\"", "fieldname": "heading_webfont", "fieldtype": "Data", "label": "Google Font (Heading)", @@ -301,4 +301,4 @@ "sort_field": "modified", "sort_order": "DESC", "title_field": "" -} \ No newline at end of file +} diff --git a/frappe/workflow/doctype/workflow/workflow.json b/frappe/workflow/doctype/workflow/workflow.json index 00244cdd2e..2ef72fae8c 100644 --- a/frappe/workflow/doctype/workflow/workflow.json +++ b/frappe/workflow/doctype/workflow/workflow.json @@ -42,7 +42,7 @@ "permlevel": 0 }, { - "description": "All possible Workflow States and roles of the workflow.
Docstatus Options: 0 is\"Saved\", 1 is \"Submitted\" and 2 is \"Cancelled\"", + "description": "All possible Workflow States and roles of the workflow. \nDocstatus Options: 0 is\"Saved\", 1 is \"Submitted\" and 2 is \"Cancelled\"", "fieldname": "states", "fieldtype": "Table", "label": "Document States", @@ -97,4 +97,4 @@ "write": 1 } ] -} \ No newline at end of file +}