diff --git a/release/datafiles/colormanagement/config.ocio b/release/datafiles/colormanagement/config.ocio
index 8f7f2b9aaf4..91d722a311f 100644
--- a/release/datafiles/colormanagement/config.ocio
+++ b/release/datafiles/colormanagement/config.ocio
@@ -171,7 +171,7 @@ colorspaces:
     name: Non-Color
     family: raw
     description: |
-        Color space used for images which contains non-color data (i.e. normal maps)
+        Color space used for images which contain non-color data (e.g. normal maps)
     equalitygroup:
     bitdepth: 32f
     isdata: true
diff --git a/release/scripts/startup/bl_ui/properties_physics_fluid.py b/release/scripts/startup/bl_ui/properties_physics_fluid.py
index 3cd4e8d2d0e..ef8ee7712e5 100644
--- a/release/scripts/startup/bl_ui/properties_physics_fluid.py
+++ b/release/scripts/startup/bl_ui/properties_physics_fluid.py
@@ -428,7 +428,7 @@ class PHYSICS_PT_fire(PhysicButtonsPanel, Panel):
         col.prop(domain, "flame_max_temp", text="Temperature Maximum")
         col.prop(domain, "flame_ignition", text="Minimum")
         row = col.row()
-        row.prop(domain, "flame_smoke_color", text="Flame Color")
+        row.prop(domain, "flame_smoke_color", text="Smoke Color")
 
 
 class PHYSICS_PT_liquid(PhysicButtonsPanel, Panel):
diff --git a/release/scripts/startup/bl_ui/properties_physics_softbody.py b/release/scripts/startup/bl_ui/properties_physics_softbody.py
index 14211d35261..ade331ac649 100644
--- a/release/scripts/startup/bl_ui/properties_physics_softbody.py
+++ b/release/scripts/startup/bl_ui/properties_physics_softbody.py
@@ -214,8 +214,12 @@ class PHYSICS_PT_softbody_edge(PhysicButtonsPanel, Panel):
 
         col = flow.column()
         col.prop(softbody, "spring_length", text="Length")
-        col.prop(softbody, "use_edge_collision", text="Collision Edge")
-        col.prop(softbody, "use_face_collision", text="Face")
+
+        col.separator()
+
+        col = flow.column(align=True, heading="Collision")
+        col.prop(softbody, "use_edge_collision", text="Edge", toggle=False)
+        col.prop(softbody, "use_face_collision", text="Face", toggle=False)
 
 
 class PHYSICS_PT_softbody_edge_aerodynamics(PhysicButtonsPanel, Panel):
diff --git a/source/blender/blenkernel/intern/object.cc b/source/blender/blenkernel/intern/object.cc
index b90e66c7401..f4911663942 100644
--- a/source/blender/blenkernel/intern/object.cc
+++ b/source/blender/blenkernel/intern/object.cc
@@ -883,13 +883,13 @@ static void object_blend_read_lib(BlendLibReader *reader, ID *id)
       if (ob->id.lib) {
         BLO_reportf_wrap(reports,
                          RPT_INFO,
-                         TIP_("Proxy lost from  object %s lib %s\n"),
+                         TIP_("Proxy lost from object %s lib %s\n"),
                          ob->id.name + 2,
                          ob->id.lib->filepath);
       }
       else {
         BLO_reportf_wrap(
-            reports, RPT_INFO, TIP_("Proxy lost from  object %s lib <NONE>\n"), ob->id.name + 2);
+            reports, RPT_INFO, TIP_("Proxy lost from object %s lib <NONE>\n"), ob->id.name + 2);
       }
       reports->count.missing_obproxies++;
     }
diff --git a/source/blender/editors/space_node/node_add.cc b/source/blender/editors/space_node/node_add.cc
index 805342a884a..4bb550a553f 100644
--- a/source/blender/editors/space_node/node_add.cc
+++ b/source/blender/editors/space_node/node_add.cc
@@ -622,7 +622,7 @@ void NODE_OT_add_collection(wmOperatorType *ot)
 {
   /* identifiers */
   ot->name = "Add Node Collection";
-  ot->description = "Add an collection info node to the current node editor";
+  ot->description = "Add a collection info node to the current node editor";
   ot->idname = "NODE_OT_add_collection";
 
   /* callbacks */
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c
index e51fe8832f0..bde9241e4ad 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c
@@ -385,7 +385,7 @@ static void object_offset_header_draw(const bContext *UNUSED(C), Panel *panel)
 
   PointerRNA *ptr = gpencil_modifier_panel_get_property_pointers(panel, NULL);
 
-  uiItemR(layout, ptr, "use_object_offset", 0, NULL, ICON_NONE);
+  uiItemR(layout, ptr, "use_object_offset", 0, IFACE_("Object Offset"), ICON_NONE);
 }
 
 static void object_offset_draw(const bContext *UNUSED(C), Panel *panel)
@@ -399,7 +399,7 @@ static void object_offset_draw(const bContext *UNUSED(C), Panel *panel)
   uiLayout *col = uiLayoutColumn(layout, false);
 
   uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_object_offset"));
-  uiItemR(col, ptr, "offset_object", 0, NULL, ICON_NONE);
+  uiItemR(col, ptr, "offset_object", 0, IFACE_("Object"), ICON_NONE);
 }
 
 static void random_panel_draw(const bContext *UNUSED(C), Panel *panel)
diff --git a/source/blender/makesrna/intern/rna_camera.c b/source/blender/makesrna/intern/rna_camera.c
index 0807dbe61eb..a1aa3261747 100644
--- a/source/blender/makesrna/intern/rna_camera.c
+++ b/source/blender/makesrna/intern/rna_camera.c
@@ -347,7 +347,7 @@ static void rna_def_camera_background_image(BlenderRNA *brna)
   prop = RNA_def_property(srna, "show_expanded", PROP_BOOLEAN, PROP_NONE);
   RNA_def_property_flag(prop, PROP_NO_DEG_UPDATE);
   RNA_def_property_boolean_sdna(prop, NULL, "flag", CAM_BGIMG_FLAG_EXPANDED);
-  RNA_def_property_ui_text(prop, "Show Expanded", "Show the expanded in the user interface");
+  RNA_def_property_ui_text(prop, "Show Expanded", "Show the details in the user interface");
   RNA_def_property_ui_icon(prop, ICON_DISCLOSURE_TRI_RIGHT, 1);
 
   prop = RNA_def_property(srna, "use_camera_clip", PROP_BOOLEAN, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_gpencil_modifier.c b/source/blender/makesrna/intern/rna_gpencil_modifier.c
index 6f985f75090..d9186021eb0 100644
--- a/source/blender/makesrna/intern/rna_gpencil_modifier.c
+++ b/source/blender/makesrna/intern/rna_gpencil_modifier.c
@@ -2267,7 +2267,7 @@ static void rna_def_modifier_gpencilarray(BlenderRNA *brna)
   RNA_def_property_pointer_sdna(prop, NULL, "object");
   RNA_def_property_ui_text(
       prop,
-      "Object Offset",
+      "Offset Object",
       "Use the location and rotation of another object to determine the distance and "
       "rotational change between arrayed items");
   RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
@@ -2352,7 +2352,7 @@ static void rna_def_modifier_gpencilarray(BlenderRNA *brna)
 
   prop = RNA_def_property(srna, "use_object_offset", PROP_BOOLEAN, PROP_NONE);
   RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_ARRAY_USE_OB_OFFSET);
-  RNA_def_property_ui_text(prop, "Object Offset", "Enable object offset");
+  RNA_def_property_ui_text(prop, "Use Object Offset", "Enable object offset");
   RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");
 
   prop = RNA_def_property(srna, "use_relative_offset", PROP_BOOLEAN, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 7aaed130783..d1e5fc913eb 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -5618,7 +5618,7 @@ static void rna_def_modifier_ocean(BlenderRNA *brna)
        "JONSWAP",
        0,
        "Established Ocean (Sharp Peaks)",
-       "Use for sharp peaks ('JONSWAP', Pierson-Moskowitz method) with peak sharpening"},
+       "Use for established oceans ('JONSWAP', Pierson-Moskowitz method) with peak sharpening"},
       {MOD_OCEAN_SPECTRUM_TEXEL_MARSEN_ARSLOE,
        "TEXEL_MARSEN_ARSLOE",
        0,
diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c
index 40000a49f03..ca336438a20 100644
--- a/source/blender/makesrna/intern/rna_object_force.c
+++ b/source/blender/makesrna/intern/rna_object_force.c
@@ -1964,7 +1964,7 @@ static void rna_def_softbody(BlenderRNA *brna)
   RNA_def_property_int_sdna(prop, NULL, "springpreload");
   RNA_def_property_range(prop, 0.0f, 200.0f);
   RNA_def_property_ui_text(
-      prop, "View Layer", "Alter spring length to shrink/blow up (unit %) 0 to disable");
+      prop, "Spring Length", "Alter spring length to shrink/blow up (unit %) 0 to disable");
   RNA_def_property_update(prop, 0, "rna_softbody_update");
 
   prop = RNA_def_property(srna, "aero", PROP_INT, PROP_NONE);
@@ -2016,13 +2016,13 @@ static void rna_def_softbody(BlenderRNA *brna)
   prop = RNA_def_property(srna, "ball_stiff", PROP_FLOAT, PROP_NONE);
   RNA_def_property_float_sdna(prop, NULL, "ballstiff");
   RNA_def_property_range(prop, 0.001f, 100.0f);
-  RNA_def_property_ui_text(prop, "Ball Size", "Ball inflating pressure");
+  RNA_def_property_ui_text(prop, "Stiffness", "Ball inflating pressure");
   RNA_def_property_update(prop, 0, "rna_softbody_update");
 
   prop = RNA_def_property(srna, "ball_damp", PROP_FLOAT, PROP_NONE);
   RNA_def_property_float_sdna(prop, NULL, "balldamp");
   RNA_def_property_range(prop, 0.001f, 1.0f);
-  RNA_def_property_ui_text(prop, "Ball Size", "Blending to inelastic collision");
+  RNA_def_property_ui_text(prop, "Dampening", "Blending to inelastic collision");
   RNA_def_property_update(prop, 0, "rna_softbody_update");
 
   /* Solver */
diff --git a/source/blender/makesrna/intern/rna_rigidbody.c b/source/blender/makesrna/intern/rna_rigidbody.c
index 7a499d10d3a..82d724878a7 100644
--- a/source/blender/makesrna/intern/rna_rigidbody.c
+++ b/source/blender/makesrna/intern/rna_rigidbody.c
@@ -1153,7 +1153,7 @@ static void rna_def_rigidbody_object(BlenderRNA *brna)
   RNA_def_property_float_default(prop, 0.0f);
   RNA_def_property_float_funcs(prop, NULL, "rna_RigidBodyOb_restitution_set", NULL);
   RNA_def_property_ui_text(prop,
-                           "Restitution",
+                           "Bounciness",
                            "Tendency of object to bounce after colliding with another "
                            "(0 = stays still, 1 = perfectly elastic)");
   RNA_def_property_update(prop, NC_OBJECT | ND_POINTCACHE, "rna_RigidBodyOb_reset");
diff --git a/source/blender/makesrna/intern/rna_shader_fx.c b/source/blender/makesrna/intern/rna_shader_fx.c
index 0a656222fd5..930d79fb0dc 100644
--- a/source/blender/makesrna/intern/rna_shader_fx.c
+++ b/source/blender/makesrna/intern/rna_shader_fx.c
@@ -432,7 +432,7 @@ static void rna_def_shader_fx_shadow(BlenderRNA *brna)
   prop = RNA_def_property(srna, "scale", PROP_FLOAT, PROP_XYZ);
   RNA_def_property_float_sdna(prop, NULL, "scale");
   RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
-  RNA_def_property_ui_text(prop, "Scale", "Offset of the shadow");
+  RNA_def_property_ui_text(prop, "Scale", "Scale of the shadow");
   RNA_def_property_update(prop, NC_OBJECT | ND_SHADERFX, "rna_ShaderFx_update");
 
   prop = RNA_def_property(srna, "shadow_color", PROP_FLOAT, PROP_COLOR);