diff options
-rw-r--r-- | intern/cycles/blender/addon/ui.py | 4 | ||||
-rw-r--r-- | release/scripts/modules/bl_i18n_utils/settings.py | 92 | ||||
-rw-r--r-- | release/scripts/modules/bl_i18n_utils/spell_check_utils.py | 23 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_object_constraint.py | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/pointcache.c | 2 | ||||
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 | ||||
-rw-r--r-- | source/blender/editors/screen/screen_ops.c | 2 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_mask.c | 6 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/sculpt.c | 1 | ||||
-rw-r--r-- | source/blender/editors/space_clip/tracking_ops.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_image/image_buttons.c | 22 | ||||
-rw-r--r-- | source/blender/editors/space_node/node_add.c | 1 | ||||
-rw-r--r-- | source/blender/render/intern/source/pipeline.c | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 11 |
14 files changed, 113 insertions, 59 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 9d2555d3003..a8ff861a1b7 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -527,7 +527,7 @@ def panel_node_draw(layout, id_data, output_type, input_name): 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 @@ class CyclesLamp_PT_lamp(CyclesButtonsPanel, Panel): 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): diff --git a/release/scripts/modules/bl_i18n_utils/settings.py b/release/scripts/modules/bl_i18n_utils/settings.py index 48761a35c99..b94f49b74a2 100644 --- a/release/scripts/modules/bl_i18n_utils/settings.py +++ b/release/scripts/modules/bl_i18n_utils/settings.py @@ -262,43 +262,78 @@ WARN_MSGID_NOT_CAPITALIZED = True # Strings that should not raise above warning! WARN_MSGID_NOT_CAPITALIZED_ALLOWED = { - "", # Simplifies things... :p - "sin(x) / x", - "fBM", - "sqrt(x*x+y*y+z*z)", - "iTaSC", + "", # 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", - "px", - "mm", + "description", # Addons' field. :/ + "dx", + "fBM", + "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 @@ WARN_MSGID_END_POINT_ALLOWED = { "Circle|Alt .", "Temp. Diff.", "Float Neg. Exp.", + " RNA Path: bpy.types.", } PARSER_CACHE_HASH = 'sha1' diff --git a/release/scripts/modules/bl_i18n_utils/spell_check_utils.py b/release/scripts/modules/bl_i18n_utils/spell_check_utils.py index ffa68ef5da2..40cbd6e9d17 100644 --- a/release/scripts/modules/bl_i18n_utils/spell_check_utils.py +++ b/release/scripts/modules/bl_i18n_utils/spell_check_utils.py @@ -81,6 +81,8 @@ class SpellChecker(): "defocus", "denoise", "despill", "despilling", + "editcurve", + "editmesh", "filebrowser", "filelist", "filename", "filenames", @@ -131,6 +133,7 @@ class SpellChecker(): "screencast", "screenshot", "screenshots", "selfcollision", "singletexture", + "spellcheck", "spellchecking", "startup", "stateful", "starfield", @@ -219,6 +222,8 @@ class SpellChecker(): "http", "init", "kbit", "kb", + "lang", "langs", + "lclick", "rclick", "lensdist", "loc", "rot", "pos", "lorem", @@ -241,6 +246,7 @@ class SpellChecker(): "sel", "spec", "struct", "structs", + "sys", "tex", "tri", "tris", "uv", "uvs", "uvw", "uw", "uvmap", @@ -255,6 +261,8 @@ class SpellChecker(): "boid", "boids", "equisolid", "euler", "eulers", + "fribidi", + "gettext", "hashable", "intrinsics", "isosurface", @@ -263,6 +271,7 @@ class SpellChecker(): "lambertian", "laplacian", "metadata", + "msgfmt", "nand", "xnor", "normals", "numpad", @@ -411,10 +420,12 @@ class SpellChecker(): # Acronyms "aa", "msaa", + "ao", "api", "asc", "cdl", "ascii", "atrac", + "bsdf", "bw", "ccd", "cmd", @@ -442,9 +453,13 @@ class SpellChecker(): "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 @@ class SpellChecker(): # Blender acronyms "bge", "bli", + "bpy", "bvh", "dbvt", "dop", # BLI K-Dop BVH @@ -480,12 +496,6 @@ class SpellChecker(): "sph", "svbvh", - # CG acronyms - "ao", - "bsdf", - "ior", - "mocap", - # Files types/formats "avi", "attrac", @@ -504,6 +514,7 @@ class SpellChecker(): "gzip", "ico", "jpg", "jpeg", + "json", "matroska", "mdd", "mkv", diff --git a/release/scripts/startup/bl_ui/properties_object_constraint.py b/release/scripts/startup/bl_ui/properties_object_constraint.py index 6478e49f464..f1bad2257c0 100644 --- a/release/scripts/startup/bl_ui/properties_object_constraint.py +++ b/release/scripts/startup/bl_ui/properties_object_constraint.py @@ -836,7 +836,7 @@ class ConstraintButtonsPanel(): 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): diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index 27c5e03132e..c8947730ea8 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -3566,7 +3566,7 @@ void BKE_ptcache_update_info(PTCacheID *pid) 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 { diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 1ad6f1bf78a..d70cbe4a145 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -7745,7 +7745,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main) 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); } diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 12a7a33c893..49ce5584421 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -206,7 +206,7 @@ int ED_operator_animview_active(bContext *C) 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; } diff --git a/source/blender/editors/sculpt_paint/paint_mask.c b/source/blender/editors/sculpt_paint/paint_mask.c index 3cf67667f39..dffb8c39bf2 100644 --- a/source/blender/editors/sculpt_paint/paint_mask.c +++ b/source/blender/editors/sculpt_paint/paint_mask.c @@ -127,13 +127,14 @@ static int mask_flood_fill_exec(bContext *C, wmOperator *op) 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 @@ void PAINT_OT_mask_flood_fill(struct wmOperatorType *ot) /* rna */ RNA_def_enum(ot->srna, "mode", mode_items, PAINT_MASK_FLOOD_VALUE, "Mode", NULL); - RNA_def_float(ot->srna, "value", 0, 0, 1, "Value", "Mask level to use when mode is \"Value\"; zero means no masking and one is fully masked", 0, 1); + RNA_def_float(ot->srna, "value", 0, 0, 1, "Value", + "Mask level to use when mode is 'Value'; zero means no masking and one is fully masked", 0, 1); } diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 342671698d2..8ea04aabbea 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -4784,6 +4784,7 @@ static void SCULPT_OT_symmetrize(wmOperatorType *ot) /* identifiers */ ot->name = "Symmetrize"; ot->idname = "SCULPT_OT_symmetrize"; + ot->description = "Symmetrize the topology modifications"; /* api callbacks */ ot->exec = sculpt_symmetrize_exec; diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c index 77ed197c1d7..ac7ebd9ddac 100644 --- a/source/blender/editors/space_clip/tracking_ops.c +++ b/source/blender/editors/space_clip/tracking_ops.c @@ -2892,7 +2892,7 @@ void CLIP_OT_set_solver_keyframe(wmOperatorType *ot) ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; /* properties */ - RNA_def_enum(ot->srna, "keyframe", keyframe_items, 0, "Keyframe", "keyframe to set"); + RNA_def_enum(ot->srna, "keyframe", keyframe_items, 0, "Keyframe", "Keyframe to set"); } /********************** track copy color operator *********************/ diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c index 01364fcacf0..6237958e723 100644 --- a/source/blender/editors/space_image/image_buttons.c +++ b/source/blender/editors/space_image/image_buttons.c @@ -82,36 +82,36 @@ static void image_info(Scene *scene, ImageUser *iuser, Image *ima, ImBuf *ibuf, if (ima == NULL) return; if (ibuf == NULL) { - ofs += sprintf(str, "%s", IFACE_("Can't Load Image")); + ofs += sprintf(str, IFACE_("Can't Load Image")); } else { if (ima->source == IMA_SRC_MOVIE) { - ofs += sprintf(str, "%s", IFACE_("Movie")); + ofs += sprintf(str, IFACE_("Movie")); if (ima->anim) - ofs += sprintf(str + ofs, IFACE_("%d frs"), IMB_anim_get_duration(ima->anim, IMB_TC_RECORD_RUN)); + ofs += sprintf(str + ofs, IFACE_(" %d frs"), IMB_anim_get_duration(ima->anim, IMB_TC_RECORD_RUN)); } else - ofs += sprintf(str, "%s", IFACE_("Image")); + ofs += sprintf(str, IFACE_("Image")); - ofs += sprintf(str + ofs, ": %s %d x %d,", IFACE_("size"), ibuf->x, ibuf->y); + ofs += sprintf(str + ofs, IFACE_(": size %d x %d,"), ibuf->x, ibuf->y); if (ibuf->rect_float) { if (ibuf->channels != 4) { - ofs += sprintf(str + ofs, "%d %s", ibuf->channels, IFACE_("float channel(s)")); + ofs += sprintf(str + ofs, IFACE_("%d float channel(s)"), ibuf->channels); } else if (ibuf->planes == R_IMF_PLANES_RGBA) - ofs += sprintf(str + ofs, "%s", IFACE_(" RGBA float")); + ofs += sprintf(str + ofs, IFACE_(" RGBA float")); else - ofs += sprintf(str + ofs, "%s", IFACE_(" RGB float")); + ofs += sprintf(str + ofs, IFACE_(" RGB float")); } else { if (ibuf->planes == R_IMF_PLANES_RGBA) - ofs += sprintf(str + ofs, "%s", IFACE_(" RGBA byte")); + ofs += sprintf(str + ofs, IFACE_(" RGBA byte")); else - ofs += sprintf(str + ofs, "%s", IFACE_(" RGB byte")); + ofs += sprintf(str + ofs, IFACE_(" RGB byte")); } if (ibuf->zbuf || ibuf->zbuf_float) - ofs += sprintf(str + ofs, "%s", IFACE_(" + Z")); + ofs += sprintf(str + ofs, IFACE_(" + Z")); if (ima->source == IMA_SRC_SEQUENCE) { char *file = BLI_last_slash(ibuf->name); diff --git a/source/blender/editors/space_node/node_add.c b/source/blender/editors/space_node/node_add.c index 22631568d03..4943bb45113 100644 --- a/source/blender/editors/space_node/node_add.c +++ b/source/blender/editors/space_node/node_add.c @@ -307,6 +307,7 @@ void NODE_OT_add_reroute(wmOperatorType *ot) ot->name = "Add Reroute"; ot->idname = "NODE_OT_add_reroute"; + ot->description = "Add a reroute node"; ot->invoke = WM_gesture_lines_invoke; ot->modal = WM_gesture_lines_modal; diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 1d04d5a117b..8c394b00730 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -1441,7 +1441,7 @@ static void tag_scenes_for_render(Render *re) Scene *scene = (Scene*) node->id; if (scene->r.alphamode != R_ALPHAPREMUL) { - BKE_reportf(re->reports, RPT_WARNING, "Setting scene %s alpha mode to Premul\n", scene->id.name + 2); + BKE_reportf(re->reports, RPT_WARNING, "Setting scene %s alpha mode to Premul", scene->id.name + 2); /* also print, so feedback is immediate */ printf("2.66 versioning fix: setting scene %s alpha mode to Premul\n", scene->id.name + 2); diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 79257479529..678c77d0d88 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -110,6 +110,8 @@ static GHash *global_ops_hash = NULL; +#define UNDOCUMENTED_OPERATOR_TIP N_("(undocumented operator)") + /* ************ operator API, exported ********** */ @@ -163,7 +165,7 @@ void WM_operatortype_append(void (*opfunc)(wmOperatorType *)) } /* XXX All ops should have a description but for now allow them not to. */ - RNA_def_struct_ui_text(ot->srna, ot->name, ot->description ? ot->description : N_("(undocumented operator)")); + RNA_def_struct_ui_text(ot->srna, ot->name, ot->description ? ot->description : UNDOCUMENTED_OPERATOR_TIP); RNA_def_struct_identifier(ot->srna, ot->idname); BLI_ghash_insert(global_ops_hash, (void *)ot->idname, ot); @@ -178,7 +180,7 @@ void WM_operatortype_append_ptr(void (*opfunc)(wmOperatorType *, void *), void * /* Set the default i18n context now, so that opfunc can redefine it if needed! */ RNA_def_struct_translation_context(ot->srna, BLF_I18NCONTEXT_OPERATOR_DEFAULT); opfunc(ot, userdata); - RNA_def_struct_ui_text(ot->srna, ot->name, ot->description ? ot->description : N_("(undocumented operator)")); + RNA_def_struct_ui_text(ot->srna, ot->name, ot->description ? ot->description : UNDOCUMENTED_OPERATOR_TIP); RNA_def_struct_identifier(ot->srna, ot->idname); BLI_ghash_insert(global_ops_hash, (void *)ot->idname, ot); @@ -375,7 +377,7 @@ wmOperatorType *WM_operatortype_append_macro(const char *idname, const char *nam ot->poll = NULL; if (!ot->description) /* XXX All ops should have a description but for now allow them not to. */ - ot->description = N_("(undocumented operator)"); + ot->description = UNDOCUMENTED_OPERATOR_TIP; RNA_def_struct_ui_text(ot->srna, ot->name, ot->description); RNA_def_struct_identifier(ot->srna, ot->idname); @@ -401,7 +403,7 @@ void WM_operatortype_append_macro_ptr(void (*opfunc)(wmOperatorType *, void *), ot->poll = NULL; if (!ot->description) - ot->description = N_("(undocumented operator)"); + ot->description = UNDOCUMENTED_OPERATOR_TIP; /* Set the default i18n context now, so that opfunc can redefine it if needed! */ RNA_def_struct_translation_context(ot->srna, BLF_I18NCONTEXT_OPERATOR_DEFAULT); @@ -1846,6 +1848,7 @@ static void WM_OT_call_menu(wmOperatorType *ot) { ot->name = "Call Menu"; ot->idname = "WM_OT_call_menu"; + ot->description = "Call (draw) a pre-defined menu"; ot->exec = wm_call_menu_exec; ot->poll = WM_operator_winactive; |