Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Eisel <eiseljulian@gmail.com>2016-09-19 17:46:20 +0300
committerJulian Eisel <eiseljulian@gmail.com>2016-09-19 17:50:45 +0300
commit16ed49b26ec3b181fd72b37bcbce0f96551bc939 (patch)
treee2986d08e9fc00f596af1665fc4f87111e9eaf7e /source/blender/windowmanager
parent7d63ea4a1c0eceb2eee04a7829419180cf9cbdc5 (diff)
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 ;) )
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r--source/blender/windowmanager/intern/wm_files_link.c4
-rw-r--r--source/blender/windowmanager/intern/wm_operators.c10
2 files changed, 7 insertions, 7 deletions
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 ************* */