Merge remote-tracking branch 'origin/blender-v4.2-release'

scripts/modules/addon_utils.py

@@ -1174,7 +1174,7 @@ def _initialize_extensions_site_packages(*, create=False):
 
 
 def _initialize_extensions_repos_once():
-    from bpy_extras.extensions.junction_module import JunctionModuleHandle
+    from _bpy_internal.extensions.junction_module import JunctionModuleHandle
     module_handle = JunctionModuleHandle(_ext_base_pkg_idname)
     module_handle.register_module()
     _ext_global.module_handle = module_handle

scripts/modules/bl_i18n_utils/settings.py

@@ -312,7 +312,7 @@ PYGETTEXT_KEYWORDS = (() +
     ((r"/\*name_display\*/\s*" + _msg_re + r"\s*,"),) +
 
     tuple((r"{}\(\s*" + _msg_re + r"\s*,\s*(?:" +
-           r"\s*,\s*)?(?:".join(_ctxt_re_gen(i) for i in range(PYGETTEXT_MAX_MULTI_CTXT)) + r")?\s*\)").format(it)
+           r"\s*,\s*)?(?:".join(_ctxt_re_gen(i) for i in range(PYGETTEXT_MAX_MULTI_CTXT)) + r")?\s*,?\s*\)").format(it)
           for it in ("BLT_I18N_MSGID_MULTI_CTXT",))
 )