jumbo merge part two

html/locale_en.json

@@ -80,7 +80,7 @@
   {"id":"","label":"CFG Scale","localized":"","hint":"Classifier Free Guidance scale: how strongly the image should conform to prompt. Lower values produce more creative results, higher values make it follow the prompt more strictly; recommended values between 5-10"},
   {"id":"","label":"CLIP skip","localized":"","hint":"Clip skip is a feature that allows users to control the level of specificity of the prompt, the higher the CLIP skip value, the less deep the prompt will be interpreted. CLIP Skip 1 is typical while some anime models produce better results at  CLIP skip 2"},
   {"id":"","label":"Seed","localized":"","hint":"A value that determines the output of random number generator - if you create an image with same parameters and seed as another image, you'll get the same result"},
-  {"id":"","label":"Extra","localized":"","hint":""},
+  {"id":"","label":"Extra","localized":"","hint":"Show additional options"},
   {"id":"","label":"Variation seed","localized":"","hint":"Seed of a different picture to be mixed into the generation"},
   {"id":"","label":"Variation strength","localized":"","hint":"How strong of a variation to produce. At 0, there will be no effect. At 1, you will get the complete picture with variation seed (except for ancestral samplers, where you will just get something)"},
   {"id":"","label":"Resize seed from width","localized":"","hint":"Make an attempt to produce a picture similar to what would have been produced with same seed at specified resolution"},
@@ -98,10 +98,10 @@
   {"id":"","label":"Show result images","localized":"","hint":"Enable to show the processed images in the image pane"},
   {"id":"","label":"Resize","localized":"","hint":"Factor for resizing 1x mean no upscale, 4x means 4 times upscale, high values might lead to memory issues on small graphics cards"},
   {"id":"","label":"Crop to fit","localized":"","hint":"If the dimensions of your source image (e.g. 512x510) deviate from your target dimensions (e.g. 1024x768) this function will fit your upscaled image into your target size image. Excess will be cropped"},
-  {"id":"","label":"Secondary Upscaler","localized":"","hint":""},
-  {"id":"","label":"Upscaler 2 visibility","localized":"","hint":""},
-  {"id":"","label":"GFPGAN visibility","localized":"","hint":""},
-  {"id":"","label":"CodeFormer visibility","localized":"","hint":""},
+  {"id":"","label":"Secondary Upscaler","localized":"","hint":"Select secondary upscaler to run after initial upscaler"},
+  {"id":"","label":"Upscaler 2 visibility","localized":"","hint":"Strength of the secondary upscaler"},
+  {"id":"","label":"GFPGAN visibility","localized":"","hint":"Strength of GFPGAN face restore network, 0=disabled"},
+  {"id":"","label":"CodeFormer visibility","localized":"","hint":"Strength of CodeFormer face restore network, 0=disabled"},
   {"id":"","label":"CodeFormer weight (0 = max, 1 = min)","localized":"","hint":""}
 ],
 "settings menu": [
@@ -281,7 +281,7 @@
   {"id":"","label":"Prompt attention mean normalization","localized":"","hint":""},
   {"id":"","label":"Disable conditional batching enabled on low memory systems","localized":"","hint":""},
   {"id":"","label":"Enable samplers quantization for sharper and cleaner results","localized":"","hint":""},
-  {"id":"","label":"Increase coherency by padding from the last comma within n tokens when using more than 75 tokens","localized":"","hint":""},
+  {"id":"","label":"Prompt padding for long prompts","localized":"","hint":"Increase coherency by padding from the last comma within n tokens when using more than 75 tokens"},
   {"id":"","label":"Original","localized":"","hint":""},
   {"id":"","label":"Diffusers","localized":"","hint":""},
   {"id":"","label":"VRAM usage polls per second during generation","localized":"","hint":""},
@@ -425,14 +425,14 @@
   {"id":"","label":"DPM++ 2M SDE Karras","localized":"","hint":""},
   {"id":"","label":"DDIM","localized":"","hint":"Denoising Diffusion Implicit Models - best at inpainting"},
   {"id":"","label":"UniPC","localized":"","hint":"Unified Predictor-Corrector Framework for Fast Sampling of Diffusion Models"},
-  {"id":"","label":"Secondary sampler","localized":"","hint":""},
-  {"id":"","label":"Force latent upscaler sampler","localized":"","hint":""},
+  {"id":"","label":"Secondary sampler","localized":"","hint":"Use specific sampler as fallback sampler if primary is not supported for specific operation"},
+  {"id":"","label":"Force latent upscaler sampler","localized":"","hint":"Force specific sampler for second pass operations"},
   {"id":"","label":"Noise multiplier for ancestral samplers (eta)","localized":"","hint":""},
   {"id":"","label":"Noise multiplier for DDIM (eta)","localized":"","hint":""},
   {"id":"","label":"uniform","localized":"","hint":""},
   {"id":"","label":"quad","localized":"","hint":""},
   {"id":"","label":"sigma churn","localized":"","hint":""},
-  {"id":"","label":"Negative Guidance minimum sigma","localized":"","hint":""},
+  {"id":"","label":"Negative Guidance minimum sigma","localized":"","hint":"Skip negative prompt for some steps when the image is almost ready, 0=disable"},
   {"id":"","label":"sigma tmin","localized":"","hint":""},
   {"id":"","label":"sigma noise","localized":"","hint":""},
   {"id":"","label":"Noise seed delta (eta)","localized":"","hint":""},
@@ -494,10 +494,9 @@
   {"id":"","label":"Card height for Extra Networks (px)","localized":"","hint":""},
   {"id":"","label":"Extra text to add before <...> when adding extra network to prompt","localized":"","hint":""},
   {"id":"","label":"Add hypernetwork to prompt","localized":"","hint":""},
-  {"id":"","label":"Enable redundant token merging via tomesd for speed and memory improvements","localized":"","hint":""},
-  {"id":"","label":"Token merging Ratio. Higher merging ratio = faster generation, smaller VRAM usage, lower quality","localized":"","hint":""},
-  {"id":"","label":"Apply only to high-res fix pass. Disabling can yield a ~20-35% speedup on contemporary resolutions","localized":"","hint":""},
-  {"id":"","label":"Merging Ratio (high-res pass) - If 'Apply only to high-res' is enabled, this will always be the ratio used","localized":"","hint":""},
+  {"id":"","label":"Token merging ratio","localized":"","hint":"Enable redundant token merging via tomesd for speed and memory improvements, 0=disabled"},
+  {"id":"","label":"Token merging ratio for img2img","localized":"","hint":"Enable redundant token merging for img2img via tomesd for speed and memory improvements, 0=disabled"},
+  {"id":"","label":"Token merging ratio for hires pass","localized":"","hint":"Enable redundant token merging for hires pass via tomesd for speed and memory improvements, 0=disabled"},
   {"id":"","label":"Use random perturbations - Can improve outputs for certain samplers. For others, it may cause visual artifacting","localized":"","hint":""},
   {"id":"","label":"Merge attention (Recommend on)","localized":"","hint":""},
   {"id":"","label":"Merge cross attention (Recommend off)","localized":"","hint":""},