Merge branch 'develop_upstream' into develop

# Conflicts:
#	fooocus_colab.ipynb
#	fooocus_version.py
#	language/en.json
#	modules/async_worker.py
#	requirements_versions.txt
#	update_log.md
#	webui.py

language/en.json

@@ -26,7 +26,7 @@
     "Upscale (1.5x)": "Upscale (1.5x)",
     "Upscale (2x)": "Upscale (2x)",
     "Upscale (Fast 2x)": "Upscale (Fast 2x)",
-    "\ud83d\udcd4 Document": "\uD83D\uDCD4 Document",
+    "\ud83d\udcd4 Documentation": "\uD83D\uDCD4 Documentation",
     "Image": "Image",
     "Stop At": "Stop At",
     "Weight": "Weight",
@@ -47,8 +47,9 @@
     "* \"Inpaint or Outpaint\" is powered by the sampler \"DPMPP Fooocus Seamless 2M SDE Karras Inpaint Sampler\" (beta)": "* \"Inpaint or Outpaint\" is powered by the sampler \"DPMPP Fooocus Seamless 2M SDE Karras Inpaint Sampler\" (beta)",
     "Advanced options": "Advanced options",
     "Generate mask from image": "Generate mask from image",
-    "Setting": "Setting",
+    "Settings": "Settings",
     "Style": "Style",
+    "Styles": "Styles",
     "Preset": "Preset",
     "Performance": "Performance",
     "Speed": "Speed",
@@ -283,7 +284,7 @@
     "Volumetric Lighting": "Volumetric Lighting",
     "Watercolor 2": "Watercolor 2",
     "Whimsical And Playful": "Whimsical And Playful",
-    "Model": "Model",
+    "Models": "Models",
     "Base Model (SDXL only)": "Base Model (SDXL only)",
     "sd_xl_base_1.0_0.9vae.safetensors": "sd_xl_base_1.0_0.9vae.safetensors",
     "bluePencilXL_v009.safetensors": "bluePencilXL_v009.safetensors",