"Fix" [#30431] UI string spelling & similar fixes.
authorBastien Montagne <montagne29@wanadoo.fr>
Fri, 2 Mar 2012 21:14:37 +0000 (21:14 +0000)
committerBastien Montagne <montagne29@wanadoo.fr>
Fri, 2 Mar 2012 21:14:37 +0000 (21:14 +0000)
All suggested changes looked good to me, thx to Michael Färber for this list of changes!

16 files changed:
release/scripts/startup/bl_operators/object.py
release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
source/blender/blenkernel/intern/scene.c
source/blender/editors/gpencil/gpencil_paint.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/mesh/editmesh_add.c
source/blender/editors/sound/sound_ops.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/makesrna/intern/rna_image.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_meta.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/windowmanager/intern/wm_operators.c

index 815bdc4e6e45f378fe78cb1a8b110b351448bbd1..008d14623224d61735780432cfd1fd533e16f2e6 100644 (file)
@@ -27,7 +27,7 @@ from bpy.props import (StringProperty,
 
 
 class SelectPattern(Operator):
-    '''Select object matching a naming pattern'''
+    '''Select objects matching a naming pattern'''
     bl_idname = "object.select_pattern"
     bl_label = "Select Pattern"
     bl_options = {'REGISTER', 'UNDO'}
index d6aeea8ece756a77610f10e63543c5538bf641e2..e1e47c1e85ff194e6374cd0975bf36ad513316e1 100644 (file)
@@ -217,7 +217,7 @@ class PHYSICS_PT_dp_canvas_output(PhysicButtonsPanel, Panel):
 
                 # paint-map output
                 row = layout.row()
-                row.prop_search(surface, "output_name_a", ob.data, "vertex_colors", text="Paintmap layer: ")
+                row.prop_search(surface, "output_name_a", ob.data, "vertex_colors", text="Paintmap layer:")
                 if surface.output_exists(object=ob, index=0):
                     ic = 'ZOOMOUT'
                 else:
@@ -227,7 +227,7 @@ class PHYSICS_PT_dp_canvas_output(PhysicButtonsPanel, Panel):
 
                 # wet-map output
                 row = layout.row()
-                row.prop_search(surface, "output_name_b", ob.data, "vertex_colors", text="Wetmap layer: ")
+                row.prop_search(surface, "output_name_b", ob.data, "vertex_colors", text="Wetmap layer:")
                 if surface.output_exists(object=ob, index=1):
                     ic = 'ZOOMOUT'
                 else:
@@ -237,7 +237,7 @@ class PHYSICS_PT_dp_canvas_output(PhysicButtonsPanel, Panel):
 
             elif surface_type == 'WEIGHT':
                 row = layout.row()
-                row.prop_search(surface, "output_name_a", ob, "vertex_groups", text="Vertex Group: ")
+                row.prop_search(surface, "output_name_a", ob, "vertex_groups", text="Vertex Group:")
                 if surface.output_exists(object=ob, index=0):
                     ic = 'ZOOMOUT'
                 else:
@@ -270,7 +270,7 @@ class PHYSICS_PT_dp_canvas_output(PhysicButtonsPanel, Panel):
                 sub.prop(surface, "output_name_b", text="")
             else:
                 col = layout.column()
-                col.prop(surface, "output_name_a", text="Filename: ")
+                col.prop(surface, "output_name_a", text="Filename:")
                 if surface_type == 'DISPLACE':
                     col.prop(surface, "displace_type", text="Displace Type")
                     col.prop(surface, "depth_clamp")
@@ -309,7 +309,7 @@ class PHYSICS_PT_dp_canvas_initial_color(PhysicButtonsPanel, Panel):
             layout.prop_search(surface, "init_layername", ob.data, "uv_textures", text="UV Map:")
 
         elif surface.init_color_type == 'VERTEX_COLOR':
-            layout.prop_search(surface, "init_layername", ob.data, "vertex_colors", text="Color Layer: ")
+            layout.prop_search(surface, "init_layername", ob.data, "vertex_colors", text="Color Layer:")
 
 
 class PHYSICS_PT_dp_effects(PhysicButtonsPanel, Panel):
index e01cd992ad8d51a8bd0053bb9671bad709787edd..150bb05d2d92458d04f66dc6ba20c591c90e9fc8 100644 (file)
@@ -662,7 +662,7 @@ int next_object(Scene **scene, int val, Base **base, Object **ob)
                /* XXX particle systems with metas+dupligroups call this recursively */
                /* see bug #18725 */
                if (in_next_object) {
-                       printf("ERROR: MetaBall generation called recursively, not supported\n");
+                       printf("ERROR: Metaball generation called recursively, not supported\n");
                        
                        return F_ERROR;
                }
index 21a9832cdc79d840732221c8873d8ed50304d08b..673d7c637ffcc50e4d62d2f4e6ac83359aae4269 100644 (file)
@@ -1938,7 +1938,7 @@ void GPENCIL_OT_draw (wmOperatorType *ot)
        ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
        
        /* settings for drawing */
-       RNA_def_enum(ot->srna, "mode", prop_gpencil_drawmodes, 0, "Mode", "Way to intepret mouse movements");
+       RNA_def_enum(ot->srna, "mode", prop_gpencil_drawmodes, 0, "Mode", "Way to interpret mouse movements");
        
        RNA_def_collection_runtime(ot->srna, "stroke", &RNA_OperatorStrokeElement, "Stroke", "");
 }
index 91a2b76eae4aeb9b0f87a72af75369179ab69ead..51526c7c902c38cd5b47a47644e22705894b177a 100644 (file)
@@ -315,7 +315,7 @@ static const char *template_id_browse_tip(StructRNA *type)
                        case ID_OB: return N_("Browse Object to be linked");
                        case ID_ME: return N_("Browse Mesh Data to be linked");
                        case ID_CU: return N_("Browse Curve Data to be linked");
-                       case ID_MB: return N_("Browse MetaBall Data to be linked");
+                       case ID_MB: return N_("Browse Metaball Data to be linked");
                        case ID_MA: return N_("Browse Material to be linked");
                        case ID_TE: return N_("Browse Texture to be linked");
                        case ID_IM: return N_("Browse Image to be linked");
index f13f15a2cc3a8e549eb8b82646368596d24ab6b8..1794e5d6e2195d4f8957aa2d462293c583e1f66e 100644 (file)
@@ -379,7 +379,7 @@ static int add_primitive_cone_exec(bContext *C, wmOperator *op)
        
        make_prim_finish(C, &state, enter_editmode);
 
-       return OPERATOR_FINISHED;       
+       return OPERATOR_FINISHED;
 }
 
 void MESH_OT_primitive_cone_add(wmOperatorType *ot)
@@ -388,7 +388,7 @@ void MESH_OT_primitive_cone_add(wmOperatorType *ot)
 
        /* identifiers */
        ot->name= "Add Cone";
-       ot->description= "Construct a conic mesh (ends filled)";
+       ot->description= "Construct a conic mesh";
        ot->idname= "MESH_OT_primitive_cone_add";
        
        /* api callbacks */
index 3f3369ac6cbeb5965f96c33e28362af9559c72cb..4f145a617f709a6e2a98ef9b77c3c2cff87ceb82 100644 (file)
@@ -299,7 +299,7 @@ static void SOUND_OT_bake_animation(wmOperatorType *ot)
 {
        /* identifiers */
        ot->name= "Update animation cache";
-       ot->description= "Updates the audio animation cache so that it's up to date";
+       ot->description= "Update the audio animation cache";
        ot->idname= "SOUND_OT_bake_animation";
 
        /* api callbacks */
index 8d91962594f72099e5f95124adcbc8d32a0e6f33..c78d63c174b1cc164c659cdc0fc9e0dafea2275b 100644 (file)
@@ -3108,7 +3108,7 @@ void VIEW3D_OT_background_image_remove(wmOperatorType *ot)
        /* flags */
        ot->flag   = 0;
 
-       RNA_def_int(ot->srna, "index", 0, 0, INT_MAX, "Index", "Background image index to remove ", 0, INT_MAX);
+       RNA_def_int(ot->srna, "index", 0, 0, INT_MAX, "Index", "Background image index to remove", 0, INT_MAX);
 }
 
 /* ********************* set clipping operator ****************** */
index 7059c001283856cf28c05ba2401276344500ca92..7e3922a8f8155c1fb6f55ba5bb6863218037e392 100644 (file)
@@ -45,7 +45,7 @@
 static EnumPropertyItem image_source_items[]= {
        {IMA_SRC_FILE, "FILE", 0, "Single Image", "Single image file"},
        {IMA_SRC_SEQUENCE, "SEQUENCE", 0, "Image Sequence", "Multiple image files, as a sequence"},
-       {IMA_SRC_MOVIE, "MOVIE", 0, "Movie File", "Movie file"},
+       {IMA_SRC_MOVIE, "MOVIE", 0, "Movie", "Movie file"},
        {IMA_SRC_GENERATED, "GENERATED", 0, "Generated", "Generated image"},
        {IMA_SRC_VIEWER, "VIEWER", 0, "Viewer", "Compositing node viewer"},
        {0, NULL, 0, NULL, NULL}};
index a62da4c3f7e3e6f4c92a06414d9979e9f2f436db..5f9c66abf4dc331f6652980a3a2b62f41879cfe5 100644 (file)
@@ -343,7 +343,7 @@ void rna_Main_metaballs_remove(Main *bmain, ReportList *reports, struct MetaBall
        if(ID_REAL_USERS(mb) <= 0)
                free_libblock(&bmain->mball, mb);
        else
-               BKE_reportf(reports, RPT_ERROR, "MetaBall \"%s\" must have zero users to be removed, found %d",
+               BKE_reportf(reports, RPT_ERROR, "Metaball \"%s\" must have zero users to be removed, found %d",
                            mb->id.name+2, ID_REAL_USERS(mb));
 }
 
@@ -1066,7 +1066,7 @@ void RNA_def_main_metaballs(BlenderRNA *brna, PropertyRNA *cprop)
        RNA_def_property_srna(cprop, "BlendDataMetaBalls");
        srna= RNA_def_struct(brna, "BlendDataMetaBalls", NULL);
        RNA_def_struct_sdna(srna, "Main");
-       RNA_def_struct_ui_text(srna, "Main MetaBalls", "Collection of metaballs");
+       RNA_def_struct_ui_text(srna, "Main Metaballs", "Collection of metaballs");
 
        func= RNA_def_function(srna, "new", "rna_Main_metaballs_new");
        RNA_def_function_ui_description(func, "Add a new metaball to the main database");
@@ -1079,7 +1079,7 @@ void RNA_def_main_metaballs(BlenderRNA *brna, PropertyRNA *cprop)
        func= RNA_def_function(srna, "remove", "rna_Main_metaballs_remove");
        RNA_def_function_flag(func, FUNC_USE_REPORTS);
        RNA_def_function_ui_description(func, "Remove a metaball from the current blendfile");
-       parm= RNA_def_pointer(func, "metaball", "MetaBall", "", "MetaBall to remove");
+       parm= RNA_def_pointer(func, "metaball", "MetaBall", "", "Metaball to remove");
        RNA_def_property_flag(parm, PROP_REQUIRED|PROP_NEVER_NULL);
 
        func= RNA_def_function(srna, "tag", "rna_Main_metaballs_tag");
index 5f33eac3e8f3bafc2eb6401e25c3a30c917cbae9..a6d256975c0743f50c8124aee410a41122893fca 100644 (file)
@@ -133,7 +133,7 @@ static void rna_MetaBall_elements_remove(MetaBall *mb, ReportList *reports, Meta
        found= BLI_remlink_safe(&mb->elems, ml);
 
        if(!found) {
-               BKE_reportf(reports, RPT_ERROR, "MetaBall \"%s\" does not contain spline given", mb->id.name+2);
+               BKE_reportf(reports, RPT_ERROR, "Metaball \"%s\" does not contain spline given", mb->id.name+2);
                return;
        }
 
@@ -167,7 +167,7 @@ static void rna_def_metaelement(BlenderRNA *brna)
 
        srna= RNA_def_struct(brna, "MetaElement", NULL);
        RNA_def_struct_sdna(srna, "MetaElem");
-       RNA_def_struct_ui_text(srna, "Meta Element", "Blobby element in a MetaBall datablock");
+       RNA_def_struct_ui_text(srna, "Meta Element", "Blobby element in a Metaball datablock");
        RNA_def_struct_ui_icon(srna, ICON_OUTLINER_DATA_META);
 
        /* enums */
index 0a8903666ef2156c7813475a5f0afa12a021a549..021ae87d60b4e313e56db7a7141828fe64f2cc4c 100644 (file)
@@ -3108,7 +3108,7 @@ void RNA_def_modifier(BlenderRNA *brna)
        /* flags */
        prop= RNA_def_property(srna, "show_viewport", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "mode", eModifierMode_Realtime);
-       RNA_def_property_ui_text(prop, "Realtime", "Realtime display of a modifier");
+       RNA_def_property_ui_text(prop, "Realtime", "Display modifier in realtime");
        RNA_def_property_flag(prop, PROP_LIB_EXCEPTION);
        RNA_def_property_update(prop, 0, "rna_Modifier_update");
        RNA_def_property_ui_icon(prop, ICON_RESTRICT_VIEW_OFF, 0);
index ed443f47eb3659be43caad56e44fe35687c664a0..433f89309d53a016d95be01ae2abcf39a7e40c61 100644 (file)
@@ -1829,7 +1829,7 @@ static void rna_def_object(BlenderRNA *brna)
                {0, NULL, 0, NULL, NULL}};
 
        static EnumPropertyItem drawtype_items[] = {
-               {OB_BOUNDBOX, "BOUNDS", 0, "Bounds", "Draw the bounding box of the object"},
+               {OB_BOUNDBOX, "BOUNDS", 0, "Bounds", "Draw the bounds of the object"},
                {OB_WIRE, "WIRE", 0, "Wire", "Draw the object as a wireframe"},
                {OB_SOLID, "SOLID", 0, "Solid", "Draw the object as a solid (if solid drawing is enabled in the viewport)"},
                {OB_TEXTURE, "TEXTURED", 0, "Textured", "Draw the object with textures (if textures are enabled in the viewport)"},
index fa82320bc67a8c797fddd7d489f5c9c72611d590..ad9e30ed55cf1de2b6121febc40f232535873bb4 100644 (file)
@@ -1815,7 +1815,7 @@ static void rna_def_unit_settings(BlenderRNA  *brna)
 
        prop= RNA_def_property(srna, "use_separate", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_UNIT_OPT_SPLIT);
-       RNA_def_property_ui_text(prop, "Separate Units", "Display units in pairs");
+       RNA_def_property_ui_text(prop, "Separate Units", "Display units in pairs (e.g. 1m 0cm)");
        RNA_def_property_update(prop, NC_WINDOW, NULL);
 }
 
@@ -3101,7 +3101,7 @@ static void rna_def_scene_render_data(BlenderRNA *brna)
                {R_OUTPUT_SCREEN, "SCREEN", 0, "Full Screen", "Images are rendered in full Screen"},
                {R_OUTPUT_AREA, "AREA", 0, "Image Editor", "Images are rendered in Image Editor"},
                {R_OUTPUT_WINDOW, "WINDOW", 0, "New Window", "Images are rendered in new Window"},
-               {R_OUTPUT_NONE, "NONE", 0, "Keep UI", "Images are rendered without forcing UI changes, optionally showing result"},
+               {R_OUTPUT_NONE, "NONE", 0, "Keep UI", "Images are rendered without forcing UI changes"},
                {0, NULL, 0, NULL, NULL}};
        
        /* Bake */
@@ -3328,7 +3328,7 @@ static void rna_def_scene_render_data(BlenderRNA *brna)
        prop= RNA_def_property(srna, "use_local_coords", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "raytrace_options", R_RAYTRACE_USE_LOCAL_COORDS);
        RNA_def_property_ui_text(prop, "Use Local Coords",
-                                "Vertex coordinates are stored localy on each primitive "
+                                "Vertex coordinates are stored locally on each primitive "
                                 "(increases memory usage, but may have impact on speed)");
        RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
 
@@ -3546,12 +3546,13 @@ static void rna_def_scene_render_data(BlenderRNA *brna)
        prop= RNA_def_property(srna, "use_free_image_textures", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "scemode", R_FREE_IMAGE);
        RNA_def_property_ui_text(prop, "Free Image Textures",
-                                "Free all image texture from memory after render, to save memory before compositing");
+                                "Free all image textures from memory after render, to save memory before compositing");
        RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
 
        prop= RNA_def_property(srna, "use_free_unused_nodes", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "scemode", R_COMP_FREE);
-       RNA_def_property_ui_text(prop, "Free Unused Nodes", "Free Nodes that are not used while compositing, to save memory");
+       RNA_def_property_ui_text(prop, "Free Unused Nodes",
+                                "Free Nodes that are not used while compositing, to save memory");
        RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
 
        prop= RNA_def_property(srna, "use_save_buffers", PROP_BOOLEAN, PROP_NONE);
index 919ee215f29e27d3ddeb45293a191738d003ed47..d14f33ca4de20679dc65463a64920e29807a4914 100644 (file)
@@ -2741,7 +2741,7 @@ static void rna_def_userdef_system(BlenderRNA *brna)
                {2, "OPENAL", 0, "OpenAL", "OpenAL device - supports 3D audio, recommended for game engine usage"},
 #endif
 #ifdef WITH_JACK
-               {3, "JACK", 0, "Jack", "Jack device - open source pro audio, recommended for pro audio users"},
+               {3, "JACK", 0, "Jack", "JACK - Audio Connection Kit, recommended for pro audio users"},
 #endif
                {0, NULL, 0, NULL, NULL}};
 
index a7502dd8c22b83154157bed1f2be3bd2ec1547d8..7f3fd9d1355561839cc8b4e6abd4b538e92e4292 100644 (file)
@@ -1653,15 +1653,17 @@ static void WM_OT_open_mainfile(wmOperatorType *ot)
        ot->name= "Open Blender File";
        ot->idname= "WM_OT_open_mainfile";
        ot->description="Open a Blender file";
-       
+
        ot->invoke= wm_open_mainfile_invoke;
        ot->exec= wm_open_mainfile_exec;
        /* ommit window poll so this can work in background mode */
-       
-       WM_operator_properties_filesel(ot, FOLDERFILE|BLENDERFILE, FILE_BLENDER, FILE_OPENFILE, WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY);
+
+       WM_operator_properties_filesel(ot, FOLDERFILE|BLENDERFILE, FILE_BLENDER, FILE_OPENFILE,
+                                      WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY);
 
        RNA_def_boolean(ot->srna, "load_ui", 1, "Load UI", "Load user interface setup in the .blend file");
-       RNA_def_boolean(ot->srna, "use_scripts", 1, "Trusted Source", "Allow blend file execute scripts automatically, default available from system preferences");
+       RNA_def_boolean(ot->srna, "use_scripts", 1, "Trusted Source",
+                       "Allow .blend file to execute scripts automatically, default available from system preferences");
 }
 
 /* **************** link/append *************** */