Cleanup: use title caps for labels

Also consistent quoting (single quotes for enums, text uses double).

17 files changed, 81 insertions, 80 deletions

diff --git a/release/scripts/startup/bl_ui/properties_animviz.py b/release/scripts/startup/bl_ui/properties_animviz.py
index 43c01822b58..9782d5a072c 100644
--- a/release/scripts/startup/bl_ui/properties_animviz.py
+++ b/release/scripts/startup/bl_ui/properties_animviz.py
@@ -87,11 +87,11 @@ class MotionPathButtonsPanel:
         col.label(text="Show:")
         col.prop(mps, "show_frame_numbers", text="Frame Numbers")
         if mpath is not None:
-            col.prop(mpath, "lines", text='Lines')
-            col.prop(mpath, "line_thickness", text='Thickness')
+            col.prop(mpath, "lines", text="Lines")
+            col.prop(mpath, "line_thickness", text="Thickness")
 
         col = split.column()
-        col.label('')
+        col.label("")
         col.prop(mps, "show_keyframe_highlight", text="Keyframes")
         sub = col.column()
         sub.enabled = mps.show_keyframe_highlight
@@ -102,10 +102,10 @@ class MotionPathButtonsPanel:
         # Customize path
         if mpath is not None:
             row = layout.row(align=True)
-            row.prop(mpath, "use_custom_color", text='', toggle=True, icon='COLOR')
+            row.prop(mpath, "use_custom_color", text="", toggle=True, icon='COLOR')
             sub = row.row(align=True)
             sub.enabled = mpath.use_custom_color
-            sub.prop(mpath, "color", text='')
+            sub.prop(mpath, "color", text="")
 
 
 # FIXME: this panel still needs to be ported so that it will work correctly with animviz
diff --git a/release/scripts/startup/bl_ui/properties_data_lamp.py b/release/scripts/startup/bl_ui/properties_data_lamp.py
index 98aa31ac915..f9394139b42 100644
--- a/release/scripts/startup/bl_ui/properties_data_lamp.py
+++ b/release/scripts/startup/bl_ui/properties_data_lamp.py
@@ -216,7 +216,7 @@ class DATA_PT_shadow(DataButtonsPanel, Panel):
             split = layout.split()
 
             col = split.column()
-            col.label(text="Form factor sampling:")
+            col.label(text="Form Factor Sampling:")
 
             sub = col.row(align=True)
 
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index d72855fab6b..14d016dca5f 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -381,7 +381,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
         split = layout.split()
 
         col = split.column()
-        col.label(text="Vertex group:")
+        col.label(text="Vertex Group:")
         col.prop_search(md, "vertex_group", ob, "vertex_groups", text="")
         sub = col.column()
         sub.active = bool(md.vertex_group)
@@ -917,9 +917,10 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
 
         scene = bpy.context.scene
         engine = scene.render.engine
-        show_adaptive_options = (engine == "CYCLES" and md == ob.modifiers[-1] and
-                                 scene.cycles.feature_set == "EXPERIMENTAL")
-
+        show_adaptive_options = (
+            engine == 'CYCLES' and md == ob.modifiers[-1] and
+            scene.cycles.feature_set == 'EXPERIMENTAL'
+        )
         if show_adaptive_options:
             col.label(text="View:")
             col.prop(md, "levels", text="Levels")
diff --git a/release/scripts/startup/bl_ui/properties_freestyle.py b/release/scripts/startup/bl_ui/properties_freestyle.py
index 9c5be7624e0..3d105934bf8 100644
--- a/release/scripts/startup/bl_ui/properties_freestyle.py
+++ b/release/scripts/startup/bl_ui/properties_freestyle.py
@@ -123,7 +123,7 @@ class RENDERLAYER_PT_freestyle(RenderLayerFreestyleButtonsPanel, Panel):
         layout.active = rl.use_freestyle
 
         row = layout.row()
-        layout.prop(freestyle, "mode", text="Control mode")
+        layout.prop(freestyle, "mode", text="Control Mode")
         layout.prop(freestyle, "use_view_map_cache", text="View Map Cache")
         layout.label(text="Edge Detection Options:")
 
@@ -285,7 +285,7 @@ class RENDERLAYER_PT_freestyle_linestyle(RenderLayerFreestyleEditorButtonsPanel,
 
     def draw_modifier_box_error(self, box, modifier, message):
         row = box.row()
-        row.label(text=message, icon="ERROR")
+        row.label(text=message, icon='ERROR')
 
     def draw_modifier_common(self, box, modifier):
         row = box.row()
diff --git a/release/scripts/startup/bl_ui/properties_game.py b/release/scripts/startup/bl_ui/properties_game.py
index 636a9707ab9..277b0842b3d 100644
--- a/release/scripts/startup/bl_ui/properties_game.py
+++ b/release/scripts/startup/bl_ui/properties_game.py
@@ -90,11 +90,11 @@ class PHYSICS_PT_game_physics(PhysicsButtonsPanel, Panel):
             split = layout.split()
 
             col = split.column()
-            col.label(text="Linear velocity:")
+            col.label(text="Linear Velocity:")
             sub = col.column(align=True)
             sub.prop(game, "velocity_min", text="Minimum")
             sub.prop(game, "velocity_max", text="Maximum")
-            col.label(text="Angular velocity:")
+            col.label(text="Angular Velocity:")
             sub = col.column(align=True)
             sub.prop(game, "angular_velocity_min", text="Minimum")
             sub.prop(game, "angular_velocity_max", text="Maximum")
diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
index 3795abff93c..2aa978a51d8 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -75,16 +75,16 @@ def gpencil_active_brush_settings_simple(context, layout):
 
     col.prop(brush, "line_width", slider=True)
     row = col.row(align=True)
-    row.prop(brush, "use_random_pressure", text='', icon='RNDCURVE')
+    row.prop(brush, "use_random_pressure", text="", icon='RNDCURVE')
     row.prop(brush, "pen_sensitivity_factor", slider=True)
-    row.prop(brush, "use_pressure", text='', icon='STYLUS_PRESSURE')
+    row.prop(brush, "use_pressure", text="", icon='STYLUS_PRESSURE')
     row = col.row(align=True)
-    row.prop(brush, "use_random_strength", text='', icon='RNDCURVE')
+    row.prop(brush, "use_random_strength", text="", icon='RNDCURVE')
     row.prop(brush, "strength", slider=True)
-    row.prop(brush, "use_strength_pressure", text='', icon='STYLUS_PRESSURE')
+    row.prop(brush, "use_strength_pressure", text="", icon='STYLUS_PRESSURE')
     row = col.row(align=True)
     row.prop(brush, "jitter", slider=True)
-    row.prop(brush, "use_jitter_pressure", text='', icon='STYLUS_PRESSURE')
+    row.prop(brush, "use_jitter_pressure", text="", icon='STYLUS_PRESSURE')
     row = col.row()
     row.prop(brush, "angle", slider=True)
     row.prop(brush, "angle_factor", text="Factor", slider=True)
@@ -340,19 +340,19 @@ class GreasePencilBrushPanel:
             row = layout.row()
             row.prop(brush, "line_width")
             row = layout.row(align=True)
-            row.prop(brush, "use_random_pressure", text='', icon='RNDCURVE')
+            row.prop(brush, "use_random_pressure", text="", icon='RNDCURVE')
             row.prop(brush, "pen_sensitivity_factor", slider=True)
-            row.prop(brush, "use_pressure", text='', icon='STYLUS_PRESSURE')
+            row.prop(brush, "use_pressure", text="", icon='STYLUS_PRESSURE')
             row = layout.row(align=True)
-            row.prop(brush, "use_random_strength", text='', icon='RNDCURVE')
+            row.prop(brush, "use_random_strength", text="", icon='RNDCURVE')
             row.prop(brush, "strength", slider=True)
-            row.prop(brush, "use_strength_pressure", text='', icon='STYLUS_PRESSURE')
+            row.prop(brush, "use_strength_pressure", text="", icon='STYLUS_PRESSURE')
             row = layout.row(align=True)
             row.prop(brush, "random_press", slider=True)
 
             row = layout.row(align=True)
             row.prop(brush, "jitter", slider=True)
-            row.prop(brush, "use_jitter_pressure", text='', icon='STYLUS_PRESSURE')
+            row.prop(brush, "use_jitter_pressure", text="", icon='STYLUS_PRESSURE')
             row = layout.row()
             row.prop(brush, "angle", slider=True)
             row.prop(brush, "angle_factor", text="Factor", slider=True)
@@ -365,7 +365,7 @@ class GreasePencilBrushPanel:
             col.separator()
             row = col.row(align=False)
             row.prop(brush, "pen_subdivision_steps")
-            row.prop(brush, "random_subdiv", text='Randomness', slider=True)
+            row.prop(brush, "random_subdiv", text="Randomness", slider=True)
 
 
 class GreasePencilStrokeSculptPanel:
@@ -609,9 +609,9 @@ class GPENCIL_MT_pie_settings_palette(Menu):
             row = col.row()
             row.operator("gpencil.stroke_join", text="Join").type = 'JOIN'
             row.operator("gpencil.stroke_join", text="Join & Copy").type = 'JOINCOPY'
-            col.operator("gpencil.stroke_flip", text="Flip direction")
+            col.operator("gpencil.stroke_flip", text="Flip Direction")
 
-            col.prop(gpd, "show_stroke_direction", text="Show drawing direction")
+            col.prop(gpd, "show_stroke_direction", text="Show Drawing Direction")
 
 
 class GPENCIL_MT_pie_tools_more(Menu):
@@ -839,8 +839,8 @@ class GPENCIL_MT_brush_specials(Menu):
 
     def draw(self, context):
         layout = self.layout
-        layout.operator("gpencil.brush_copy", icon='PASTEDOWN', text="Copy current drawing brush")
-        layout.operator("gpencil.brush_presets_create", icon='HELP', text="Create a set of predefined brushes")
+        layout.operator("gpencil.brush_copy", icon='PASTEDOWN', text="Copy Current Drawing Brush")
+        layout.operator("gpencil.brush_presets_create", icon='HELP', text="Create a Set of Predefined Brushes")
 
 
 class GPENCIL_MT_palettecolor_specials(Menu):
diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py
index dfd20d90ec4..b79f8263e39 100644
--- a/release/scripts/startup/bl_ui/properties_paint_common.py
+++ b/release/scripts/startup/bl_ui/properties_paint_common.py
@@ -157,9 +157,9 @@ def brush_texpaint_common(panel, context, layout, brush, settings, projpaint=Fal
         col.separator()
         if projpaint:
             if settings.mode == 'MATERIAL':
-                col.prop(settings, "use_clone_layer", text="Clone from paint slot")
+                col.prop(settings, "use_clone_layer", text="Clone from Paint Slot")
             elif settings.mode == 'IMAGE':
-                col.prop(settings, "use_clone_layer", text="Clone from image/UV map")
+                col.prop(settings, "use_clone_layer", text="Clone from Image/UV Map")
 
             if settings.use_clone_layer:
                 ob = context.active_object
diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py
index 23e7c0a6787..aa4cb0ba1e9 100644
--- a/release/scripts/startup/bl_ui/properties_particle.py
+++ b/release/scripts/startup/bl_ui/properties_particle.py
@@ -628,7 +628,7 @@ class PARTICLE_PT_physics(ParticleButtonsPanel, Panel):
                 split = layout.split()
 
                 col = split.column()
-                col.label(text="Fluid properties:")
+                col.label(text="Fluid Properties:")
                 col.prop(fluid, "stiffness", text="Stiffness")
                 col.prop(fluid, "linear_viscosity", text="Viscosity")
                 col.prop(fluid, "buoyancy", text="Buoyancy", slider=True)
@@ -749,7 +749,7 @@ class PARTICLE_PT_physics(ParticleButtonsPanel, Panel):
             if part.physics_type == 'BOIDS':
                 layout.label(text="Relations:")
             elif part.physics_type == 'FLUID':
-                layout.label(text="Fluid interaction:")
+                layout.label(text="Fluid Interaction:")
 
             row = layout.row()
             row.template_list("UI_UL_list", "particle_targets", psys, "targets",
@@ -1081,7 +1081,7 @@ class PARTICLE_PT_render(ParticleButtonsPanel, Panel):
             col = row.column()
             col.prop(part, "trail_count")
             if part.trail_count > 1:
-                col.prop(part, "use_absolute_path_time", text="Length in frames")
+                col.prop(part, "use_absolute_path_time", text="Length in Frames")
                 col = row.column()
                 col.prop(part, "path_end", text="Length", slider=not part.use_absolute_path_time)
                 col.prop(part, "length_random", text="Random", slider=True)
diff --git a/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py b/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
index cf1d4f38038..ec7287ef363 100644
--- a/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
+++ b/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
@@ -245,7 +245,7 @@ class PHYSICS_PT_dp_canvas_output(PhysicButtonsPanel, Panel):
 
                 # paint-map output
                 row = layout.row()
-                row.prop_search(surface, "output_name_a", ob.data, "vertex_colors", text="Paintmap layer")
+                row.prop_search(surface, "output_name_a", ob.data, "vertex_colors", text="Paintmap Layer")
                 if surface.output_exists(object=ob, index=0):
                     ic = 'ZOOMOUT'
                 else:
@@ -255,7 +255,7 @@ class PHYSICS_PT_dp_canvas_output(PhysicButtonsPanel, Panel):
 
                 # wet-map output
                 row = layout.row()
-                row.prop_search(surface, "output_name_b", ob.data, "vertex_colors", text="Wetmap layer")
+                row.prop_search(surface, "output_name_b", ob.data, "vertex_colors", text="Wetmap Layer")
                 if surface.output_exists(object=ob, index=1):
                     ic = 'ZOOMOUT'
                 else:
@@ -282,7 +282,7 @@ class PHYSICS_PT_dp_canvas_output(PhysicButtonsPanel, Panel):
             layout.prop(surface, "image_output_path", text="")
             row = layout.row()
             row.prop(surface, "image_fileformat", text="")
-            row.prop(surface, "use_premultiply", text="Premultiply alpha")
+            row.prop(surface, "use_premultiply", text="Premultiply Alpha")
 
             if surface_type == 'PAINT':
                 split = layout.split(percentage=0.4)
@@ -439,12 +439,12 @@ class PHYSICS_PT_dp_brush_source(PhysicButtonsPanel, Panel):
         if brush.paint_source == 'PARTICLE_SYSTEM':
             col.prop_search(brush, "particle_system", ob, "particle_systems", text="")
             if brush.particle_system:
-                col.label(text="Particle effect:")
+                col.label(text="Particle Effect:")
                 sub = col.column()
                 sub.active = not brush.use_particle_radius
                 sub.prop(brush, "solid_radius", text="Solid Radius")
                 col.prop(brush, "use_particle_radius", text="Use Particle's Radius")
-                col.prop(brush, "smooth_radius", text="Smooth radius")
+                col.prop(brush, "smooth_radius", text="Smooth Radius")
 
         if brush.paint_source in {'DISTANCE', 'VOLUME_DISTANCE', 'POINT'}:
             col.prop(brush, "paint_distance", text="Paint Distance")
diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py
index 98aa4057a6e..6101c715991 100644
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@ -287,7 +287,7 @@ class RENDER_PT_performance(RenderButtonsPanel, Panel):
         sub.prop(rd, "use_free_image_textures")
         sub = col.column()
         sub.active = rd.use_raytrace
-        sub.label(text="Acceleration structure:")
+        sub.label(text="Acceleration Structure:")
         sub.prop(rd, "raytrace_method", text="")
         if rd.raytrace_method == 'OCTREE':
             sub.prop(rd, "octree_resolution", text="Resolution")
@@ -348,7 +348,7 @@ class RENDER_PT_stamp(RenderButtonsPanel, Panel):
         col.active = rd.use_stamp
         row = col.row()
         row.prop(rd, "stamp_font_size", text="Font Size")
-        row.prop(rd, "use_stamp_labels", text="Draw labels")
+        row.prop(rd, "use_stamp_labels", text="Draw Labels")
 
         row = col.row()
         row.column().prop(rd, "stamp_foreground", slider=True)
@@ -483,9 +483,9 @@ class RENDER_PT_encoding(RenderButtonsPanel, Panel):
         layout.prop(ffmpeg, "gopsize")
         # B-Frames
         row = layout.row()
-        row.prop(ffmpeg, "use_max_b_frames", text='Max B-frames')
+        row.prop(ffmpeg, "use_max_b_frames", text="Max B-frames")
         pbox = row.split()
-        pbox.prop(ffmpeg, "max_b_frames", text='')
+        pbox.prop(ffmpeg, "max_b_frames", text="")
         pbox.enabled = ffmpeg.use_max_b_frames
 
         split = layout.split()
diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py
index 43679727992..57195d22340 100644
--- a/release/scripts/startup/bl_ui/space_clip.py
+++ b/release/scripts/startup/bl_ui/space_clip.py
@@ -1033,11 +1033,11 @@ class CLIP_PT_proxy(CLIP_PT_clip_view_panel, Panel):
         if clip.source == 'MOVIE':
             col2 = col.column()
 
-            col2.label(text="Use timecode index:")
+            col2.label(text="Use Timecode Index:")
             col2.prop(clip.proxy, "timecode", text="")
 
         col2 = col.column()
-        col2.label(text="Proxy render size:")
+        col2.label(text="Proxy Render Size:")
 
         col.prop(sc.clip_user, "proxy_render_size", text="")
 
@@ -1418,7 +1418,7 @@ class CLIP_MT_tracking_specials(Menu):
                         text="Enable Markers").action = 'ENABLE'
 
         layout.operator("clip.disable_markers",
-                        text="Disable markers").action = 'DISABLE'
+                        text="Disable Markers").action = 'DISABLE'
 
         layout.separator()
         layout.operator("clip.set_origin")
diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py
index b37b3c5705a..e2056905d93 100644
--- a/release/scripts/startup/bl_ui/space_node.py
+++ b/release/scripts/startup/bl_ui/space_node.py
@@ -187,10 +187,10 @@ class NODE_MT_view(Menu):
         if context.space_data.show_backdrop:
             layout.separator()
 
-            layout.operator("node.backimage_move", text="Backdrop move")
-            layout.operator("node.backimage_zoom", text="Backdrop zoom in").factor = 1.2
-            layout.operator("node.backimage_zoom", text="Backdrop zoom out").factor = 0.83333
-            layout.operator("node.backimage_fit", text="Fit backdrop to available space")
+            layout.operator("node.backimage_move", text="Backdrop Move")
+            layout.operator("node.backimage_zoom", text="Backdrop Zoom In").factor = 1.2
+            layout.operator("node.backimage_zoom", text="Backdrop Zoom Out").factor = 0.83333
+            layout.operator("node.backimage_fit", text="Fit Backdrop to Available Space")
 
         layout.separator()
 
@@ -243,7 +243,7 @@ class NODE_MT_node(Menu):
 
         layout.separator()
 
-        layout.operator("node.join", text="Join in new Frame")
+        layout.operator("node.join", text="Join in New Frame")
         layout.operator("node.detach", text="Remove from Frame")
 
         layout.separator()
diff --git a/release/scripts/startup/bl_ui/space_outliner.py b/release/scripts/startup/bl_ui/space_outliner.py
index 4eb550bbb35..731ab3d4b14 100644
--- a/release/scripts/startup/bl_ui/space_outliner.py
+++ b/release/scripts/startup/bl_ui/space_outliner.py
@@ -56,7 +56,7 @@ class OUTLINER_HT_header(Header):
                 row.operator("anim.keyframe_delete", text="", icon='KEY_DEHLT')
             else:
                 row = layout.row()
-                row.label(text="No Keying Set active")
+                row.label(text="No Keying Set Active")
         elif space.display_mode == 'ORPHAN_DATA':
             layout.operator("outliner.orphans_purge")
 
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py
index d155f5868f4..06dd90685b7 100644
--- a/release/scripts/startup/bl_ui/space_sequencer.py
+++ b/release/scripts/startup/bl_ui/space_sequencer.py
@@ -43,7 +43,7 @@ def draw_color_balance(layout, color_balance):
     col.separator()
     col.separator()
     col.prop(color_balance, "lift", text="")
-    col.prop(color_balance, "invert_lift", text="Invert", icon="ARROW_LEFTRIGHT")
+    col.prop(color_balance, "invert_lift", text="Invert", icon='ARROW_LEFTRIGHT')
     split.template_color_picker(color_balance, "lift", value_slider=True,  cubic=True)
 
     box = layout.box()
@@ -53,7 +53,7 @@ def draw_color_balance(layout, color_balance):
     col.separator()
     col.separator()
     col.prop(color_balance, "gamma", text="")
-    col.prop(color_balance, "invert_gamma", text="Invert", icon="ARROW_LEFTRIGHT")
+    col.prop(color_balance, "invert_gamma", text="Invert", icon='ARROW_LEFTRIGHT')
     split.template_color_picker(color_balance, "gamma", value_slider=True, lock_luminosity=True, cubic=True)
 
     box = layout.box()
@@ -63,7 +63,7 @@ def draw_color_balance(layout, color_balance):
     col.separator()
     col.separator()
     col.prop(color_balance, "gain", text="")
-    col.prop(color_balance, "invert_gain", text="Invert", icon="ARROW_LEFTRIGHT")
+    col.prop(color_balance, "invert_gain", text="Invert", icon='ARROW_LEFTRIGHT')
     split.template_color_picker(color_balance, "gain", value_slider=True, lock_luminosity=True, cubic=True)
 
 
@@ -197,7 +197,7 @@ class SEQUENCER_MT_view(Menu):
             layout.operator_context = 'INVOKE_DEFAULT'
         if is_preview:
             layout.operator_context = 'INVOKE_REGION_PREVIEW'
-            layout.operator("sequencer.view_all_preview", text="Fit preview in window")
+            layout.operator("sequencer.view_all_preview", text="Fit Preview in Window")
 
             layout.separator()
 
@@ -246,10 +246,10 @@ class SEQUENCER_MT_select(Menu):
 
         layout.operator("sequencer.select_active_side", text="Strips to the Left").side = 'LEFT'
         layout.operator("sequencer.select_active_side", text="Strips to the Right").side = 'RIGHT'
-        props = layout.operator("sequencer.select", text="All strips to the Left")
+        props = layout.operator("sequencer.select", text="All Strips to the Left")
         props.left_right = 'LEFT'
         props.linked_time = True
-        props = layout.operator("sequencer.select", text="All strips to the Right")
+        props = layout.operator("sequencer.select", text="All Strips to the Right")
         props.left_right = 'RIGHT'
         props.linked_time = True
 
@@ -397,15 +397,15 @@ class SEQUENCER_MT_strip(Menu):
         layout.operator_context = 'INVOKE_REGION_WIN'
 
         layout.operator("transform.transform", text="Grab/Move").mode = 'TRANSLATION'
-        layout.operator("transform.transform", text="Grab/Extend from frame").mode = 'TIME_EXTEND'
+        layout.operator("transform.transform", text="Grab/Extend from Frame").mode = 'TIME_EXTEND'
         layout.operator("sequencer.gap_remove").all = False
         layout.operator("sequencer.gap_insert")
 
         #  uiItemO(layout, NULL, 0, "sequencer.strip_snap"); // TODO - add this operator
         layout.separator()
 
-        layout.operator("sequencer.cut", text="Cut (hard) at frame").type = 'HARD'
-        layout.operator("sequencer.cut", text="Cut (soft) at frame").type = 'SOFT'
+        layout.operator("sequencer.cut", text="Cut (Hard) at Frame").type = 'HARD'
+        layout.operator("sequencer.cut", text="Cut (Soft) at Frame").type = 'SOFT'
         layout.operator("sequencer.slip", text="Slip Strip Contents")
         layout.operator("sequencer.images_separate")
         layout.operator("sequencer.offset_clear")
@@ -631,7 +631,7 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel):
                 if strip.use_as_speed:
                     layout.prop(strip, "speed_factor")
                 else:
-                    layout.prop(strip, "speed_factor", text="Frame number")
+                    layout.prop(strip, "speed_factor", text="Frame Number")
                     layout.prop(strip, "scale_to_length")
 
         elif strip.type == 'TRANSFORM':
@@ -698,7 +698,7 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel):
                         row.label("")
             else:
                 col.separator()
-                col.label(text="Two or more channels are needed below this strip", icon="INFO")
+                col.label(text="Two or more channels are needed below this strip", icon='INFO')
 
 
         elif strip.type == 'TEXT':
@@ -728,7 +728,7 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel):
         elif strip.type in {'CROSS', 'GAMMA_CROSS', 'WIPE', 'ALPHA_OVER', 'ALPHA_UNDER', 'OVER_DROP'}:
             col.prop(strip, "use_default_fade", "Default fade")
             if not strip.use_default_fade:
-                col.prop(strip, "effect_fader", text="Effect fader")
+                col.prop(strip, "effect_fader", text="Effect Fader")
         elif strip.type == 'GAUSSIAN_BLUR':
             row = col.row(align=True)
             row.prop(strip, "size_x")
@@ -784,7 +784,7 @@ class SEQUENCER_PT_input(SequencerButtonsPanel, Panel):
             split.label(text="Alpha:")
             split.prop(strip, "alpha_mode", text="")
 
-            layout.operator("sequencer.change_path", icon="FILESEL").filter_image = True
+            layout.operator("sequencer.change_path", icon='FILESEL').filter_image = True
 
         elif seq_type == 'MOVIE':
             split = layout.split(percentage=0.2)
@@ -1056,9 +1056,9 @@ class SEQUENCER_PT_proxy(SequencerButtonsPanel, Panel):
             proxy = strip.proxy
 
             flow = layout.column_flow()
-            flow.prop(sequencer, "proxy_storage", text='Storage')
+            flow.prop(sequencer, "proxy_storage", text="Storage")
             if sequencer.proxy_storage == 'PROJECT':
-                flow.prop(sequencer, "proxy_dir", text='Directory')
+                flow.prop(sequencer, "proxy_dir", text="Directory")
             else:
                 flow.prop(proxy, "use_proxy_custom_directory")
                 flow.prop(proxy, "use_proxy_custom_file")
@@ -1077,7 +1077,7 @@ class SEQUENCER_PT_proxy(SequencerButtonsPanel, Panel):
             layout.prop(proxy, "use_overwrite")
 
             col = layout.column()
-            col.prop(proxy, "quality", text="Build JPEG quality")
+            col.prop(proxy, "quality", text="Build JPEG Quality")
 
             if strip.type == 'MOVIE':
                 col = layout.column()
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index 468b631416a..5ba1f0b8dcb 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -479,7 +479,7 @@ class USERPREF_PT_system(Panel):
         col.label(text="Sound:")
         col.row().prop(system, "audio_device", expand=False)
         sub = col.column()
-        sub.active = system.audio_device != 'NONE' and system.audio_device != 'Null'
+        sub.active = system.audio_device not in {'NONE', 'Null'}
         #sub.prop(system, "use_preview_images")
         sub.prop(system, "audio_channels", text="Channels")
         sub.prop(system, "audio_mixing_buffer", text="Mixing Buffer")
@@ -1107,29 +1107,29 @@ class USERPREF_MT_ndof_settings(Menu):
             layout.prop(input_prefs, "ndof_show_guide")
 
             layout.separator()
-            layout.label(text="Orbit style")
+            layout.label(text="Orbit Style")
             layout.row().prop(input_prefs, "ndof_view_navigate_method", text="")
             layout.row().prop(input_prefs, "ndof_view_rotate_method", text="")
             layout.separator()
-            layout.label(text="Orbit options")
+            layout.label(text="Orbit Options")
             layout.prop(input_prefs, "ndof_rotx_invert_axis")
             layout.prop(input_prefs, "ndof_roty_invert_axis")
             layout.prop(input_prefs, "ndof_rotz_invert_axis")
 
         # view2d use pan/zoom
         layout.separator()
-        layout.label(text="Pan options")
+        layout.label(text="Pan Options")
         layout.prop(input_prefs, "ndof_panx_invert_axis")
         layout.prop(input_prefs, "ndof_pany_invert_axis")
         layout.prop(input_prefs, "ndof_panz_invert_axis")
         layout.prop(input_prefs, "ndof_pan_yz_swap_axis")
 
-        layout.label(text="Zoom options")
+        layout.label(text="Zoom Options")
         layout.prop(input_prefs, "ndof_zoom_invert")
 
         if is_view3d:
             layout.separator()
-            layout.label(text="Fly/Walk options")
+            layout.label(text="Fly/Walk Options")
             layout.prop(input_prefs, "ndof_fly_helicopter", icon='NDOF_FLY')
             layout.prop(input_prefs, "ndof_lock_horizon", icon='NDOF_DOM')
 
@@ -1454,7 +1454,7 @@ class USERPREF_PT_addons(Panel):
 
                 sub = row.row()
                 sub.active = is_enabled
-                sub.label(text='%s: %s' % (info["category"], info["name"]))
+                sub.label(text="%s: %s" % (info["category"], info["name"]))
                 if info["warning"]:
                     sub.label(icon='ERROR')
 
@@ -1482,11 +1482,11 @@ class USERPREF_PT_addons(Panel):
                     if info["version"]:
                         split = colsub.row().split(percentage=0.15)
                         split.label(text="Version:")
-                        split.label(text='.'.join(str(x) for x in info["version"]), translate=False)
+                        split.label(text=".".join(str(x) for x in info["version"]), translate=False)
                     if info["warning"]:
                         split = colsub.row().split(percentage=0.15)
                         split.label(text="Warning:")
-                        split.label(text='  ' + info["warning"], icon='ERROR')
+                        split.label(text="  " + info["warning"], icon='ERROR')
 
                     user_addon = USERPREF_PT_addons.is_user_addon(mod, user_addon_paths)
                     tot_row = bool(info["wiki_url"]) + bool(user_addon)
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index f4e83530383..2a96905a359 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -1711,7 +1711,7 @@ class VIEW3D_MT_brush(Menu):
 
         # skip if no active brush
         if not brush:
-            layout.label(text="No Brushes currently available", icon="INFO")
+            layout.label(text="No Brushes currently available", icon='INFO')
             return
 
         # brush paint modes
@@ -2114,7 +2114,7 @@ class VIEW3D_MT_pose_transform(Menu):
 
         layout.separator()
 
-        layout.operator("pose.user_transforms_clear", text="Reset unkeyed")
+        layout.operator("pose.user_transforms_clear", text="Reset Unkeyed")
 
 
 class VIEW3D_MT_pose_slide(Menu):
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 4026bc972fe..eb1b2e5971d 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -1925,7 +1925,7 @@ class VIEW3D_PT_tools_particlemode(View3DPanel, Panel):
         col = layout.column(align=True)
         if pe.is_hair:
             col.active = pe.is_editable
-            col.prop(pe, "use_emitter_deflect", text="Deflect emitter")
+            col.prop(pe, "use_emitter_deflect", text="Deflect Emitter")
             sub = col.row(align=True)
             sub.active = pe.use_emitter_deflect
             sub.prop(pe, "emitter_distance", text="Distance")