scripts/modules/bpy/utils/__init__.py

@@ -355,7 +355,7 @@ def script_paths(*, subdir=None, user_pref=True, check_all=False, use_user=True)
 
     :arg subdir: Optional subdir.
     :type subdir: string
-    :arg user_pref: Include the user preference script path.
+    :arg user_pref: Include the user preference script paths.
     :type user_pref: bool
     :arg check_all: Include local, user and system paths rather just the paths Blender uses.
     :type check_all: bool
@@ -387,6 +387,9 @@ def script_paths(*, subdir=None, user_pref=True, check_all=False, use_user=True)
         if use_user:
             base_paths.append(path_user)
 
+    if user_pref:
+        base_paths.extend(script_paths_pref())
+
     scripts = []
     for path in base_paths:
         if not path:

scripts/startup/bl_ui/space_text.py

@@ -66,12 +66,12 @@ class TEXT_HT_footer(Header):
             if text.filepath:
                 if text.is_dirty:
                     row.label(
-                        text=iface_("File: *%s (unsaved)" % text.filepath),
+                        text=iface_("File: *%s (unsaved)") % text.filepath,
                         translate=False,
                     )
                 else:
                     row.label(
-                        text=iface_("File: %s" % text.filepath),
+                        text=iface_("File: %s") % text.filepath,
                         translate=False,
                     )
             else:

scripts/startup/bl_ui/space_userpref.py

@@ -1951,7 +1951,7 @@ class USERPREF_PT_addons(AddOnPanel, Panel):
 
         addon_user_dirs = tuple(
             p for p in (
-                *[os.path.join(pref_p, "addons") for pref_p in bpy.utils.script_path_user()],
+                *[os.path.join(pref_p, "addons") for pref_p in bpy.utils.script_paths_pref()],
                 bpy.utils.user_resource('SCRIPTS', path="addons"),
             )
             if p

source/blender/makesrna/intern/rna_nodetree.c

@@ -5014,7 +5014,7 @@ static void def_vector_math(StructRNA *srna)
   RNA_def_property_enum_sdna(prop, NULL, "custom1");
   RNA_def_property_enum_items(prop, rna_enum_node_vec_math_items);
   RNA_def_property_ui_text(prop, "Operation", "");
-  RNA_def_struct_translation_context(srna, BLT_I18NCONTEXT_ID_NODETREE);
+  RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_ID_NODETREE);
   RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_ShaderNode_socket_update");
 }