Merge pull request #1 from AUTOMATIC1111/master

updating files to resolve merge conflicts

2 files changed, 2 insertions, 4 deletions

diff --git a/javascript/contextMenus.js b/javascript/contextMenus.js
index 2d82269f..7852793c 100644
--- a/javascript/contextMenus.js
+++ b/javascript/contextMenus.js
@@ -147,10 +147,6 @@ generateOnRepeatId = appendContextMenuOption('#txt2img_generate','Generate forev
 

 cancelGenerateForever = function(){ 

   clearInterval(window.generateOnRepeatInterval) 

-  let interruptbutton = gradioApp().querySelector('#txt2img_interrupt');

-  if(interruptbutton.offsetParent){

-      interruptbutton.click();

-  }

 }

 

 appendContextMenuOption('#txt2img_interrupt','Cancel generate forever',cancelGenerateForever)

diff --git a/javascript/hints.js b/javascript/hints.js
index 8e352e94..045f2d3c 100644
--- a/javascript/hints.js
+++ b/javascript/hints.js
@@ -79,6 +79,8 @@ titles = {
     "Highres. fix": "Use a two step process to partially create an image at smaller resolution, upscale, and then improve details in it without changing composition",
     "Scale latent": "Uscale the image in latent space. Alternative is to produce the full image from latent representation, upscale that, and then move it back to latent space.",
 
+    "Eta noise seed delta": "If this values is non-zero, it will be added to seed and used to initialize RNG for noises when using samplers with Eta. You can use this to produce even more variation of images, or you can use this to match images of other software if you know what you are doing.",
+    "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 bevaing in an unethical manner.",
 }