From 16ed49b26ec3b181fd72b37bcbce0f96551bc939 Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Mon, 19 Sep 2016 16:46:20 +0200 Subject: UI Messages: Consistent spelling of term "data-block" Was using a bunch of different spellings, mostly "data-block" though, so went with that one (would have been my #1 choice anyway ;) ) --- source/blender/windowmanager/intern/wm_files_link.c | 4 ++-- source/blender/windowmanager/intern/wm_operators.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'source/blender/windowmanager') diff --git a/source/blender/windowmanager/intern/wm_files_link.c b/source/blender/windowmanager/intern/wm_files_link.c index 3405537a09c..e872ec1a524 100644 --- a/source/blender/windowmanager/intern/wm_files_link.c +++ b/source/blender/windowmanager/intern/wm_files_link.c @@ -466,7 +466,7 @@ static void wm_link_append_properties_common(wmOperatorType *ot, bool is_link) /* better not save _any_ settings for this operator */ /* properties */ prop = RNA_def_boolean(ot->srna, "link", is_link, - "Link", "Link the objects or datablocks rather than appending"); + "Link", "Link the objects or data-blocks rather than appending"); RNA_def_property_flag(prop, PROP_SKIP_SAVE | PROP_HIDDEN); prop = RNA_def_boolean(ot->srna, "autoselect", true, "Select", "Select new objects"); @@ -675,7 +675,7 @@ static void lib_relocate_do( id_sort_by_name(which_libbase(bmain, GS(old_id->name)), old_id); BKE_reportf(reports, RPT_WARNING, - "Lib Reload: Replacing all references to old datablock '%s' by reloaded one failed, " + "Lib Reload: Replacing all references to old data-block '%s' by reloaded one failed, " "old one (%d remaining users) had to be kept and was renamed to '%s'", new_id->name, old_id->us, old_id->name); } diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 7177244611e..87ef0596e52 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -3963,9 +3963,9 @@ static int previews_ensure_exec(bContext *C, wmOperator *UNUSED(op)) static void WM_OT_previews_ensure(wmOperatorType *ot) { - ot->name = "Refresh DataBlock Previews"; + ot->name = "Refresh Data-Block Previews"; ot->idname = "WM_OT_previews_ensure"; - ot->description = "Ensure datablock previews are available and up-to-date " + ot->description = "Ensure data-block previews are available and up-to-date " "(to be saved in .blend file, only for some types like materials, textures, etc.)"; ot->exec = previews_ensure_exec; @@ -4022,9 +4022,9 @@ static int previews_clear_exec(bContext *C, wmOperator *op) static void WM_OT_previews_clear(wmOperatorType *ot) { - ot->name = "Clear DataBlock Previews"; + ot->name = "Clear Data-Block Previews"; ot->idname = "WM_OT_previews_clear"; - ot->description = "Clear datablock previews (only for some types like objects, materials, textures, etc.)"; + ot->description = "Clear data-block previews (only for some types like objects, materials, textures, etc.)"; ot->exec = previews_clear_exec; ot->invoke = WM_menu_invoke; @@ -4032,7 +4032,7 @@ static void WM_OT_previews_clear(wmOperatorType *ot) ot->prop = RNA_def_enum_flag(ot->srna, "id_type", preview_id_type_items, FILTER_ID_SCE | FILTER_ID_OB | FILTER_ID_GR | FILTER_ID_MA | FILTER_ID_LA | FILTER_ID_WO | FILTER_ID_TE | FILTER_ID_IM, - "DataBlock Type", "Which datablock previews to clear"); + "Data-Block Type", "Which data-block previews to clear"); } /* *************************** Doc from UI ************* */ -- cgit v1.2.3