[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44941] trunk/blender: Minor UI messages fixes, and enabling i18n for all modifier_setError() error messages.
Bastien Montagne
montagne29 at wanadoo.fr
Sat Mar 17 15:27:51 CET 2012
Revision: 44941
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44941
Author: mont29
Date: 2012-03-17 14:27:46 +0000 (Sat, 17 Mar 2012)
Log Message:
-----------
Minor UI messages fixes, and enabling i18n for all modifier_setError() error messages.
Modified Paths:
--------------
trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
trunk/blender/release/scripts/startup/bl_ui/properties_object.py
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
trunk/blender/source/blender/blenkernel/intern/cloth.c
trunk/blender/source/blender/editors/armature/meshlaplacian.c
trunk/blender/source/blender/editors/space_clip/tracking_ops.c
trunk/blender/source/blender/makesrna/intern/rna_mesh.c
trunk/blender/source/blender/makesrna/intern/rna_scene.c
trunk/blender/source/blender/makesrna/intern/rna_userdef.c
trunk/blender/source/blender/modifiers/intern/MOD_boolean.c
trunk/blender/source/blender/modifiers/intern/MOD_decimate.c
trunk/blender/source/blender/modifiers/intern/MOD_meshdeform.c
Modified: trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py 2012-03-17 12:32:36 UTC (rev 44940)
+++ trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py 2012-03-17 14:27:46 UTC (rev 44941)
@@ -156,19 +156,19 @@
)
clean_angle = FloatProperty(
name="Highlight Angle",
- description="Less then 90 limits the angle used in the tonal range",
+ description="Less than 90 limits the angle used in the tonal range",
min=0.0, max=180.0,
default=180.0,
)
dirt_angle = FloatProperty(
name="Dirt Angle",
- description="Less then 90 limits the angle used in the tonal range",
+ description="Less than 90 limits the angle used in the tonal range",
min=0.0, max=180.0,
default=0.0,
)
dirt_only = BoolProperty(
name="Dirt Only",
- description="Dont calculate cleans for convex areas",
+ description="Don't calculate cleans for convex areas",
default=False,
)
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_object.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_object.py 2012-03-17 12:32:36 UTC (rev 44940)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_object.py 2012-03-17 14:27:46 UTC (rev 44941)
@@ -90,7 +90,7 @@
#row.column().prop(ob, "delta_rotation_axis_angle", text="Rotation")
row.column().label(text="Not for Axis-Angle")
else:
- row.column().prop(ob, "delta_rotation_euler", text="Rotation")
+ row.column().prop(ob, "delta_rotation_euler", text="Delat Rotation")
row.column().prop(ob, "delta_scale")
Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2012-03-17 12:32:36 UTC (rev 44940)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2012-03-17 14:27:46 UTC (rev 44941)
@@ -51,6 +51,8 @@
#include "BLI_utildefines.h"
#include "BLI_linklist.h"
+#include "BLF_translation.h"
+
#include "BKE_cdderivedmesh.h"
#include "BKE_displist.h"
#include "BKE_key.h"
@@ -1389,7 +1391,7 @@
if(!modifier_isEnabled(scene, md, required_mode)) continue;
if(mti->type == eModifierTypeType_OnlyDeform && !useDeform) continue;
if((mti->flags & eModifierTypeFlag_RequiresOriginalData) && dm) {
- modifier_setError(md, "Modifier requires original data, bad stack position.");
+ modifier_setError(md, TIP_("Modifier requires original data, bad stack position."));
continue;
}
if(sculpt_mode && (!has_multires || multires_applied)) {
@@ -1402,7 +1404,7 @@
unsupported|= multires_applied;
if(unsupported) {
- modifier_setError(md, "Not supported in sculpt mode.");
+ modifier_setError(md, TIP_("Not supported in sculpt mode."));
continue;
}
}
@@ -1731,7 +1733,7 @@
if(!modifier_isEnabled(scene, md, required_mode)) return 0;
if((mti->flags & eModifierTypeFlag_RequiresOriginalData) && dm) {
- modifier_setError(md, "Modifier requires original data, bad stack position.");
+ modifier_setError(md, TIP_("Modifier requires original data, bad stack position."));
return 0;
}
Modified: trunk/blender/source/blender/blenkernel/intern/cloth.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cloth.c 2012-03-17 12:32:36 UTC (rev 44940)
+++ trunk/blender/source/blender/blenkernel/intern/cloth.c 2012-03-17 14:27:46 UTC (rev 44941)
@@ -41,6 +41,8 @@
#include "BLI_utildefines.h"
#include "BLI_linklist.h"
+#include "BLF_translation.h"
+
#include "BKE_cdderivedmesh.h"
#include "BKE_cloth.h"
#include "BKE_effect.h"
@@ -827,7 +829,7 @@
clmd->clothObject->edgehash = NULL;
}
else if (!clmd->clothObject) {
- modifier_setError ( & ( clmd->modifier ), "Out of memory on allocating clmd->clothObject." );
+ modifier_setError(&(clmd->modifier), TIP_("Out of memory on allocating clmd->clothObject."));
return 0;
}
@@ -892,7 +894,7 @@
if ( !cloth_build_springs ( clmd, dm ) )
{
cloth_free_modifier ( clmd );
- modifier_setError ( & ( clmd->modifier ), "Can't build springs." );
+ modifier_setError(&(clmd->modifier), TIP_("Can't build springs."));
printf("cloth_free_modifier cloth_build_springs\n");
return 0;
}
@@ -938,7 +940,7 @@
if ( clmd->clothObject->verts == NULL )
{
cloth_free_modifier ( clmd );
- modifier_setError ( & ( clmd->modifier ), "Out of memory on allocating clmd->clothObject->verts." );
+ modifier_setError(&(clmd->modifier), TIP_("Out of memory on allocating clmd->clothObject->verts."));
printf("cloth_free_modifier clmd->clothObject->verts\n");
return;
}
@@ -949,7 +951,7 @@
if ( clmd->clothObject->mfaces == NULL )
{
cloth_free_modifier ( clmd );
- modifier_setError ( & ( clmd->modifier ), "Out of memory on allocating clmd->clothObject->mfaces." );
+ modifier_setError(&(clmd->modifier), TIP_("Out of memory on allocating clmd->clothObject->mfaces."));
printf("cloth_free_modifier clmd->clothObject->mfaces\n");
return;
}
Modified: trunk/blender/source/blender/editors/armature/meshlaplacian.c
===================================================================
--- trunk/blender/source/blender/editors/armature/meshlaplacian.c 2012-03-17 12:32:36 UTC (rev 44940)
+++ trunk/blender/source/blender/editors/armature/meshlaplacian.c 2012-03-17 14:27:46 UTC (rev 44941)
@@ -47,6 +47,8 @@
#include "BLI_memarena.h"
#include "BLI_string.h"
+#include "BLF_translation.h"
+
#include "BKE_DerivedMesh.h"
#include "BKE_modifier.h"
#include "BKE_mesh.h"
@@ -1714,7 +1716,7 @@
}
}
else {
- modifier_setError(&mmd->modifier, "Failed to find bind solution (increase precision?).");
+ modifier_setError(&mmd->modifier, TIP_("Failed to find bind solution (increase precision?)."));
error("Mesh Deform: failed to find bind solution.");
break;
}
Modified: trunk/blender/source/blender/editors/space_clip/tracking_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/tracking_ops.c 2012-03-17 12:32:36 UTC (rev 44940)
+++ trunk/blender/source/blender/editors/space_clip/tracking_ops.c 2012-03-17 14:27:46 UTC (rev 44941)
@@ -2935,7 +2935,7 @@
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* properties */
- RNA_def_enum(ot->srna, "position", position_items, 0, "Position", "Position to jumo to");
+ RNA_def_enum(ot->srna, "position", position_items, 0, "Position", "Position to jump to");
}
/********************** join tracks operator *********************/
Modified: trunk/blender/source/blender/makesrna/intern/rna_mesh.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_mesh.c 2012-03-17 12:32:36 UTC (rev 44940)
+++ trunk/blender/source/blender/makesrna/intern/rna_mesh.c 2012-03-17 14:27:46 UTC (rev 44941)
@@ -1962,7 +1962,7 @@
/* Float */
srna = RNA_def_struct(brna, "MeshFloatPropertyLayer", NULL);
RNA_def_struct_sdna(srna, "CustomDataLayer");
- RNA_def_struct_ui_text(srna, "Mesh Float Property Layer", "User defined layer of floating pointer number values");
+ RNA_def_struct_ui_text(srna, "Mesh Float Property Layer", "User defined layer of floating point number values");
RNA_def_struct_path_func(srna, "rna_MeshFloatPropertyLayer_path");
prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c 2012-03-17 12:32:36 UTC (rev 44940)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c 2012-03-17 14:27:46 UTC (rev 44941)
@@ -3529,7 +3529,7 @@
prop = RNA_def_property(srna, "use_color_unpremultiply", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "color_mgt_flag", R_COLOR_MANAGEMENT_PREDIVIDE);
- RNA_def_property_ui_text(prop, "Color Unpremultipy", "For premultiplied alpha render output, do color space conversion on colors without alpha, to avoid fringing on light backgrounds");
+ RNA_def_property_ui_text(prop, "Color Unpremultiply", "For premultiplied alpha render output, do color space conversion on colors without alpha, to avoid fringing on light backgrounds");
RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
prop = RNA_def_property(srna, "use_file_extension", PROP_BOOLEAN, PROP_NONE);
Modified: trunk/blender/source/blender/makesrna/intern/rna_userdef.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_userdef.c 2012-03-17 12:32:36 UTC (rev 44940)
+++ trunk/blender/source/blender/makesrna/intern/rna_userdef.c 2012-03-17 14:27:46 UTC (rev 44941)
@@ -1991,7 +1991,7 @@
prop = RNA_def_property(srna, "selected_marker", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_float_sdna(prop, NULL, "sel_marker");
RNA_def_property_array(prop, 3);
- RNA_def_property_ui_text(prop, "Selected Marker", "Color of sleected marker");
+ RNA_def_property_ui_text(prop, "Selected Marker", "Color of selected marker");
RNA_def_property_update(prop, 0, "rna_userdef_update");
prop = RNA_def_property(srna, "disabled_marker", PROP_FLOAT, PROP_COLOR_GAMMA);
Modified: trunk/blender/source/blender/modifiers/intern/MOD_boolean.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_boolean.c 2012-03-17 12:32:36 UTC (rev 44940)
+++ trunk/blender/source/blender/modifiers/intern/MOD_boolean.c 2012-03-17 14:27:46 UTC (rev 44941)
@@ -38,6 +38,7 @@
#include "BLI_utildefines.h"
+#include "BLF_translation.h"
#include "BKE_cdderivedmesh.h"
#include "BKE_modifier.h"
@@ -155,7 +156,7 @@
if(result)
return result;
else
- modifier_setError(md, "Can't execute boolean operation.");
+ modifier_setError(md, TIP_("Can't execute boolean operation."));
}
return derivedData;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list