[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54940] trunk/blender: More UI messages fixes...
Bastien Montagne
montagne29 at wanadoo.fr
Thu Feb 28 16:31:21 CET 2013
Revision: 54940
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54940
Author: mont29
Date: 2013-02-28 15:31:20 +0000 (Thu, 28 Feb 2013)
Log Message:
-----------
More UI messages fixes...
Modified Paths:
--------------
trunk/blender/intern/cycles/blender/addon/ui.py
trunk/blender/release/scripts/modules/bl_i18n_utils/settings.py
trunk/blender/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
trunk/blender/release/scripts/startup/bl_ui/properties_object_constraint.py
trunk/blender/source/blender/blenkernel/intern/pointcache.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/sculpt_paint/paint_mask.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
trunk/blender/source/blender/editors/space_clip/tracking_ops.c
trunk/blender/source/blender/editors/space_image/image_buttons.c
trunk/blender/source/blender/editors/space_node/node_add.c
trunk/blender/source/blender/render/intern/source/pipeline.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
Modified: trunk/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/ui.py 2013-02-28 14:25:40 UTC (rev 54939)
+++ trunk/blender/intern/cycles/blender/addon/ui.py 2013-02-28 15:31:20 UTC (rev 54940)
@@ -527,7 +527,7 @@
node = find_node(id_data, output_type)
if not node:
- layout.label(text="No output node.")
+ layout.label(text="No output node")
else:
input = find_node_input(node, input_name)
layout.template_node_view(ntree, node, input)
@@ -590,7 +590,7 @@
layout.prop(clamp, "use_multiple_importance_sampling")
if lamp.type == 'HEMI':
- layout.label(text="Not supported, interpreted as sun lamp.")
+ layout.label(text="Not supported, interpreted as sun lamp")
class CyclesLamp_PT_nodes(CyclesButtonsPanel, Panel):
Modified: trunk/blender/release/scripts/modules/bl_i18n_utils/settings.py
===================================================================
--- trunk/blender/release/scripts/modules/bl_i18n_utils/settings.py 2013-02-28 14:25:40 UTC (rev 54939)
+++ trunk/blender/release/scripts/modules/bl_i18n_utils/settings.py 2013-02-28 15:31:20 UTC (rev 54940)
@@ -262,43 +262,78 @@
# Strings that should not raise above warning!
WARN_MSGID_NOT_CAPITALIZED_ALLOWED = {
- "", # Simplifies things... :p
- "sin(x) / x",
+ "", # Simplifies things... :p
+ "ac3",
+ "along X",
+ "along Y",
+ "along Z",
+ "along %s X",
+ "along %s Y",
+ "along %s Z",
+ "along local Z",
+ "ascii",
+ "author", # Addons' field. :/
+ "bItasc",
+ "description", # Addons' field. :/
+ "dx",
"fBM",
- "sqrt(x*x+y*y+z*z)",
- "iTaSC",
- "bItasc",
- "px",
- "mm",
+ "flac",
+ "fps: %.2f",
+ "fps: %i",
"fStop",
- "sRGB",
+ "gimbal",
+ "global",
+ "iScale",
"iso-8859-15",
- "utf-8",
- "ascii",
- "re",
- "y",
- "ac3",
- "flac",
+ "iTaSC",
+ "iTaSC parameters",
+ "kb",
+ "local",
+ "location", # Addons' field. :/
+ "locking %s X",
+ "locking %s Y",
+ "locking %s Z",
"mkv",
+ "mm",
"mp2",
"mp3",
+ "normal",
"ogg",
- "wav",
- "iTaSC parameters",
- "vBVH",
- "rv",
- "et_EE",
- "eo",
- "available with", # Is part of multi-line msg.
- "virtual parents", # Is part of multi-line msg.
- "description", # Addons' field. :/
- "location", # Addons' field. :/
- "author", # Addons' field. :/
- "in memory to enable editing!", # Is part of multi-line msg.
- "iScale",
- "dx",
"p0",
+ "px",
+ "re",
"res",
+ "rv",
+ "sin(x) / x",
+ "sqrt(x*x+y*y+z*z)",
+ "sRGB",
+ "utf-8",
+ "vBVH",
+ "view",
+ "wav",
+ "y",
+ # Sub-strings.
+ "available with",
+ "can't save image while rendering",
+ "expected a timeline/animation area to be active",
+ "expected a view3d region",
+ "expected a view3d region & editcurve",
+ "expected a view3d region & editmesh",
+ "image file not found",
+ "image path can't be written to",
+ "in memory to enable editing!",
+ "unable to load movie clip",
+ "unable to load text",
+ "unable to open the file",
+ "unknown error reading file",
+ "unknown error stating file",
+ "unknown error writing file",
+ "unsupported font format",
+ "unsupported format",
+ "unsupported image format",
+ "unsupported movie clip format",
+ "verts only",
+ "virtual parents",
}
WARN_MSGID_NOT_CAPITALIZED_ALLOWED |= set(lng[2] for lng in LANGUAGES)
@@ -307,6 +342,7 @@
"Circle|Alt .",
"Temp. Diff.",
"Float Neg. Exp.",
+ " RNA Path: bpy.types.",
}
PARSER_CACHE_HASH = 'sha1'
Modified: trunk/blender/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bl_i18n_utils/spell_check_utils.py 2013-02-28 14:25:40 UTC (rev 54939)
+++ trunk/blender/release/scripts/modules/bl_i18n_utils/spell_check_utils.py 2013-02-28 15:31:20 UTC (rev 54940)
@@ -81,6 +81,8 @@
"defocus",
"denoise",
"despill", "despilling",
+ "editcurve",
+ "editmesh",
"filebrowser",
"filelist",
"filename", "filenames",
@@ -131,6 +133,7 @@
"screencast", "screenshot", "screenshots",
"selfcollision",
"singletexture",
+ "spellcheck", "spellchecking",
"startup",
"stateful",
"starfield",
@@ -219,6 +222,8 @@
"http",
"init",
"kbit", "kb",
+ "lang", "langs",
+ "lclick", "rclick",
"lensdist",
"loc", "rot", "pos",
"lorem",
@@ -241,6 +246,7 @@
"sel",
"spec",
"struct", "structs",
+ "sys",
"tex",
"tri", "tris",
"uv", "uvs", "uvw", "uw", "uvmap",
@@ -255,6 +261,8 @@
"boid", "boids",
"equisolid",
"euler", "eulers",
+ "fribidi",
+ "gettext",
"hashable",
"intrinsics",
"isosurface",
@@ -263,6 +271,7 @@
"lambertian",
"laplacian",
"metadata",
+ "msgfmt",
"nand", "xnor",
"normals",
"numpad",
@@ -411,10 +420,12 @@
# Acronyms
"aa", "msaa",
+ "ao",
"api",
"asc", "cdl",
"ascii",
"atrac",
+ "bsdf",
"bw",
"ccd",
"cmd",
@@ -442,9 +453,13 @@
"hh", "mm", "ss", "ff", # hh:mm:ss:ff timecode
"hsv", "hsva",
"id",
+ "ior",
"itu",
"lhs",
"lmb", "mmb", "rmb",
+ "kb",
+ "mocap",
+ "msgid", "msgids",
"mux",
"ndof",
"ppc",
@@ -467,6 +482,7 @@
# Blender acronyms
"bge",
"bli",
+ "bpy",
"bvh",
"dbvt",
"dop", # BLI K-Dop BVH
@@ -480,12 +496,6 @@
"sph",
"svbvh",
- # CG acronyms
- "ao",
- "bsdf",
- "ior",
- "mocap",
-
# Files types/formats
"avi",
"attrac",
@@ -504,6 +514,7 @@
"gzip",
"ico",
"jpg", "jpeg",
+ "json",
"matroska",
"mdd",
"mkv",
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_object_constraint.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_object_constraint.py 2013-02-28 14:25:40 UTC (rev 54939)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_object_constraint.py 2013-02-28 15:31:20 UTC (rev 54940)
@@ -836,7 +836,7 @@
layout.operator("clip.constraint_to_fcurve")
def SCRIPT(self, context, layout, con):
- layout.label("Blender 2.6 doesn't support python constraints yet.")
+ layout.label("Blender 2.6 doesn't support python constraints yet")
class OBJECT_PT_constraints(ConstraintButtonsPanel, Panel):
Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c 2013-02-28 14:25:40 UTC (rev 54939)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c 2013-02-28 15:31:20 UTC (rev 54940)
@@ -3566,7 +3566,7 @@
BLI_snprintf(cache->info, sizeof(cache->info), IFACE_("%s, cache is outdated!"), mem_info);
}
else if (cache->flag & PTCACHE_FRAMES_SKIPPED) {
- BLI_snprintf(cache->info, sizeof(cache->info), IFACE_("%s, not exact since frame %i."),
+ BLI_snprintf(cache->info, sizeof(cache->info), IFACE_("%s, not exact since frame %i"),
mem_info, cache->last_exact);
}
else {
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2013-02-28 14:25:40 UTC (rev 54939)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2013-02-28 15:31:20 UTC (rev 54940)
@@ -7745,7 +7745,7 @@
prop = BKE_bproperty_object_get(ob, "Text");
if (prop) {
BKE_reportf_wrap(fd->reports, RPT_WARNING,
- TIP_("Game property name conflict in object '%s':\ntext objects reserve the "
+ TIP_("Game property name conflict in object '%s': text objects reserve the "
"['Text'] game property to change their content through logic bricks"),
ob->id.name + 2);
}
Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c 2013-02-28 14:25:40 UTC (rev 54939)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c 2013-02-28 15:31:20 UTC (rev 54940)
@@ -206,7 +206,7 @@
return TRUE;
}
- CTX_wm_operator_poll_msg_set(C, "expected an timeline/animation area to be active");
+ CTX_wm_operator_poll_msg_set(C, "expected a timeline/animation area to be active");
return 0;
}
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_mask.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_mask.c 2013-02-28 14:25:40 UTC (rev 54939)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_mask.c 2013-02-28 15:31:20 UTC (rev 54940)
@@ -127,13 +127,14 @@
void PAINT_OT_mask_flood_fill(struct wmOperatorType *ot)
{
static EnumPropertyItem mode_items[] = {
- {PAINT_MASK_FLOOD_VALUE, "VALUE", 0, "Value", "Set mask to the level specified by the \"value\" property"},
+ {PAINT_MASK_FLOOD_VALUE, "VALUE", 0, "Value", "Set mask to the level specified by the 'value' property"},
{PAINT_MASK_INVERT, "INVERT", 0, "Invert", "Invert the mask"},
{0}};
/* identifiers */
ot->name = "Mask Flood Fill";
ot->idname = "PAINT_OT_mask_flood_fill";
+ ot->description = "Fill the whole mask with a given value, or invert its values";
/* api callbacks */
ot->exec = mask_flood_fill_exec;
@@ -143,5 +144,6 @@
/* rna */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list