archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

"Fix" [#30431] UI string spelling & similar fixes.

Browse Source 
All suggested changes looked good to me, thx to Michael Färber for this list of changes!
This commit is contained in:
Bastien Montagne
2012-03-02 21:14:37 +00:00
parent e9c935caa0
commit b3a0a33791
16 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/startup/bl_operators/object.py
View 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'}

10
release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
View 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):

2
source/blender/blenkernel/intern/scene.c
View 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;
}

2
source/blender/editors/gpencil/gpencil_paint.c
View 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", "");
}

2
source/blender/editors/interface/interface_templates.c
View 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");

2
source/blender/editors/mesh/editmesh_add.c
View File

@@ -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 */

2
source/blender/editors/sound/sound_ops.c
View 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 */

2
source/blender/editors/space_view3d/view3d_edit.c
View 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 ****************** */

2
source/blender/makesrna/intern/rna_image.c
View 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}};

6
source/blender/makesrna/intern/rna_main_api.c
View 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");

4
source/blender/makesrna/intern/rna_meta.c
View 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 */

2
source/blender/makesrna/intern/rna_modifier.c
View 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);

2
source/blender/makesrna/intern/rna_object.c
View 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)"},

11
source/blender/makesrna/intern/rna_scene.c
View 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);

2
source/blender/makesrna/intern/rna_userdef.c
View 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}};

6
source/blender/windowmanager/intern/wm_operators.c
View File

@@ -1658,10 +1658,12 @@ static void WM_OT_open_mainfile(wmOperatorType *ot)
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 *************** */