Merge branch 'AUTOMATIC1111:master' into master

1 files changed, 5 insertions, 2 deletions

diff --git a/javascript/hints.js b/javascript/hints.js
index f65e7b88..af010a59 100644
--- a/javascript/hints.js
+++ b/javascript/hints.js
@@ -83,9 +83,12 @@ titles = {
     "Do not add watermark to images": "If this option is enabled, watermark will not be added to created images. Warning: if you do not add watermark, you may be behaving in an unethical manner.",
 
     "Filename word regex": "This regular expression will be used extract words from filename, and they will be joined using the option below into label text used for training. Leave empty to keep filename text as it is.",
-    "Filename join string": "This string will be used to hoin split words into a single line if the option above is enabled.",
+    "Filename join string": "This string will be used to join split words into a single line if the option above is enabled.",
 
-    "Quicksettings list": "List of setting names, separated by commas, for settings that should go to the quick access bar at the top, rather than the usual setting tab. See modules/shared.py for setting names. Requires restarting to apply."
+    "Quicksettings list": "List of setting names, separated by commas, for settings that should go to the quick access bar at the top, rather than the usual setting tab. See modules/shared.py for setting names. Requires restarting to apply.",
+
+    "Weighted Sum": "Result = A * (1 - M) + B * M",
+    "Add difference": "Result = A + (B - C) * (1 - M)",
 }