diff options
43 files changed, 324 insertions, 326 deletions
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->headerstr); ED_workspace_status_text(C, NULL); diff --git a/source/blender/editors/armature/pose_slide.c b/source/blender/editors/armature/pose_slide.c index 9bc204c9e3b..97317a86104 100644 --- a/source/blender/editors/armature/pose_slide.c +++ b/source/blender/editors/armature/pose_slide.c @@ -27,6 +27,8 @@ #include "BLI_blenlib.h" #include "BLI_dlrbTree.h" +#include "BLT_translation.h" + #include "DNA_anim_types.h" #include "DNA_armature_types.h" #include "DNA_object_types.h" @@ -829,35 +831,35 @@ static void pose_slide_draw_status(tPoseSlideOp *pso) switch (pso->mode) { case POSESLIDE_PUSH: - strcpy(mode_str, "Push Pose"); + strcpy(mode_str, TIP_("Push Pose")); break; case POSESLIDE_RELAX: - strcpy(mode_str, "Relax Pose"); + strcpy(mode_str, TIP_("Relax Pose")); break; case POSESLIDE_BREAKDOWN: - strcpy(mode_str, "Breakdown"); + strcpy(mode_str, TIP_("Breakdown")); break; default: /* unknown */ - strcpy(mode_str, "Sliding-Tool"); + strcpy(mode_str, TIP_("Sliding-Tool")); break; } switch (pso->axislock) { case PS_LOCK_X: - BLI_strncpy(axis_str, "[X]/Y/Z axis only (X to clear)", sizeof(axis_str)); + BLI_strncpy(axis_str, TIP_("[X]/Y/Z axis only (X to clear)"), sizeof(axis_str)); break; case PS_LOCK_Y: - BLI_strncpy(axis_str, "X/[Y]/Z axis only (Y to clear)", sizeof(axis_str)); + BLI_strncpy(axis_str, TIP_("X/[Y]/Z axis only (Y to clear)"), sizeof(axis_str)); break; case PS_LOCK_Z: - BLI_strncpy(axis_str, "X/Y/[Z] axis only (Z to clear)", sizeof(axis_str)); + BLI_strncpy(axis_str, TIP_("X/Y/[Z] axis only (Z to clear)"), sizeof(axis_str)); break; default: if (ELEM(pso->channels, PS_TFM_LOC, PS_TFM_ROT, PS_TFM_SIZE)) { - BLI_strncpy(axis_str, "X/Y/Z = Axis Constraint", sizeof(axis_str)); + BLI_strncpy(axis_str, TIP_("X/Y/Z = Axis Constraint"), sizeof(axis_str)); } else { axis_str[0] = '\0'; @@ -869,31 +871,34 @@ static void pose_slide_draw_status(tPoseSlideOp *pso) case PS_TFM_LOC: BLI_snprintf(limits_str, sizeof(limits_str), - "[G]/R/S/B/C - Location only (G to clear) | %s", + TIP_("[G]/R/S/B/C - Location only (G to clear) | %s"), axis_str); break; case PS_TFM_ROT: BLI_snprintf(limits_str, sizeof(limits_str), - "G/[R]/S/B/C - Rotation only (R to clear) | %s", + TIP_("G/[R]/S/B/C - Rotation only (R to clear) | %s"), axis_str); break; case PS_TFM_SIZE: - BLI_snprintf( - limits_str, sizeof(limits_str), "G/R/[S]/B/C - Scale only (S to clear) | %s", axis_str); + BLI_snprintf(limits_str, + sizeof(limits_str), + TIP_("G/R/[S]/B/C - Scale only (S to clear) | %s"), + axis_str); break; case PS_TFM_BBONE_SHAPE: BLI_strncpy(limits_str, - "G/R/S/[B]/C - Bendy Bone properties only (B to clear) | %s", + TIP_("G/R/S/[B]/C - Bendy Bone properties only (B to clear) | %s"), sizeof(limits_str)); break; case PS_TFM_PROPS: BLI_strncpy(limits_str, - "G/R/S/B/[C] - Custom Properties only (C to clear) | %s", + TIP_("G/R/S/B/[C] - Custom Properties only (C to clear) | %s"), sizeof(limits_str)); break; default: - BLI_strncpy(limits_str, "G/R/S/B/C - Limit to Transform/Property Set", sizeof(limits_str)); + BLI_strncpy( + limits_str, TIP_("G/R/S/B/C - Limit to Transform/Property Set"), sizeof(limits_str)); break; } diff --git a/source/blender/editors/gpencil/annotate_paint.c b/source/blender/editors/gpencil/annotate_paint.c index 73230e5fb0e..5962d95c5af 100644 --- a/source/blender/editors/gpencil/annotate_paint.c +++ b/source/blender/editors/gpencil/annotate_paint.c @@ -1688,8 +1688,8 @@ static void gpencil_draw_status_indicators(bContext *C, tGPsdata *p) /* Provide usage tips, since this is modal, and unintuitive without hints */ ED_workspace_status_text( C, - IFACE_("Annotation Create Poly: LMB click to place next stroke vertex | " - "ESC/Enter to end (or click outside this area)")); + TIP_("Annotation Create Poly: LMB click to place next stroke vertex | " + "ESC/Enter to end (or click outside this area)")); break; default: /* Do nothing - the others are self explanatory, exit quickly once the mouse is released @@ -1704,29 +1704,29 @@ static void gpencil_draw_status_indicators(bContext *C, tGPsdata *p) switch (p->paintmode) { case GP_PAINTMODE_ERASER: ED_workspace_status_text(C, - IFACE_("Annotation Eraser: Hold and drag LMB or RMB to erase | " - "ESC/Enter to end (or click outside this area)")); + TIP_("Annotation Eraser: Hold and drag LMB or RMB to erase | " + "ESC/Enter to end (or click outside this area)")); break; case GP_PAINTMODE_DRAW_STRAIGHT: ED_workspace_status_text(C, - IFACE_("Annotation Line Draw: Hold and drag LMB to draw | " - "ESC/Enter to end (or click outside this area)")); + TIP_("Annotation Line Draw: Hold and drag LMB to draw | " + "ESC/Enter to end (or click outside this area)")); break; case GP_PAINTMODE_DRAW: ED_workspace_status_text(C, - IFACE_("Annotation Freehand Draw: Hold and drag LMB to draw | " - "E/ESC/Enter to end (or click outside this area)")); + TIP_("Annotation Freehand Draw: Hold and drag LMB to draw | " + "E/ESC/Enter to end (or click outside this area)")); break; case GP_PAINTMODE_DRAW_POLY: ED_workspace_status_text( C, - IFACE_("Annotation Create Poly: LMB click to place next stroke vertex | " - "ESC/Enter to end (or click outside this area)")); + TIP_("Annotation Create Poly: LMB click to place next stroke vertex | " + "ESC/Enter to end (or click outside this area)")); break; default: /* unhandled future cases */ ED_workspace_status_text( - C, IFACE_("Annotation Session: ESC/Enter to end (or click outside this area)")); + C, TIP_("Annotation Session: ESC/Enter to end (or click outside this area)")); break; } break; diff --git a/source/blender/editors/gpencil/gpencil_brush.c b/source/blender/editors/gpencil/gpencil_brush.c index 48d6cab7b2a..f5b27d8268d 100644 --- a/source/blender/editors/gpencil/gpencil_brush.c +++ b/source/blender/editors/gpencil/gpencil_brush.c @@ -1182,9 +1182,9 @@ static void gpsculpt_brush_header_set(bContext *C, tGP_BrushEditData *gso) BLI_snprintf(str, sizeof(str), - IFACE_("GPencil Sculpt: %s Stroke | LMB to paint | RMB/Escape to Exit" - " | Ctrl to Invert Action | Wheel Up/Down for Size " - " | Shift-Wheel Up/Down for Strength"), + TIP_("GPencil Sculpt: %s Stroke | LMB to paint | RMB/Escape to Exit" + " | Ctrl to Invert Action | Wheel Up/Down for Size " + " | Shift-Wheel Up/Down for Strength"), (brush_name) ? brush_name : "<?>"); ED_workspace_status_text(C, str); diff --git a/source/blender/editors/gpencil/gpencil_fill.c b/source/blender/editors/gpencil/gpencil_fill.c index bf15b846bb6..df27198922c 100644 --- a/source/blender/editors/gpencil/gpencil_fill.c +++ b/source/blender/editors/gpencil/gpencil_fill.c @@ -1141,7 +1141,7 @@ static void gpencil_stroke_from_buffer(tGPDfill *tgpf) /* Helper: Draw status message while the user is running the operator */ static void gpencil_fill_status_indicators(bContext *C, tGPDfill *UNUSED(tgpf)) { - const char *status_str = IFACE_("Fill: ESC/RMB cancel, LMB Fill, Shift Draw on Back"); + const char *status_str = TIP_("Fill: ESC/RMB cancel, LMB Fill, Shift Draw on Back"); ED_workspace_status_text(C, status_str); } diff --git a/source/blender/editors/gpencil/gpencil_interpolate.c b/source/blender/editors/gpencil/gpencil_interpolate.c index d83cc7858bd..8a9f7c1224a 100644 --- a/source/blender/editors/gpencil/gpencil_interpolate.c +++ b/source/blender/editors/gpencil/gpencil_interpolate.c @@ -377,7 +377,7 @@ static void gpencil_interpolate_status_indicators(bContext *C, tGPDinterpolate * char status_str[UI_MAX_DRAW_STR]; char msg_str[UI_MAX_DRAW_STR]; - BLI_strncpy(msg_str, IFACE_("GPencil Interpolation: "), UI_MAX_DRAW_STR); + BLI_strncpy(msg_str, TIP_("GPencil Interpolation: "), UI_MAX_DRAW_STR); if (hasNumInput(&p->num)) { char str_offs[NUM_STR_REP_LEN]; @@ -395,7 +395,7 @@ static void gpencil_interpolate_status_indicators(bContext *C, tGPDinterpolate * ED_area_status_text(p->sa, status_str); ED_workspace_status_text( - C, IFACE_("ESC/RMB to cancel, Enter/LMB to confirm, WHEEL/MOVE to adjust factor")); + C, TIP_("ESC/RMB to cancel, Enter/LMB to confirm, WHEEL/MOVE to adjust factor")); } /* Update screen and stroke */ diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index 14bb955cf84..041704d8473 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -2480,22 +2480,21 @@ static void gpencil_draw_status_indicators(bContext *C, tGPsdata *p) case GP_PAINTMODE_ERASER: { ED_workspace_status_text( C, - IFACE_("Grease Pencil Erase Session: Hold and drag LMB or RMB to erase | " - "ESC/Enter to end (or click outside this area)")); + TIP_("Grease Pencil Erase Session: Hold and drag LMB or RMB to erase | " + "ESC/Enter to end (or click outside this area)")); break; } case GP_PAINTMODE_DRAW_STRAIGHT: { - ED_workspace_status_text( - C, - IFACE_("Grease Pencil Line Session: Hold and drag LMB to draw | " - "ESC/Enter to end (or click outside this area)")); + ED_workspace_status_text(C, + TIP_("Grease Pencil Line Session: Hold and drag LMB to draw | " + "ESC/Enter to end (or click outside this area)")); break; } case GP_PAINTMODE_SET_CP: { ED_workspace_status_text( C, - IFACE_("Grease Pencil Guides: LMB click and release to place reference point | " - "Esc/RMB to cancel")); + TIP_("Grease Pencil Guides: LMB click and release to place reference point | " + "Esc/RMB to cancel")); break; } case GP_PAINTMODE_DRAW: { @@ -2503,26 +2502,26 @@ static void gpencil_draw_status_indicators(bContext *C, tGPsdata *p) if (guide->use_guide) { ED_workspace_status_text( C, - IFACE_("Grease Pencil Freehand Session: Hold and drag LMB to draw | " - "M key to flip guide | O key to move reference point")); + TIP_("Grease Pencil Freehand Session: Hold and drag LMB to draw | " + "M key to flip guide | O key to move reference point")); } else { ED_workspace_status_text( - C, IFACE_("Grease Pencil Freehand Session: Hold and drag LMB to draw")); + C, TIP_("Grease Pencil Freehand Session: Hold and drag LMB to draw")); } break; } case GP_PAINTMODE_DRAW_POLY: { ED_workspace_status_text( C, - IFACE_("Grease Pencil Poly Session: LMB click to place next stroke vertex | " - "Release Shift/ESC/Enter to end (or click outside this area)")); + TIP_("Grease Pencil Poly Session: LMB click to place next stroke vertex | " + "Release Shift/ESC/Enter to end (or click outside this area)")); break; } default: /* unhandled future cases */ { ED_workspace_status_text( - C, IFACE_("Grease Pencil Session: ESC/Enter to end (or click outside this area)")); + C, TIP_("Grease Pencil Session: ESC/Enter to end (or click outside this area)")); break; } } diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c index d6497e6e58e..b10801fc87f 100644 --- a/source/blender/editors/gpencil/gpencil_primitive.c +++ b/source/blender/editors/gpencil/gpencil_primitive.c @@ -400,32 +400,32 @@ static void gpencil_primitive_status_indicators(bContext *C, tGPDprimitive *tgpi if (tgpi->type == GP_STROKE_LINE) { BLI_strncpy(msg_str, - IFACE_("Line: ESC to cancel, LMB set origin, Enter/MMB to confirm, WHEEL/+- to " - "adjust subdivision number, Shift to align, Alt to center, E: extrude"), + TIP_("Line: ESC to cancel, LMB set origin, Enter/MMB to confirm, WHEEL/+- to " + "adjust subdivision number, Shift to align, Alt to center, E: extrude"), UI_MAX_DRAW_STR); } else if (tgpi->type == GP_STROKE_BOX) { BLI_strncpy(msg_str, - IFACE_("Rectangle: ESC to cancel, LMB set origin, Enter/MMB to confirm, WHEEL/+- " - "to adjust subdivision number, Shift to square, Alt to center"), + TIP_("Rectangle: ESC to cancel, LMB set origin, Enter/MMB to confirm, WHEEL/+- " + "to adjust subdivision number, Shift to square, Alt to center"), UI_MAX_DRAW_STR); } else if (tgpi->type == GP_STROKE_CIRCLE) { BLI_strncpy(msg_str, - IFACE_("Circle: ESC to cancel, Enter/MMB to confirm, WHEEL/+- to adjust edge " - "number, Shift to square, Alt to center"), + TIP_("Circle: ESC to cancel, Enter/MMB to confirm, WHEEL/+- to adjust edge " + "number, Shift to square, Alt to center"), UI_MAX_DRAW_STR); } else if (tgpi->type == GP_STROKE_ARC) { BLI_strncpy(msg_str, - IFACE_("Arc: ESC to cancel, Enter/MMB to confirm, WHEEL/+- to adjust edge number, " - "Shift to square, Alt to center, M: Flip, E: extrude"), + TIP_("Arc: ESC to cancel, Enter/MMB to confirm, WHEEL/+- to adjust edge number, " + "Shift to square, Alt to center, M: Flip, E: extrude"), UI_MAX_DRAW_STR); } else if (tgpi->type == GP_STROKE_CURVE) { BLI_strncpy(msg_str, - IFACE_("Curve: ESC to cancel, Enter/MMB to confirm, WHEEL/+- to adjust edge " - "number, Shift to square, Alt to center, E: extrude"), + TIP_("Curve: ESC to cancel, Enter/MMB to confirm, WHEEL/+- to adjust edge " + "number, Shift to square, Alt to center, E: extrude"), UI_MAX_DRAW_STR); } diff --git a/source/blender/editors/interface/interface_region_tooltip.c b/source/blender/editors/interface/interface_region_tooltip.c index 6c780482777..9d1b6fc92fc 100644 --- a/source/blender/editors/interface/interface_region_tooltip.c +++ b/source/blender/editors/interface/interface_region_tooltip.c @@ -657,7 +657,7 @@ static uiTooltipData *ui_tooltip_data_from_button(bContext *C, uiBut *but) .style = UI_TIP_STYLE_NORMAL, .color_id = UI_TIP_LC_NORMAL, }); - field->text = BLI_strdup(IFACE_("(Shift-Click/Drag to select multiple)")); + field->text = BLI_strdup(TIP_("(Shift-Click/Drag to select multiple)")); } } /* Enum field label & tip */ diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index e1d3bd736e7..d1a50cd5234 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -1723,7 +1723,7 @@ void uiTemplatePathBuilder(uiLayout *layout, /************************ Modifier Template *************************/ -#define ERROR_LIBDATA_MESSAGE IFACE_("Can't edit external library data") +#define ERROR_LIBDATA_MESSAGE TIP_("Can't edit external library data") static void modifiers_convertToReal(bContext *C, void *ob_v, void *md_v) { @@ -2550,7 +2550,7 @@ static uiLayout *draw_constraint(uiLayout *layout, Object *ob, bConstraint *con) /* Set but-locks for protected settings (magic numbers are used here!) */ if (proxy_protected) { - UI_block_lock_set(block, true, IFACE_("Cannot edit Proxy-Protected Constraint")); + UI_block_lock_set(block, true, TIP_("Cannot edit Proxy-Protected Constraint")); } /* Draw constraint data */ diff --git a/source/blender/editors/mesh/editmesh_bevel.c b/source/blender/editors/mesh/editmesh_bevel.c index 28153dc7716..78b4cfe38d4 100644 --- a/source/blender/editors/mesh/editmesh_bevel.c +++ b/source/blender/editors/mesh/editmesh_bevel.c @@ -169,19 +169,19 @@ static void edbm_bevel_update_header(bContext *C, wmOperator *op) BLI_snprintf(header, sizeof(header), - IFACE_("%s: confirm, " - "%s: cancel, " - "%s: mode (%s), " - "%s: width (%s), " - "%s: segments (%d), " - "%s: profile (%.3f), " - "%s: clamp overlap (%s), " - "%s: vertex only (%s), " - "%s: outer miter (%s), " - "%s: inner miter (%s), " - "%s: harden normals (%s), " - "%s: mark seam (%s), " - "%s: mark sharp (%s)"), + TIP_("%s: confirm, " + "%s: cancel, " + "%s: mode (%s), " + "%s: width (%s), " + "%s: segments (%d), " + "%s: profile (%.3f), " + "%s: clamp overlap (%s), " + "%s: vertex only (%s), " + "%s: outer miter (%s), " + "%s: inner miter (%s), " + "%s: harden normals (%s), " + "%s: mark seam (%s), " + "%s: mark sharp (%s)"), WM_MODALKEY(BEV_MODAL_CONFIRM), WM_MODALKEY(BEV_MODAL_CANCEL), WM_MODALKEY(BEV_MODAL_OFFSET_MODE_CHANGE), diff --git a/source/blender/editors/mesh/editmesh_bisect.c b/source/blender/editors/mesh/editmesh_bisect.c index 1d173d8e396..283e147b77b 100644 --- a/source/blender/editors/mesh/editmesh_bisect.c +++ b/source/blender/editors/mesh/editmesh_bisect.c @@ -170,7 +170,7 @@ static int mesh_bisect_invoke(bContext *C, wmOperator *op, const wmEvent *event) v3d->gizmo_flag = V3D_GIZMO_HIDE; /* Initialize modal callout. */ - ED_workspace_status_text(C, IFACE_("LMB: Click and drag to draw cut line")); + ED_workspace_status_text(C, TIP_("LMB: Click and drag to draw cut line")); } MEM_freeN(objects); return ret; @@ -202,7 +202,7 @@ static int mesh_bisect_modal(bContext *C, wmOperator *op, const wmEvent *event) /* update or clear modal callout */ if (event->type == EVT_MODAL_MAP) { if (event->val == GESTURE_MODAL_BEGIN) { - ED_workspace_status_text(C, IFACE_("LMB: Release to confirm cut line")); + ED_workspace_status_text(C, TIP_("LMB: Release to confirm cut line")); } else { ED_workspace_status_text(C, NULL); diff --git a/source/blender/editors/mesh/editmesh_inset.c b/source/blender/editors/mesh/editmesh_inset.c index 9c7b234028c..1413e0db41d 100644 --- a/source/blender/editors/mesh/editmesh_inset.c +++ b/source/blender/editors/mesh/editmesh_inset.c @@ -80,7 +80,7 @@ static void edbm_inset_update_header(wmOperator *op, bContext *C) { InsetData *opdata = op->customdata; - const char *str = IFACE_( + const char *str = TIP_( "Confirm: Enter/LClick, Cancel: (Esc/RClick), Thickness: %s, " "Depth (Ctrl to tweak): %s (%s), Outset (O): (%s), Boundary (B): (%s), Individual (I): " "(%s)"); diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c index 976dbe01a22..bb584094580 100644 --- a/source/blender/editors/mesh/editmesh_knife.c +++ b/source/blender/editors/mesh/editmesh_knife.c @@ -280,11 +280,11 @@ static void knife_update_header(bContext *C, wmOperator *op, KnifeTool_OpData *k BLI_snprintf(header, sizeof(header), - IFACE_("%s: confirm, %s: cancel, " - "%s: start/define cut, %s: close cut, %s: new cut, " - "%s: midpoint snap (%s), %s: ignore snap (%s), " - "%s: angle constraint (%s), %s: cut through (%s), " - "%s: panning"), + TIP_("%s: confirm, %s: cancel, " + "%s: start/define cut, %s: close cut, %s: new cut, " + "%s: midpoint snap (%s), %s: ignore snap (%s), " + "%s: angle constraint (%s), %s: cut through (%s), " + "%s: panning"), WM_MODALKEY(KNF_MODAL_CONFIRM), WM_MODALKEY(KNF_MODAL_CANCEL), WM_MODALKEY(KNF_MODAL_ADD_CUT), diff --git a/source/blender/editors/mesh/editmesh_loopcut.c b/source/blender/editors/mesh/editmesh_loopcut.c index 59355890428..c7606758b63 100644 --- a/source/blender/editors/mesh/editmesh_loopcut.c +++ b/source/blender/editors/mesh/editmesh_loopcut.c @@ -451,8 +451,8 @@ static int loopcut_init(bContext *C, wmOperator *op, const wmEvent *event) if (is_interactive) { ED_workspace_status_text( C, - IFACE_("Select a ring to be cut, use mouse-wheel or page-up/down for number of cuts, " - "hold Alt for smooth")); + TIP_("Select a ring to be cut, use mouse-wheel or page-up/down for number of cuts, " + "hold Alt for smooth")); return OPERATOR_RUNNING_MODAL; } else { @@ -668,7 +668,7 @@ static int loopcut_modal(bContext *C, wmOperator *op, const wmEvent *event) } BLI_snprintf(buf, sizeof(buf), - IFACE_("Number of Cuts: %s, Smooth: %s (Alt)"), + TIP_("Number of Cuts: %s, Smooth: %s (Alt)"), str_rep, str_rep + NUM_STR_REP_LEN); ED_workspace_status_text(C, buf); diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index a1ebcff31aa..c4216d81317 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -7718,11 +7718,11 @@ static void point_normals_update_header(bContext *C, wmOperator *op) BLI_snprintf(header, sizeof(header), - IFACE_("%s: confirm, %s: cancel, " - "%s: point to mouse (%s), %s: point to Pivot, " - "%s: point to object origin, %s: reset normals, " - "%s: set & point to 3D cursor, %s: select & point to mesh item, " - "%s: invert normals (%s), %s: spherize (%s), %s: align (%s)"), + TIP_("%s: confirm, %s: cancel, " + "%s: point to mouse (%s), %s: point to Pivot, " + "%s: point to object origin, %s: reset normals, " + "%s: set & point to 3D cursor, %s: select & point to mesh item, " + "%s: invert normals (%s), %s: spherize (%s), %s: align (%s)"), WM_MODALKEY(EDBM_CLNOR_MODAL_CONFIRM), WM_MODALKEY(EDBM_CLNOR_MODAL_CANCEL), WM_MODALKEY(EDBM_CLNOR_MODAL_POINTTO_USE_MOUSE), diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index 1e85c895f71..0d92e1ae378 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -418,21 +418,21 @@ static void make_renderinfo_string(const RenderStats *rs, /* local view */ if (rs->localview) { - spos += sprintf(spos, "%s | ", IFACE_("3D Local View")); + spos += sprintf(spos, "%s | ", TIP_("3D Local View")); } else if (v3d_override) { - spos += sprintf(spos, "%s | ", IFACE_("3D View")); + spos += sprintf(spos, "%s | ", TIP_("3D View")); } /* frame number */ - spos += sprintf(spos, IFACE_("Frame:%d "), (scene->r.cfra)); + spos += sprintf(spos, TIP_("Frame:%d "), (scene->r.cfra)); /* previous and elapsed time */ BLI_timecode_string_from_time_simple(info_time_str, sizeof(info_time_str), rs->lastframetime); if (rs->infostr && rs->infostr[0]) { if (rs->lastframetime != 0.0) { - spos += sprintf(spos, IFACE_("| Last:%s "), info_time_str); + spos += sprintf(spos, TIP_("| Last:%s "), info_time_str); } else { spos += sprintf(spos, "| "); @@ -445,7 +445,7 @@ static void make_renderinfo_string(const RenderStats *rs, spos += sprintf(spos, "| "); } - spos += sprintf(spos, IFACE_("Time:%s "), info_time_str); + spos += sprintf(spos, TIP_("Time:%s "), info_time_str); /* statistics */ if (rs->statstr) { @@ -459,43 +459,43 @@ static void make_renderinfo_string(const RenderStats *rs, } if (rs->totvert) { - spos += sprintf(spos, IFACE_("Ve:%d "), rs->totvert); + spos += sprintf(spos, TIP_("Ve:%d "), rs->totvert); } if (rs->totface) { - spos += sprintf(spos, IFACE_("Fa:%d "), rs->totface); + spos += sprintf(spos, TIP_("Fa:%d "), rs->totface); } if (rs->tothalo) { - spos += sprintf(spos, IFACE_("Ha:%d "), rs->tothalo); + spos += sprintf(spos, TIP_("Ha:%d "), rs->tothalo); } if (rs->totstrand) { - spos += sprintf(spos, IFACE_("St:%d "), rs->totstrand); + spos += sprintf(spos, TIP_("St:%d "), rs->totstrand); } if (rs->totlamp) { - spos += sprintf(spos, IFACE_("Li:%d "), rs->totlamp); + spos += sprintf(spos, TIP_("Li:%d "), rs->totlamp); } if (rs->mem_peak == 0.0f) { spos += sprintf(spos, - IFACE_("| Mem:%.2fM (%.2fM, Peak %.2fM) "), + TIP_("| Mem:%.2fM (%.2fM, Peak %.2fM) "), megs_used_memory, mmap_used_memory, megs_peak_memory); } else { - spos += sprintf(spos, IFACE_("| Mem:%.2fM, Peak: %.2fM "), rs->mem_used, rs->mem_peak); + spos += sprintf(spos, TIP_("| Mem:%.2fM, Peak: %.2fM "), rs->mem_used, rs->mem_peak); } if (rs->curfield) { - spos += sprintf(spos, IFACE_("Field %d "), rs->curfield); + spos += sprintf(spos, TIP_("Field %d "), rs->curfield); } if (rs->curblur) { - spos += sprintf(spos, IFACE_("Blur %d "), rs->curblur); + spos += sprintf(spos, TIP_("Blur %d "), rs->curblur); } } /* full sample */ if (rs->curfsa) { - spos += sprintf(spos, IFACE_("| Full Sample %d "), rs->curfsa); + spos += sprintf(spos, TIP_("| Full Sample %d "), rs->curfsa); } /* extra info */ diff --git a/source/blender/editors/screen/screen_user_menu.c b/source/blender/editors/screen/screen_user_menu.c index 08b9d010f79..86be939d41b 100644 --- a/source/blender/editors/screen/screen_user_menu.c +++ b/source/blender/editors/screen/screen_user_menu.c @@ -289,8 +289,8 @@ static void screen_user_menu_draw(const bContext *C, Menu *menu) } if (is_empty) { - uiItemL(menu->layout, IFACE_("No menu items found"), ICON_NONE); - uiItemL(menu->layout, IFACE_("Right click on buttons to add them to this menu"), ICON_NONE); + uiItemL(menu->layout, TIP_("No menu items found"), ICON_NONE); + uiItemL(menu->layout, TIP_("Right click on buttons to add them to this menu"), ICON_NONE); } } diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index 2bbb99b2b67..41dfd6f68c3 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -952,10 +952,10 @@ static void sample_color_update_header(SampleColorData *data, bContext *C) if (sa) { BLI_snprintf(msg, sizeof(msg), - IFACE_("Sample color for %s"), + TIP_("Sample color for %s"), !data->sample_palette ? - IFACE_("Brush. Use Left Click to sample for palette instead") : - IFACE_("Palette. Use Left Click to sample more colors")); + TIP_("Brush. Use Left Click to sample for palette instead") : + TIP_("Palette. Use Left Click to sample more colors")); ED_workspace_status_text(C, msg); } } diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 0e18e5eb343..c902b6a0551 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -6398,7 +6398,7 @@ static int sculpt_sample_detail_size_exec(bContext *C, wmOperator *op) static int sculpt_sample_detail_size_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(e)) { - ED_workspace_status_text(C, "Click on the mesh to set the detail"); + ED_workspace_status_text(C, TIP_("Click on the mesh to set the detail")); WM_cursor_modal_set(CTX_wm_window(C), BC_EYEDROPPER_CURSOR); WM_event_add_modal_handler(C, op); return OPERATOR_RUNNING_MODAL; diff --git a/source/blender/editors/space_buttons/buttons_texture.c b/source/blender/editors/space_buttons/buttons_texture.c index b9b83abf670..87ea011e0a7 100644 --- a/source/blender/editors/space_buttons/buttons_texture.c +++ b/source/blender/editors/space_buttons/buttons_texture.c @@ -483,7 +483,7 @@ void uiTemplateTextureUser(uiLayout *layout, bContext *C) user = ct->user; if (!user) { - uiItemL(layout, IFACE_("No textures in context"), ICON_NONE); + uiItemL(layout, TIP_("No textures in context"), ICON_NONE); return; } diff --git a/source/blender/editors/space_clip/clip_buttons.c b/source/blender/editors/space_clip/clip_buttons.c index 2496b16ffae..45707d74d2e 100644 --- a/source/blender/editors/space_clip/clip_buttons.c +++ b/source/blender/editors/space_clip/clip_buttons.c @@ -814,27 +814,27 @@ void uiTemplateMovieclipInformation(uiLayout *layout, /* Display frame dimensions, channels number and byffer type. */ BKE_movieclip_get_size(clip, user, &width, &height); - ofs += BLI_snprintf(str + ofs, sizeof(str) - ofs, IFACE_("%d x %d"), width, height); + ofs += BLI_snprintf(str + ofs, sizeof(str) - ofs, TIP_("%d x %d"), width, height); if (ibuf) { if (ibuf->rect_float) { if (ibuf->channels != 4) { ofs += BLI_snprintf( - str + ofs, sizeof(str) - ofs, IFACE_(", %d float channel(s)"), ibuf->channels); + str + ofs, sizeof(str) - ofs, TIP_(", %d float channel(s)"), ibuf->channels); } else if (ibuf->planes == R_IMF_PLANES_RGBA) { - ofs += BLI_strncpy_rlen(str + ofs, IFACE_(", RGBA float"), sizeof(str) - ofs); + ofs += BLI_strncpy_rlen(str + ofs, TIP_(", RGBA float"), sizeof(str) - ofs); } else { - ofs += BLI_strncpy_rlen(str + ofs, IFACE_(", RGB float"), sizeof(str) - ofs); + ofs += BLI_strncpy_rlen(str + ofs, TIP_(", RGB float"), sizeof(str) - ofs); } } else { if (ibuf->planes == R_IMF_PLANES_RGBA) { - ofs += BLI_strncpy_rlen(str + ofs, IFACE_(", RGBA byte"), sizeof(str) - ofs); + ofs += BLI_strncpy_rlen(str + ofs, TIP_(", RGBA byte"), sizeof(str) - ofs); } else { - ofs += BLI_strncpy_rlen(str + ofs, IFACE_(", RGB byte"), sizeof(str) - ofs); + ofs += BLI_strncpy_rlen(str + ofs, TIP_(", RGB byte"), sizeof(str) - ofs); } } @@ -843,12 +843,12 @@ void uiTemplateMovieclipInformation(uiLayout *layout, float frs_sec_base; if (IMB_anim_get_fps(clip->anim, &frs_sec, &frs_sec_base, true)) { ofs += BLI_snprintf( - str + ofs, sizeof(str) - ofs, IFACE_(", %.2f fps"), (float)frs_sec / frs_sec_base); + str + ofs, sizeof(str) - ofs, TIP_(", %.2f fps"), (float)frs_sec / frs_sec_base); } } } else { - ofs += BLI_strncpy_rlen(str + ofs, IFACE_(", failed to load"), sizeof(str) - ofs); + ofs += BLI_strncpy_rlen(str + ofs, TIP_(", failed to load"), sizeof(str) - ofs); } uiItemL(col, str, ICON_NONE); @@ -856,10 +856,10 @@ void uiTemplateMovieclipInformation(uiLayout *layout, /* Display current frame number. */ framenr = BKE_movieclip_remap_scene_to_clip_frame(clip, user->framenr); if (framenr <= clip->len) { - BLI_snprintf(str, sizeof(str), IFACE_("Frame: %d / %d"), framenr, clip->len); + BLI_snprintf(str, sizeof(str), TIP_("Frame: %d / %d"), framenr, clip->len); } else { - BLI_snprintf(str, sizeof(str), IFACE_("Frame: - / %d"), clip->len); + BLI_snprintf(str, sizeof(str), TIP_("Frame: - / %d"), clip->len); } uiItemL(col, str, ICON_NONE); @@ -876,7 +876,7 @@ void uiTemplateMovieclipInformation(uiLayout *layout, file = "-"; } - BLI_snprintf(str, sizeof(str), IFACE_("File: %s"), file); + BLI_snprintf(str, sizeof(str), TIP_("File: %s"), file); uiItemL(col, str, ICON_NONE); } diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c index 2de01e0b7ec..d8d50ba72b5 100644 --- a/source/blender/editors/space_clip/tracking_ops.c +++ b/source/blender/editors/space_clip/tracking_ops.c @@ -152,7 +152,7 @@ void CLIP_OT_add_marker(wmOperatorType *ot) static int add_marker_at_click_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event)) { - ED_workspace_status_text(C, IFACE_("Use LMB click to define location where place the marker")); + ED_workspace_status_text(C, TIP_("Use LMB click to define location where place the marker")); /* Add modal handler for ESC. */ WM_event_add_modal_handler(C, op); diff --git a/source/blender/editors/space_graph/graph_buttons.c b/source/blender/editors/space_graph/graph_buttons.c index 3b1e70b8db7..cdb5e672f4a 100644 --- a/source/blender/editors/space_graph/graph_buttons.c +++ b/source/blender/editors/space_graph/graph_buttons.c @@ -952,29 +952,28 @@ static void graph_draw_driver_settings_panel(uiLayout *layout, block = uiLayoutGetBlock(col); if (driver->flag & DRIVER_FLAG_INVALID) { - uiItemL(col, IFACE_("ERROR: Invalid Python expression"), ICON_CANCEL); + uiItemL(col, TIP_("ERROR: Invalid Python expression"), ICON_CANCEL); } else if (!BKE_driver_has_simple_expression(driver)) { if ((G.f & G_FLAG_SCRIPT_AUTOEXEC) == 0) { /* TODO: Add button to enable? */ - uiItemL(col, IFACE_("WARNING: Python expressions limited for security"), ICON_ERROR); + uiItemL(col, TIP_("WARNING: Python expressions limited for security"), ICON_ERROR); } else { - uiItemL(col, IFACE_("Slow Python expression"), ICON_INFO); + uiItemL(col, TIP_("Slow Python expression"), ICON_INFO); } } /* Explicit bpy-references are evil. Warn about these to prevent errors */ /* TODO: put these in a box? */ if (bpy_data_expr_error || bpy_ctx_expr_error) { - uiItemL(col, IFACE_("WARNING: Driver expression may not work correctly"), ICON_HELP); + uiItemL(col, TIP_("WARNING: Driver expression may not work correctly"), ICON_HELP); if (bpy_data_expr_error) { - uiItemL( - col, IFACE_("TIP: Use variables instead of bpy.data paths (see below)"), ICON_ERROR); + uiItemL(col, TIP_("TIP: Use variables instead of bpy.data paths (see below)"), ICON_ERROR); } if (bpy_ctx_expr_error) { - uiItemL(col, IFACE_("TIP: bpy.context is not safe for renderfarm usage"), ICON_ERROR); + uiItemL(col, TIP_("TIP: bpy.context is not safe for renderfarm usage"), ICON_ERROR); } } } @@ -984,7 +983,7 @@ static void graph_draw_driver_settings_panel(uiLayout *layout, block = uiLayoutGetBlock(col); if (driver->flag & DRIVER_FLAG_INVALID) { - uiItemL(col, IFACE_("ERROR: Invalid target channel(s)"), ICON_ERROR); + uiItemL(col, TIP_("ERROR: Invalid target channel(s)"), ICON_ERROR); } /* Warnings about a lack of variables @@ -994,11 +993,11 @@ static void graph_draw_driver_settings_panel(uiLayout *layout, * property animation */ if (BLI_listbase_is_empty(&driver->variables)) { - uiItemL(col, IFACE_("ERROR: Driver is useless without any inputs"), ICON_ERROR); + uiItemL(col, TIP_("ERROR: Driver is useless without any inputs"), ICON_ERROR); if (!BLI_listbase_is_empty(&fcu->modifiers)) { - uiItemL(col, IFACE_("TIP: Use F-Curves for procedural animation instead"), ICON_INFO); - uiItemL(col, IFACE_("F-Modifiers can generate curves for those too"), ICON_INFO); + uiItemL(col, TIP_("TIP: Use F-Curves for procedural animation instead"), ICON_INFO); + uiItemL(col, TIP_("F-Modifiers can generate curves for those too"), ICON_INFO); } } } @@ -1118,7 +1117,7 @@ static void graph_draw_driver_settings_panel(uiLayout *layout, 0.0, 0.0, 0.0, - IFACE_("Invalid variable name, click here for details")); + TIP_("Invalid variable name, click here for details")); UI_but_func_set(but, driver_dvar_invalid_name_query_cb, dvar, NULL); // XXX: reports? } @@ -1136,7 +1135,7 @@ static void graph_draw_driver_settings_panel(uiLayout *layout, 0.0, 0.0, 0.0, - IFACE_("Delete target variable")); + TIP_("Delete target variable")); UI_but_func_set(but, driver_delete_var_cb, driver, dvar); UI_block_emboss_set(block, UI_EMBOSS); diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c index 17710734c80..fb4369f5113 100644 --- a/source/blender/editors/space_image/image_buttons.c +++ b/source/blender/editors/space_image/image_buttons.c @@ -1209,36 +1209,36 @@ void uiTemplateImageInfo(uiLayout *layout, bContext *C, Image *ima, ImageUser *i uiLayoutSetAlignment(col, UI_LAYOUT_ALIGN_RIGHT); if (ibuf == NULL) { - uiItemL(col, IFACE_("Can't Load Image"), ICON_NONE); + uiItemL(col, TIP_("Can't Load Image"), ICON_NONE); } else { char str[MAX_IMAGE_INFO_LEN] = {0}; const int len = MAX_IMAGE_INFO_LEN; int ofs = 0; - ofs += BLI_snprintf(str + ofs, len - ofs, IFACE_("%d x %d, "), ibuf->x, ibuf->y); + ofs += BLI_snprintf(str + ofs, len - ofs, TIP_("%d x %d, "), ibuf->x, ibuf->y); if (ibuf->rect_float) { if (ibuf->channels != 4) { - ofs += BLI_snprintf(str + ofs, len - ofs, IFACE_("%d float channel(s)"), ibuf->channels); + ofs += BLI_snprintf(str + ofs, len - ofs, TIP_("%d float channel(s)"), ibuf->channels); } else if (ibuf->planes == R_IMF_PLANES_RGBA) { - ofs += BLI_strncpy_rlen(str + ofs, IFACE_(" RGBA float"), len - ofs); + ofs += BLI_strncpy_rlen(str + ofs, TIP_(" RGBA float"), len - ofs); } else { - ofs += BLI_strncpy_rlen(str + ofs, IFACE_(" RGB float"), len - ofs); + ofs += BLI_strncpy_rlen(str + ofs, TIP_(" RGB float"), len - ofs); } } else { if (ibuf->planes == R_IMF_PLANES_RGBA) { - ofs += BLI_strncpy_rlen(str + ofs, IFACE_(" RGBA byte"), len - ofs); + ofs += BLI_strncpy_rlen(str + ofs, TIP_(" RGBA byte"), len - ofs); } else { - ofs += BLI_strncpy_rlen(str + ofs, IFACE_(" RGB byte"), len - ofs); + ofs += BLI_strncpy_rlen(str + ofs, TIP_(" RGB byte"), len - ofs); } } if (ibuf->zbuf || ibuf->zbuf_float) { - ofs += BLI_strncpy_rlen(str + ofs, IFACE_(" + Z"), len - ofs); + ofs += BLI_strncpy_rlen(str + ofs, TIP_(" + Z"), len - ofs); } uiItemL(col, str, ICON_NONE); @@ -1261,17 +1261,17 @@ void uiTemplateImageInfo(uiLayout *layout, bContext *C, Image *ima, ImageUser *i if (duration > 0) { /* Movie duration */ - BLI_snprintf(str, MAX_IMAGE_INFO_LEN, IFACE_("Frame %d / %d"), framenr, duration); + BLI_snprintf(str, MAX_IMAGE_INFO_LEN, TIP_("Frame %d / %d"), framenr, duration); } else if (ima->source == IMA_SRC_SEQUENCE && ibuf) { /* Image sequence frame number + filename */ const char *filename = BLI_last_slash(ibuf->name); filename = (filename == NULL) ? ibuf->name : filename + 1; - BLI_snprintf(str, MAX_IMAGE_INFO_LEN, IFACE_("Frame %d: %s"), framenr, filename); + BLI_snprintf(str, MAX_IMAGE_INFO_LEN, TIP_("Frame %d: %s"), framenr, filename); } else { /* Frame number */ - BLI_snprintf(str, MAX_IMAGE_INFO_LEN, IFACE_("Frame %d"), framenr); + BLI_snprintf(str, MAX_IMAGE_INFO_LEN, TIP_("Frame %d"), framenr); } uiItemL(col, str, ICON_NONE); diff --git a/source/blender/editors/space_info/info_stats.c b/source/blender/editors/space_info/info_stats.c index 604792e3254..1c9a7d3584c 100644 --- a/source/blender/editors/space_info/info_stats.c +++ b/source/blender/editors/space_info/info_stats.c @@ -442,11 +442,11 @@ static void stats_string(ViewLayer *view_layer) /* get memory statistics */ BLI_str_format_byte_unit(formatted_mem, mem_in_use - mmap_in_use, true); - ofs = BLI_snprintf(memstr, MAX_INFO_MEM_LEN, IFACE_(" | Mem: %s"), formatted_mem); + ofs = BLI_snprintf(memstr, MAX_INFO_MEM_LEN, TIP_(" | Mem: %s"), formatted_mem); if (mmap_in_use) { BLI_str_format_byte_unit(formatted_mem, mmap_in_use, true); - BLI_snprintf(memstr + ofs, MAX_INFO_MEM_LEN - ofs, IFACE_(" (%s)"), formatted_mem); + BLI_snprintf(memstr + ofs, MAX_INFO_MEM_LEN - ofs, TIP_(" (%s)"), formatted_mem); } if (GPU_mem_stats_supported()) { @@ -455,11 +455,11 @@ static void stats_string(ViewLayer *view_layer) GPU_mem_stats_get(&gpu_tot_memory, &gpu_free_mem); BLI_str_format_byte_unit(formatted_mem, gpu_free_mem, true); - ofs = BLI_snprintf(gpumemstr, MAX_INFO_MEM_LEN, IFACE_(" | Free GPU Mem: %s"), formatted_mem); + ofs = BLI_snprintf(gpumemstr, MAX_INFO_MEM_LEN, TIP_(" | Free GPU Mem: %s"), formatted_mem); if (gpu_tot_memory) { BLI_str_format_byte_unit(formatted_mem, gpu_tot_memory, true); - BLI_snprintf(gpumemstr + ofs, MAX_INFO_MEM_LEN - ofs, IFACE_("/%s"), formatted_mem); + BLI_snprintf(gpumemstr + ofs, MAX_INFO_MEM_LEN - ofs, TIP_("/%s"), formatted_mem); } } @@ -479,13 +479,13 @@ static void stats_string(ViewLayer *view_layer) if (obedit) { if (BKE_keyblock_from_object(obedit)) { - ofs += BLI_strncpy_rlen(s + ofs, IFACE_("(Key) "), MAX_INFO_LEN - ofs); + ofs += BLI_strncpy_rlen(s + ofs, TIP_("(Key) "), MAX_INFO_LEN - ofs); } if (obedit->type == OB_MESH) { ofs += BLI_snprintf(s + ofs, MAX_INFO_LEN - ofs, - IFACE_("Verts:%s/%s | Edges:%s/%s | Faces:%s/%s | Tris:%s"), + TIP_("Verts:%s/%s | Edges:%s/%s | Faces:%s/%s | Tris:%s"), stats_fmt.totvertsel, stats_fmt.totvert, stats_fmt.totedgesel, @@ -497,7 +497,7 @@ static void stats_string(ViewLayer *view_layer) else if (obedit->type == OB_ARMATURE) { ofs += BLI_snprintf(s + ofs, MAX_INFO_LEN - ofs, - IFACE_("Verts:%s/%s | Bones:%s/%s"), + TIP_("Verts:%s/%s | Bones:%s/%s"), stats_fmt.totvertsel, stats_fmt.totvert, stats_fmt.totbonesel, @@ -506,7 +506,7 @@ static void stats_string(ViewLayer *view_layer) else { ofs += BLI_snprintf(s + ofs, MAX_INFO_LEN - ofs, - IFACE_("Verts:%s/%s"), + TIP_("Verts:%s/%s"), stats_fmt.totvertsel, stats_fmt.totvert); } @@ -517,7 +517,7 @@ static void stats_string(ViewLayer *view_layer) else if (ob && (object_mode & OB_MODE_POSE)) { ofs += BLI_snprintf(s + ofs, MAX_INFO_LEN - ofs, - IFACE_("Bones:%s/%s %s%s"), + TIP_("Bones:%s/%s %s%s"), stats_fmt.totbonesel, stats_fmt.totbone, memstr, @@ -526,7 +526,7 @@ static void stats_string(ViewLayer *view_layer) else if ((ob) && (ob->type == OB_GPENCIL)) { ofs += BLI_snprintf(s + ofs, MAX_INFO_LEN - ofs, - IFACE_("Layers:%s | Frames:%s | Strokes:%s | Points:%s | Objects:%s/%s"), + TIP_("Layers:%s | Frames:%s | Strokes:%s | Points:%s | Objects:%s/%s"), stats_fmt.totgplayer, stats_fmt.totgpframe, stats_fmt.totgpstroke, @@ -540,7 +540,7 @@ static void stats_string(ViewLayer *view_layer) else if (stats_is_object_dynamic_topology_sculpt(ob, object_mode)) { ofs += BLI_snprintf(s + ofs, MAX_INFO_LEN - ofs, - IFACE_("Verts:%s | Tris:%s%s"), + TIP_("Verts:%s | Tris:%s%s"), stats_fmt.totvert, stats_fmt.tottri, gpumemstr); @@ -548,7 +548,7 @@ static void stats_string(ViewLayer *view_layer) else { ofs += BLI_snprintf(s + ofs, MAX_INFO_LEN - ofs, - IFACE_("Verts:%s | Faces:%s | Tris:%s | Objects:%s/%s%s%s"), + TIP_("Verts:%s | Faces:%s | Tris:%s | Objects:%s/%s%s%s"), stats_fmt.totvert, stats_fmt.totface, stats_fmt.tottri, diff --git a/source/blender/editors/space_node/node_relationships.c b/source/blender/editors/space_node/node_relationships.c index d34ba14700a..cf52ca8489f 100644 --- a/source/blender/editors/space_node/node_relationships.c +++ b/source/blender/editors/space_node/node_relationships.c @@ -562,7 +562,7 @@ static void node_link_update_header(bContext *C, bNodeLinkDrag *UNUSED(nldrag)) { char header[UI_MAX_DRAW_STR]; - BLI_strncpy(header, IFACE_("LMB: drag node link, RMB: cancel"), sizeof(header)); + BLI_strncpy(header, TIP_("LMB: drag node link, RMB: cancel"), sizeof(header)); ED_workspace_status_text(C, header); } diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index b32f73323b2..0328bf3fb6a 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -1613,10 +1613,10 @@ static void sequencer_slip_update_header(Scene *scene, ScrArea *sa, SlipData *da if (hasNumInput(&data->num_input)) { char num_str[NUM_STR_REP_LEN]; outputNumInput(&data->num_input, num_str, &scene->unit); - BLI_snprintf(msg, sizeof(msg), IFACE_("Trim offset: %s"), num_str); + BLI_snprintf(msg, sizeof(msg), TIP_("Trim offset: %s"), num_str); } else { - BLI_snprintf(msg, sizeof(msg), IFACE_("Trim offset: %d"), offset); + BLI_snprintf(msg, sizeof(msg), TIP_("Trim offset: %d"), offset); } } diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 167ad6a76c0..9019b21997f 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -971,23 +971,23 @@ static void transform_event_xyz_constraint(TransInfo *t, short key_type, char cm /* Initialize */ switch (key_type) { case XKEY: - msg1 = IFACE_("along X"); - msg2 = IFACE_("along %s X"); - msg3 = IFACE_("locking %s X"); + msg1 = TIP_("along X"); + msg2 = TIP_("along %s X"); + msg3 = TIP_("locking %s X"); axis = 'X'; constraint_axis = CON_AXIS0; break; case YKEY: - msg1 = IFACE_("along Y"); - msg2 = IFACE_("along %s Y"); - msg3 = IFACE_("locking %s Y"); + msg1 = TIP_("along Y"); + msg2 = TIP_("along %s Y"); + msg3 = TIP_("locking %s Y"); axis = 'Y'; constraint_axis = CON_AXIS1; break; case ZKEY: - msg1 = IFACE_("along Z"); - msg2 = IFACE_("along %s Z"); - msg3 = IFACE_("locking %s Z"); + msg1 = TIP_("along Z"); + msg2 = TIP_("along %s Z"); + msg3 = TIP_("locking %s Z"); axis = 'Z'; constraint_axis = CON_AXIS2; break; @@ -1392,7 +1392,7 @@ int transformEvent(TransInfo *t, const wmEvent *event) /* exception for switching to dolly, or trackball, in camera view */ if (t->flag & T_CAMERA) { if (t->mode == TFM_TRANSLATION) { - setLocalConstraint(t, (CON_AXIS2), IFACE_("along local Z")); + setLocalConstraint(t, (CON_AXIS2), TIP_("along local Z")); } else if (t->mode == TFM_ROTATION) { restoreTransObjects(t); @@ -3383,7 +3383,7 @@ static void Bend(TransInfo *t, const int UNUSED(mval[2])) BLI_snprintf(str, sizeof(str), - IFACE_("Bend Angle: %s Radius: %s Alt, Clamp %s"), + TIP_("Bend Angle: %s Radius: %s Alt, Clamp %s"), &c[0], &c[NUM_STR_REP_LEN], WM_bool_as_string(is_clamp)); @@ -3392,7 +3392,7 @@ static void Bend(TransInfo *t, const int UNUSED(mval[2])) /* default header print */ BLI_snprintf(str, sizeof(str), - IFACE_("Bend Angle: %.3f Radius: %.4f, Alt, Clamp %s"), + TIP_("Bend Angle: %.3f Radius: %.4f, Alt, Clamp %s"), RAD2DEGF(values.angle), values.scale * data->warp_init_dist, WM_bool_as_string(is_clamp)); @@ -3622,13 +3622,13 @@ static void applyShear(TransInfo *t, const int UNUSED(mval[2])) outputNumInput(&(t->num), c, &t->scene->unit); - BLI_snprintf(str, sizeof(str), IFACE_("Shear: %s %s"), c, t->proptext); + BLI_snprintf(str, sizeof(str), TIP_("Shear: %s %s"), c, t->proptext); } else { /* default header print */ BLI_snprintf(str, sizeof(str), - IFACE_("Shear: %.3f %s (Press X or Y to set shear axis)"), + TIP_("Shear: %.3f %s (Press X or Y to set shear axis)"), value, t->proptext); } @@ -3768,7 +3768,7 @@ static void headerResize(TransInfo *t, const float vec[3], char str[UI_MAX_DRAW_ case 0: ofs += BLI_snprintf(str + ofs, UI_MAX_DRAW_STR - ofs, - IFACE_("Scale: %s%s %s"), + TIP_("Scale: %s%s %s"), &tvec[0], t->con.text, t->proptext); @@ -3776,7 +3776,7 @@ static void headerResize(TransInfo *t, const float vec[3], char str[UI_MAX_DRAW_ case 1: ofs += BLI_snprintf(str + ofs, UI_MAX_DRAW_STR - ofs, - IFACE_("Scale: %s : %s%s %s"), + TIP_("Scale: %s : %s%s %s"), &tvec[0], &tvec[NUM_STR_REP_LEN], t->con.text, @@ -3785,7 +3785,7 @@ static void headerResize(TransInfo *t, const float vec[3], char str[UI_MAX_DRAW_ case 2: ofs += BLI_snprintf(str + ofs, UI_MAX_DRAW_STR - ofs, - IFACE_("Scale: %s : %s : %s%s %s"), + TIP_("Scale: %s : %s : %s%s %s"), &tvec[0], &tvec[NUM_STR_REP_LEN], &tvec[NUM_STR_REP_LEN * 2], @@ -3798,7 +3798,7 @@ static void headerResize(TransInfo *t, const float vec[3], char str[UI_MAX_DRAW_ if (t->flag & T_2D_EDIT) { ofs += BLI_snprintf(str + ofs, UI_MAX_DRAW_STR - ofs, - IFACE_("Scale X: %s Y: %s%s %s"), + TIP_("Scale X: %s Y: %s%s %s"), &tvec[0], &tvec[NUM_STR_REP_LEN], t->con.text, @@ -3807,7 +3807,7 @@ static void headerResize(TransInfo *t, const float vec[3], char str[UI_MAX_DRAW_ else { ofs += BLI_snprintf(str + ofs, UI_MAX_DRAW_STR - ofs, - IFACE_("Scale X: %s Y: %s Z: %s%s %s"), + TIP_("Scale X: %s Y: %s Z: %s%s %s"), &tvec[0], &tvec[NUM_STR_REP_LEN], &tvec[NUM_STR_REP_LEN * 2], @@ -3818,7 +3818,7 @@ static void headerResize(TransInfo *t, const float vec[3], char str[UI_MAX_DRAW_ if (t->flag & T_PROP_EDIT_ALL) { ofs += BLI_snprintf( - str + ofs, UI_MAX_DRAW_STR - ofs, IFACE_(" Proportional size: %.2f"), t->prop_size); + str + ofs, UI_MAX_DRAW_STR - ofs, TIP_(" Proportional size: %.2f"), t->prop_size); } } @@ -4226,11 +4226,11 @@ static void applyToSphere(TransInfo *t, const int UNUSED(mval[2])) outputNumInput(&(t->num), c, &t->scene->unit); - BLI_snprintf(str, sizeof(str), IFACE_("To Sphere: %s %s"), c, t->proptext); + BLI_snprintf(str, sizeof(str), TIP_("To Sphere: %s %s"), c, t->proptext); } else { /* default header print */ - BLI_snprintf(str, sizeof(str), IFACE_("To Sphere: %.4f %s"), ratio, t->proptext); + BLI_snprintf(str, sizeof(str), TIP_("To Sphere: %.4f %s"), ratio, t->proptext); } FOREACH_TRANS_DATA_CONTAINER (t, tc) { @@ -4312,17 +4312,13 @@ static void headerRotation(TransInfo *t, char str[UI_MAX_DRAW_STR], float final) outputNumInput(&(t->num), c, &t->scene->unit); - ofs += BLI_snprintf(str + ofs, - UI_MAX_DRAW_STR - ofs, - IFACE_("Rot: %s %s %s"), - &c[0], - t->con.text, - t->proptext); + ofs += BLI_snprintf( + str + ofs, UI_MAX_DRAW_STR - ofs, TIP_("Rot: %s %s %s"), &c[0], t->con.text, t->proptext); } else { ofs += BLI_snprintf(str + ofs, UI_MAX_DRAW_STR - ofs, - IFACE_("Rot: %.2f%s %s"), + TIP_("Rot: %.2f%s %s"), RAD2DEGF(final), t->con.text, t->proptext); @@ -4330,7 +4326,7 @@ static void headerRotation(TransInfo *t, char str[UI_MAX_DRAW_STR], float final) if (t->flag & T_PROP_EDIT_ALL) { ofs += BLI_snprintf( - str + ofs, UI_MAX_DRAW_STR - ofs, IFACE_(" Proportional size: %.2f"), t->prop_size); + str + ofs, UI_MAX_DRAW_STR - ofs, TIP_(" Proportional size: %.2f"), t->prop_size); } } @@ -4743,7 +4739,7 @@ static void applyTrackball(TransInfo *t, const int UNUSED(mval[2])) ofs += BLI_snprintf(str + ofs, sizeof(str) - ofs, - IFACE_("Trackball: %s %s %s"), + TIP_("Trackball: %s %s %s"), &c[0], &c[NUM_STR_REP_LEN], t->proptext); @@ -4751,7 +4747,7 @@ static void applyTrackball(TransInfo *t, const int UNUSED(mval[2])) else { ofs += BLI_snprintf(str + ofs, sizeof(str) - ofs, - IFACE_("Trackball: %.2f %.2f %s"), + TIP_("Trackball: %.2f %.2f %s"), RAD2DEGF(phi[0]), RAD2DEGF(phi[1]), t->proptext); @@ -4759,7 +4755,7 @@ static void applyTrackball(TransInfo *t, const int UNUSED(mval[2])) if (t->flag & T_PROP_EDIT_ALL) { ofs += BLI_snprintf( - str + ofs, sizeof(str) - ofs, IFACE_(" Proportional size: %.2f"), t->prop_size); + str + ofs, sizeof(str) - ofs, TIP_(" Proportional size: %.2f"), t->prop_size); } #if 0 /* UNUSED */ @@ -5037,7 +5033,7 @@ static void headerTranslation(TransInfo *t, const float vec[3], char str[UI_MAX_ short chainlen = t->settings->autoik_chainlen; if (chainlen) { - BLI_snprintf(autoik, NUM_STR_REP_LEN, IFACE_("AutoIK-Len: %d"), chainlen); + BLI_snprintf(autoik, NUM_STR_REP_LEN, TIP_("AutoIK-Len: %d"), chainlen); } else { autoik[0] = '\0'; @@ -5111,7 +5107,7 @@ static void headerTranslation(TransInfo *t, const float vec[3], char str[UI_MAX_ if (t->flag & T_PROP_EDIT_ALL) { ofs += BLI_snprintf( - str + ofs, UI_MAX_DRAW_STR - ofs, IFACE_(" Proportional size: %.2f"), t->prop_size); + str + ofs, UI_MAX_DRAW_STR - ofs, TIP_(" Proportional size: %.2f"), t->prop_size); } if (t->spacetype == SPACE_NODE) { @@ -5119,9 +5115,8 @@ static void headerTranslation(TransInfo *t, const float vec[3], char str[UI_MAX_ if ((snode->flag & SNODE_SKIP_INSOFFSET) == 0) { const char *str_old = BLI_strdup(str); - const char *str_dir = (snode->insert_ofs_dir == SNODE_INSERTOFS_DIR_RIGHT) ? - IFACE_("right") : - IFACE_("left"); + const char *str_dir = (snode->insert_ofs_dir == SNODE_INSERTOFS_DIR_RIGHT) ? TIP_("right") : + TIP_("left"); char str_km[64]; WM_modalkeymap_items_to_string( @@ -5129,7 +5124,7 @@ static void headerTranslation(TransInfo *t, const float vec[3], char str[UI_MAX_ ofs += BLI_snprintf(str, UI_MAX_DRAW_STR, - IFACE_("Auto-offset set to %s - press %s to toggle direction | %s"), + TIP_("Auto-offset set to %s - press %s to toggle direction | %s"), str_dir, str_km, str_old); @@ -5345,7 +5340,7 @@ static void applyShrinkFatten(TransInfo *t, const int UNUSED(mval[2])) t->values[0] = -distance; /* header print for NumInput */ - ofs += BLI_strncpy_rlen(str + ofs, IFACE_("Shrink/Fatten:"), sizeof(str) - ofs); + ofs += BLI_strncpy_rlen(str + ofs, TIP_("Shrink/Fatten:"), sizeof(str) - ofs); if (hasNumInput(&t->num)) { char c[NUM_STR_REP_LEN]; outputNumInput(&(t->num), c, &t->scene->unit); @@ -5369,7 +5364,7 @@ static void applyShrinkFatten(TransInfo *t, const int UNUSED(mval[2])) } BLI_snprintf(str + ofs, sizeof(str) - ofs, - IFACE_(" or Alt) Even Thickness %s"), + TIP_(" or Alt) Even Thickness %s"), WM_bool_as_string((t->flag & T_ALT_TRANSFORM) != 0)); /* done with header string */ @@ -5448,13 +5443,13 @@ static void applyTilt(TransInfo *t, const int UNUSED(mval[2])) outputNumInput(&(t->num), c, &t->scene->unit); - BLI_snprintf(str, sizeof(str), IFACE_("Tilt: %s° %s"), &c[0], t->proptext); + BLI_snprintf(str, sizeof(str), TIP_("Tilt: %s° %s"), &c[0], t->proptext); /* XXX For some reason, this seems needed for this op, else RNA prop is not updated... :/ */ t->values[0] = final; } else { - BLI_snprintf(str, sizeof(str), IFACE_("Tilt: %.2f° %s"), RAD2DEGF(final), t->proptext); + BLI_snprintf(str, sizeof(str), TIP_("Tilt: %.2f° %s"), RAD2DEGF(final), t->proptext); } FOREACH_TRANS_DATA_CONTAINER (t, tc) { @@ -5530,10 +5525,10 @@ static void applyCurveShrinkFatten(TransInfo *t, const int UNUSED(mval[2])) char c[NUM_STR_REP_LEN]; outputNumInput(&(t->num), c, &t->scene->unit); - BLI_snprintf(str, sizeof(str), IFACE_("Shrink/Fatten: %s"), c); + BLI_snprintf(str, sizeof(str), TIP_("Shrink/Fatten: %s"), c); } else { - BLI_snprintf(str, sizeof(str), IFACE_("Shrink/Fatten: %3f"), ratio); + BLI_snprintf(str, sizeof(str), TIP_("Shrink/Fatten: %3f"), ratio); } FOREACH_TRANS_DATA_CONTAINER (t, tc) { @@ -5615,10 +5610,10 @@ static void applyMaskShrinkFatten(TransInfo *t, const int UNUSED(mval[2])) char c[NUM_STR_REP_LEN]; outputNumInput(&(t->num), c, &t->scene->unit); - BLI_snprintf(str, sizeof(str), IFACE_("Feather Shrink/Fatten: %s"), c); + BLI_snprintf(str, sizeof(str), TIP_("Feather Shrink/Fatten: %s"), c); } else { - BLI_snprintf(str, sizeof(str), IFACE_("Feather Shrink/Fatten: %3f"), ratio); + BLI_snprintf(str, sizeof(str), TIP_("Feather Shrink/Fatten: %3f"), ratio); } /* detect if no points have feather yet */ @@ -5728,10 +5723,10 @@ static void applyGPShrinkFatten(TransInfo *t, const int UNUSED(mval[2])) char c[NUM_STR_REP_LEN]; outputNumInput(&(t->num), c, &t->scene->unit); - BLI_snprintf(str, sizeof(str), IFACE_("Shrink/Fatten: %s"), c); + BLI_snprintf(str, sizeof(str), TIP_("Shrink/Fatten: %s"), c); } else { - BLI_snprintf(str, sizeof(str), IFACE_("Shrink/Fatten: %3f"), ratio); + BLI_snprintf(str, sizeof(str), TIP_("Shrink/Fatten: %3f"), ratio); } FOREACH_TRANS_DATA_CONTAINER (t, tc) { @@ -5810,10 +5805,10 @@ static void applyGPOpacity(TransInfo *t, const int UNUSED(mval[2])) char c[NUM_STR_REP_LEN]; outputNumInput(&(t->num), c, &t->scene->unit); - BLI_snprintf(str, sizeof(str), IFACE_("Opacity: %s"), c); + BLI_snprintf(str, sizeof(str), TIP_("Opacity: %s"), c); } else { - BLI_snprintf(str, sizeof(str), IFACE_("Opacity: %3f"), ratio); + BLI_snprintf(str, sizeof(str), TIP_("Opacity: %3f"), ratio); } FOREACH_TRANS_DATA_CONTAINER (t, tc) { @@ -5885,12 +5880,12 @@ static void applyPushPull(TransInfo *t, const int UNUSED(mval[2])) outputNumInput(&(t->num), c, &t->scene->unit); - BLI_snprintf(str, sizeof(str), IFACE_("Push/Pull: %s%s %s"), c, t->con.text, t->proptext); + BLI_snprintf(str, sizeof(str), TIP_("Push/Pull: %s%s %s"), c, t->con.text, t->proptext); } else { /* default header print */ BLI_snprintf( - str, sizeof(str), IFACE_("Push/Pull: %.4f%s %s"), distance, t->con.text, t->proptext); + str, sizeof(str), TIP_("Push/Pull: %.4f%s %s"), distance, t->con.text, t->proptext); } if (t->con.applyRot && t->con.mode & CON_APPLY) { @@ -5985,19 +5980,19 @@ static void applyBevelWeight(TransInfo *t, const int UNUSED(mval[2])) outputNumInput(&(t->num), c, &t->scene->unit); if (weight >= 0.0f) { - BLI_snprintf(str, sizeof(str), IFACE_("Bevel Weight: +%s %s"), c, t->proptext); + BLI_snprintf(str, sizeof(str), TIP_("Bevel Weight: +%s %s"), c, t->proptext); } else { - BLI_snprintf(str, sizeof(str), IFACE_("Bevel Weight: %s %s"), c, t->proptext); + BLI_snprintf(str, sizeof(str), TIP_("Bevel Weight: %s %s"), c, t->proptext); } } else { /* default header print */ if (weight >= 0.0f) { - BLI_snprintf(str, sizeof(str), IFACE_("Bevel Weight: +%.3f %s"), weight, t->proptext); + BLI_snprintf(str, sizeof(str), TIP_("Bevel Weight: +%.3f %s"), weight, t->proptext); } else { - BLI_snprintf(str, sizeof(str), IFACE_("Bevel Weight: %.3f %s"), weight, t->proptext); + BLI_snprintf(str, sizeof(str), TIP_("Bevel Weight: %.3f %s"), weight, t->proptext); } } @@ -6075,19 +6070,19 @@ static void applyCrease(TransInfo *t, const int UNUSED(mval[2])) outputNumInput(&(t->num), c, &t->scene->unit); if (crease >= 0.0f) { - BLI_snprintf(str, sizeof(str), IFACE_("Crease: +%s %s"), c, t->proptext); + BLI_snprintf(str, sizeof(str), TIP_("Crease: +%s %s"), c, t->proptext); } else { - BLI_snprintf(str, sizeof(str), IFACE_("Crease: %s %s"), c, t->proptext); + BLI_snprintf(str, sizeof(str), TIP_("Crease: %s %s"), c, t->proptext); } } else { /* default header print */ if (crease >= 0.0f) { - BLI_snprintf(str, sizeof(str), IFACE_("Crease: +%.3f %s"), crease, t->proptext); + BLI_snprintf(str, sizeof(str), TIP_("Crease: +%.3f %s"), crease, t->proptext); } else { - BLI_snprintf(str, sizeof(str), IFACE_("Crease: %.3f %s"), crease, t->proptext); + BLI_snprintf(str, sizeof(str), TIP_("Crease: %.3f %s"), crease, t->proptext); } } @@ -6166,12 +6161,12 @@ static void headerBoneSize(TransInfo *t, const float vec[3], char str[UI_MAX_DRA if (t->con.mode & CON_APPLY) { if (t->num.idx_max == 0) { BLI_snprintf( - str, UI_MAX_DRAW_STR, IFACE_("ScaleB: %s%s %s"), &tvec[0], t->con.text, t->proptext); + str, UI_MAX_DRAW_STR, TIP_("ScaleB: %s%s %s"), &tvec[0], t->con.text, t->proptext); } else { BLI_snprintf(str, UI_MAX_DRAW_STR, - IFACE_("ScaleB: %s : %s : %s%s %s"), + TIP_("ScaleB: %s : %s : %s%s %s"), &tvec[0], &tvec[NUM_STR_REP_LEN], &tvec[NUM_STR_REP_LEN * 2], @@ -6182,7 +6177,7 @@ static void headerBoneSize(TransInfo *t, const float vec[3], char str[UI_MAX_DRA else { BLI_snprintf(str, UI_MAX_DRAW_STR, - IFACE_("ScaleB X: %s Y: %s Z: %s%s %s"), + TIP_("ScaleB X: %s Y: %s Z: %s%s %s"), &tvec[0], &tvec[NUM_STR_REP_LEN], &tvec[NUM_STR_REP_LEN * 2], @@ -6304,10 +6299,10 @@ static void applyBoneEnvelope(TransInfo *t, const int UNUSED(mval[2])) char c[NUM_STR_REP_LEN]; outputNumInput(&(t->num), c, &t->scene->unit); - BLI_snprintf(str, sizeof(str), IFACE_("Envelope: %s"), c); + BLI_snprintf(str, sizeof(str), TIP_("Envelope: %s"), c); } else { - BLI_snprintf(str, sizeof(str), IFACE_("Envelope: %3f"), ratio); + BLI_snprintf(str, sizeof(str), TIP_("Envelope: %3f"), ratio); } FOREACH_TRANS_DATA_CONTAINER (t, tc) { @@ -8074,7 +8069,7 @@ static void applyEdgeSlide(TransInfo *t, const int UNUSED(mval[2])) t->values[0] = final; /* header string */ - ofs += BLI_strncpy_rlen(str + ofs, IFACE_("Edge Slide: "), sizeof(str) - ofs); + ofs += BLI_strncpy_rlen(str + ofs, TIP_("Edge Slide: "), sizeof(str) - ofs); if (hasNumInput(&t->num)) { char c[NUM_STR_REP_LEN]; outputNumInput(&(t->num), c, &t->scene->unit); @@ -8084,13 +8079,13 @@ static void applyEdgeSlide(TransInfo *t, const int UNUSED(mval[2])) ofs += BLI_snprintf(str + ofs, sizeof(str) - ofs, "%.4f ", final); } ofs += BLI_snprintf( - str + ofs, sizeof(str) - ofs, IFACE_("(E)ven: %s, "), WM_bool_as_string(use_even)); + str + ofs, sizeof(str) - ofs, TIP_("(E)ven: %s, "), WM_bool_as_string(use_even)); if (use_even) { ofs += BLI_snprintf( - str + ofs, sizeof(str) - ofs, IFACE_("(F)lipped: %s, "), WM_bool_as_string(flipped)); + str + ofs, sizeof(str) - ofs, TIP_("(F)lipped: %s, "), WM_bool_as_string(flipped)); } ofs += BLI_snprintf( - str + ofs, sizeof(str) - ofs, IFACE_("Alt or (C)lamp: %s"), WM_bool_as_string(is_clamp)); + str + ofs, sizeof(str) - ofs, TIP_("Alt or (C)lamp: %s"), WM_bool_as_string(is_clamp)); /* done with header string */ /* do stuff here */ @@ -8685,7 +8680,7 @@ static void applyVertSlide(TransInfo *t, const int UNUSED(mval[2])) t->values[0] = final; /* header string */ - ofs += BLI_strncpy_rlen(str + ofs, IFACE_("Vert Slide: "), sizeof(str) - ofs); + ofs += BLI_strncpy_rlen(str + ofs, TIP_("Vert Slide: "), sizeof(str) - ofs); if (hasNumInput(&t->num)) { char c[NUM_STR_REP_LEN]; outputNumInput(&(t->num), c, &t->scene->unit); @@ -8695,13 +8690,13 @@ static void applyVertSlide(TransInfo *t, const int UNUSED(mval[2])) ofs += BLI_snprintf(str + ofs, sizeof(str) - ofs, "%.4f ", final); } ofs += BLI_snprintf( - str + ofs, sizeof(str) - ofs, IFACE_("(E)ven: %s, "), WM_bool_as_string(use_even)); + str + ofs, sizeof(str) - ofs, TIP_("(E)ven: %s, "), WM_bool_as_string(use_even)); if (use_even) { ofs += BLI_snprintf( - str + ofs, sizeof(str) - ofs, IFACE_("(F)lipped: %s, "), WM_bool_as_string(flipped)); + str + ofs, sizeof(str) - ofs, TIP_("(F)lipped: %s, "), WM_bool_as_string(flipped)); } ofs += BLI_snprintf( - str + ofs, sizeof(str) - ofs, IFACE_("Alt or (C)lamp: %s"), WM_bool_as_string(is_clamp)); + str + ofs, sizeof(str) - ofs, TIP_("Alt or (C)lamp: %s"), WM_bool_as_string(is_clamp)); /* done with header string */ /* do stuff here */ @@ -8760,10 +8755,10 @@ static void applyBoneRoll(TransInfo *t, const int UNUSED(mval[2])) outputNumInput(&(t->num), c, &t->scene->unit); - BLI_snprintf(str, sizeof(str), IFACE_("Roll: %s"), &c[0]); + BLI_snprintf(str, sizeof(str), TIP_("Roll: %s"), &c[0]); } else { - BLI_snprintf(str, sizeof(str), IFACE_("Roll: %.2f"), RAD2DEGF(final)); + BLI_snprintf(str, sizeof(str), TIP_("Roll: %.2f"), RAD2DEGF(final)); } /* set roll values */ @@ -8843,19 +8838,19 @@ static void applyBakeTime(TransInfo *t, const int mval[2]) outputNumInput(&(t->num), c, &t->scene->unit); if (time >= 0.0f) { - BLI_snprintf(str, sizeof(str), IFACE_("Time: +%s %s"), c, t->proptext); + BLI_snprintf(str, sizeof(str), TIP_("Time: +%s %s"), c, t->proptext); } else { - BLI_snprintf(str, sizeof(str), IFACE_("Time: %s %s"), c, t->proptext); + BLI_snprintf(str, sizeof(str), TIP_("Time: %s %s"), c, t->proptext); } } else { /* default header print */ if (time >= 0.0f) { - BLI_snprintf(str, sizeof(str), IFACE_("Time: +%.3f %s"), time, t->proptext); + BLI_snprintf(str, sizeof(str), TIP_("Time: +%.3f %s"), time, t->proptext); } else { - BLI_snprintf(str, sizeof(str), IFACE_("Time: %.3f %s"), time, t->proptext); + BLI_snprintf(str, sizeof(str), TIP_("Time: %.3f %s"), time, t->proptext); } } @@ -8927,7 +8922,7 @@ static void applyMirror(TransInfo *t, const int UNUSED(mval[2])) t->con.applySize(t, NULL, NULL, mat); } - BLI_snprintf(str, sizeof(str), IFACE_("Mirror%s"), t->con.text); + BLI_snprintf(str, sizeof(str), TIP_("Mirror%s"), t->con.text); FOREACH_TRANS_DATA_CONTAINER (t, tc) { TransData *td = tc->data; @@ -8971,10 +8966,10 @@ static void applyMirror(TransInfo *t, const int UNUSED(mval[2])) recalcData(t); if (t->flag & T_2D_EDIT) { - ED_area_status_text(t->sa, IFACE_("Select a mirror axis (X, Y)")); + ED_area_status_text(t->sa, TIP_("Select a mirror axis (X, Y)")); } else { - ED_area_status_text(t->sa, IFACE_("Select a mirror axis (X, Y, Z)")); + ED_area_status_text(t->sa, TIP_("Select a mirror axis (X, Y, Z)")); } } } @@ -9037,7 +9032,7 @@ static void applyAlign(TransInfo *t, const int UNUSED(mval[2])) recalcData(t); - ED_area_status_text(t->sa, IFACE_("Align")); + ED_area_status_text(t->sa, TIP_("Align")); } /** \} */ @@ -9082,7 +9077,7 @@ static void headerSeqSlide(TransInfo *t, const float val[2], char str[UI_MAX_DRA } ofs += BLI_snprintf( - str + ofs, UI_MAX_DRAW_STR - ofs, IFACE_("Sequence Slide: %s%s, ("), &tvec[0], t->con.text); + str + ofs, UI_MAX_DRAW_STR - ofs, TIP_("Sequence Slide: %s%s, ("), &tvec[0], t->con.text); if (t->keymap) { wmKeyMapItem *kmi = WM_modalkeymap_find_propvalue(t->keymap, TFM_MODAL_TRANSLATE); @@ -9092,7 +9087,7 @@ static void headerSeqSlide(TransInfo *t, const float val[2], char str[UI_MAX_DRA } ofs += BLI_snprintf(str + ofs, UI_MAX_DRAW_STR - ofs, - IFACE_(" or Alt) Expand to fit %s"), + TIP_(" or Alt) Expand to fit %s"), WM_bool_as_string((t->flag & T_ALT_TRANSFORM) != 0)); } @@ -9353,11 +9348,11 @@ static void headerTimeTranslate(TransInfo *t, char str[UI_MAX_DRAW_STR]) } } - ofs += BLI_snprintf(str, UI_MAX_DRAW_STR, IFACE_("DeltaX: %s"), &tvec[0]); + ofs += BLI_snprintf(str, UI_MAX_DRAW_STR, TIP_("DeltaX: %s"), &tvec[0]); if (t->flag & T_PROP_EDIT_ALL) { ofs += BLI_snprintf( - str + ofs, UI_MAX_DRAW_STR - ofs, IFACE_(" Proportional size: %.2f"), t->prop_size); + str + ofs, UI_MAX_DRAW_STR - ofs, TIP_(" Proportional size: %.2f"), t->prop_size); } } @@ -9545,7 +9540,7 @@ static void headerTimeSlide(TransInfo *t, const float sval, char str[UI_MAX_DRAW BLI_snprintf(&tvec[0], NUM_STR_REP_LEN, "%.4f", val); } - BLI_snprintf(str, UI_MAX_DRAW_STR, IFACE_("TimeSlide: %s"), &tvec[0]); + BLI_snprintf(str, UI_MAX_DRAW_STR, TIP_("TimeSlide: %s"), &tvec[0]); } static void applyTimeSlideValue(TransInfo *t, float sval) @@ -9703,7 +9698,7 @@ static void headerTimeScale(TransInfo *t, char str[UI_MAX_DRAW_STR]) BLI_snprintf(&tvec[0], NUM_STR_REP_LEN, "%.4f", t->values[0]); } - BLI_snprintf(str, UI_MAX_DRAW_STR, IFACE_("ScaleX: %s"), &tvec[0]); + BLI_snprintf(str, UI_MAX_DRAW_STR, TIP_("ScaleX: %s"), &tvec[0]); } static void applyTimeScaleValue(TransInfo *t) diff --git a/source/blender/editors/transform/transform_constraints.c b/source/blender/editors/transform/transform_constraints.c index ee08eb20ea3..06851451461 100644 --- a/source/blender/editors/transform/transform_constraints.c +++ b/source/blender/editors/transform/transform_constraints.c @@ -691,17 +691,17 @@ void setUserConstraint(TransInfo *t, short orientation, int mode, const char fte switch (orientation) { case V3D_ORIENT_GLOBAL: { float mtx[3][3]; - BLI_snprintf(text, sizeof(text), ftext, IFACE_("global")); + BLI_snprintf(text, sizeof(text), ftext, TIP_("global")); unit_m3(mtx); setConstraint(t, mtx, mode, text); break; } case V3D_ORIENT_LOCAL: - BLI_snprintf(text, sizeof(text), ftext, IFACE_("local")); + BLI_snprintf(text, sizeof(text), ftext, TIP_("local")); setLocalConstraint(t, mode, text); break; case V3D_ORIENT_NORMAL: - BLI_snprintf(text, sizeof(text), ftext, IFACE_("normal")); + BLI_snprintf(text, sizeof(text), ftext, TIP_("normal")); if (checkUseAxisMatrix(t)) { setAxisMatrixConstraint(t, mode, text); } @@ -710,19 +710,19 @@ void setUserConstraint(TransInfo *t, short orientation, int mode, const char fte } break; case V3D_ORIENT_VIEW: - BLI_snprintf(text, sizeof(text), ftext, IFACE_("view")); + BLI_snprintf(text, sizeof(text), ftext, TIP_("view")); setConstraint(t, t->spacemtx, mode, text); break; case V3D_ORIENT_CURSOR: - BLI_snprintf(text, sizeof(text), ftext, IFACE_("cursor")); + BLI_snprintf(text, sizeof(text), ftext, TIP_("cursor")); setConstraint(t, t->spacemtx, mode, text); break; case V3D_ORIENT_GIMBAL: - BLI_snprintf(text, sizeof(text), ftext, IFACE_("gimbal")); + BLI_snprintf(text, sizeof(text), ftext, TIP_("gimbal")); setConstraint(t, t->spacemtx, mode, text); break; case V3D_ORIENT_CUSTOM_MATRIX: - BLI_snprintf(text, sizeof(text), ftext, IFACE_("custom matrix")); + BLI_snprintf(text, sizeof(text), ftext, TIP_("custom matrix")); setConstraint(t, t->spacemtx, mode, text); break; case V3D_ORIENT_CUSTOM: { @@ -730,7 +730,7 @@ void setUserConstraint(TransInfo *t, short orientation, int mode, const char fte BLI_snprintf(orientation_str, sizeof(orientation_str), "%s \"%s\"", - IFACE_("custom orientation"), + TIP_("custom orientation"), t->orientation.custom->name); BLI_snprintf(text, sizeof(text), ftext, orientation_str); setConstraint(t, t->spacemtx, mode, text); @@ -1025,11 +1025,11 @@ static void setNearestAxis2d(TransInfo *t) /* no correction needed... just use whichever one is lower */ if (abs(t->mval[0] - t->con.imval[0]) < abs(t->mval[1] - t->con.imval[1])) { t->con.mode |= CON_AXIS1; - BLI_strncpy(t->con.text, IFACE_(" along Y axis"), sizeof(t->con.text)); + BLI_strncpy(t->con.text, TIP_(" along Y axis"), sizeof(t->con.text)); } else { t->con.mode |= CON_AXIS0; - BLI_strncpy(t->con.text, IFACE_(" along X axis"), sizeof(t->con.text)); + BLI_strncpy(t->con.text, TIP_(" along X axis"), sizeof(t->con.text)); } } @@ -1081,31 +1081,31 @@ static void setNearestAxis3d(TransInfo *t) if (len[0] <= len[1] && len[0] <= len[2]) { if (t->modifiers & MOD_CONSTRAINT_PLANE) { t->con.mode |= (CON_AXIS1 | CON_AXIS2); - BLI_snprintf(t->con.text, sizeof(t->con.text), IFACE_(" locking %s X axis"), t->spacename); + BLI_snprintf(t->con.text, sizeof(t->con.text), TIP_(" locking %s X axis"), t->spacename); } else { t->con.mode |= CON_AXIS0; - BLI_snprintf(t->con.text, sizeof(t->con.text), IFACE_(" along %s X axis"), t->spacename); + BLI_snprintf(t->con.text, sizeof(t->con.text), TIP_(" along %s X axis"), t->spacename); } } else if (len[1] <= len[0] && len[1] <= len[2]) { if (t->modifiers & MOD_CONSTRAINT_PLANE) { t->con.mode |= (CON_AXIS0 | CON_AXIS2); - BLI_snprintf(t->con.text, sizeof(t->con.text), IFACE_(" locking %s Y axis"), t->spacename); + BLI_snprintf(t->con.text, sizeof(t->con.text), TIP_(" locking %s Y axis"), t->spacename); } else { t->con.mode |= CON_AXIS1; - BLI_snprintf(t->con.text, sizeof(t->con.text), IFACE_(" along %s Y axis"), t->spacename); + BLI_snprintf(t->con.text, sizeof(t->con.text), TIP_(" along %s Y axis"), t->spacename); } } else if (len[2] <= len[1] && len[2] <= len[0]) { if (t->modifiers & MOD_CONSTRAINT_PLANE) { t->con.mode |= (CON_AXIS0 | CON_AXIS1); - BLI_snprintf(t->con.text, sizeof(t->con.text), IFACE_(" locking %s Z axis"), t->spacename); + BLI_snprintf(t->con.text, sizeof(t->con.text), TIP_(" locking %s Z axis"), t->spacename); } else { t->con.mode |= CON_AXIS2; - BLI_snprintf(t->con.text, sizeof(t->con.text), IFACE_(" along %s Z axis"), t->spacename); + BLI_snprintf(t->con.text, sizeof(t->con.text), TIP_(" along %s Z axis"), t->spacename); } } } diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c index 70bb2bf98a6..cbe9505d3f2 100644 --- a/source/blender/editors/transform/transform_orientations.c +++ b/source/blender/editors/transform/transform_orientations.c @@ -439,25 +439,25 @@ void initTransformOrientation(bContext *C, TransInfo *t) switch (t->orientation.user) { case V3D_ORIENT_GLOBAL: unit_m3(t->spacemtx); - BLI_strncpy(t->spacename, IFACE_("global"), sizeof(t->spacename)); + BLI_strncpy(t->spacename, TIP_("global"), sizeof(t->spacename)); break; case V3D_ORIENT_GIMBAL: unit_m3(t->spacemtx); if (ob && gimbal_axis(ob, t->spacemtx)) { - BLI_strncpy(t->spacename, IFACE_("gimbal"), sizeof(t->spacename)); + BLI_strncpy(t->spacename, TIP_("gimbal"), sizeof(t->spacename)); break; } ATTR_FALLTHROUGH; /* no gimbal fallthrough to normal */ case V3D_ORIENT_NORMAL: if (obedit || (ob && ob->mode & OB_MODE_POSE)) { - BLI_strncpy(t->spacename, IFACE_("normal"), sizeof(t->spacename)); + BLI_strncpy(t->spacename, TIP_("normal"), sizeof(t->spacename)); ED_getTransformOrientationMatrix(C, t->spacemtx, t->around); break; } ATTR_FALLTHROUGH; /* we define 'normal' as 'local' in Object mode */ case V3D_ORIENT_LOCAL: - BLI_strncpy(t->spacename, IFACE_("local"), sizeof(t->spacename)); + BLI_strncpy(t->spacename, TIP_("local"), sizeof(t->spacename)); if (ob) { copy_m3_m4(t->spacemtx, ob->obmat); @@ -474,7 +474,7 @@ void initTransformOrientation(bContext *C, TransInfo *t) RegionView3D *rv3d = t->ar->regiondata; float mat[3][3]; - BLI_strncpy(t->spacename, IFACE_("view"), sizeof(t->spacename)); + BLI_strncpy(t->spacename, TIP_("view"), sizeof(t->spacename)); copy_m3_m4(mat, rv3d->viewinv); normalize_m3(mat); copy_m3_m3(t->spacemtx, mat); @@ -484,13 +484,13 @@ void initTransformOrientation(bContext *C, TransInfo *t) } break; case V3D_ORIENT_CURSOR: { - BLI_strncpy(t->spacename, IFACE_("cursor"), sizeof(t->spacename)); + BLI_strncpy(t->spacename, TIP_("cursor"), sizeof(t->spacename)); BKE_scene_cursor_rot_to_mat3(&t->scene->cursor, t->spacemtx); break; } case V3D_ORIENT_CUSTOM_MATRIX: /* Already set. */ - BLI_strncpy(t->spacename, IFACE_("custom"), sizeof(t->spacename)); + BLI_strncpy(t->spacename, TIP_("custom"), sizeof(t->spacename)); break; case V3D_ORIENT_CUSTOM: BLI_strncpy(t->spacename, t->orientation.custom->name, sizeof(t->spacename)); diff --git a/source/blender/editors/util/ed_util.c b/source/blender/editors/util/ed_util.c index c23e004b306..e751c7263cb 100644 --- a/source/blender/editors/util/ed_util.c +++ b/source/blender/editors/util/ed_util.c @@ -324,14 +324,14 @@ void unpack_menu(bContext *C, if (!STREQ(abs_name, local_name)) { switch (checkPackedFile(BKE_main_blendfile_path(bmain), local_name, pf)) { case PF_NOFILE: - BLI_snprintf(line, sizeof(line), IFACE_("Create %s"), local_name); + BLI_snprintf(line, sizeof(line), TIP_("Create %s"), local_name); uiItemFullO_ptr(layout, ot, line, ICON_NONE, NULL, WM_OP_EXEC_DEFAULT, 0, &props_ptr); RNA_enum_set(&props_ptr, "method", PF_WRITE_LOCAL); RNA_string_set(&props_ptr, "id", id_name); break; case PF_EQUAL: - BLI_snprintf(line, sizeof(line), IFACE_("Use %s (identical)"), local_name); + BLI_snprintf(line, sizeof(line), TIP_("Use %s (identical)"), local_name); // uiItemEnumO_ptr(layout, ot, line, 0, "method", PF_USE_LOCAL); uiItemFullO_ptr(layout, ot, line, ICON_NONE, NULL, WM_OP_EXEC_DEFAULT, 0, &props_ptr); RNA_enum_set(&props_ptr, "method", PF_USE_LOCAL); @@ -339,13 +339,13 @@ void unpack_menu(bContext *C, break; case PF_DIFFERS: - BLI_snprintf(line, sizeof(line), IFACE_("Use %s (differs)"), local_name); + BLI_snprintf(line, sizeof(line), TIP_("Use %s (differs)"), local_name); // uiItemEnumO_ptr(layout, ot, line, 0, "method", PF_USE_LOCAL); uiItemFullO_ptr(layout, ot, line, ICON_NONE, NULL, WM_OP_EXEC_DEFAULT, 0, &props_ptr); RNA_enum_set(&props_ptr, "method", PF_USE_LOCAL); RNA_string_set(&props_ptr, "id", id_name); - BLI_snprintf(line, sizeof(line), IFACE_("Overwrite %s"), local_name); + BLI_snprintf(line, sizeof(line), TIP_("Overwrite %s"), local_name); // uiItemEnumO_ptr(layout, ot, line, 0, "method", PF_WRITE_LOCAL); uiItemFullO_ptr(layout, ot, line, ICON_NONE, NULL, WM_OP_EXEC_DEFAULT, 0, &props_ptr); RNA_enum_set(&props_ptr, "method", PF_WRITE_LOCAL); @@ -357,27 +357,27 @@ void unpack_menu(bContext *C, switch (checkPackedFile(BKE_main_blendfile_path(bmain), abs_name, pf)) { case PF_NOFILE: - BLI_snprintf(line, sizeof(line), IFACE_("Create %s"), abs_name); + BLI_snprintf(line, sizeof(line), TIP_("Create %s"), abs_name); // uiItemEnumO_ptr(layout, ot, line, 0, "method", PF_WRITE_ORIGINAL); uiItemFullO_ptr(layout, ot, line, ICON_NONE, NULL, WM_OP_EXEC_DEFAULT, 0, &props_ptr); RNA_enum_set(&props_ptr, "method", PF_WRITE_ORIGINAL); RNA_string_set(&props_ptr, "id", id_name); break; case PF_EQUAL: - BLI_snprintf(line, sizeof(line), IFACE_("Use %s (identical)"), abs_name); + BLI_snprintf(line, sizeof(line), TIP_("Use %s (identical)"), abs_name); // uiItemEnumO_ptr(layout, ot, line, 0, "method", PF_USE_ORIGINAL); uiItemFullO_ptr(layout, ot, line, ICON_NONE, NULL, WM_OP_EXEC_DEFAULT, 0, &props_ptr); RNA_enum_set(&props_ptr, "method", PF_USE_ORIGINAL); RNA_string_set(&props_ptr, "id", id_name); break; case PF_DIFFERS: - BLI_snprintf(line, sizeof(line), IFACE_("Use %s (differs)"), abs_name); + BLI_snprintf(line, sizeof(line), TIP_("Use %s (differs)"), abs_name); // uiItemEnumO_ptr(layout, ot, line, 0, "method", PF_USE_ORIGINAL); uiItemFullO_ptr(layout, ot, line, ICON_NONE, NULL, WM_OP_EXEC_DEFAULT, 0, &props_ptr); RNA_enum_set(&props_ptr, "method", PF_USE_ORIGINAL); RNA_string_set(&props_ptr, "id", id_name); - BLI_snprintf(line, sizeof(line), IFACE_("Overwrite %s"), abs_name); + BLI_snprintf(line, sizeof(line), TIP_("Overwrite %s"), abs_name); // uiItemEnumO_ptr(layout, ot, line, 0, "method", PF_WRITE_ORIGINAL); uiItemFullO_ptr(layout, ot, line, ICON_NONE, NULL, WM_OP_EXEC_DEFAULT, 0, &props_ptr); RNA_enum_set(&props_ptr, "method", PF_WRITE_ORIGINAL); diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.c b/source/blender/editors/uvedit/uvedit_smart_stitch.c index b938f963d9a..76c3a6d6c4a 100644 --- a/source/blender/editors/uvedit/uvedit_smart_stitch.c +++ b/source/blender/editors/uvedit/uvedit_smart_stitch.c @@ -290,7 +290,7 @@ static void stitch_preview_delete(StitchPreviewer *stitch_preview) /* This function updates the header of the UV editor when the stitch tool updates its settings */ static void stitch_update_header(StitchStateContainer *ssc, bContext *C) { - const char *str = IFACE_( + const char *str = TIP_( "Mode(TAB) %s, " "(S)nap %s, " "(M)idpoints %s, " @@ -305,7 +305,7 @@ static void stitch_update_header(StitchStateContainer *ssc, bContext *C) BLI_snprintf(msg, sizeof(msg), str, - ssc->mode == STITCH_VERT ? IFACE_("Vertex") : IFACE_("Edge"), + ssc->mode == STITCH_VERT ? TIP_("Vertex") : TIP_("Edge"), WM_bool_as_string(ssc->snap_islands), WM_bool_as_string(ssc->midpoints), ssc->limit_dist, diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c index 796594802c4..bb73d61a139 100644 --- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c +++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c @@ -727,9 +727,9 @@ static void minimize_stretch_iteration(bContext *C, wmOperator *op, bool interac param_flush(ms->handle); if (sa) { - BLI_snprintf(str, sizeof(str), IFACE_("Minimize Stretch. Blend %.2f"), ms->blend); + BLI_snprintf(str, sizeof(str), TIP_("Minimize Stretch. Blend %.2f"), ms->blend); ED_area_status_text(sa, str); - ED_workspace_status_text(C, IFACE_("Press + and -, or scroll wheel to set blending")); + ED_workspace_status_text(C, TIP_("Press + and -, or scroll wheel to set blending")); } ms->lasttime = PIL_check_seconds_timer(); diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp index bcf87f81c71..4552ce849f2 100644 --- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp +++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp @@ -307,7 +307,7 @@ static bool test_edge_type_conditions(struct edge_type_condition *conditions, static void prepare(Render *re, ViewLayer *view_layer, Depsgraph *depsgraph) { // load mesh - re->i.infostr = IFACE_("Freestyle: Mesh loading"); + re->i.infostr = TIP_("Freestyle: Mesh loading"); re->stats_draw(re->sdh, &re->i); re->i.infostr = NULL; if (controller->LoadMesh( @@ -502,7 +502,7 @@ static void prepare(Render *re, ViewLayer *view_layer, Depsgraph *depsgraph) } // compute view map - re->i.infostr = IFACE_("Freestyle: View map creation"); + re->i.infostr = TIP_("Freestyle: View map creation"); re->stats_draw(re->sdh, &re->i); re->i.infostr = NULL; controller->ComputeViewMap(); @@ -669,7 +669,7 @@ Render *FRS_do_stroke_rendering(Render *re, ViewLayer *view_layer, int render) // render and composite Freestyle result if (controller->_ViewMap) { // render strokes - re->i.infostr = IFACE_("Freestyle: Stroke rendering"); + re->i.infostr = TIP_("Freestyle: Stroke rendering"); re->stats_draw(re->sdh, &re->i); re->i.infostr = NULL; g_freestyle.scene = DEG_get_evaluated_scene(depsgraph); diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 2e27ec81bd0..e0576d6b253 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -181,22 +181,22 @@ static void stats_background(void *UNUSED(arg), RenderStats *rs) megs_peak_memory = (peak_memory) / (1024.0 * 1024.0); fprintf(stdout, - IFACE_("Fra:%d Mem:%.2fM (%.2fM, Peak %.2fM) "), + TIP_("Fra:%d Mem:%.2fM (%.2fM, Peak %.2fM) "), rs->cfra, megs_used_memory, mmap_used_memory, megs_peak_memory); if (rs->curfield) { - fprintf(stdout, IFACE_("Field %d "), rs->curfield); + fprintf(stdout, TIP_("Field %d "), rs->curfield); } if (rs->curblur) { - fprintf(stdout, IFACE_("Blur %d "), rs->curblur); + fprintf(stdout, TIP_("Blur %d "), rs->curblur); } BLI_timecode_string_from_time_simple( info_time_str, sizeof(info_time_str), PIL_check_seconds_timer() - rs->starttime); - fprintf(stdout, IFACE_("| Time:%s | "), info_time_str); + fprintf(stdout, TIP_("| Time:%s | "), info_time_str); if (rs->infostr) { fprintf(stdout, "%s", rs->infostr); @@ -204,7 +204,7 @@ static void stats_background(void *UNUSED(arg), RenderStats *rs) else { if (rs->tothalo) { fprintf(stdout, - IFACE_("Sce: %s Ve:%d Fa:%d Ha:%d La:%d"), + TIP_("Sce: %s Ve:%d Fa:%d Ha:%d La:%d"), rs->scene_name, rs->totvert, rs->totface, @@ -213,7 +213,7 @@ static void stats_background(void *UNUSED(arg), RenderStats *rs) } else { fprintf(stdout, - IFACE_("Sce: %s Ve:%d Fa:%d La:%d"), + TIP_("Sce: %s Ve:%d Fa:%d La:%d"), rs->scene_name, rs->totvert, rs->totface, diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 67b1b828f96..3a1c164c88e 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -2814,13 +2814,13 @@ static uiBlock *block_create_autorun_warning(struct bContext *C, /* Text and some vertical space */ uiLayout *col = uiLayoutColumn(layout, true); uiItemL(col, - IFACE_("For security reasons, automatic execution of Python scripts in this file was " - "disabled:"), + TIP_("For security reasons, automatic execution of Python scripts in this file was " + "disabled:"), ICON_ERROR); uiLayout *sub = uiLayoutRow(col, true); uiLayoutSetRedAlert(sub, true); uiItemL(sub, G.autoexec_fail, ICON_BLANK1); - uiItemL(col, IFACE_("This may lead to unexpected behavior"), ICON_BLANK1); + uiItemL(col, TIP_("This may lead to unexpected behavior"), ICON_BLANK1); uiItemS(layout); @@ -2830,7 +2830,7 @@ static uiBlock *block_create_autorun_warning(struct bContext *C, &pref_ptr, "use_scripts_auto_execute", 0, - IFACE_("Permanently allow execution of scripts"), + TIP_("Permanently allow execution of scripts"), ICON_NONE); uiItemS(layout); |