[Bf-blender-cvs] [23df1a774b5] master: Fix/Cleanup: I18N: Bad usage of IFACE_ instead of TIP_.
Bastien Montagne
noreply at git.blender.org
Tue Jun 11 22:28:00 CEST 2019
Commit: 23df1a774b5b70e5108e2d1b1901d2a204ca1d9e
Author: Bastien Montagne
Date: Tue Jun 11 22:25:01 2019 +0200
Branches: master
https://developer.blender.org/rB23df1a774b5b70e5108e2d1b1901d2a204ca1d9e
Fix/Cleanup: I18N: Bad usage of IFACE_ instead of TIP_.
Cheap tip: anything that is not "Camel Case" and/or that is more than
a few words long should use `TIP_` translation, not `IFACE_` one.
Also added several missing strings (including the one reported in D5056
by Jean First (@robbott), thanks).
===================================================================
M source/blender/blenkernel/intern/pointcache.c
M source/blender/compositor/intern/COM_ExecutionGroup.cpp
M source/blender/compositor/intern/COM_ExecutionSystem.cpp
M source/blender/draw/engines/eevee/eevee_lightcache.c
M source/blender/editors/animation/anim_ipo_utils.c
M source/blender/editors/animation/anim_markers.c
M source/blender/editors/armature/pose_lib.c
M source/blender/editors/armature/pose_slide.c
M source/blender/editors/gpencil/annotate_paint.c
M source/blender/editors/gpencil/gpencil_brush.c
M source/blender/editors/gpencil/gpencil_fill.c
M source/blender/editors/gpencil/gpencil_interpolate.c
M source/blender/editors/gpencil/gpencil_paint.c
M source/blender/editors/gpencil/gpencil_primitive.c
M source/blender/editors/interface/interface_region_tooltip.c
M source/blender/editors/interface/interface_templates.c
M source/blender/editors/mesh/editmesh_bevel.c
M source/blender/editors/mesh/editmesh_bisect.c
M source/blender/editors/mesh/editmesh_inset.c
M source/blender/editors/mesh/editmesh_knife.c
M source/blender/editors/mesh/editmesh_loopcut.c
M source/blender/editors/mesh/editmesh_tools.c
M source/blender/editors/render/render_internal.c
M source/blender/editors/screen/screen_user_menu.c
M source/blender/editors/sculpt_paint/paint_image.c
M source/blender/editors/sculpt_paint/sculpt.c
M source/blender/editors/space_buttons/buttons_texture.c
M source/blender/editors/space_clip/clip_buttons.c
M source/blender/editors/space_clip/tracking_ops.c
M source/blender/editors/space_graph/graph_buttons.c
M source/blender/editors/space_image/image_buttons.c
M source/blender/editors/space_info/info_stats.c
M source/blender/editors/space_node/node_relationships.c
M source/blender/editors/space_sequencer/sequencer_edit.c
M source/blender/editors/transform/transform.c
M source/blender/editors/transform/transform_constraints.c
M source/blender/editors/transform/transform_orientations.c
M source/blender/editors/util/ed_util.c
M source/blender/editors/uvedit/uvedit_smart_stitch.c
M source/blender/editors/uvedit/uvedit_unwrap_ops.c
M source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
M source/blender/render/intern/source/pipeline.c
M source/blender/windowmanager/intern/wm_files.c
===================================================================
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index a55d0be4f95..2a64a50213c 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -4482,13 +4482,13 @@ void BKE_ptcache_update_info(PTCacheID *pid)
/* smoke doesn't use frame 0 as info frame so can't check based on totpoint */
if (pid->type == PTCACHE_TYPE_SMOKE_DOMAIN && totframes) {
- BLI_snprintf(cache->info, sizeof(cache->info), IFACE_("%i frames found!"), totframes);
+ BLI_snprintf(cache->info, sizeof(cache->info), TIP_("%i frames found!"), totframes);
}
else if (totframes && cache->totpoint) {
- BLI_snprintf(cache->info, sizeof(cache->info), IFACE_("%i points found!"), cache->totpoint);
+ BLI_snprintf(cache->info, sizeof(cache->info), TIP_("%i points found!"), cache->totpoint);
}
else {
- BLI_strncpy(cache->info, IFACE_("No valid data to read!"), sizeof(cache->info));
+ BLI_strncpy(cache->info, TIP_("No valid data to read!"), sizeof(cache->info));
}
return;
}
@@ -4499,10 +4499,10 @@ void BKE_ptcache_update_info(PTCacheID *pid)
if (cache->totpoint > totpoint) {
BLI_snprintf(
- mem_info, sizeof(mem_info), IFACE_("%i cells + High Resolution cached"), totpoint);
+ mem_info, sizeof(mem_info), TIP_("%i cells + High Resolution cached"), totpoint);
}
else {
- BLI_snprintf(mem_info, sizeof(mem_info), IFACE_("%i cells cached"), totpoint);
+ BLI_snprintf(mem_info, sizeof(mem_info), TIP_("%i cells cached"), totpoint);
}
}
else {
@@ -4514,7 +4514,7 @@ void BKE_ptcache_update_info(PTCacheID *pid)
}
}
- BLI_snprintf(mem_info, sizeof(mem_info), IFACE_("%i frames on disk"), totframes);
+ BLI_snprintf(mem_info, sizeof(mem_info), TIP_("%i frames on disk"), totframes);
}
}
else {
@@ -4544,18 +4544,18 @@ void BKE_ptcache_update_info(PTCacheID *pid)
BLI_snprintf(mem_info,
sizeof(mem_info),
- IFACE_("%s frames in memory (%s)"),
+ TIP_("%s frames in memory (%s)"),
formatted_tot,
formatted_mem);
}
if (cache->flag & PTCACHE_OUTDATED) {
- BLI_snprintf(cache->info, sizeof(cache->info), IFACE_("%s, cache is outdated!"), mem_info);
+ BLI_snprintf(cache->info, sizeof(cache->info), TIP_("%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"),
+ TIP_("%s, not exact since frame %i"),
mem_info,
cache->last_exact);
}
diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.cpp b/source/blender/compositor/intern/COM_ExecutionGroup.cpp
index 1718722e860..65c7429bb68 100644
--- a/source/blender/compositor/intern/COM_ExecutionGroup.cpp
+++ b/source/blender/compositor/intern/COM_ExecutionGroup.cpp
@@ -431,7 +431,7 @@ void ExecutionGroup::finalizeChunkExecution(int chunkNumber, MemoryBuffer **memo
char buf[128];
BLI_snprintf(buf,
sizeof(buf),
- IFACE_("Compositing | Tile %u-%u"),
+ TIP_("Compositing | Tile %u-%u"),
this->m_chunksFinished,
this->m_numberOfChunks);
this->m_bTree->stats_draw(this->m_bTree->sdh, buf);
diff --git a/source/blender/compositor/intern/COM_ExecutionSystem.cpp b/source/blender/compositor/intern/COM_ExecutionSystem.cpp
index 0d1fefc857d..d502deb1c93 100644
--- a/source/blender/compositor/intern/COM_ExecutionSystem.cpp
+++ b/source/blender/compositor/intern/COM_ExecutionSystem.cpp
@@ -80,7 +80,7 @@ ExecutionSystem::ExecutionSystem(RenderData *rd,
viewer_border->xmin < viewer_border->xmax &&
viewer_border->ymin < viewer_border->ymax;
- editingtree->stats_draw(editingtree->sdh, IFACE_("Compositing | Determining resolution"));
+ editingtree->stats_draw(editingtree->sdh, TIP_("Compositing | Determining resolution"));
for (index = 0; index < this->m_groups.size(); index++) {
resolution[0] = 0;
@@ -131,7 +131,7 @@ void ExecutionSystem::set_operations(const Operations &operations, const Groups
void ExecutionSystem::execute()
{
const bNodeTree *editingtree = this->m_context.getbNodeTree();
- editingtree->stats_draw(editingtree->sdh, IFACE_("Compositing | Initializing execution"));
+ editingtree->stats_draw(editingtree->sdh, TIP_("Compositing | Initializing execution"));
DebugInfo::execute_started(this);
@@ -189,7 +189,7 @@ void ExecutionSystem::execute()
WorkScheduler::finish();
WorkScheduler::stop();
- editingtree->stats_draw(editingtree->sdh, IFACE_("Compositing | De-initializing execution"));
+ editingtree->stats_draw(editingtree->sdh, TIP_("Compositing | De-initializing execution"));
for (index = 0; index < this->m_operations.size(); index++) {
NodeOperation *operation = this->m_operations[index];
operation->deinitExecution();
diff --git a/source/blender/draw/engines/eevee/eevee_lightcache.c b/source/blender/draw/engines/eevee/eevee_lightcache.c
index ebdc7813335..5af0a6fa920 100644
--- a/source/blender/draw/engines/eevee/eevee_lightcache.c
+++ b/source/blender/draw/engines/eevee/eevee_lightcache.c
@@ -213,7 +213,7 @@ void EEVEE_lightcache_info_update(SceneEEVEE *eevee)
if (lcache != NULL) {
if (lcache->flag & LIGHTCACHE_BAKING) {
BLI_strncpy(
- eevee->light_cache_info, IFACE_("Baking light cache"), sizeof(eevee->light_cache_info));
+ eevee->light_cache_info, TIP_("Baking light cache"), sizeof(eevee->light_cache_info));
return;
}
@@ -224,14 +224,14 @@ void EEVEE_lightcache_info_update(SceneEEVEE *eevee)
BLI_snprintf(eevee->light_cache_info,
sizeof(eevee->light_cache_info),
- IFACE_("%d Ref. Cubemaps, %d Irr. Samples (%s in memory)"),
+ TIP_("%d Ref. Cubemaps, %d Irr. Samples (%s in memory)"),
lcache->cube_len - 1,
irr_samples,
formatted_mem);
}
else {
BLI_strncpy(eevee->light_cache_info,
- IFACE_("No light cache in this scene"),
+ TIP_("No light cache in this scene"),
sizeof(eevee->light_cache_info));
}
}
diff --git a/source/blender/editors/animation/anim_ipo_utils.c b/source/blender/editors/animation/anim_ipo_utils.c
index 19fd521d7d9..f5bd7a47248 100644
--- a/source/blender/editors/animation/anim_ipo_utils.c
+++ b/source/blender/editors/animation/anim_ipo_utils.c
@@ -61,10 +61,10 @@ int getname_anim_fcurve(char *name, ID *id, FCurve *fcu)
}
else if (ELEM(NULL, id, fcu, fcu->rna_path)) {
if (fcu == NULL) {
- strcpy(name, IFACE_("<invalid>"));
+ strcpy(name, TIP_("<invalid>"));
}
else if (fcu->rna_path == NULL) {
- strcpy(name, IFACE_("<no path>"));
+ strcpy(name, TIP_("<no path>"));
}
else { /* id == NULL */
BLI_snprintf(name, 256, "%s[%d]", fcu->rna_path, fcu->array_index);
diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c
index dec34eb04ac..2bbb8e5888c 100644
--- a/source/blender/editors/animation/anim_markers.c
+++ b/source/blender/editors/animation/anim_markers.c
@@ -772,14 +772,14 @@ static void ed_marker_move_update_header(bContext *C, wmOperator *op)
/* we print current marker value */
if (use_time) {
BLI_snprintf(
- str, sizeof(str), IFACE_("Marker %.2f offset %s"), FRA2TIME(selmarker->frame), str_offs);
+ str, sizeof(str), TIP_("Marker %.2f offset %s"), FRA2TIME(selmarker->frame), str_offs);
}
else {
- BLI_snprintf(str, sizeof(str), IFACE_("Marker %d offset %s"), selmarker->frame, str_offs);
+ BLI_snprintf(str, sizeof(str), TIP_("Marker %d offset %s"), selmarker->frame, str_offs);
}
}
else {
- BLI_snprintf(str, sizeof(str), IFACE_("Marker offset %s"), str_offs);
+ BLI_snprintf(str, sizeof(str), TIP_("Marker offset %s"), str_offs);
}
ED_area_status_text(CTX_wm_area(C), str);
diff --git a/source/blender/editors/armature/pose_lib.c b/source/blender/editors/armature/pose_lib.c
index 96ba6212992..3407b3e6b7f 100644
--- a/source/blender/editors/armature/pose_lib.c
+++ b/source/blender/editors/armature/pose_lib.c
@@ -1171,8 +1171,8 @@ static void poselib_preview_apply(bContext *C, wmOperator *op)
/* do header print - if interactively previewing */
if (pld->state == PL_PREVIEW_RUNNING) {
if (pld->flag & PL_PREVIEW_SHOWORIGINAL) {
- ED_area_status_text(pld->sa, IFACE_("PoseLib Previewing Pose: [Showing Original Pose]"));
- ED_workspace_status_text(C, IFACE_("Use Tab to start previewing poses again"));
+ ED_area_status_text(pld->sa, TIP_("PoseLib Previewing Pose: [Showing Original Pose]"));
+ ED_workspace_status_text(C, TIP_("Use Tab to start previewing poses again"));
}
else if (pld->searchstr[0]) {
char tempstr[65];
@@ -1196,17 +1196,17 @@ static void poselib_preview_apply(bContext *C, wmOperator *op)
BLI_snprintf(pld->headerstr,
sizeof(pld->headerstr),
- IFACE_("PoseLib Previewing Pose: Filter - [%s] | "
- "Current Pose - \"%s\""),
+ TIP_("PoseLib Previewing Pose: Filter - [%s] | "
+ "Current Pose - \"%s\""),
tempstr,
markern);
ED_area_status_text(pld->sa, pld->headerstr);
- ED_workspace_status_text(C, IFACE_("Use ScrollWheel or PageUp/Down to change pose"));
+ ED_workspace_status_text(C, TIP_("Use ScrollWheel or PageUp/Down to change pose"));
}
else {
BLI_snprintf(pld->headerstr,
sizeof(pld->headerstr),
- IFACE_("PoseLib Previewing Pose: \"%s\""),
+ TIP_("PoseLib Previewing Pose: \"%s\""),
pld->marker->name);
ED_area_status_text(pld->sa, pld
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list