/trunk: Removed final points in UI strings and messages.

Plus a few styling enhancements.

[[Split portion of a mixed commit.]]

52 files changed, 503 insertions, 424 deletions

diff --git a/add_curve_ivygen.py b/add_curve_ivygen.py
index 30fdb336..30ad75e8 100644
--- a/add_curve_ivygen.py
+++ b/add_curve_ivygen.py
@@ -26,7 +26,7 @@ bl_info = {
     "api": 39307,
     "location": "View3D > Add > Curve",
     "description": "Adds generated ivy to a mesh object starting at the 3D"\
-                   " cursor.",
+                   " cursor",
     "warning": "",
     "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/"\
                 "Scripts/Curve/Ivy_Gen",
@@ -448,45 +448,45 @@ class IvyGen(bpy.types.Operator):
     bl_options = {'REGISTER', 'UNDO'}
 
     maxIvyLength = FloatProperty(name="Max Ivy Length",
-                    description="Maximum ivy length in Blender Units.",
+                    description="Maximum ivy length in Blender Units",
                     default=1.0,
                     min=0.0,
                     soft_max=3.0,
                     subtype='DISTANCE',
                     unit='LENGTH')
     primaryWeight = FloatProperty(name="Primary Weight",
-                    description="Weighting given to the current direction.",
+                    description="Weighting given to the current direction",
                     default=0.5,
                     min=0.0,
                     soft_max=1.0)
     randomWeight = FloatProperty(name="Random Weight",
-                    description="Weighting given to the random direction.",
+                    description="Weighting given to the random direction",
                     default=0.2,
                     min=0.0,
                     soft_max=1.0)
     gravityWeight = FloatProperty(name="Gravity Weight",
-                    description="Weighting given to the gravity direction.",
+                    description="Weighting given to the gravity direction",
                     default=1.0,
                     min=0.0,
                     soft_max=1.0)
     adhesionWeight = FloatProperty(name="Adhesion Weight",
-                    description="Weighting given to the adhesion direction.",
+                    description="Weighting given to the adhesion direction",
                     default=0.1,
                     min=0.0,
                     soft_max=1.0)
     branchingProbability = FloatProperty(name="Branching Probability",
-                    description="Probability of a new branch forming.",
+                    description="Probability of a new branch forming",
                     default=0.05,
                     min=0.0,
                     soft_max=1.0)
     leafProbability = FloatProperty(name="Leaf Probability",
-                    description="Probability of a leaf forming.",
+                    description="Probability of a leaf forming",
                     default=0.35,
                     min=0.0,
                     soft_max=1.0)
     ivySize = FloatProperty(name="Ivy Size",
                     description=("The length of an ivy segment in Blender"
-                                 " Units."),
+                                 " Units"),
                     default=0.02,
                     min=0.0,
                     soft_max=1.0,
@@ -505,19 +505,19 @@ class IvyGen(bpy.types.Operator):
                     precision=4)
     maxFloatLength = FloatProperty(name="Max Float Length",
                     description=("The maximum distance that a branch "
-                                 "can live while floating."),
+                                 "can live while floating"),
                     default=0.5,
                     min=0.0,
                     soft_max=1.0)
     maxAdhesionDistance = FloatProperty(name="Max Adhesion Length",
                     description=("The maximum distance that a branch "
-                                 "will feel the effects of adhesion."),
+                                 "will feel the effects of adhesion"),
                     default=1.0,
                     min=0.0,
                     soft_max=2.0,
                     precision=2)
     randomSeed = IntProperty(name="Random Seed",
-                    description="The seed governing random generation.",
+                    description="The seed governing random generation",
                     default=0,
                     min=0)
     maxTime = FloatProperty(name="Maximum Time",
@@ -527,7 +527,7 @@ class IvyGen(bpy.types.Operator):
                     min=0.0,
                     soft_max=10)
     growLeaves = BoolProperty(name="Grow Leaves",
-                    description="Grow leaves or not.",
+                    description="Grow leaves or not",
                     default=True)
     updateIvy = BoolProperty(name="Update Ivy", default=False)
 
diff --git a/add_curve_torus_knots.py b/add_curve_torus_knots.py
index 5854d42f..5d5551aa 100644
--- a/add_curve_torus_knots.py
+++ b/add_curve_torus_knots.py
@@ -107,7 +107,7 @@ class torus_knot_plus(bpy.types.Operator, AddObjectHelper):
     #### general options
     options_plus = BoolProperty(name="plus options",
                 default=False,
-                description="Show more options (the plus part).")
+                description="Show more options (the plus part)")
 
     #### GEO Options
     geo_surf = BoolProperty(name="Surface",
diff --git a/add_mesh_BoltFactory/createMesh.py b/add_mesh_BoltFactory/createMesh.py
index 2b6f9dea..a7eda066 100644
--- a/add_mesh_BoltFactory/createMesh.py
+++ b/add_mesh_BoltFactory/createMesh.py
@@ -53,7 +53,7 @@ def unpack_face_list(list_of_tuples):
         face = [i for i in t]
 
         if len(face) != 3 and len(face) != 4:
-            raise RuntimeError("{0} vertices in face.".format(len(face)))
+            raise RuntimeError("{0} vertices in face".format(len(face)))
         
         # rotate indices if the 4th is 0
         if len(face) == 4 and face[3] == 0:
diff --git a/add_mesh_ant_landscape.py b/add_mesh_ant_landscape.py
index ffcf0a27..8a944315 100644
--- a/add_mesh_ant_landscape.py
+++ b/add_mesh_ant_landscape.py
@@ -534,31 +534,31 @@ class landscape_add(bpy.types.Operator):
                 min=1,
                 max=16,
                 default=6,
-                description="Noise Depth - number of frequencies in the fBm.")
+                description="Noise Depth - number of frequencies in the fBm")
 
     mDimension = FloatProperty(name="Dimension",
                 min=0.01,
                 max=2.0,
                 default=1.0,
-                description="H - fractal dimension of the roughest areas.")
+                description="H - fractal dimension of the roughest areas")
 
     mLacunarity = FloatProperty(name="Lacunarity",
                 min=0.01,
                 max=6.0,
                 default=2.0,
-                description="Lacunarity - gap between successive frequencies.")
+                description="Lacunarity - gap between successive frequencies")
 
     mOffset = FloatProperty(name="Offset",
                 min=0.01,
                 max=6.0,
                 default=1.0,
-                description="Offset - raises the terrain from sea level.")
+                description="Offset - raises the terrain from sea level")
 
     mGain = FloatProperty(name="Gain",
                 min=0.01,
                 max=6.0,
                 default=1.0,
-                description="Gain - scale factor.")
+                description="Gain - scale factor")
 
     BiasTypes = [
                 ("0","Sin","Sin"),
diff --git a/add_mesh_extra_objects/add_mesh_3d_function_surface.py b/add_mesh_extra_objects/add_mesh_3d_function_surface.py
index 8965a820..01560311 100644
--- a/add_mesh_extra_objects/add_mesh_3d_function_surface.py
+++ b/add_mesh_extra_objects/add_mesh_3d_function_surface.py
@@ -239,24 +239,24 @@ class AddZFunctionSurface(bpy.types.Operator):
         default="1 - ( x**2 + y**2 )")
 
     div_x = IntProperty(name="X Subdivisions",
-        description="Number of vertices in x direction.",
+        description="Number of vertices in x direction",
         default=16,
         min=3,
         max=256)
     div_y = IntProperty(name="Y Subdivisions",
-        description="Number of vertices in y direction.",
+        description="Number of vertices in y direction",
         default=16,
         min=3,
         max=256)
 
     size_x = FloatProperty(name="X Size",
-        description="Size of the x axis.",
+        description="Size of the x axis",
         default=2.0,
         min=0.01,
         max=100.0,
         unit="LENGTH")
     size_y = FloatProperty(name="Y Size",
-        description="Size of the y axis.",
+        description="Size of the y axis",
         default=2.0,
         min=0.01,
         max=100.0,
@@ -504,13 +504,13 @@ class AddXYZFunctionSurface(bpy.types.Operator):
         default="sin(v)*(1+cos(u))*sin(v/8)")
 
     range_u_min = FloatProperty(name="U min",
-        description="Minimum U value. Lower boundary of U range.",
+        description="Minimum U value. Lower boundary of U range",
         min=-100.00,
         max=0.00,
         default=0.00)
 
     range_u_max = FloatProperty(name="U max",
-        description="Maximum U value. Upper boundary of U range.",
+        description="Maximum U value. Upper boundary of U range",
         min=0.00,
         max=100.00,
         default=2 * pi)
@@ -526,13 +526,13 @@ class AddXYZFunctionSurface(bpy.types.Operator):
         default=True)
 
     range_v_min = FloatProperty(name="V min",
-        description="Minimum V value. Lower boundary of V range.",
+        description="Minimum V value. Lower boundary of V range",
         min=-100.00,
         max=0.00,
         default=0.00)
 
     range_v_max = FloatProperty(name="V max",
-        description="Maximum V value. Upper boundary of V range.",
+        description="Maximum V value. Upper boundary of V range",
         min=0.00,
         max=100.00,
         default=4 * pi)
diff --git a/add_mesh_extra_objects/add_mesh_extra_objects.py b/add_mesh_extra_objects/add_mesh_extra_objects.py
index c545056a..a90b7224 100644
--- a/add_mesh_extra_objects/add_mesh_extra_objects.py
+++ b/add_mesh_extra_objects/add_mesh_extra_objects.py
@@ -368,8 +368,8 @@ class AddSqorus(bpy.types.Operator):
         max=1.99,
         default=2.0 / 3.0)
     subdivide = BoolProperty(name="Subdivide Outside",
-        description="Enable to subdivide the faces on the outside." \
-            " This results in equally spaced vertices.",
+        description="Enable to subdivide the faces on the outside " \
+                    "(this results in equally spaced vertices)",
         default=True)
 
     def execute(self, context):
diff --git a/add_mesh_extra_objects/add_mesh_gemstones.py b/add_mesh_extra_objects/add_mesh_gemstones.py
index 02bc10f4..481ca8b5 100644
--- a/add_mesh_extra_objects/add_mesh_gemstones.py
+++ b/add_mesh_extra_objects/add_mesh_gemstones.py
@@ -286,7 +286,7 @@ class AddGem(bpy.types.Operator):
     """Add a diamond gem"""
     bl_idname = "mesh.primitive_gem_add"
     bl_label = "Add Gem"
-    bl_description = "Create an offset faceted gem."
+    bl_description = "Create an offset faceted gem"
     bl_options = {'REGISTER', 'UNDO'}
 
     segments = IntProperty(name="Segments",
@@ -300,17 +300,17 @@ class AddGem(bpy.types.Operator):
        max=9999.0,
        default=1.0)
     crown_radius = FloatProperty(name="Table Radius",
-       description="Radius of the table(top).",
+       description="Radius of the table(top)",
        min=0.01,
        max=9999.0,
        default=0.6)
     crown_height = FloatProperty(name="Table height",
-       description="Height of the top half.",
+       description="Height of the top half",
        min=0.01,
        max=9999.0,
        default=0.35)
     pavilion_height = FloatProperty(name="Pavilion height",
-       description="Height of bottom half.",
+       description="Height of bottom half",
        min=0.01,
        max=9999.0,
        default=0.8)
diff --git a/add_mesh_pipe_joint.py b/add_mesh_pipe_joint.py
index a726be7b..03f5a72b 100644
--- a/add_mesh_pipe_joint.py
+++ b/add_mesh_pipe_joint.py
@@ -227,31 +227,31 @@ class AddElbowJoint(bpy.types.Operator):
     bl_options = {'REGISTER', 'UNDO'}
 
     radius = FloatProperty(name="Radius",
-        description="The radius of the pipe.",
+        description="The radius of the pipe",
         default=1.0,
         min=0.01,
         max=100.0,
         unit="LENGTH")
     div = IntProperty(name="Divisions",
-        description="Number of vertices (divisions).",
+        description="Number of vertices (divisions)",
         default=32, min=3, max=256)
 
     angle = FloatProperty(name="Angle",
-        description="The angle of the branching pipe (i.e. the 'arm')." \
-            " Measured from the center line of the main pipe.",
+        description="The angle of the branching pipe (i.e. the 'arm' - " \
+                    "Measured from the center line of the main pipe",
         default=radians(45.0),
         min=radians(-179.9),
         max=radians(179.9),
         unit="ROTATION")
 
     startLength = FloatProperty(name="Length Start",
-        description="Length of the beginning of the pipe.",
+        description="Length of the beginning of the pipe",
         default=3.0,
         min=0.01,
         max=100.0,
         unit="LENGTH")
     endLength = FloatProperty(name="End Length",
-        description="Length of the end of the pipe.",
+        description="Length of the end of the pipe",
         default=3.0,
         min=0.01,
         max=100.0,
@@ -328,20 +328,20 @@ class AddTeeJoint(bpy.types.Operator):
     bl_options = {'REGISTER', 'UNDO'}
 
     radius = FloatProperty(name="Radius",
-        description="The radius of the pipe.",
+        description="The radius of the pipe",
         default=1.0,
         min=0.01,
         max=100.0,
         unit="LENGTH")
     div = IntProperty(name="Divisions",
-        description="Number of vertices (divisions).",
+        description="Number of vertices (divisions)",
         default=32,
         min=4,
         max=256)
 
     angle = FloatProperty(name="Angle",
-        description="The angle of the branching pipe (i.e. the 'arm')." \
-            " Measured from the center line of the main pipe.",
+        description="The angle of the branching pipe (i.e. the 'arm' - " \
+                    "Measured from the center line of the main pipe",
         default=radians(90.0),
         min=radians(0.1),
         max=radians(179.9),
@@ -349,20 +349,20 @@ class AddTeeJoint(bpy.types.Operator):
 
     startLength = FloatProperty(name="Length Start",
         description="Length of the beginning of the" \
-            " main pipe (the straight one).",
+                    " main pipe (the straight one)",
         default=3.0,
         min=0.01,
         max=100.0,
         unit="LENGTH")
     endLength = FloatProperty(name="End Length",
         description="Length of the end of the" \
-            " main pipe (the straight one).",
+                    " main pipe (the straight one)",
         default=3.0,
         min=0.01,
         max=100.0,
         unit="LENGTH")
     branchLength = FloatProperty(name="Arm Length",
-        description="Length of the arm pipe (the bent one).",
+        description="Length of the arm pipe (the bent one)",
         default=3.0,
         min=0.01,
         max=100.0,
@@ -505,27 +505,27 @@ class AddWyeJoint(bpy.types.Operator):
     bl_options = {'REGISTER', 'UNDO'}
 
     radius = FloatProperty(name="Radius",
-        description="The radius of the pipe.",
+        description="The radius of the pipe",
         default=1.0,
         min=0.01,
         max=100.0,
         unit="LENGTH")
     div = IntProperty(name="Divisions",
-        description="Number of vertices (divisions).",
+        description="Number of vertices (divisions)",
         default=32,
         min=4,
         max=256)
 
     angle1 = FloatProperty(name="Angle 1",
-        description="The angle of the 1. branching pipe." \
-            " Measured from the center line of the main pipe.",
+        description="The angle of the 1. branching pipe " \
+                    "(measured from the center line of the main pipe)",
         default=radians(45.0),
         min=radians(-179.9),
         max=radians(179.9),
         unit="ROTATION")
     angle2 = FloatProperty(name="Angle 2",
-        description="The angle of the 2. branching pipe." \
-            " Measured from the center line of the main pipe.",
+        description="The angle of the 2. branching pipe " \
+                    "(measured from the center line of the main pipe) ",
         default=radians(45.0),
         min=radians(-179.9),
         max=radians(179.9),
@@ -533,19 +533,19 @@ class AddWyeJoint(bpy.types.Operator):
 
     startLength = FloatProperty(name="Length Start",
         description="Length of the beginning of the" \
-            " main pipe (the straight one).",
+                    " main pipe (the straight one)",
         default=3.0,
         min=0.01,
         max=100.0,
         unit="LENGTH")
     branch1Length = FloatProperty(name="Length Arm 1",
-        description="Length of the 1. arm.",
+        description="Length of the 1. arm",
         default=3.0,
         min=0.01,
         max=100.0,
         unit="LENGTH")
     branch2Length = FloatProperty(name="Length Arm 2",
-        description="Length of the 2. arm.",
+        description="Length of the 2. arm",
         default=3.0,
         min=0.01,
         max=100.0,
@@ -700,31 +700,31 @@ class AddCrossJoint(bpy.types.Operator):
     bl_options = {'REGISTER', 'UNDO'}
 
     radius = FloatProperty(name="Radius",
-        description="The radius of the pipe.",
+        description="The radius of the pipe",
         default=1.0,
         min=0.01,
         max=100.0,
         unit="LENGTH")
     div = IntProperty(name="Divisions",
-        description="Number of vertices (divisions).",
+        description="Number of vertices (divisions)",
         default=32,
         min=4,
         max=256)
 
     angle1 = FloatProperty(name="Angle 1",
-        description="The angle of the 1. arm (from the main axis).",
+        description="The angle of the 1. arm (from the main axis)",
         default=radians(90.0),
         min=radians(-179.9),
         max=radians(179.9),
         unit="ROTATION")
     angle2 = FloatProperty(name="Angle 2",
-        description="The angle of the 2. arm (from the main axis).",
+        description="The angle of the 2. arm (from the main axis)",
         default=radians(90.0),
         min=radians(-179.9),
         max=radians(179.9),
         unit="ROTATION")
     angle3 = FloatProperty(name="Angle 3 (center)",
-        description="The angle of the center arm (from the main axis).",
+        description="The angle of the center arm (from the main axis)",
         default=radians(0.0),
         min=radians(-179.9),
         max=radians(179.9),
@@ -732,25 +732,25 @@ class AddCrossJoint(bpy.types.Operator):
 
     startLength = FloatProperty(name="Length Start",
         description="Length of the beginning of the " \
-                "main pipe (the straight one).",
+                    "main pipe (the straight one)",
         default=3.0,
         min=0.01,
         max=100.0,
         unit="LENGTH")
     branch1Length = FloatProperty(name="Length Arm 1",
-        description="Length of the 1. arm.",
+        description="Length of the 1. arm",
         default=3.0,
         min=0.01,
         max=100.0,
         unit="LENGTH")
     branch2Length = FloatProperty(name="Length Arm 2",
-        description="Length of the 2. arm.",
+        description="Length of the 2. arm",
         default=3.0,
         min=0.01,
         max=100.0,
         unit="LENGTH")
     branch3Length = FloatProperty(name="Length Arm 3 (center)",
-        description="Length of the center arm.",
+        description="Length of the center arm",
         default=3.0,
         min=0.01,
         max=100.0,
@@ -955,13 +955,13 @@ class AddNJoint(bpy.types.Operator):
     bl_options = {'REGISTER', 'UNDO'}
 
     radius = FloatProperty(name="Radius",
-        description="The radius of the pipe.",
+        description="The radius of the pipe",
         default=1.0,
         min=0.01,
         max=100.0,
         unit="LENGTH")
     div = IntProperty(name="Divisions",
-        description="Number of vertices (divisions).",
+        description="Number of vertices (divisions)",
         default=32,
         min=4,
         max=256)
diff --git a/game_engine_save_as_runtime.py b/game_engine_save_as_runtime.py
index 6b10bf0a..4e0f43d5 100644
--- a/game_engine_save_as_runtime.py
+++ b/game_engine_save_as_runtime.py
@@ -61,7 +61,7 @@ def CopyPythonLibs(dst, overwrite_lib, report=print):
         if write:
             shutil.copytree(src, dst, ignore=lambda dir, contents: [i for i in contents if i == '__pycache__'])
     else:
-        report({'WARNING'}, "Python not found in %r, skipping pythn copy." % src)
+        report({'WARNING'}, "Python not found in %r, skipping pythn copy" % src)
 
 
 def WriteAppleRuntime(player_path, output_path, copy_python, overwrite_lib):
@@ -86,7 +86,7 @@ def WriteRuntime(player_path, output_path, copy_python, overwrite_lib, copy_dlls
 
     # Check the paths
     if not os.path.isfile(player_path) and not(os.path.exists(player_path) and player_path.endswith('.app')):
-        report({'ERROR'}, "The player could not be found! Runtime not saved.")
+        report({'ERROR'}, "The player could not be found! Runtime not saved")
         return
     
     # Check if we're bundling a .app
diff --git a/io_anim_bvh/__init__.py b/io_anim_bvh/__init__.py
index 53a4db09..815f6dc1 100644
--- a/io_anim_bvh/__init__.py
+++ b/io_anim_bvh/__init__.py
@@ -66,7 +66,7 @@ class ImportBVH(bpy.types.Operator, ImportHelper):
             ('OBJECT', "Object", ""),
             ),
                 name="Target",
-                description="Import target type.",
+                description="Import target type",
                 default='ARMATURE')
 
     global_scale = FloatProperty(
@@ -88,7 +88,7 @@ class ImportBVH(bpy.types.Operator, ImportHelper):
             )
     rotate_mode = EnumProperty(
             name="Rotation",
-            description="Rotation conversion.",
+            description="Rotation conversion",
             items=(('QUATERNION', "Quaternion",
                     "Convert rotations to quaternions"),
                    ('NATIVE', "Euler (Native)", ("Use the rotation order "
@@ -173,7 +173,7 @@ class ExportBVH(bpy.types.Operator, ExportHelper):
             )
     rotate_mode = EnumProperty(
             name="Rotation",
-            description="Rotation conversion.",
+            description="Rotation conversion",
             items=(('NATIVE', "Euler (Native)",
                     "Use the rotation order defined in the BVH file"),
                    ('XYZ', "Euler (XYZ)", "Convert rotations to euler XYZ"),
diff --git a/io_coat3D/__init__.py b/io_coat3D/__init__.py
index 560ed674..38f2cb22 100644
--- a/io_coat3D/__init__.py
+++ b/io_coat3D/__init__.py
@@ -57,7 +57,7 @@ def register():
         objectdir = StringProperty(name="ObjectPath", subtype="FILE_PATH")
         texturefolder = StringProperty(name="Texture folder:", subtype="DIR_PATH")
         path3b = StringProperty(name="3B Path", subtype="FILE_PATH")
-        export_on = BoolProperty(name="Export_On", description="Add Modifiers and export.",default= False)
+        export_on = BoolProperty(name="Export_On", description="Add Modifiers and export",default= False)
 
 
     class SceneCoat3D(bpy.types.PropertyGroup):
@@ -78,37 +78,37 @@ def register():
         )
         import_box = BoolProperty(
             name="Import window",
-            description="Allows to skip import dialog.",
+            description="Allows to skip import dialog",
             default= True
         )
         export_box = BoolProperty(
             name="Export window",
-            description="Allows to skip export dialog.",
+            description="Allows to skip export dialog",
             default= True
         )
         export_color = BoolProperty(
             name="Export color",
-            description="Export color texture.",
+            description="Export color texture",
             default= True
         )
         export_spec = BoolProperty(
             name="Export specular",
-            description="Export specular texture.",
+            description="Export specular texture",
             default= True
         )
         export_normal = BoolProperty(
             name="Export Normal",
-            description="Export normal texture.",
+            description="Export normal texture",
             default= True
         )
         export_disp = BoolProperty(
             name="Export Displacement",
-            description="Export displacement texture.",
+            description="Export displacement texture",
             default= True
         )
         export_position = BoolProperty(
             name="Export Source Position",
-            description="Export source position.",
+            description="Export source position",
             default= True
         )
         export_zero_layer = BoolProperty(
@@ -118,84 +118,84 @@ def register():
         )
         export_coarse = BoolProperty(
             name="Export Coarse",
-            description="Export Coarse.",
+            description="Export Coarse",
             default= True
         )
         exportfile = BoolProperty(
             name="No Import File",
-            description="Add Modifiers and export.",
+            description="Add Modifiers and export",
             default= False
         )
         importmod = BoolProperty(
             name="Remove Modifiers",
-            description="Import and add modifiers.",
+            description="Import and add modifiers",
             default= False
         )
         exportmod = BoolProperty(
             name="Modifiers",
-            description="Export modifiers.",
+            description="Export modifiers",
             default= False
         )
         export_pos = BoolProperty(
             name="Remember Position",
-            description="Remember position.",
+            description="Remember position",
             default= True
         )
         importtextures = BoolProperty(
             name="Bring Textures",
-            description="Import Textures.",
+            description="Import Textures",
             default= True
         )
         importlevel = BoolProperty(
-            name="Multires. Level.",
-            description="Bring Specific Multires Level.",
+            name="Multires. Level",
+            description="Bring Specific Multires Level",
             default= False
         )
         exportover = BoolProperty(
             name="Export Obj",
-            description="Import Textures.",
+            description="Import Textures",
             default= False
         )
         importmesh = BoolProperty(
             name="Mesh",
-            description="Import Mesh.",
+            description="Import Mesh",
             default= True
         )
 
         # copy location
         cursor = FloatVectorProperty(
             name="Cursor",
-            description="Location.",
+            description="Location",
             subtype="XYZ",
             default=(0.0, 0.0, 0.0)
         )
         loca = FloatVectorProperty(
             name="location",
-            description="Location.",
+            description="Location",
             subtype="XYZ",
             default=(0.0, 0.0, 0.0)
         )
         rota = FloatVectorProperty(
             name="location",
-            description="Location.",
+            description="Location",
             subtype="EULER",
             default=(0.0, 0.0, 0.0)
         )
         scal = FloatVectorProperty(
             name="location",
-            description="Location.",
+            description="Location",
             subtype="XYZ",
             default=(0.0, 0.0, 0.0)
         )
         dime = FloatVectorProperty(
             name="dimension",
-            description="Dimension.",
+            description="Dimension",
             subtype="XYZ",
             default=(0.0, 0.0, 0.0)
         )
 
         type = EnumProperty( name= "Export Type",
-            description= "Diffrent Export Types.",
+            description= "Different Export Types",
             items=(("ppp",   "Per-Pixel Painting", ""),
                    ("mv",   "Microvertex Painting", ""),
                    ("ptex",   "Ptex Painting", ""),
diff --git a/io_convert_image_to_mesh_img/__init__.py b/io_convert_image_to_mesh_img/__init__.py
index 99021bcd..d42f5842 100644
--- a/io_convert_image_to_mesh_img/__init__.py
+++ b/io_convert_image_to_mesh_img/__init__.py
@@ -79,7 +79,7 @@ class ImportHiRISEIMGDTM(bpy.types.Operator, ImportHelper):
                                    ('BIN12-FAST', "12x12 Fast", "use one sample per 12x12 region"),
                                   ),
                             name="Binning",
-                            description="Import Binning.",
+                            description="Import Binning",
                             default='BIN12-FAST'
                             )
 
diff --git a/io_export_directx_x.py b/io_export_directx_x.py
index 1e521d00..00bc5a93 100644
--- a/io_export_directx_x.py
+++ b/io_export_directx_x.py
@@ -1201,21 +1201,58 @@ class DirectXExporter(bpy.types.Operator):
     filepath = StringProperty(subtype='FILE_PATH')
 
     #Coordinate System
-    CoordinateSystem = EnumProperty(name="System", description="Select a coordinate system to export to", items=CoordinateSystems, default="1")
+    CoordinateSystem = EnumProperty(
+        name="System",
+        description="Select a coordinate system to export to",
+        items=CoordinateSystems,
+        default="1")
 
     #General Options
-    RotateX = BoolProperty(name="Rotate X 90 Degrees", description="Rotate the entire scene 90 degrees around the X axis so Y is up.", default=True)
-    FlipNormals = BoolProperty(name="Flip Normals", description="", default=False)
-    ApplyModifiers = BoolProperty(name="Apply Modifiers", description="Apply object modifiers before export.", default=False)
-    IncludeFrameRate = BoolProperty(name="Include Frame Rate", description="Include the AnimTicksPerSecond template which is used by some engines to control animation speed.", default=False)
-    ExportTextures = BoolProperty(name="Export Textures", description="Reference external image files to be used by the model.", default=True)
-    ExportArmatures = BoolProperty(name="Export Armatures", description="Export the bones of any armatures to deform meshes.", default=False)
-    ExportAnimation = EnumProperty(name="Animations", description="Select the type of animations to export.  Only object and armature bone animations can be exported.  Full Animation exports every frame.", items=AnimationModes, default="0")
+    RotateX = BoolProperty(
+        name="Rotate X 90 Degrees",
+        description="Rotate the entire scene 90 degrees around the X axis so Y is up",
+        default=True)
+    FlipNormals = BoolProperty(
+        name="Flip Normals",
+        description="",
+        default=False)
+    ApplyModifiers = BoolProperty(
+        name="Apply Modifiers",
+        description="Apply object modifiers before export",
+        default=False)
+    IncludeFrameRate = BoolProperty(
+        name="Include Frame Rate",
+        description="Include the AnimTicksPerSecond template which is used by " \
+                    "some engines to control animation speed",
+        default=False)
+    ExportTextures = BoolProperty(
+        name="Export Textures",
+        description="Reference external image files to be used by the model",
+        default=True)
+    ExportArmatures = BoolProperty(
+        name="Export Armatures",
+        description="Export the bones of any armatures to deform meshes",
+        default=False)
+    ExportAnimation = EnumProperty(
+        name="Animations",
+        description="Select the type of animations to export. Only object " \
+                    "and armature bone animations can be exported. Full " \
+                    "Animation exports every frame",
+        items=AnimationModes,
+        default="0")
 
     #Export Mode
-    ExportMode = EnumProperty(name="Export", description="Select which objects to export.  Only Mesh, Empty, and Armature objects will be exported.", items=ExportModes, default="1")
-
-    Verbose = BoolProperty(name="Verbose", description="Run the exporter in debug mode.  Check the console for output.", default=False)
+    ExportMode = EnumProperty(
+        name="Export",
+        description="Select which objects to export. Only Mesh, Empty, " \
+                    "and Armature objects will be exported",
+        items=ExportModes,
+        default="1")
+
+    Verbose = BoolProperty(
+        name="Verbose",
+        description="Run the exporter in debug mode. Check the console for output",
+        default=False)
 
     def execute(self, context):
         #Append .x
diff --git a/io_export_unreal_psk_psa.py b/io_export_unreal_psk_psa.py
index a49565ae..47460162 100644
--- a/io_export_unreal_psk_psa.py
+++ b/io_export_unreal_psk_psa.py
@@ -1663,7 +1663,7 @@ def fs_callback(filename, context):
             #print("Okay")
             bArmatureScale = True
         else:
-            print("Error, Armature Object not scale right should be (1,1,1).")            
+            print("Error, Armature Object not scale right should be (1,1,1).")
             bArmatureScale = False
         if blender_armature[0].location.x == 0 and blender_armature[0].location.y == 0 and blender_armature[0].location.z == 0:
             #print("Okay")
@@ -1777,19 +1777,25 @@ from bpy.props import *
 
 bpy.types.Scene.unrealfpsrate = IntProperty(
     name="fps rate",
-    description="Set the frame per second (fps) for unreal.",
+    description="Set the frame per second (fps) for unreal",
     default=24,min=1,max=100)
     
 bpy.types.Scene.unrealexport_settings = EnumProperty(
     name="Export:",
     description="Select a export settings (psk/psa/all)...",
-    items = [("0","PSK","Export PSK"),("1","PSA","Export PSA"),("2","ALL","Export ALL")], default = '0')
-	
+    items = [("0","PSK","Export PSK"),
+             ("1","PSA","Export PSA"),
+             ("2","ALL","Export ALL")],
+    default = '0')
+
 bpy.types.Scene.UEActionSetSettings = EnumProperty(
     name="Action Set(s) Export Type",
-    description="For Exporting Single, All, and Select Action Set(s).",
-    items = [("0","Single","Single Action Set Export"),("1","All","All Action Sets Export"),("2","Select","Select Action Set(s) Export")], default = '0')        
-	
+    description="For Exporting Single, All, and Select Action Set(s)",
+    items = [("0","Single","Single Action Set Export"),
+             ("1","All","All Action Sets Export"),
+             ("2","Select","Select Action Set(s) Export")],
+    default = '0')        
+
 bpy.types.Scene.unrealtriangulatebool = BoolProperty(
     name="Triangulate Mesh",
     description="Convert Quad to Tri Mesh Boolean...",
@@ -1797,12 +1803,14 @@ bpy.types.Scene.unrealtriangulatebool = BoolProperty(
 
 bpy.types.Scene.unrealignoreactionmatchcount = BoolProperty(
     name="Acion Group Ignore Count",
-    description="It will ingore Action group count as long is matches the Armature bone count to match and over ride the armature animation data.",
+    description="It will ingore Action group count as long is matches the " \
+                "Armature bone count to match and over ride the armature " \
+                "animation data",
     default=False)
     
 bpy.types.Scene.unrealdisplayactionsets = BoolProperty(
     name="Show Action Set(s)",
-    description="Display Action Sets Information.",
+    description="Display Action Sets Information",
     default=False)    
     
 bpy.types.Scene.unrealexportpsk = BoolProperty(
@@ -1818,10 +1826,13 @@ bpy.types.Scene.unrealexportpsa = BoolProperty(
 class UEAPropertyGroup(bpy.types.PropertyGroup):
     ## create Properties for the collection entries:
     mystring = bpy.props.StringProperty()
-    mybool = bpy.props.BoolProperty(name="Export",description="Check if you want to export the action set.",default = False)
-	
-bpy.utils.register_class(UEAPropertyGroup) 
- 
+    mybool = bpy.props.BoolProperty(
+        name="Export",
+        description="Check if you want to export the action set",
+        default = False)
+
+bpy.utils.register_class(UEAPropertyGroup)
+
 ## create CollectionProperty and link it to the property class
 bpy.types.Object.myCollectionUEA = bpy.props.CollectionProperty(type = UEAPropertyGroup)
 bpy.types.Object.myCollectionUEA_index = bpy.props.IntProperty(min = -1, default = -1)
@@ -1916,12 +1927,15 @@ class ExportUDKAnimData(bpy.types.Operator):
             )
     actionexportall = BoolProperty(
             name="All Actions",
-            description="This will export all the actions that matches the current armature.",
+            description="This will export all the actions that matches the " \
+                        "current armature",
             default=False,
             )
     ignoreactioncountexportbool = BoolProperty(
             name="Ignore Action Group Count",
-            description="It will ignore action group count but as long it matches the armature bone count to over ride the animation data.",
+            description="It will ignore action group count but as long it " \
+                        "matches the armature bone count to over ride the " \
+                        "animation data",
             default= False,
             )
 
diff --git a/io_import_images_as_planes.py b/io_import_images_as_planes.py
index 7c5c6fd1..28245cc1 100644
--- a/io_import_images_as_planes.py
+++ b/io_import_images_as_planes.py
@@ -228,14 +228,14 @@ class IMPORT_OT_image_to_plane(bpy.types.Operator, ImportHelper, AddObjectHelper
     bl_idname = "import.image_to_plane"
     bl_label = "Import Images as Planes"
     bl_description = "Create mesh plane(s) from image files" \
-        " with the appropiate aspect ratio."
+                     " with the appropiate aspect ratio"
     bl_options = {'REGISTER', 'UNDO'}
 
     ## OPTIONS ##
     all_in_directory = BoolProperty(
             name="All in directory",
             description=("Import all image files (of the selected type) "
-                         "in this directory."),
+                         "in this directory"),
             default=False,
             )
     align = BoolProperty(
@@ -271,13 +271,13 @@ class IMPORT_OT_image_to_plane(bpy.types.Operator, ImportHelper, AddObjectHelper
         )
     extension = EnumProperty(
             name="Extension",
-            description="Only import files of this type.",
+            description="Only import files of this type",
             items=extEnum)
     use_dimension = BoolProperty(name="Use image dimensions",
-            description="Use the images pixels to derive the size of the plane.",
+            description="Use the images pixels to derive the size of the plane",
             default=False)
     factor = IntProperty(name="Pixels/BU",
-            description="Number of pixels per Blenderunit.",
+            description="Number of pixels per Blenderunit",
             min=1,
             default=500,
             )
@@ -290,7 +290,7 @@ class IMPORT_OT_image_to_plane(bpy.types.Operator, ImportHelper, AddObjectHelper
             )
     use_transparency = BoolProperty(
             name="Use alpha",
-            description="Use alphachannel for transparency.",
+            description="Use alphachannel for transparency",
             default=False,
             )
     tEnum = (
diff --git a/io_import_scene_lwo.py b/io_import_scene_lwo.py
index 927d893b..6aba65bf 100644
--- a/io_import_scene_lwo.py
+++ b/io_import_scene_lwo.py
@@ -1216,7 +1216,7 @@ class IMPORT_OT_lwo(bpy.types.Operator):
     '''Import LWO Operator.'''
     bl_idname= "import_scene.lwo"
     bl_label= "Import LWO"
-    bl_description= "Import a LightWave Object file."
+    bl_description= "Import a LightWave Object file"
     bl_options= {'REGISTER', 'UNDO'}
 
     filepath= StringProperty(name="File Path", description="Filepath used for importing the LWO file", maxlen=1024, default="")
diff --git a/io_import_scene_mhx.py b/io_import_scene_mhx.py
index bb95437c..8d0dd75c 100644
--- a/io_import_scene_mhx.py
+++ b/io_import_scene_mhx.py
@@ -2682,10 +2682,9 @@ def rigifyMhx(context, name):
     except:
         success = False
     if not success:
-        MyError(
-"Unable to create advanced human. \n" +
-"Make sure that the Rigify add-on is enabled. \n" +
-"It is found under Rigging.")
+        MyError("Unable to create advanced human. \n" \
+                "Make sure that the Rigify add-on is enabled. \n" \
+                "It is found under Rigging.")
         return
 
     meta = context.object
diff --git a/io_import_scene_unreal_psk.py b/io_import_scene_unreal_psk.py
index d58fc96c..70cc64ff 100644
--- a/io_import_scene_unreal_psk.py
+++ b/io_import_scene_unreal_psk.py
@@ -55,7 +55,7 @@ from bpy.props import *
 
 bpy.types.Scene.unrealbonesize = FloatProperty(
     name="Bone Length",
-    description="Bone Length from head to tail distance.",
+    description="Bone Length from head to tail distance",
     default=1,min=0.001,max=1000)
 
 #output log in to txt file
@@ -765,22 +765,23 @@ class IMPORT_OT_psk(bpy.types.Operator):
             )
     importbone = BoolProperty(
             name="Bones",
-            description="Import bones only. Current not working yet.",
+            description="Import bones only. Current not working yet",
             default=True,
             )
     importmultiuvtextures = BoolProperty(
             name="Single UV Texture(s)",
-            description="Single or Multi uv textures.",
+            description="Single or Multi uv textures",
             default=True,
             )
     bDebugLogPSK = BoolProperty(
             name="Debug Log.txt",
-            description="Log the output of raw format. It will save in current file dir. Note this just for testing.",
+            description="Log the output of raw format. It will save in " \
+                        "current file dir. Note this just for testing",
             default=False,
             )
     unrealbonesize = FloatProperty(
             name="Bone Length",
-            description="Bone Length from head to tail distance.",
+            description="Bone Length from head to tail distance",
             default=1,
             min=0.001,
             max=1000,
diff --git a/io_mesh_raw/__init__.py b/io_mesh_raw/__init__.py
index 70780b36..e9903b4d 100644
--- a/io_mesh_raw/__init__.py
+++ b/io_mesh_raw/__init__.py
@@ -90,7 +90,7 @@ class RawExporter(bpy.types.Operator):
             )
     triangulate = BoolProperty(
             name="Triangulate",
-            description="Triangulate quads.",
+            description="Triangulate quads",
             default=True,
             )
 
diff --git a/io_scene_3ds/__init__.py b/io_scene_3ds/__init__.py
index 52289c37..aacb8ce2 100644
--- a/io_scene_3ds/__init__.py
+++ b/io_scene_3ds/__init__.py
@@ -61,22 +61,22 @@ class Import3DS(bpy.types.Operator, ImportHelper):
 
     constrain_size = FloatProperty(
             name="Size Constraint",
-            description=("Scale the model by 10 until it reacehs the "
-                         "size constraint. Zero Disables."),
+            description="Scale the model by 10 until it reacehs the " \
+                        "size constraint. Zero Disables",
             min=0.0, max=1000.0,
             soft_min=0.0, soft_max=1000.0,
             default=10.0,
             )
     use_image_search = BoolProperty(
             name="Image Search",
-            description=("Search subdirectories for any assosiated images "
-                         "(Warning, may be slow)"),
+            description="Search subdirectories for any assosiated images " \
+                        "(Warning, may be slow)",
             default=True,
             )
     use_apply_transform = BoolProperty(
             name="Apply Transform",
-            description=("Workaround for object transformations "
-                         "importing incorrectly"),
+            description="Workaround for object transformations " \
+                        "importing incorrectly",
             default=True,
             )
 
diff --git a/io_scene_fbx/export_fbx.py b/io_scene_fbx/export_fbx.py
index 2877eece..c006eb83 100644
--- a/io_scene_fbx/export_fbx.py
+++ b/io_scene_fbx/export_fbx.py
@@ -1941,7 +1941,9 @@ def save_single(operator, scene, filepath="",
 
                         # Warning for scaled, mesh objects with armatures
                         if abs(ob.scale[0] - 1.0) > 0.05 or abs(ob.scale[1] - 1.0) > 0.05 or abs(ob.scale[1] - 1.0) > 0.05:
-                            operator.report('WARNING', "Object '%s' has a scale of (%.3f, %.3f, %.3f), Armature deformation will not work as expected!, Apply Scale to fix." % ((ob.name,) + tuple(ob.scale)))
+                            operator.report('WARNING', "Object '%s' has a scale of (%.3f, %.3f, %.3f), " \
+                                                       "Armature deformation will not work as expected " \
+                                                       "(apply Scale to fix)" % ((ob.name,) + tuple(ob.scale)))
 
                     else:
                         blenParentBoneName = armob = None
diff --git a/io_scene_obj/__init__.py b/io_scene_obj/__init__.py
index 2ea405c7..8cefbf39 100644
--- a/io_scene_obj/__init__.py
+++ b/io_scene_obj/__init__.py
@@ -95,14 +95,14 @@ class ImportOBJ(bpy.types.Operator, ImportHelper):
 
     use_groups_as_vgroups = BoolProperty(
             name="Poly Groups",
-            description="Import OBJ groups as vertex groups.",
+            description="Import OBJ groups as vertex groups",
             default=False,
             )
 
     use_image_search = BoolProperty(
             name="Image Search",
-            description=("Search subdirs for any assosiated images "
-                         "(Warning, may be slow)"),
+            description="Search subdirs for any assosiated images " \
+                        "(Warning, may be slow)",
             default=True,
             )
 
diff --git a/mesh_bsurfaces.py b/mesh_bsurfaces.py
index 6f131148..308ff4da 100644
--- a/mesh_bsurfaces.py
+++ b/mesh_bsurfaces.py
@@ -66,7 +66,7 @@ class VIEW3D_PT_tools_SURF_SKETCH(bpy.types.Panel):
 class GPENCIL_OT_SURFSK_add_surface(bpy.types.Operator):
     bl_idname = "gpencil.surfsk_add_surface"
     bl_label = "Bsurfaces add surface"
-    bl_description = "Generates a surface from grease pencil strokes or from curves."
+    bl_description = "Generates a surface from grease pencil strokes or from curves"
     bl_options = {'REGISTER', 'UNDO'}
     
     
diff --git a/mesh_looptools.py b/mesh_looptools.py
index 7d385897..0bfb876e 100644
--- a/mesh_looptools.py
+++ b/mesh_looptools.py
@@ -2648,7 +2648,8 @@ class Bridge(bpy.types.Operator):
         default = True)
     reverse = bpy.props.BoolProperty(name = "Reverse",
         description = "Manually override the direction in which the loops "\
-            "are bridged. Only use if the tool gives the wrong result.",
+                      "are bridged. Only use if the tool gives the wrong " \
+                      "result",
         default = False)
     segments = bpy.props.IntProperty(name = "Segments",
         description = "Number of segments used to bridge the gap "\
@@ -3524,8 +3525,9 @@ class LoopToolsProps(bpy.types.PropertyGroup):
         max = 100,
         subtype = 'PERCENTAGE')
     bridge_mode = bpy.props.EnumProperty(name = "Mode",
-        items = (('basic', "Basic", "Fast algorithm"), ('shortest',
-            "Shortest edge", "Slower algorithm with better vertex matching")),
+        items = (('basic', "Basic", "Fast algorithm"),
+                 ('shortest', "Shortest edge", "Slower algorithm with " \
+                                               "better vertex matching")),
         description = "Algorithm used for bridging",
         default = 'shortest')
     bridge_remove_faces = bpy.props.BoolProperty(name = "Remove faces",
@@ -3533,7 +3535,8 @@ class LoopToolsProps(bpy.types.PropertyGroup):
         default = True)
     bridge_reverse = bpy.props.BoolProperty(name = "Reverse",
         description = "Manually override the direction in which the loops "\
-            "are bridged. Only use if the tool gives the wrong result.",
+                      "are bridged. Only use if the tool gives the wrong " \
+                      "result",
         default = False)
     bridge_segments = bpy.props.IntProperty(name = "Segments",
         description = "Number of segments used to bridge the gap "\
diff --git a/object_cloud_gen.py b/object_cloud_gen.py
index a6308683..ab8eba9b 100644
--- a/object_cloud_gen.py
+++ b/object_cloud_gen.py
@@ -329,7 +329,7 @@ class VIEW3D_PT_tools_cloud(bpy.types.Panel):
         elif WhatToDo == 'NO_SELECTION_DO_NOTHING':
             col.label(text="Select one or more")
             col.label(text="objects to generate")
-            col.label(text="a cloud.")
+            col.label(text="a cloud")
 
         elif WhatToDo == 'CLOUD_DO_NOTHING':
             col.label(text="Must select")
@@ -344,9 +344,9 @@ class VIEW3D_PT_tools_cloud(bpy.types.Panel):
         else:
             col.label(text="Select one or more")
             col.label(text="objects to generate")
-            col.label(text="a cloud.")
+            col.label(text="a cloud")
+
 
-                                
 class GenerateCloud(bpy.types.Operator):
     bl_idname = "cloud.generate_cloud"
     bl_label = "Generate Cloud"
diff --git a/object_fracture/fracture_ops.py b/object_fracture/fracture_ops.py
index ba858589..2878fd20 100644
--- a/object_fracture/fracture_ops.py
+++ b/object_fracture/fracture_ops.py
@@ -360,11 +360,11 @@ class FractureSimple(bpy.types.Operator):
 
     hierarchy = BoolProperty(name="Generate hierarchy",
         description="Hierarchy is usefull for simulation of objects" \
-            " breaking in motion.",
+                    " breaking in motion",
         default=False)
 
     nshards = IntProperty(name="Number of shards",
-        description="Number of shards the object should be split into.",
+        description="Number of shards the object should be split into",
         min=2,
         default=5)
 
diff --git a/render_povray/__init__.py b/render_povray/__init__.py
index b21a9ac4..28466fee 100644
--- a/render_povray/__init__.py
+++ b/render_povray/__init__.py
@@ -55,16 +55,16 @@ class RenderPovSettingsScene(bpy.types.PropertyGroup):
     # File Options
     tempfiles_enable = BoolProperty(
             name="Enable Tempfiles",
-            description="Enable the OS-Tempfiles. Otherwise set the path where to save the files.",
+            description="Enable the OS-Tempfiles. Otherwise set the path where to save the files",
             default=True)
     deletefiles_enable = BoolProperty(
             name="Delete files",
-            description="Delete files after rendering. Doesn't work with the image.",
+            description="Delete files after rendering. Doesn't work with the image",
             default=True)
     scene_name = StringProperty(
             name="Scene Name",
             description="Name of POV-Ray scene to create. Empty name will use the name of " \
-                        "the blend file.",
+                        "the blend file",
             default="", maxlen=1024)
     scene_path = StringProperty(
             name="Export scene path",
@@ -73,12 +73,12 @@ class RenderPovSettingsScene(bpy.types.PropertyGroup):
             default="", maxlen=1024, subtype="DIR_PATH")
     renderimage_path = StringProperty(
             name="Rendered image path",
-            description="Full path to directory where the rendered image is saved.",
+            description="Full path to directory where the rendered image is saved",
             default="", maxlen=1024, subtype="DIR_PATH")
     list_lf_enable = BoolProperty(
             name="LF in lists",
             description="Enable line breaks in lists (vectors and indices). Disabled: " \
-                        "lists are exported in one line.",
+                        "lists are exported in one line",
             default=True)
 
     # Not a real pov option, just to know if we should write
@@ -101,7 +101,7 @@ class RenderPovSettingsScene(bpy.types.PropertyGroup):
             min=1, max=100, default=35)
 
     media_color = FloatVectorProperty(
-            name="Media Color", description="The atmospheric media color.",
+            name="Media Color", description="The atmospheric media color",
             precision=4, step=0.01, min=0, soft_max=1,
             default=(0.001, 0.001, 0.001), options={'ANIMATABLE'}, subtype='COLOR')
 
@@ -130,7 +130,7 @@ class RenderPovSettingsScene(bpy.types.PropertyGroup):
     command_line_switches = StringProperty(
             name="Command Line Switches",
             description="Command line switches consist of a + (plus) or - (minus) sign, followed " \
-                        "by one or more alphabetic characters and possibly a numeric value.",
+                        "by one or more alphabetic characters and possibly a numeric value",
             default="", maxlen=500)
 
     antialias_enable = BoolProperty(
@@ -140,7 +140,7 @@ class RenderPovSettingsScene(bpy.types.PropertyGroup):
     antialias_method = EnumProperty(
             name="Method",
             description="AA-sampling method. Type 1 is an adaptive, non-recursive, super-sampling "\
-                        "method. Type 2 is an adaptive and recursive super-sampling method.",
+                        "method. Type 2 is an adaptive and recursive super-sampling method",
             items=(("0", "non-recursive AA", "Type 1 Sampling in POV-Ray"),
                    ("1", "recursive AA", "Type 2 Sampling in POV-Ray")),
             default="1")
@@ -156,17 +156,17 @@ class RenderPovSettingsScene(bpy.types.PropertyGroup):
     jitter_enable = BoolProperty(
             name="Jitter",
             description="Enable Jittering. Adds noise into the sampling process (it should be " \
-                        "avoided to use jitter in animation).",
+                        "avoided to use jitter in animation)",
             default=True)
 
     jitter_amount = FloatProperty(
-            name="Jitter Amount", description="Amount of jittering.",
+            name="Jitter Amount", description="Amount of jittering",
             min=0.0, max=1.0, soft_min=0.01, soft_max=1.0, default=1.0)
 
     antialias_gamma = FloatProperty(
             name="Antialias Gamma",
             description="POV-Ray compares gamma-adjusted values for super sampling. Antialias " \
-                        "Gamma sets the Gamma before comparison.",
+                        "Gamma sets the Gamma before comparison",
             min=0.0, max=5.0, soft_min=0.01, soft_max=2.5, default=2.5)
 
     max_trace_level = IntProperty(
@@ -313,17 +313,17 @@ class RenderPovSettingsMaterial(bpy.types.PropertyGroup):
             description="Contribution of the iridescence effect to the overall surface color. " \
                         "As a rule of thumb keep to around 0.25 (25% contribution) or less, " \
                         "but experiment. If the surface is coming out too white, try lowering " \
-                        "the diffuse and possibly the ambient values of the surface.",
+                        "the diffuse and possibly the ambient values of the surface",
             min=0.0, max=1.0, soft_min=0.01, soft_max=1.0, default=0.25)
 
     irid_thickness = FloatProperty(
             name="thickness",
             description="A very thin film will have a high frequency of color changes while a " \
-                        "thick film will have large areas of color.",
+                        "thick film will have large areas of color",
             min=0.0, max=1000.0, soft_min=0.1, soft_max=10.0, default=1)
 
     irid_turbulence = FloatProperty(
-            name="turbulence", description="This parameter varies the thickness.",
+            name="turbulence", description="This parameter varies the thickness",
             min=0.0, max=10.0, soft_min=0.000, soft_max=1.0, default=0)
 
     interior_fade_color = FloatVectorProperty(
@@ -427,7 +427,7 @@ class RenderPovSettingsObject(bpy.types.PropertyGroup):
             name="Receive Photon Caustics",
             description="Enable object to collect photons from other objects caustics. Turn " \
                         "off for objects that don't really need to receive caustics (e.g. objects" \
-                        " that generate caustics often don't need to show any on themselves).",
+                        " that generate caustics often don't need to show any on themselves)",
             default=True)
 
     #Photons spacing_multiplier
@@ -483,7 +483,7 @@ class RenderPovSettingsCamera(bpy.types.PropertyGroup):
     dof_confidence = FloatProperty(
             name="Confidence",
             description="Probability to reach the real color value. Larger confidence values " \
-                        "will lead to more samples, slower traces and better images.",
+                        "will lead to more samples, slower traces and better images",
             min=0.01, max=0.99, default=0.90)
 
     ##################################CustomPOV Code############################
diff --git a/render_povray/update_files.py b/render_povray/update_files.py
index 7aa3cff8..0e2c7fc2 100644
--- a/render_povray/update_files.py
+++ b/render_povray/update_files.py
@@ -146,15 +146,15 @@ def register():
     # File Options
     Scene.pov_tempfiles_enable = BoolProperty(
             name="Enable Tempfiles",
-            description="Enable the OS-Tempfiles. Otherwise set the path where to save the files.",
+            description="Enable the OS-Tempfiles. Otherwise set the path where to save the files",
             default=True)
     Scene.pov_deletefiles_enable = BoolProperty(
             name="Delete files",
-            description="Delete files after rendering. Doesn't work with the image.",
+            description="Delete files after rendering. Doesn't work with the image",
             default=True)
     Scene.pov_scene_name = StringProperty(
             name="Scene Name",
-            description="Name of POV-Ray scene to create. Empty name will use the name of the blend file.",
+            description="Name of POV-Ray scene to create. Empty name will use the name of the blend file",
             default="", maxlen=1024)
     Scene.pov_scene_path = StringProperty(
             name="Export scene path",
@@ -163,11 +163,11 @@ def register():
             default="", maxlen=1024, subtype="DIR_PATH")
     Scene.pov_renderimage_path = StringProperty(
             name="Rendered image path",
-            description="Full path to directory where the rendered image is saved.",
+            description="Full path to directory where the rendered image is saved",
             default="", maxlen=1024, subtype="DIR_PATH")
     Scene.pov_list_lf_enable = BoolProperty(
             name="LF in lists",
-            description="Enable line breaks in lists (vectors and indices). Disabled: lists are exported in one line.",
+            description="Enable line breaks in lists (vectors and indices). Disabled: lists are exported in one line",
             default=True)
 
     # Not a real pov option, just to know if we should write
@@ -189,7 +189,7 @@ def register():
 
     Scene.pov_media_color = FloatVectorProperty(
             name="Media Color",
-            description="The atmospheric media color.",
+            description="The atmospheric media color",
             subtype='COLOR',
             precision=4,
             step=0.01,
@@ -221,7 +221,7 @@ def register():
 
     # Real pov options
     Scene.pov_command_line_switches = StringProperty(name="Command Line Switches",
-            description="Command line switches consist of a + (plus) or - (minus) sign, followed by one or more alphabetic characters and possibly a numeric value.",
+            description="Command line switches consist of a + (plus) or - (minus) sign, followed by one or more alphabetic characters and possibly a numeric value",
             default="", maxlen=500)
 
     Scene.pov_antialias_enable = BoolProperty(
@@ -230,7 +230,7 @@ def register():
 
     Scene.pov_antialias_method = EnumProperty(
             name="Method",
-            description="AA-sampling method. Type 1 is an adaptive, non-recursive, super-sampling method. Type 2 is an adaptive and recursive super-sampling method.",
+            description="AA-sampling method. Type 1 is an adaptive, non-recursive, super-sampling method. Type 2 is an adaptive and recursive super-sampling method",
             items=(("0", "non-recursive AA", "Type 1 Sampling in POV-Ray"),
                ("1", "recursive AA", "Type 2 Sampling in POV-Ray")),
             default="1")
@@ -244,15 +244,15 @@ def register():
             min=0.0, max=1.0, soft_min=0.05, soft_max=0.5, default=0.1)
 
     Scene.pov_jitter_enable = BoolProperty(
-            name="Jitter", description="Enable Jittering. Adds noise into the sampling process (it should be avoided to use jitter in animation).",
+            name="Jitter", description="Enable Jittering. Adds noise into the sampling process (it should be avoided to use jitter in animation)",
             default=True)
 
     Scene.pov_jitter_amount = FloatProperty(
-            name="Jitter Amount", description="Amount of jittering.",
+            name="Jitter Amount", description="Amount of jittering",
             min=0.0, max=1.0, soft_min=0.01, soft_max=1.0, default=1.0)
 
     Scene.pov_antialias_gamma = FloatProperty(
-            name="Antialias Gamma", description="POV-Ray compares gamma-adjusted values for super sampling. Antialias Gamma sets the Gamma before comparison.",
+            name="Antialias Gamma", description="POV-Ray compares gamma-adjusted values for super sampling. Antialias Gamma sets the Gamma before comparison",
             min=0.0, max=5.0, soft_min=0.01, soft_max=2.5, default=2.5)
 
     Scene.pov_max_trace_level = IntProperty(
@@ -360,17 +360,17 @@ def register():
 
     Mat.pov_irid_amount = FloatProperty(
             name="amount",
-            description="Contribution of the iridescence effect to the overall surface color. As a rule of thumb keep to around 0.25 (25% contribution) or less, but experiment. If the surface is coming out too white, try lowering the diffuse and possibly the ambient values of the surface.",
+            description="Contribution of the iridescence effect to the overall surface color. As a rule of thumb keep to around 0.25 (25% contribution) or less, but experiment. If the surface is coming out too white, try lowering the diffuse and possibly the ambient values of the surface",
             min=0.0, max=1.0, soft_min=0.01, soft_max=1.0, default=0.25)
 
     Mat.pov_irid_thickness = FloatProperty(
             name="thickness",
-            description="A very thin film will have a high frequency of color changes while a thick film will have large areas of color.",
+            description="A very thin film will have a high frequency of color changes while a thick film will have large areas of color",
             min=0.0, max=1000.0, soft_min=0.1, soft_max=10.0, default=1)
 
     Mat.pov_irid_turbulence = FloatProperty(
             name="turbulence",
-            description="This parameter varies the thickness.",
+            description="This parameter varies the thickness",
             min=0.0, max=10.0, soft_min=0.000, soft_max=1.0, default=0)
 
     Mat.pov_interior_fade_color = FloatVectorProperty(
@@ -502,7 +502,7 @@ def register():
 
     Cam.pov_dof_confidence = FloatProperty(
             name="Confidence",
-            description="Probability to reach the real color value. Larger confidence values will lead to more samples, slower traces and better images.",
+            description="Probability to reach the real color value. Larger confidence values will lead to more samples, slower traces and better images",
             min=0.01, max=0.99, default=0.90)
 
     ###################################TEXT####################################
diff --git a/render_renderfarmfi.py b/render_renderfarmfi.py
index 862aa107..0f72eb40 100644
--- a/render_renderfarmfi.py
+++ b/render_renderfarmfi.py
@@ -852,37 +852,50 @@ class ORE_PrepareOp(bpy.types.Operator):
         rd.resolution_percentage = 100
         if rd.file_format != 'PNG':
             print("Renderfarm.fi always uses PNG for output. Changing to PNG.")
-            self.report({'WARNING'}, "Renderfarm.fi always uses PNG for output. Changing to PNG.")
+            self.report({'WARNING'}, "Renderfarm.fi always uses PNG for " \
+                                     "output, changing to PNG")
         rd.file_format = 'PNG'
         if (rd.use_sss == True or hasSSSMaterial()) and ore.parts > 1:
-            print("Subsurface Scattering is not supported when rendering with parts > 1. Disabling")
-            self.report({'WARNING'}, "Subsurface Scattering is not supported when rendering with parts > 1. Disabling")
+            print("Subsurface Scattering is not supported when rendering " \
+                  "with parts > 1. Disabling")
+            self.report({'WARNING'}, "Subsurface Scattering is not " \
+                                     "supported when rendering with " \
+                                     "parts > 1, disabling")
             rd.use_sss = False # disabling because ore.parts > 1. It's ok to use SSS with 1part/frame
         if hasUnsupportedSimulation() == True:
-            print("An unsupported simulation was detected. Please check your settings and remove them")
-            self.report({'WARNING'}, "An unsupported simulation was detected. Please check your settings and remove them")
+            print("An unsupported simulation was detected. Please " \
+                  "check your settings and remove them")
+            self.report({'WARNING'}, "An unsupported simulation was " \
+                                     "detected. Please check your settings " \
+                                     "and remove them")
             ore.hasUnsupportedSimulation = True
             errors = True
         else:
             ore.hasUnsupportedSimulation = False
         if (rd.use_full_sample == True and rd.use_save_buffers == True):
-            print("Save Buffers is not supported. As you also have Full Sample on, I'm turning both of the settings off")
-            self.report({'WARNING'}, "Save Buffers is not supported. As you also have Full Sample on, I'm turning both of the settings off")
+            print("Save Buffers is not supported. As you also have Full " \
+                  "Sample on, I'm turning both of the settings off")
+            self.report({'WARNING'}, "Save Buffers is not supported; as you " \
+                                     "also have Full Sample on, I'm turning " \
+                                     "both of the settings off")
         if (rd.use_full_sample == False and rd.use_save_buffers == True):
             print("Save buffers needs to be turned off. Changing to off")
-            self.report({'WARNING'}, "Save buffers needs to be turned off. Changing to off")
+            self.report({'WARNING'}, "Save buffers needs to be turned off, " \
+                                     "changing to off")
         rd.use_full_sample = False
         rd.use_save_buffers = False
         rd.use_free_image_textures = True
         if (rd.use_border == True):
             print("Border render is not supported. Turning it off")
-            self.report({'WARNING'}, "Border render is not supported. Turning it off")
+            self.report({'WARNING'}, "Border render is not supported, " \
+                                     "turning it off")
         rd.use_border = False
         if rd.use_compositing:
             if hasCompositingErrors(sce.use_nodes, sce.node_tree, ore.parts):
                 print("Found disallowed nodes or problematic setup")
                 rd.use_compositing = False
-                self.report({'WARNING'}, "Found disallowed nodes or problematic setup")
+                self.report({'WARNING'}, "Found disallowed nodes or " \
+                                         "problematic setup")
         print("Done checking the scene. Now do a test render")
         self.report({'INFO'}, "Done checking the scene. Now do a test render")
         print("=============================================")
@@ -892,7 +905,9 @@ class ORE_PrepareOp(bpy.types.Operator):
         # Errors is only True if there is a setting that could not be changed to the correct setting
         # In short, unsupported simulations
         if errors:
-            self.report({'WARNING'}, "Some issues found. Check console and do a test render to make sure everything works.")
+            self.report({'WARNING'}, "Some issues found, check console and " \
+                                     "do a test render to make sure " \
+                                     "everything works")
             ore.prepared = False
         else:
             ore.prepared = True
@@ -982,7 +997,10 @@ class RenderfarmFi(bpy.types.RenderEngine):
 def register():
     bpy.utils.register_module(__name__)
 
-    bpy.types.Scene.ore_render = PointerProperty(type=ORESettings, name='ORE Render', description='ORE Render Settings')
+    bpy.types.Scene.ore_render = PointerProperty(
+            type=ORESettings,
+            name='ORE Render',
+            description='ORE Render Settings')
 
     #~ bpy.types.INFO_MT_render.append(menu_export)
 
diff --git a/rigify/__init__.py b/rigify/__init__.py
index 4884abac..fc8eb818 100644
--- a/rigify/__init__.py
+++ b/rigify/__init__.py
@@ -129,7 +129,7 @@ def register():
     bpy.utils.register_class(RigifyParameters)
     bpy.utils.register_class(RigifyArmatureLayer)
 
-    bpy.types.PoseBone.rigify_type = bpy.props.StringProperty(name="Rigify Type", description="Rig type for this bone.")
+    bpy.types.PoseBone.rigify_type = bpy.props.StringProperty(name="Rigify Type", description="Rig type for this bone")
     bpy.types.PoseBone.rigify_parameters = bpy.props.CollectionProperty(type=RigifyParameters)
 
     bpy.types.Armature.rigify_layers = bpy.props.CollectionProperty(type=RigifyArmatureLayer)
@@ -137,7 +137,7 @@ def register():
     IDStore = bpy.types.WindowManager
     IDStore.rigify_collection = bpy.props.EnumProperty(items=col_enum_list, default="All", name="Rigify Active Collection", description="The selected rig collection")
     IDStore.rigify_types = bpy.props.CollectionProperty(type=RigifyName)
-    IDStore.rigify_active_type = bpy.props.IntProperty(name="Rigify Active Type", description="The selected rig type.")
+    IDStore.rigify_active_type = bpy.props.IntProperty(name="Rigify Active Type", description="The selected rig type")
 
     # Add rig parameters
     for rig in rig_list:
diff --git a/rigify/rigs/basic/copy.py b/rigify/rigs/basic/copy.py
index d430113b..6a8800b2 100644
--- a/rigify/rigs/basic/copy.py
+++ b/rigify/rigs/basic/copy.py
@@ -85,8 +85,8 @@ class Rig:
         """ Add the parameters of this rig type to the
             RigifyParameters PropertyGroup
         """
-        group.make_control = bpy.props.BoolProperty(name="Control", default=True, description="Create a control bone for the copy.")
-        group.make_deform = bpy.props.BoolProperty(name="Deform", default=True, description="Create a deform bone for the copy.")
+        group.make_control = bpy.props.BoolProperty(name="Control", default=True, description="Create a control bone for the copy")
+        group.make_deform = bpy.props.BoolProperty(name="Deform", default=True, description="Create a deform bone for the copy")
 
 
     @classmethod
diff --git a/rigify/rigs/basic/copy_chain.py b/rigify/rigs/basic/copy_chain.py
index b1dbcd83..937b02f6 100644
--- a/rigify/rigs/basic/copy_chain.py
+++ b/rigify/rigs/basic/copy_chain.py
@@ -40,7 +40,7 @@ class Rig:
         self.make_deforms = params.make_deforms
 
         if len(self.org_bones) <= 1:
-            raise MetarigError("RIGIFY ERROR: Bone '%s': input to rig type must be a chain of 2 or more bones." % (strip_org(bone_name)))
+            raise MetarigError("RIGIFY ERROR: Bone '%s': input to rig type must be a chain of 2 or more bones" % (strip_org(bone_name)))
 
     def generate(self):
         """ Generate the rig.
@@ -124,8 +124,8 @@ class Rig:
         """ Add the parameters of this rig type to the
             RigifyParameters PropertyGroup
         """
-        group.make_controls = bpy.props.BoolProperty(name="Controls", default=True, description="Create control bones for the copy.")
-        group.make_deforms = bpy.props.BoolProperty(name="Deform", default=True, description="Create deform bones for the copy.")
+        group.make_controls = bpy.props.BoolProperty(name="Controls", default=True, description="Create control bones for the copy")
+        group.make_deforms = bpy.props.BoolProperty(name="Deform", default=True, description="Create deform bones for the copy")
 
 
     @classmethod
diff --git a/rigify/rigs/biped/arm/__init__.py b/rigify/rigs/biped/arm/__init__.py
index 74677af0..55cd2564 100644
--- a/rigify/rigs/biped/arm/__init__.py
+++ b/rigify/rigs/biped/arm/__init__.py
@@ -95,13 +95,13 @@ class Rig:
         items = [('X', 'X', ''), ('Y', 'Y', ''), ('Z', 'Z', ''), ('-X', '-X', ''), ('-Y', '-Y', ''), ('-Z', '-Z', '')]
         group.primary_rotation_axis = bpy.props.EnumProperty(items=items, name="Primary Rotation Axis", default='X')
 
-        group.bend_hint = bpy.props.BoolProperty(name="Bend Hint", default=True, description="Give IK chain a hint about which way to bend.  Useful for perfectly straight chains.")
+        group.bend_hint = bpy.props.BoolProperty(name="Bend Hint", default=True, description="Give IK chain a hint about which way to bend.  Useful for perfectly straight chains")
 
-        group.separate_ik_layers = bpy.props.BoolProperty(name="Separate IK Control Layers:", default=False, description="Enable putting the ik controls on a separate layer from the fk controls.")
-        group.ik_layers = bpy.props.BoolVectorProperty(size=32, description="Layers for the ik controls to be on.")
+        group.separate_ik_layers = bpy.props.BoolProperty(name="Separate IK Control Layers:", default=False, description="Enable putting the ik controls on a separate layer from the fk controls")
+        group.ik_layers = bpy.props.BoolVectorProperty(size=32, description="Layers for the ik controls to be on")
 
-        group.use_upper_arm_twist = bpy.props.BoolProperty(name="Upper Arm Twist", default=True, description="Generate the dual-bone twist setup for the upper arm.")
-        group.use_forearm_twist = bpy.props.BoolProperty(name="Forearm Twist", default=True, description="Generate the dual-bone twist setup for the forearm.")
+        group.use_upper_arm_twist = bpy.props.BoolProperty(name="Upper Arm Twist", default=True, description="Generate the dual-bone twist setup for the upper arm")
+        group.use_forearm_twist = bpy.props.BoolProperty(name="Forearm Twist", default=True, description="Generate the dual-bone twist setup for the forearm")
 
     @classmethod
     def parameters_ui(self, layout, obj, bone):
diff --git a/rigify/rigs/biped/arm/deform.py b/rigify/rigs/biped/arm/deform.py
index 265c944d..112c5550 100644
--- a/rigify/rigs/biped/arm/deform.py
+++ b/rigify/rigs/biped/arm/deform.py
@@ -87,7 +87,7 @@ class Rig:
         self.org_bones = [bone] + connected_children_names(self.obj, bone)[:2]
 
         if len(self.org_bones) != 3:
-            raise MetarigError("RIGIFY ERROR: Bone '%s': input to rig type must be a chain of 3 bones." % (strip_org(bone)))
+            raise MetarigError("RIGIFY ERROR: Bone '%s': input to rig type must be a chain of 3 bones" % (strip_org(bone)))
 
         # Get rig parameters
         self.use_upper_arm_twist = params.use_upper_arm_twist
diff --git a/rigify/rigs/biped/arm/fk.py b/rigify/rigs/biped/arm/fk.py
index 214d7682..690dab50 100644
--- a/rigify/rigs/biped/arm/fk.py
+++ b/rigify/rigs/biped/arm/fk.py
@@ -45,7 +45,7 @@ class Rig:
         self.org_bones = [bone] + connected_children_names(self.obj, bone)[:2]
 
         if len(self.org_bones) != 3:
-            raise MetarigError("RIGIFY ERROR: Bone '%s': input to rig type must be a chain of 3 bones." % (strip_org(bone)))
+            raise MetarigError("RIGIFY ERROR: Bone '%s': input to rig type must be a chain of 3 bones" % (strip_org(bone)))
 
         # Get (optional) parent
         if self.obj.data.bones[bone].parent is None:
diff --git a/rigify/rigs/biped/arm/ik.py b/rigify/rigs/biped/arm/ik.py
index fb784b7d..55147a47 100644
--- a/rigify/rigs/biped/arm/ik.py
+++ b/rigify/rigs/biped/arm/ik.py
@@ -75,7 +75,7 @@ class Rig:
         self.org_bones = [bone] + connected_children_names(self.obj, bone)[:2]
 
         if len(self.org_bones) != 3:
-            raise MetarigError("RIGIFY ERROR: Bone '%s': input to rig type must be a chain of 3 bones." % (strip_org(bone)))
+            raise MetarigError("RIGIFY ERROR: Bone '%s': input to rig type must be a chain of 3 bones" % (strip_org(bone)))
 
         # Get the rig parameters
         if params.separate_ik_layers:
diff --git a/rigify/rigs/biped/leg/__init__.py b/rigify/rigs/biped/leg/__init__.py
index 21c5fa2b..c80376a8 100644
--- a/rigify/rigs/biped/leg/__init__.py
+++ b/rigify/rigs/biped/leg/__init__.py
@@ -97,13 +97,13 @@ class Rig:
         items = [('X', 'X', ''), ('Y', 'Y', ''), ('Z', 'Z', ''), ('-X', '-X', ''), ('-Y', '-Y', ''), ('-Z', '-Z', '')]
         group.primary_rotation_axis = bpy.props.EnumProperty(items=items, name="Primary Rotation Axis", default='X')
 
-        group.bend_hint = bpy.props.BoolProperty(name="Bend Hint", default=True, description="Give IK chain a hint about which way to bend.  Useful for perfectly straight chains.")
+        group.bend_hint = bpy.props.BoolProperty(name="Bend Hint", default=True, description="Give IK chain a hint about which way to bend (useful for perfectly straight chains)")
 
-        group.separate_ik_layers = bpy.props.BoolProperty(name="Separate IK Control Layers:", default=False, description="Enable putting the ik controls on a separate layer from the fk controls.")
-        group.ik_layers = bpy.props.BoolVectorProperty(size=32, description="Layers for the ik controls to be on.")
+        group.separate_ik_layers = bpy.props.BoolProperty(name="Separate IK Control Layers:", default=False, description="Enable putting the ik controls on a separate layer from the fk controls")
+        group.ik_layers = bpy.props.BoolVectorProperty(size=32, description="Layers for the ik controls to be on")
 
-        group.use_thigh_twist = bpy.props.BoolProperty(name="Thigh Twist", default=True, description="Generate the dual-bone twist setup for the thigh.")
-        group.use_shin_twist = bpy.props.BoolProperty(name="Shin Twist", default=True, description="Generate the dual-bone twist setup for the shin.")
+        group.use_thigh_twist = bpy.props.BoolProperty(name="Thigh Twist", default=True, description="Generate the dual-bone twist setup for the thigh")
+        group.use_shin_twist = bpy.props.BoolProperty(name="Shin Twist", default=True, description="Generate the dual-bone twist setup for the shin")
 
     @classmethod
     def parameters_ui(self, layout, obj, bone):
diff --git a/rigify/rigs/biped/leg/deform.py b/rigify/rigs/biped/leg/deform.py
index 3a649139..5ea8cf65 100644
--- a/rigify/rigs/biped/leg/deform.py
+++ b/rigify/rigs/biped/leg/deform.py
@@ -87,7 +87,7 @@ class Rig:
         leg_bones = [bone] + connected_children_names(self.obj, bone)[:2]
 
         if len(leg_bones) != 2:
-            raise MetarigError("RIGIFY ERROR: Bone '%s': incorrect bone configuration for rig type." % (strip_org(bone)))
+            raise MetarigError("RIGIFY ERROR: Bone '%s': incorrect bone configuration for rig type" % (strip_org(bone)))
 
         # Get the foot and heel
         foot = None
@@ -100,7 +100,7 @@ class Rig:
                     heel = b.name
 
         if foot is None or heel is None:
-            raise MetarigError("RIGIFY ERROR: Bone '%s': incorrect bone configuration for rig type." % (strip_org(bone)))
+            raise MetarigError("RIGIFY ERROR: Bone '%s': incorrect bone configuration for rig type" % (strip_org(bone)))
 
         # Get the toe
         toe = None
@@ -109,7 +109,7 @@ class Rig:
                 toe = b.name
 
         if toe is None:
-            raise MetarigError("RIGIFY ERROR: Bone '%s': incorrect bone configuration for rig type." % (strip_org(bone)))
+            raise MetarigError("RIGIFY ERROR: Bone '%s': incorrect bone configuration for rig type" % (strip_org(bone)))
 
         self.org_bones = leg_bones + [foot, toe, heel]
 
diff --git a/rigify/rigs/biped/leg/fk.py b/rigify/rigs/biped/leg/fk.py
index 0e51b501..5ff9d4a9 100644
--- a/rigify/rigs/biped/leg/fk.py
+++ b/rigify/rigs/biped/leg/fk.py
@@ -46,7 +46,7 @@ class Rig:
         leg_bones = [bone] + connected_children_names(self.obj, bone)[:2]
 
         if len(leg_bones) != 2:
-            raise MetarigError("RIGIFY ERROR: Bone '%s': incorrect bone configuration for rig type." % (strip_org(bone)))
+            raise MetarigError("RIGIFY ERROR: Bone '%s': incorrect bone configuration for rig type" % (strip_org(bone)))
 
         # Get the foot and heel
         foot = None
@@ -59,7 +59,7 @@ class Rig:
                     heel = b.name
 
         if foot is None or heel is None:
-            raise MetarigError("RIGIFY ERROR: Bone '%s': incorrect bone configuration for rig type." % (strip_org(bone)))
+            raise MetarigError("RIGIFY ERROR: Bone '%s': incorrect bone configuration for rig type" % (strip_org(bone)))
 
         # Get the toe
         toe = None
@@ -69,7 +69,7 @@ class Rig:
 
         # Get the toe
         if toe is None:
-            raise MetarigError("RIGIFY ERROR: Bone '%s': incorrect bone configuration for rig type." % (strip_org(bone)))
+            raise MetarigError("RIGIFY ERROR: Bone '%s': incorrect bone configuration for rig type" % (strip_org(bone)))
 
         self.org_bones = leg_bones + [foot, toe, heel]
 
diff --git a/rigify/rigs/biped/leg/ik.py b/rigify/rigs/biped/leg/ik.py
index 806de417..cfac1430 100644
--- a/rigify/rigs/biped/leg/ik.py
+++ b/rigify/rigs/biped/leg/ik.py
@@ -96,7 +96,7 @@ class Rig:
         leg_bones = [bone] + connected_children_names(self.obj, bone)[:2]
 
         if len(leg_bones) != 2:
-            raise MetarigError("RIGIFY ERROR: Bone '%s': incorrect bone configuration for rig type." % (strip_org(bone)))
+            raise MetarigError("RIGIFY ERROR: Bone '%s': incorrect bone configuration for rig type" % (strip_org(bone)))
 
         # Get the foot and heel
         foot = None
@@ -113,7 +113,7 @@ class Rig:
 
         if foot is None or heel is None:
             print("blah")
-            raise MetarigError("RIGIFY ERROR: Bone '%s': incorrect bone configuration for rig type." % (strip_org(bone)))
+            raise MetarigError("RIGIFY ERROR: Bone '%s': incorrect bone configuration for rig type" % (strip_org(bone)))
 
         # Get the toe
         toe = None
@@ -123,7 +123,7 @@ class Rig:
 
         # Get toe
         if toe is None:
-            raise MetarigError("RIGIFY ERROR: Bone '%s': incorrect bone configuration for rig type." % (strip_org(bone)))
+            raise MetarigError("RIGIFY ERROR: Bone '%s': incorrect bone configuration for rig type" % (strip_org(bone)))
 
         self.org_bones = leg_bones + [foot, toe, heel, rocker]
 
diff --git a/rigify/rigs/finger.py b/rigify/rigs/finger.py
index c33fdfd9..523a9edd 100644
--- a/rigify/rigs/finger.py
+++ b/rigify/rigs/finger.py
@@ -39,7 +39,7 @@ class Rig:
         self.params = params
 
         if len(self.org_bones) <= 1:
-            raise MetarigError("RIGIFY ERROR: Bone '%s': input to rig type must be a chain of 2 or more bones." % (strip_org(bone)))
+            raise MetarigError("RIGIFY ERROR: Bone '%s': input to rig type must be a chain of 2 or more bones" % (strip_org(bone)))
 
         # Get user-specified layers, if they exist
         if params.separate_extra_layers:
@@ -280,10 +280,10 @@ class Rig:
         items = [('X', 'X', ''), ('Y', 'Y', ''), ('Z', 'Z', ''), ('-X', '-X', ''), ('-Y', '-Y', ''), ('-Z', '-Z', '')]
         group.primary_rotation_axis = bpy.props.EnumProperty(items=items, name="Primary Rotation Axis", default='X')
 
-        group.separate_extra_layers = bpy.props.BoolProperty(name="Separate Secondary Control Layers:", default=False, description="Enable putting the secondary controls on a separate layer from the primary controls.")
-        group.extra_layers = bpy.props.BoolVectorProperty(size=32, description="Layers for the secondary controls to be on.")
+        group.separate_extra_layers = bpy.props.BoolProperty(name="Separate Secondary Control Layers:", default=False, description="Enable putting the secondary controls on a separate layer from the primary controls")
+        group.extra_layers = bpy.props.BoolVectorProperty(size=32, description="Layers for the secondary controls to be on")
 
-        group.use_digit_twist = bpy.props.BoolProperty(name="Digit Twist", default=True, description="Generate the dual-bone twist setup for the first finger digit.")
+        group.use_digit_twist = bpy.props.BoolProperty(name="Digit Twist", default=True, description="Generate the dual-bone twist setup for the first finger digit")
 
     @classmethod
     def parameters_ui(self, layout, obj, bone):
diff --git a/rigify/rigs/misc/delta.py b/rigify/rigs/misc/delta.py
index 12bd69ce..2db278f0 100644
--- a/rigify/rigs/misc/delta.py
+++ b/rigify/rigs/misc/delta.py
@@ -40,9 +40,9 @@ class Rig:
         bb = obj.data.bones
 
         if bb[bone].children is None:
-            raise MetarigError("RIGIFY ERROR: bone '%s': rig type requires one child." % org_name(bone.name))
+            raise MetarigError("RIGIFY ERROR: bone '%s': rig type requires one child" % org_name(bone.name))
         if bb[bone].use_connect == True:
-            raise MetarigError("RIGIFY ERROR: bone '%s': rig type cannot be connected to parent." % org_name(bone.name))
+            raise MetarigError("RIGIFY ERROR: bone '%s': rig type cannot be connected to parent" % org_name(bone.name))
 
         self.obj = obj
         self.org_bones = {"delta": bone, "child": bb[bone].children[0].name}
diff --git a/rigify/rigs/neck_short.py b/rigify/rigs/neck_short.py
index b5ffc453..edba5c8d 100644
--- a/rigify/rigs/neck_short.py
+++ b/rigify/rigs/neck_short.py
@@ -53,7 +53,7 @@ class Rig:
         self.params = params
 
         if len(self.org_bones) <= 1:
-            raise MetarigError("RIGIFY ERROR: Bone '%s': input to rig type must be a chain of 2 or more bones." % (strip_org(bone_name)))
+            raise MetarigError("RIGIFY ERROR: Bone '%s': input to rig type must be a chain of 2 or more bones" % (strip_org(bone_name)))
 
         self.isolate = False
         if self.obj.data.bones[bone_name].parent:
diff --git a/rigify/rigs/palm.py b/rigify/rigs/palm.py
index 6ad72f4e..1309f626 100644
--- a/rigify/rigs/palm.py
+++ b/rigify/rigs/palm.py
@@ -66,7 +66,7 @@ class Rig:
         siblings = bone_siblings(obj, bone)
 
         if len(siblings) == 0:
-            raise MetarigError("RIGIFY ERROR: Bone '%s': must have a parent and at least one sibling." % (strip_org(bone)))
+            raise MetarigError("RIGIFY ERROR: Bone '%s': must have a parent and at least one sibling" % (strip_org(bone)))
 
         # Sort list by name and distance
         siblings.sort()
diff --git a/rigify/rigs/spine.py b/rigify/rigs/spine.py
index 740cfa7e..1b77c4c3 100644
--- a/rigify/rigs/spine.py
+++ b/rigify/rigs/spine.py
@@ -75,7 +75,7 @@ class Rig:
         self.pivot_rest = min(self.pivot_rest, 1.0-(1.0/len(self.org_bones)))
 
         if len(self.org_bones) <= 1:
-            raise MetarigError("RIGIFY ERROR: Bone '%s': input to rig type must be a chain of 2 or more bones." % (strip_org(bone_name)))
+            raise MetarigError("RIGIFY ERROR: Bone '%s': input to rig type must be a chain of 2 or more bones" % (strip_org(bone_name)))
 
     def gen_deform(self):
         """ Generate the deformation rig.
@@ -528,9 +528,9 @@ class Rig:
         """ Add the parameters of this rig type to the
             RigifyParameters PropertyGroup
         """
-        group.spine_main_control_name = bpy.props.StringProperty(name="Main control name", default="torso", description="Name that the main control bone should be given.")
-        group.rest_pivot_slide = bpy.props.FloatProperty(name="Rest Pivot Slide", default=0.0, min=0.0, max=1.0, soft_min=0.0, soft_max=1.0, description="The pivot slide value in the rest pose.")
-        group.chain_bone_controls = bpy.props.StringProperty(name="Control bone list", default="", description="Define which bones have controls.")
+        group.spine_main_control_name = bpy.props.StringProperty(name="Main control name", default="torso", description="Name that the main control bone should be given")
+        group.rest_pivot_slide = bpy.props.FloatProperty(name="Rest Pivot Slide", default=0.0, min=0.0, max=1.0, soft_min=0.0, soft_max=1.0, description="The pivot slide value in the rest pose")
+        group.chain_bone_controls = bpy.props.StringProperty(name="Control bone list", default="", description="Define which bones have controls")
 
 
     @classmethod
diff --git a/rigify/utils.py b/rigify/utils.py
index d9135271..c367c82a 100644
--- a/rigify/utils.py
+++ b/rigify/utils.py
@@ -128,7 +128,7 @@ def new_bone(obj, bone_name):
         bpy.ops.object.mode_set(mode='EDIT')
         return name
     else:
-        raise MetarigError("Can't add new bone '%s' outside of edit mode." % bone_name)
+        raise MetarigError("Can't add new bone '%s' outside of edit mode" % bone_name)
 
 
 def copy_bone(obj, bone_name, assign_name=''):
@@ -136,7 +136,7 @@ def copy_bone(obj, bone_name, assign_name=''):
         Returns the resulting bone's name.
     """
     if bone_name not in obj.data.bones:
-        raise MetarigError("copy_bone(): bone '%s' not found, cannot copy it." % bone_name)
+        raise MetarigError("copy_bone(): bone '%s' not found, cannot copy it" % bone_name)
 
     if obj == bpy.context.active_object and bpy.context.mode == 'EDIT_ARMATURE':
         if assign_name == '':
@@ -199,14 +199,14 @@ def copy_bone(obj, bone_name, assign_name=''):
 
         return bone_name_2
     else:
-        raise MetarigError("Cannot copy bones outside of edit mode.")
+        raise MetarigError("Cannot copy bones outside of edit mode")
 
 
 def flip_bone(obj, bone_name):
     """ Flips an edit bone.
     """
     if bone_name not in obj.data.bones:
-        raise MetarigError("flip_bone(): bone '%s' not found, cannot copy it." % bone_name)
+        raise MetarigError("flip_bone(): bone '%s' not found, cannot copy it" % bone_name)
 
     if obj == bpy.context.active_object and bpy.context.mode == 'EDIT_ARMATURE':
         bone = obj.data.edit_bones[bone_name]
@@ -216,14 +216,14 @@ def flip_bone(obj, bone_name):
         bone.head = tail
         bone.tail = head
     else:
-        raise MetarigError("Cannot flip bones outside of edit mode.")
+        raise MetarigError("Cannot flip bones outside of edit mode")
 
 
 def put_bone(obj, bone_name, pos):
     """ Places a bone at the given position.
     """
     if bone_name not in obj.data.bones:
-        raise MetarigError("put_bone(): bone '%s' not found, cannot copy it." % bone_name)
+        raise MetarigError("put_bone(): bone '%s' not found, cannot copy it" % bone_name)
 
     if obj == bpy.context.active_object and bpy.context.mode == 'EDIT_ARMATURE':
         bone = obj.data.edit_bones[bone_name]
@@ -231,7 +231,7 @@ def put_bone(obj, bone_name, pos):
         delta = pos - bone.head
         bone.translate(delta)
     else:
-        raise MetarigError("Cannot 'put' bones outside of edit mode.")
+        raise MetarigError("Cannot 'put' bones outside of edit mode")
 
 
 #=============================================
@@ -242,7 +242,7 @@ def obj_to_bone(obj, rig, bone_name):
     """ Places an object at the location/rotation/scale of the given bone.
     """
     if bpy.context.mode == 'EDIT_ARMATURE':
-        raise MetarigError("obj_to_bone(): does not work while in edit mode.")
+        raise MetarigError("obj_to_bone(): does not work while in edit mode")
 
     bone = rig.data.bones[bone_name]
 
diff --git a/space_view3d_panel_measure.py b/space_view3d_panel_measure.py
index 30809809..efe9b523 100644
--- a/space_view3d_panel_measure.py
+++ b/space_view3d_panel_measure.py
@@ -847,7 +847,7 @@ class VIEW3D_OT_display_measurements(bpy.types.Operator):
     '''Display the measurements made in the 'Measure' panel'''
     bl_idname = "view3d.display_measurements"
     bl_label = "Display the measurements made in the" \
-        " 'Measure' panel in the 3D View."
+               " 'Measure' panel in the 3D View"
     bl_options = {'REGISTER'}
 
     def modal(self, context, event):
@@ -882,7 +882,7 @@ class VIEW3D_OT_display_measurements(bpy.types.Operator):
 class VIEW3D_OT_activate_measure_panel(bpy.types.Operator):
     bl_label = "Activate"
     bl_idname = "view3d.activate_measure_panel"
-    bl_description = "Activate the callback needed to draw the lines."
+    bl_description = "Activate the callback needed to draw the lines"
     bl_options = {'REGISTER'}
 
     def invoke(self, context, event):
@@ -896,8 +896,8 @@ class VIEW3D_OT_activate_measure_panel(bpy.types.Operator):
 class VIEW3D_OT_reenter_editmode(bpy.types.Operator):
     bl_label = "Re-enter EditMode"
     bl_idname = "view3d.reenter_editmode"
-    bl_description = "Update mesh data of an active mesh object." \
-        " This is done by exiting and re-entering mesh edit mode."
+    bl_description = "Update mesh data of an active mesh object " \
+                     "(this is done by exiting and re-entering mesh edit mode)"
     bl_options = {'REGISTER'}
 
     def invoke(self, context, event):
@@ -1011,7 +1011,7 @@ class VIEW3D_PT_measure(bpy.types.Panel):
 #                            " not be updated in mesh edit mode" \
 #                            " automatically. Press this button" \
 #                            " to do this manually, after you changed" \
-#                            " the selection.")
+#                            " the selection")
 
                 elif len(verts_selected) == 1:
                     # One vertex selected.
@@ -1083,7 +1083,7 @@ class VIEW3D_PT_measure(bpy.types.Panel):
 
                         else:
                             row = layout.row()
-                            row.label(text="Selection not supported.",
+                            row.label(text="Selection not supported",
                                 icon='INFO')
 
                             row = layout.row()
@@ -1293,14 +1293,14 @@ class VIEW3D_PT_measure(bpy.types.Panel):
 
             else:
                 row = layout.row()
-                row.label(text="Selection not supported.",
-                    icon='INFO')
+                row.label(text="Selection not supported",
+                          icon='INFO')
 
             if drawTansformButtons:
                 row = layout.row()
                 row.prop(sce,
-                    "measure_panel_transform",
-                    expand=True)
+                         "measure_panel_transform",
+                         expand=True)
 
 
 def register():
@@ -1332,14 +1332,14 @@ def register():
 
     TRANSFORM = [
         ("measure_global", "Global",
-            "Calculate values in global space."),
+         "Calculate values in global space"),
         ("measure_local", "Local",
-            "Calculate values inside the local object space.")]
+         "Calculate values inside the local object space")]
 
     # Define dropdown for the global/local setting
     bpy.types.Scene.measure_panel_transform = bpy.props.EnumProperty(
         name="Space",
-        description="Choose in which space you want to measure.",
+        description="Choose in which space you want to measure",
         items=TRANSFORM,
         default='measure_global')
 
diff --git a/space_view3d_screencast_keys.py b/space_view3d_screencast_keys.py
index 30a9d5ce..d1d46773 100644
--- a/space_view3d_screencast_keys.py
+++ b/space_view3d_screencast_keys.py
@@ -545,7 +545,6 @@ def init_properties():
             default = False)
 
     print ("Screencast Keys: initialized from AddOn default settings.")
-        
 
     # Runstate initially always set to False
     # note: it is not stored in the Scene, but in window manager:
diff --git a/space_view3d_spacebar_menu.py b/space_view3d_spacebar_menu.py
index 8dd6d0d4..66de6018 100644
--- a/space_view3d_spacebar_menu.py
+++ b/space_view3d_spacebar_menu.py
@@ -106,7 +106,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(bpy.types.Menu):
 
             # Modifier block
             layout.operator_menu_enum("object.modifier_add", "type",
-                icon='MODIFIER')
+                                      icon='MODIFIER')
 
             # Align block
             layout.menu("VIEW3D_MT_AlignMenu", icon='ALIGN')
@@ -125,11 +125,11 @@ class VIEW3D_MT_Space_Dynamic_Menu(bpy.types.Menu):
             #In which case we don't need the toggle
             # Toggle Editmode
             layout.operator("object.editmode_toggle", text="Enter Edit Mode",
-                icon='EDITMODE_HLT')
+                            icon='EDITMODE_HLT')
 
             # Delete block
             layout.operator("object.delete", text="Delete Object",
-                icon='CANCEL')
+                            icon='CANCEL')
 
 
         elif ob.mode == 'EDIT_MESH':
@@ -141,7 +141,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(bpy.types.Menu):
 
             # Add block
             layout.menu("INFO_MT_mesh_add", text="Add Mesh",
-                icon='OUTLINER_OB_MESH')
+                        icon='OUTLINER_OB_MESH')
 
             # Transform block
             layout.menu("VIEW3D_MT_TransformMenu", icon='MANIPUL')
@@ -154,9 +154,9 @@ class VIEW3D_MT_Space_Dynamic_Menu(bpy.types.Menu):
 
             # Proportional block
             layout.prop_menu_enum(settings, "proportional_edit",
-                icon="PROP_CON")
+                                  icon="PROP_CON")
             layout.prop_menu_enum(settings, "proportional_edit_falloff",
-                icon="SMOOTHCURVE")
+                                  icon="SMOOTHCURVE")
 
             # Edit block
             layout.menu("VIEW3D_MT_edit_TK", icon='EDITMODE_HLT')
@@ -175,7 +175,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(bpy.types.Menu):
 
             # Select block
             layout.menu("VIEW3D_MT_SelectEditMenu",
-                icon='RESTRICT_SELECT_OFF')
+                        icon='RESTRICT_SELECT_OFF')
 
             # Toolshelf block
             layout.operator("view3d.toolshelf", icon='MENU_PANEL')
@@ -185,7 +185,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(bpy.types.Menu):
 
             # Toggle Object Mode
             layout.operator("object.editmode_toggle",
-                text="Enter Object Mode", icon='OBJECT_DATAMODE')
+                            text="Enter Object Mode", icon='OBJECT_DATAMODE')
 
             # Delete Block
             layout.operator("mesh.delete", icon='CANCEL')
@@ -199,7 +199,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(bpy.types.Menu):
 
             # Add block
             layout.menu("INFO_MT_curve_add", text="Add Curve",
-                icon='OUTLINER_OB_CURVE')
+                        icon='OUTLINER_OB_CURVE')
 
             # Transform block
             layout.menu("VIEW3D_MT_TransformMenu", icon='MANIPUL')
@@ -212,24 +212,24 @@ class VIEW3D_MT_Space_Dynamic_Menu(bpy.types.Menu):
 
             # Proportional block
             layout.prop_menu_enum(settings, "proportional_edit",
-                icon="PROP_CON")
+                                  icon="PROP_CON")
             layout.prop_menu_enum(settings, "proportional_edit_falloff",
-                icon="SMOOTHCURVE")
+                                  icon="SMOOTHCURVE")
 
             # Edit Control Points
             layout.menu("VIEW3D_MT_EditCurveCtrlpoints",
-                icon='CURVE_BEZCURVE')
+                        icon='CURVE_BEZCURVE')
 
             # Edit Curve Specials
             layout.menu("VIEW3D_MT_EditCurveSpecials",
-                icon='MODIFIER')
+                        icon='MODIFIER')
 
             # Select Curve Block
             #Could use: VIEW3D_MT_select_edit_curve
             #Which is the default, instead of a hand written one, left it alone
             #for now though.
             layout.menu("VIEW3D_MT_SelectCurveMenu",
-                icon='RESTRICT_SELECT_OFF')
+                        icon='RESTRICT_SELECT_OFF')
 
             # Toolshelf block
             layout.operator("view3d.toolshelf", icon='MENU_PANEL')
@@ -239,11 +239,11 @@ class VIEW3D_MT_Space_Dynamic_Menu(bpy.types.Menu):
 
             # Toggle Objectmode
             layout.operator("object.editmode_toggle", text="Enter Object Mode",
-                icon='OBJECT_DATA')
+                            icon='OBJECT_DATA')
 
             # Delete block
             layout.operator("curve.delete", text="Delete Object",
-                icon='CANCEL')
+                            icon='CANCEL')
 
         if ob.mode == 'EDIT_SURFACE':
             # Surface menu
@@ -254,7 +254,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(bpy.types.Menu):
 
             # Add block
             layout.menu("INFO_MT_surface_add", text="Add Surface",
-                icon='OUTLINER_OB_SURFACE')
+                        icon='OUTLINER_OB_SURFACE')
 
             # Transform block
             layout.menu("VIEW3D_MT_TransformMenu", icon='MANIPUL')
@@ -267,13 +267,13 @@ class VIEW3D_MT_Space_Dynamic_Menu(bpy.types.Menu):
 
             # Proportional block
             layout.prop_menu_enum(settings, "proportional_edit",
-                icon="PROP_CON")
+                                  icon="PROP_CON")
             layout.prop_menu_enum(settings, "proportional_edit_falloff",
-                icon="SMOOTHCURVE")
+                                  icon="SMOOTHCURVE")
 
             # Edit Curve Specials
             layout.menu("VIEW3D_MT_EditCurveSpecials",
-                icon='MODIFIER')
+                        icon='MODIFIER')
 
             # Select Surface
             layout.menu("VIEW3D_MT_SelectSurface", icon='RESTRICT_SELECT_OFF')
@@ -287,11 +287,11 @@ class VIEW3D_MT_Space_Dynamic_Menu(bpy.types.Menu):
 
             # Toggle Objectmode
             layout.operator("object.editmode_toggle", text="Enter Object Mode",
-                icon='OBJECT_DATA')
+                            icon='OBJECT_DATA')
 
             # Delete block
             layout.operator("curve.delete", text="Delete Object",
-                icon='CANCEL')
+                            icon='CANCEL')
 
         if ob.mode == 'EDIT_METABALL':
             # Metaball menu
@@ -302,9 +302,10 @@ class VIEW3D_MT_Space_Dynamic_Menu(bpy.types.Menu):
 
             # Add block
             #layout.menu("INFO_MT_metaball_add", text="Add Metaball",
-            #    icon='OUTLINER_OB_META')
+            #            icon='OUTLINER_OB_META')
             layout.operator_menu_enum("object.metaball_add", "type",
-                text="Add Metaball", icon='OUTLINER_OB_META')
+                                      text="Add Metaball",
+                                      icon='OUTLINER_OB_META')
 
             # Transform block
             layout.menu("VIEW3D_MT_TransformMenu", icon='MANIPUL')
@@ -317,9 +318,9 @@ class VIEW3D_MT_Space_Dynamic_Menu(bpy.types.Menu):
 
             # Proportional block
             layout.prop_menu_enum(settings, "proportional_edit",
-                icon="PROP_CON")
+                                  icon="PROP_CON")
             layout.prop_menu_enum(settings, "proportional_edit_falloff",
-                icon="SMOOTHCURVE")
+                                  icon="SMOOTHCURVE")
 
             #Select Metaball
             layout.menu("VIEW3D_MT_SelectMetaball", icon='RESTRICT_SELECT_OFF')
@@ -332,11 +333,11 @@ class VIEW3D_MT_Space_Dynamic_Menu(bpy.types.Menu):
 
             # Toggle Objectmode
             layout.operator("object.editmode_toggle", text="Enter Object Mode",
-                icon='OBJECT_DATA')
+                            icon='OBJECT_DATA')
 
             # Delete block
             layout.operator("mball.delete_metaelems", text="Delete Object",
-                icon='CANCEL')
+                            icon='CANCEL')
 
         elif ob.mode == 'EDIT_LATTICE':
             # Lattice menu
@@ -356,14 +357,14 @@ class VIEW3D_MT_Space_Dynamic_Menu(bpy.types.Menu):
 
             # Proportional block
             layout.prop_menu_enum(settings, "proportional_edit",
-                icon= "PROP_CON")
+                                  icon= "PROP_CON")
             layout.prop_menu_enum(settings, "proportional_edit_falloff",
-                icon= "SMOOTHCURVE")
+                                  icon= "SMOOTHCURVE")
             layout.operator("lattice.make_regular")
 
             #Select Lattice
             layout.menu("VIEW3D_MT_select_edit_lattice",
-                icon='RESTRICT_SELECT_OFF')
+                        icon='RESTRICT_SELECT_OFF')
 
             # Toolshelf block
             layout.operator("view3d.toolshelf", icon='MENU_PANEL')
@@ -373,11 +374,11 @@ class VIEW3D_MT_Space_Dynamic_Menu(bpy.types.Menu):
 
             # Toggle Objectmode
             layout.operator("object.editmode_toggle", text="Enter Object Mode",
-                icon='OBJECT_DATA')
+                            icon='OBJECT_DATA')
 
             # Delete block - Can't delete any lattice stuff so not needed
             #layout.operator("object.delete", text="Delete Object",
-            #    icon='CANCEL')
+            #                icon='CANCEL')
 
         if  context.mode == 'PARTICLE':
             # Particle menu
@@ -397,16 +398,16 @@ class VIEW3D_MT_Space_Dynamic_Menu(bpy.types.Menu):
 
             # Proportional block
             layout.prop_menu_enum(settings, "proportional_edit",
-                icon= "PROP_CON")
+                                  icon= "PROP_CON")
             layout.prop_menu_enum(settings, "proportional_edit_falloff",
-                icon= "SMOOTHCURVE")
+                                  icon= "SMOOTHCURVE")
 
             # Particle block
             layout.menu("VIEW3D_MT_particle", icon='PARTICLEMODE')
 
             #Select Particle
             layout.menu("VIEW3D_MT_select_particle",
-                icon='RESTRICT_SELECT_OFF')
+                        icon='RESTRICT_SELECT_OFF')
 
             # History/Cursor Block
             layout.menu("VIEW3D_MT_undoS", icon='ARROW_LEFTRIGHT')
@@ -419,11 +420,11 @@ class VIEW3D_MT_Space_Dynamic_Menu(bpy.types.Menu):
 
             # Toggle Objectmode
             layout.operator("object.mode_set", text="Enter Object Mode",
-                icon='OBJECT_DATA')
+                            icon='OBJECT_DATA')
 
             # Delete block
             layout.operator("object.delete", text="Delete Object",
-                icon='CANCEL')
+                            icon='CANCEL')
 
         ob = context
         if ob.mode == 'PAINT_WEIGHT':
@@ -453,7 +454,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(bpy.types.Menu):
 
             # Toggle Objectmode
             layout.operator("object.mode_set", text="Enter Object Mode",
-                icon='OBJECT_DATA')
+                            icon='OBJECT_DATA')
 
         elif ob.mode == 'PAINT_VERTEX':
             # Vertex paint menu
@@ -482,7 +483,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(bpy.types.Menu):
 
             # Toggle Objectmode
             layout.operator("object.mode_set", text="Enter Object Mode",
-                icon='OBJECT_DATA')
+                            icon='OBJECT_DATA')
 
         elif ob.mode == 'PAINT_TEXTURE':
             # Texture paint menu
@@ -508,7 +509,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(bpy.types.Menu):
 
             # Toggle Objectmode
             layout.operator("object.mode_set", text="Enter Object Mode",
-                icon='OBJECT_DATA')
+                            icon='OBJECT_DATA')
 
         elif ob.mode == 'SCULPT':
             # Sculpt menu
@@ -540,7 +541,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(bpy.types.Menu):
 
             # Toggle Objectmode
             layout.operator("object.mode_set", text="Enter Object Mode",
-                icon='OBJECT_DATA')
+                            icon='OBJECT_DATA')
 
         elif ob.mode == 'EDIT_ARMATURE':
             # Armature menu
@@ -560,36 +561,36 @@ class VIEW3D_MT_Space_Dynamic_Menu(bpy.types.Menu):
 
             # Proportional block
             layout.prop_menu_enum(settings, "proportional_edit",
-                icon="PROP_CON")
+                                  icon="PROP_CON")
             layout.prop_menu_enum(settings, "proportional_edit_falloff",
-                icon="SMOOTHCURVE")
+                                  icon="SMOOTHCURVE")
             layout.separator()
 
             # Edit Armature roll
             layout.menu("VIEW3D_MT_edit_armature_roll",
-                icon='BONE_DATA')
+                        icon='BONE_DATA')
 
             # Edit Armature Toolkit
             layout.menu("VIEW3D_MT_EditArmatureTK",
-                icon='ARMATURE_DATA')
+                        icon='ARMATURE_DATA')
 
             # Edit Armature Name
             layout.menu("VIEW3D_MT_ArmatureName",
-                icon='NEW')
+                        icon='NEW')
 
             # Parent block
             layout.menu("VIEW3D_MT_ParentMenu", icon='ROTACTIVE')
 
             # bone options block
             layout.menu("VIEW3D_MT_bone_options_toggle",
-                text="Bone Settings")
+                        text="Bone Settings")
 
             # Edit Armature Specials
             layout.menu("VIEW3D_MT_armature_specials", icon='MODIFIER')
 
             # Edit Armature Select
             layout.menu("VIEW3D_MT_SelectArmatureMenu",
-                icon='RESTRICT_SELECT_OFF')
+                        icon='RESTRICT_SELECT_OFF')
 
             # Toolshelf block
             layout.operator("view3d.toolshelf", icon='MENU_PANEL')
@@ -599,15 +600,15 @@ class VIEW3D_MT_Space_Dynamic_Menu(bpy.types.Menu):
 
             # Toggle Posemode
             layout.operator("object.posemode_toggle", text="Enter Pose Mode",
-                icon='POSE_HLT')
+                            icon='POSE_HLT')
 
             # Toggle Posemode
             layout.operator("object.editmode_toggle", text="Enter Object Mode",
-                icon='OBJECT_DATA')
+                            icon='OBJECT_DATA')
 
             # Delete block
             layout.operator("armature.delete", text="Delete Object",
-                icon='CANCEL')
+                            icon='CANCEL')
 
         if context.mode == 'POSE':
             # Pose mode menu
@@ -631,7 +632,7 @@ class VIEW3D_MT_Space_Dynamic_Menu(bpy.types.Menu):
 
             if arm.draw_type in {'BBONE', 'ENVELOPE'}:
                 layout.operator("transform.transform",
-                    text="Scale Envelope Distance").mode = 'BONE_SIZE'
+                                text="Scale Envelope Distance").mode = 'BONE_SIZE'
 
             layout.menu("VIEW3D_MT_pose_apply")
             layout.operator("pose.relax")
@@ -646,12 +647,12 @@ class VIEW3D_MT_Space_Dynamic_Menu(bpy.types.Menu):
 
             layout.operator_context = 'INVOKE_AREA'
             layout.operator("pose.armature_layers",
-                text="Change Armature Layers...")
+                            text="Change Armature Layers...")
             layout.operator("pose.bone_layers", text="Change Bone Layers...")
 
             layout.menu("VIEW3D_MT_pose_showhide")
             layout.menu("VIEW3D_MT_bone_options_toggle",
-                text="Bone Settings")
+                        text="Bone Settings")
 
             # Select Pose Block
             layout.menu("VIEW3D_MT_SelectPoseMenu", icon='RESTRICT_SELECT_OFF')
@@ -664,10 +665,10 @@ class VIEW3D_MT_Space_Dynamic_Menu(bpy.types.Menu):
 
             # Toggle Editmode
             layout.operator("object.editmode_toggle", text="Enter Edit Mode",
-                icon='EDITMODE_HLT')
+                            icon='EDITMODE_HLT')
 
             layout.operator("object.mode_set", text="Enter Object Mode",
-                icon='OBJECT_DATA').mode='OBJECT'
+                            icon='OBJECT_DATA').mode='OBJECT'
 
 class VIEW3D_MT_AddMenu(bpy.types.Menu):
     bl_label = "Add Object Menu"
@@ -677,37 +678,37 @@ class VIEW3D_MT_AddMenu(bpy.types.Menu):
         layout.operator_context = 'INVOKE_REGION_WIN'
 
         layout.menu("INFO_MT_mesh_add", text="Add Mesh",
-            icon='OUTLINER_OB_MESH')
+                    icon='OUTLINER_OB_MESH')
         layout.menu("INFO_MT_curve_add", text="Add Curve",
-            icon='OUTLINER_OB_CURVE')
+                    icon='OUTLINER_OB_CURVE')
         layout.menu("INFO_MT_surface_add", text="Add Surface",
-            icon='OUTLINER_OB_SURFACE')
+                    icon='OUTLINER_OB_SURFACE')
         layout.operator_menu_enum("object.metaball_add", "type",
-            icon='OUTLINER_OB_META')
+                                  icon='OUTLINER_OB_META')
         layout.operator("object.text_add", text="Add Text",
-            icon='OUTLINER_OB_FONT')
+                        icon='OUTLINER_OB_FONT')
         layout.separator()
         layout.menu("INFO_MT_armature_add", text="Add Armature",
-            icon='OUTLINER_OB_ARMATURE')
+                    icon='OUTLINER_OB_ARMATURE')
         layout.operator("object.add", text="Lattice",
-            icon='OUTLINER_OB_LATTICE').type = 'LATTICE'
+                        icon='OUTLINER_OB_LATTICE').type = 'LATTICE'
         layout.separator()
         layout.operator("object.add", text="Add Empty",
-            icon='OUTLINER_OB_EMPTY')
+                        icon='OUTLINER_OB_EMPTY')
         layout.separator()
 
         layout.operator("object.camera_add", text="Camera",
-            icon='OUTLINER_OB_CAMERA')
+                        icon='OUTLINER_OB_CAMERA')
         layout.operator_menu_enum("object.lamp_add", "type",
-            icon="OUTLINER_OB_LAMP")
+                                  icon="OUTLINER_OB_LAMP")
         layout.separator()
 
         layout.operator_menu_enum("object.effector_add", "type",
-            text="Force Field",
-            icon='OUTLINER_OB_EMPTY')
+                                  text="Force Field",
+                                  icon='OUTLINER_OB_EMPTY')
         layout.operator_menu_enum("object.group_instance_add", "group",
-            text="Group Instance",
-            icon='OUTLINER_OB_EMPTY')
+                                  text="Group Instance",
+                                  icon='OUTLINER_OB_EMPTY')
 
 
 class VIEW3D_MT_TransformMenu(bpy.types.Menu):
@@ -735,17 +736,17 @@ class VIEW3D_MT_TransformMenu(bpy.types.Menu):
             layout.operator_context = 'EXEC_REGION_WIN'
             # @todo vvv See alignmenu() in edit.c of b2.4x to get this working.
             layout.operator("transform.transform",
-                text="Align to Transform Orientation").mode = 'ALIGN'
+                            text="Align to Transform Orientation").mode = 'ALIGN'
         layout.separator()
 
         layout.operator_context = 'EXEC_AREA'
 
         layout.operator("object.origin_set",
-            text="Geometry to Origin").type = 'GEOMETRY_ORIGIN'
+                        text="Geometry to Origin").type = 'GEOMETRY_ORIGIN'
         layout.operator("object.origin_set",
-            text="Origin to Geometry").type = 'ORIGIN_GEOMETRY'
+                        text="Origin to Geometry").type = 'ORIGIN_GEOMETRY'
         layout.operator("object.origin_set",
-            text="Origin to 3D Cursor").type = 'ORIGIN_CURSOR'
+                        text="Origin to 3D Cursor").type = 'ORIGIN_CURSOR'
 
 
 class VIEW3D_MT_MirrorMenu(bpy.types.Menu):
@@ -819,9 +820,9 @@ class VIEW3D_MT_AlignMenu(bpy.types.Menu):
         layout.separator()
 
         layout.operator("view3d.view_all",
-            text="Center Cursor and View All").center = True
+                        text="Center Cursor and View All").center = True
         layout.operator("view3d.camera_to_view",
-            text="Align Active Camera to View")
+                        text="Align Active Camera to View")
         layout.operator("view3d.view_selected")
         layout.operator("view3d.view_center_cursor")
 
@@ -842,14 +843,14 @@ class VIEW3D_MT_SelectMenu(bpy.types.Menu):
         layout.operator("object.select_mirror", text="Mirror")
         layout.operator("object.select_by_layer", text="Select All by Layer")
         layout.operator_menu_enum("object.select_by_type", "type",
-            text="Select All by Type...")
+                                  text="Select All by Type...")
         layout.operator("object.select_camera", text="Select Camera")
         layout.separator()
 
         layout.operator_menu_enum("object.select_grouped", "type",
-            text="Grouped")
+                                  text="Grouped")
         layout.operator_menu_enum("object.select_linked", "type",
-            text="Linked")
+                                  text="Linked")
         layout.operator("object.select_pattern", text="Select Pattern...")
 
 class VIEW3D_MT_SelectEditMenu(bpy.types.Menu):
@@ -870,20 +871,20 @@ class VIEW3D_MT_SelectEditMenu(bpy.types.Menu):
         layout.operator("mesh.select_nth", text="Every N Number of Verts")
         layout.operator("mesh.edges_select_sharp", text="Sharp Edges")
         layout.operator("mesh.faces_select_linked_flat",
-            text="Linked Flat Faces")
+                        text="Linked Flat Faces")
         layout.operator("mesh.faces_select_interior", text="Interior Faces")
         layout.operator("mesh.select_axis", text="Side of Active")
         layout.separator()
 
         layout.operator("mesh.select_by_number_vertices",
-            text="Triangles").type = 'TRIANGLES'
+                        text="Triangles").type = 'TRIANGLES'
         layout.operator("mesh.select_by_number_vertices",
-            text="Quads").type = 'QUADS'
+                        text="Quads").type = 'QUADS'
         if context.scene.tool_settings.mesh_select_mode[2] == False:
                 layout.operator("mesh.select_non_manifold",
-            text="Non Manifold")
+                                text="Non Manifold")
         layout.operator("mesh.select_by_number_vertices",
-            text="Loose Verts/Edges").type = 'OTHER'
+                        text="Loose Verts/Edges").type = 'OTHER'
         layout.operator("mesh.select_similar", text="Similar")
         layout.separator()
 
@@ -941,18 +942,18 @@ class VIEW3D_MT_SelectArmatureMenu(bpy.types.Menu):
         layout.separator()
 
         layout.operator("armature.select_hierarchy",
-            text="Parent").direction = 'PARENT'
+                        text="Parent").direction = 'PARENT'
         layout.operator("armature.select_hierarchy",
-            text="Child").direction = 'CHILD'
+                        text="Child").direction = 'CHILD'
         layout.separator()
 
         props = layout.operator("armature.select_hierarchy",
-            text="Extend Parent")
+                                text="Extend Parent")
         props.extend = True
         props.direction = 'PARENT'
 
         props = layout.operator("armature.select_hierarchy",
-            text="Extend Child")
+                                text="Extend Child")
         props.extend = True
         props.direction = 'CHILD'
 
@@ -971,14 +972,14 @@ class VIEW3D_MT_SelectPoseMenu(bpy.types.Menu):
         layout.operator("pose.select_all", text="Select/Deselect All")
         layout.operator("pose.select_inverse", text="Inverse")
         layout.operator("pose.select_constraint_target",
-            text="Constraint Target")
+                        text="Constraint Target")
         layout.operator("pose.select_linked", text="Linked")
         layout.separator()
 
         layout.operator("pose.select_hierarchy",
-            text="Parent").direction = 'PARENT'
+                        text="Parent").direction = 'PARENT'
         layout.operator("pose.select_hierarchy",
-            text="Child").direction = 'CHILD'
+                        text="Child").direction = 'CHILD'
         layout.separator()
 
         props = layout.operator("pose.select_hierarchy", text="Extend Parent")
@@ -991,7 +992,7 @@ class VIEW3D_MT_SelectPoseMenu(bpy.types.Menu):
         layout.separator()
 
         layout.operator_menu_enum("pose.select_grouped", "type",
-            text="Grouped")
+                                  text="Grouped")
         layout.operator("object.select_pattern", text="Select Pattern...")
 
 class VIEW3D_MT_PoseCopy(bpy.types.Menu):
@@ -1003,7 +1004,7 @@ class VIEW3D_MT_PoseCopy(bpy.types.Menu):
         layout.operator("pose.copy")
         layout.operator("pose.paste")
         layout.operator("pose.paste",
-           text="Paste X-Flipped Pose").flipped = True
+                        text="Paste X-Flipped Pose").flipped = True
         layout.separator()
 
 class VIEW3D_MT_PoseNames(bpy.types.Menu):
@@ -1014,11 +1015,11 @@ class VIEW3D_MT_PoseNames(bpy.types.Menu):
 
         layout.operator_context = 'EXEC_AREA'
         layout.operator("pose.autoside_names",
-            text="AutoName Left/Right").axis = 'XAXIS'
+                        text="AutoName Left/Right").axis = 'XAXIS'
         layout.operator("pose.autoside_names",
-            text="AutoName Front/Back").axis = 'YAXIS'
+                        text="AutoName Front/Back").axis = 'YAXIS'
         layout.operator("pose.autoside_names",
-            text="AutoName Top/Bottom").axis = 'ZAXIS'
+                        text="AutoName Top/Bottom").axis = 'ZAXIS'
 
         layout.operator("pose.flip_names")
 
@@ -1077,7 +1078,7 @@ class VIEW3D_MT_edit_TK(bpy.types.Menu):
         layout.separator()
         layout.menu("VIEW3D_MT_edit_mesh_normals", icon='META_DATA')
         layout.operator("mesh.loopcut_slide",
-            text="Loopcut", icon='EDIT_VEC')
+                        text="Loopcut", icon='EDIT_VEC')
 
 
 
@@ -1090,39 +1091,43 @@ class VIEW3D_MT_edit_multi(bpy.types.Menu):
 
         layout.separator()
         prop = layout.operator("wm.context_set_value", text="Vertex Select",
-            icon='VERTEXSEL')
+                               icon='VERTEXSEL')
         prop.value = "(True, False, False)"
         prop.data_path = "tool_settings.mesh_select_mode"
 
         prop = layout.operator("wm.context_set_value", text="Edge Select",
-            icon='EDGESEL')
+                               icon='EDGESEL')
         prop.value = "(False, True, False)"
         prop.data_path = "tool_settings.mesh_select_mode"
 
         prop = layout.operator("wm.context_set_value", text="Face Select",
-            icon='FACESEL')
+                               icon='FACESEL')
         prop.value = "(False, False, True)"
         prop.data_path = "tool_settings.mesh_select_mode"
         layout.separator()
 
         prop = layout.operator("wm.context_set_value",
-            text="Vertex & Edge Select", icon='EDITMODE_HLT')
+                               text="Vertex & Edge Select",
+                               icon='EDITMODE_HLT')
         prop.value = "(True, True, False)"
         prop.data_path = "tool_settings.mesh_select_mode"
 
         prop = layout.operator("wm.context_set_value",
-            text="Vertex & Face Select", icon='ORTHO')
+                               text="Vertex & Face Select",
+                               icon='ORTHO')
         prop.value = "(True, False, True)"
         prop.data_path = "tool_settings.mesh_select_mode"
 
         prop = layout.operator("wm.context_set_value",
-            text="Edge & Face Select", icon='SNAP_FACE')
+                               text="Edge & Face Select",
+                               icon='SNAP_FACE')
         prop.value = "(False, True, True)"
         prop.data_path = "tool_settings.mesh_select_mode"
         layout.separator()
 
         prop = layout.operator("wm.context_set_value",
-            text="Vertex & Edge & Face Select", icon='SNAP_VOLUME')
+                               text="Vertex & Edge & Face Select",
+                               icon='SNAP_VOLUME')
         prop.value = "(True, True, True)"
         prop.data_path = "tool_settings.mesh_select_mode"
 
@@ -1143,9 +1148,9 @@ class VIEW3D_MT_editM_Edge(bpy.types.Menu):
         layout.separator()
 
         layout.operator("mesh.edge_rotate",
-            text="Rotate Edge CW").direction = 'CW'
+                        text="Rotate Edge CW").direction = 'CW'
         layout.operator("mesh.edge_rotate",
-            text="Rotate Edge CCW").direction = 'CCW'
+                        text="Rotate Edge CCW").direction = 'CCW'
         layout.separator()
 
         layout.operator("TFM_OT_edge_slide", text="Edge Slide")
@@ -1208,10 +1213,10 @@ class VIEW3D_MT_EditArmatureTK(bpy.types.Menu):
         # Edit Armature
 
         layout.operator("transform.transform",
-            text="Scale Envelope Distance").mode = 'BONE_SIZE'
+                        text="Scale Envelope Distance").mode = 'BONE_SIZE'
 
         layout.operator("transform.transform",
-            text="Scale B-Bone Width").mode = 'BONE_SIZE'
+                        text="Scale B-Bone Width").mode = 'BONE_SIZE'
         layout.separator()
 
         layout.operator("armature.extrude_move")
@@ -1237,11 +1242,11 @@ class VIEW3D_MT_ArmatureName(bpy.types.Menu):
 
         layout.operator_context = 'EXEC_AREA'
         layout.operator("armature.autoside_names",
-            text="AutoName Left/Right").type = 'XAXIS'
+                        text="AutoName Left/Right").type = 'XAXIS'
         layout.operator("armature.autoside_names",
-            text="AutoName Front/Back").type = 'YAXIS'
+                        text="AutoName Front/Back").type = 'YAXIS'
         layout.operator("armature.autoside_names",
-            text="AutoName Top/Bottom").type = 'ZAXIS'
+                        text="AutoName Top/Bottom").type = 'ZAXIS'
         layout.operator("armature.flip_names")
         layout.separator()
 
@@ -1253,11 +1258,11 @@ class VIEW3D_MT_KeyframeMenu(bpy.types.Menu):
 
         # Keyframe Bleck
         layout.operator("anim.keyframe_insert_menu",
-            text="Insert Keyframe...")
+                        text="Insert Keyframe...")
         layout.operator("anim.keyframe_delete_v3d",
-            text="Delete Keyframe...")
+                        text="Delete Keyframe...")
         layout.operator("anim.keying_set_active_set",
-            text="Change Keying Set...")
+                        text="Change Keying Set...")
         layout.separator()
 
 # Classes for VIEW3D_MT_CursorMenu()
@@ -1296,23 +1301,23 @@ class VIEW3D_MT_CursorMenu(bpy.types.Menu):
         layout = self.layout
         layout.operator_context = 'INVOKE_REGION_WIN'
         layout.operator("view3d.snap_cursor_to_selected",
-            text="Cursor to Selected")
+                        text="Cursor to Selected")
         layout.operator("view3d.snap_cursor_to_center",
-            text="Cursor to Center")
+                        text="Cursor to Center")
         layout.operator("view3d.snap_cursor_to_grid",
-            text="Cursor to Grid")
+                        text="Cursor to Grid")
         layout.operator("view3d.snap_cursor_to_active",
-            text="Cursor to Active")
+                        text="Cursor to Active")
         layout.separator()
         layout.operator("view3d.snap_selected_to_cursor",
-            text="Selection to Cursor")
+                        text="Selection to Cursor")
         layout.operator("view3d.snap_selected_to_grid",
-            text="Selection to Grid")
+                        text="Selection to Grid")
         layout.separator()
         layout.operator("view3d.pivot_cursor",
-            text="Set Cursor as Pivot Point")
+                        text="Set Cursor as Pivot Point")
         layout.operator("view3d.revert_pivot",
-            text="Revert Pivot Point")
+                        text="Revert Pivot Point")
 
 class VIEW3D_MT_EditCursorMenu(bpy.types.Menu):
     bl_label = "Snap Cursor Menu"
@@ -1322,27 +1327,27 @@ class VIEW3D_MT_EditCursorMenu(bpy.types.Menu):
         layout = self.layout
         layout.operator_context = 'INVOKE_REGION_WIN'
         layout.operator("view3d.snap_cursor_to_selected",
-            text="Cursor to Selected")
+                        text="Cursor to Selected")
         layout.operator("view3d.snap_cursor_to_center",
-            text="Cursor to Center")
+                        text="Cursor to Center")
         layout.operator("view3d.snap_cursor_to_grid",
-            text="Cursor to Grid")
+                        text="Cursor to Grid")
         layout.operator("view3d.snap_cursor_to_active",
-            text="Cursor to Active")
+                        text="Cursor to Active")
         layout.separator()
         layout.operator("view3d.snap_selected_to_cursor",
-            text="Selection to Cursor")
+                        text="Selection to Cursor")
         layout.operator("view3d.snap_selected_to_grid",
-            text="Selection to Grid")
+                        text="Selection to Grid")
         layout.separator()
         layout.operator("view3d.pivot_cursor",
-            text="Set Cursor as Pivot Point")
+                        text="Set Cursor as Pivot Point")
         layout.operator("view3d.revert_pivot",
-            text="Revert Pivot Point")
+                        text="Revert Pivot Point")
         layout.operator("view3d.snap_cursor_to_edge_intersection",
-            text="Cursor to Edge Intersection")
+                        text="Cursor to Edge Intersection")
         layout.operator("transform.snap_type", text="Snap Tools",
-            icon='SNAP_ON')
+                        icon='SNAP_ON')
 
 def abs(val):
     if val > 0:
@@ -1378,7 +1383,7 @@ def edgeIntersect(context, operator):
 
     if len(edges) != 2:
         operator.report({'ERROR'},
-            "Operator requires exactly 2 edges to be selected.")
+                        "Operator requires exactly 2 edges to be selected")
         return
 
     line = intersect_line_line(verts[edges[0].vertices[0]].co,
@@ -1387,7 +1392,7 @@ def edgeIntersect(context, operator):
                                verts[edges[1].vertices[1]].co)
 
     if line is None:
-        operator.report({'ERROR'}, "Selected edges do not intersect.")
+        operator.report({'ERROR'}, "Selected edges do not intersect")
         return
 
     point = line[0].lerp(line[1], 0.5)
diff --git a/system_blend_info.py b/system_blend_info.py
index c07dda30..9b2a8242 100644
--- a/system_blend_info.py
+++ b/system_blend_info.py
@@ -77,9 +77,9 @@ class OBJECT_PT_blendinfo(bpy.types.Panel):
 
         l_row = layout.row()
         num = len(bpy.data.objects)
-        l_row.label(text=quantity_string(num, "Object", "Objects")
-            + " in the scene:",
-            icon='OBJECT_DATA')
+        l_row.label(text=quantity_string(num, "Object", "Objects") \
+                         " in the scene:",
+                    icon='OBJECT_DATA')
 
         l_row = layout.row()
         ob_cols.append(l_row.column())
@@ -89,43 +89,43 @@ class OBJECT_PT_blendinfo(bpy.types.Panel):
         meshes = [o for o in objects.values() if o.type == 'MESH']
         num = len(meshes)
         row.label(text=quantity_string(num, "Mesh", "Meshes"),
-            icon='MESH_DATA')
+                  icon='MESH_DATA')
 
         row = ob_cols[1].row()
         curves = [o for o in objects.values() if o.type == 'CURVE']
         num = len(curves)
         row.label(text=quantity_string(num, "Curve", "Curves"),
-            icon='CURVE_DATA')
+                  icon='CURVE_DATA')
 
         row = ob_cols[0].row()
         cameras = [o for o in objects.values() if o.type == 'CAMERA']
         num = len(cameras)
         row.label(text=quantity_string(num, "Camera", "Cameras"),
-            icon='CAMERA_DATA')
+                  icon='CAMERA_DATA')
 
         row = ob_cols[1].row()
         lamps = [o for o in objects.values() if o.type == 'LAMP']
         num = len(lamps)
         row.label(text=quantity_string(num, "Lamp", "Lamps"),
-            icon='LAMP_DATA')
+                  icon='LAMP_DATA')
 
         row = ob_cols[0].row()
         armatures = [o for o in objects.values() if o.type == 'ARMATURE']
         num = len(armatures)
         row.label(text=quantity_string(num, "Armature", "Armatures"),
-            icon='ARMATURE_DATA')
+                  icon='ARMATURE_DATA')
 
         row = ob_cols[1].row()
         lattices = [o for o in objects.values() if o.type == 'LATTICE']
         num = len(lattices)
         row.label(text=quantity_string(num, "Lattice", "Lattices"),
-            icon='LATTICE_DATA')
+                  icon='LATTICE_DATA')
 
         row = ob_cols[0].row()
         empties = [o for o in objects.values() if o.type == 'EMPTY']
         num = len(empties)
         row.label(text=quantity_string(num, "Empty", "Empties"),
-            icon='EMPTY_DATA')
+                  icon='EMPTY_DATA')
 
         layout.separator()
         
@@ -142,57 +142,57 @@ class OBJECT_PT_blendinfo(bpy.types.Panel):
         row = db_cols[0].row()
         num = len(bpy.data.meshes)
         row.label(text=quantity_string(num, "Mesh", "Meshes"),
-            icon='MESH_DATA')
+                  icon='MESH_DATA')
 
         row = db_cols[1].row()
         num = len(bpy.data.curves)
         row.label(text=quantity_string(num, "Curve", "Curves"),
-            icon='CURVE_DATA')
+                  icon='CURVE_DATA')
 
         row = db_cols[0].row()
         num = len(bpy.data.cameras)
         row.label(text=quantity_string(num, "Camera", "Cameras"),
-            icon='CAMERA_DATA')
+                  icon='CAMERA_DATA')
 
         row = db_cols[1].row()
         num = len(bpy.data.lamps)
         row.label(text=quantity_string(num, "Lamp", "Lamps"),
-            icon='LAMP_DATA')
+                  icon='LAMP_DATA')
 
         row = db_cols[0].row()
         num = len(bpy.data.armatures)
         row.label(text=quantity_string(num, "Armature", "Armatures"),
-            icon='ARMATURE_DATA')
+                  icon='ARMATURE_DATA')
 
         row = db_cols[1].row()
         num = len(bpy.data.lattices)
         row.label(text=quantity_string(num, "Lattice", "Lattices"),
-            icon='LATTICE_DATA')
+                  icon='LATTICE_DATA')
 
         row = db_cols[0].row()
         num = len(bpy.data.materials)
         row.label(text=quantity_string(num, "Material", "Materials"),
-            icon='MATERIAL_DATA')
+                  icon='MATERIAL_DATA')
 
         row = db_cols[1].row()
         num = len(bpy.data.worlds)
         row.label(text=quantity_string(num, "World", "Worlds"),
-            icon='WORLD_DATA')
+                  icon='WORLD_DATA')
 
         row = db_cols[0].row()
         num = len(bpy.data.textures)
         row.label(text=quantity_string(num, "Texture", "Textures"),
-            icon='TEXTURE_DATA')
+                  icon='TEXTURE_DATA')
 
         row = db_cols[1].row()
         num = len(bpy.data.images)
         row.label(text=quantity_string(num, "Image", "Images"),
-            icon='IMAGE_DATA')
+                  icon='IMAGE_DATA')
 
         row = db_cols[0].row()
         num = len(bpy.data.texts)
         row.label(text=quantity_string(num, "Text", "Texts"),
-            icon='TEXT')
+                  icon='TEXT')
 
 
 def register():
diff --git a/system_demo_mode/__init__.py b/system_demo_mode/__init__.py
index a1a0a2e5..e17b8e84 100644
--- a/system_demo_mode/__init__.py
+++ b/system_demo_mode/__init__.py
@@ -107,7 +107,7 @@ class DemoModeSetup(bpy.types.Operator):
 
         box = layout.box()
         box.label("Search *.blend recursively")
-        box.label("Writes: demo.py config text.")
+        box.label("Writes: demo.py config text")
 
         layout.prop(self, "run")
 
diff --git a/system_property_chart.py b/system_property_chart.py
index 045ead0d..8226a698 100644
--- a/system_property_chart.py
+++ b/system_property_chart.py
@@ -228,7 +228,8 @@ def register():
                 cls._PROP_STORAGE_ID,
                 StringProperty(
                     name="Scene Name",
-                    description="Name of POV-Ray scene to create. Empty name will use the name of the blend file.",
+                    description="Name of POV-Ray scene to create. Empty " \
+                                "name will use the name of the blend file",
                     default=cls._PROP_STORAGE_DEFAULT, maxlen=1024),
                 )