From 019eb5a35efecd6931fd76b84ca40b10adc8101e Mon Sep 17 00:00:00 2001 From: Damien Picard Date: Wed, 7 Feb 2024 11:17:50 +0100 Subject: [PATCH] I18n: use IFACE_ to translate status bar info & viewport statistics Although the information displayed in the status bar is strictly speaking reports, it makes sense to translate them using the Interface setting instead of Reports, as the tool names and stats terms are also translated in other UI places (toolbar, menus). This change includes status bars statistics and keymaps, and viewport statistics. The change is quite extensive as it is all or nothing. Translating keymaps using Interface means some status messages will include them indirectly, and thus cannot use Reports without having a weird mix of original and translated words. In turn, having only some messages translated would be even more confusing. The result is that all messages related to input are now translated with Interface, which I think also makes sense. Discussed as a followup to !116804. ----- cc. @gtitaev Pull Request: https://projects.blender.org/blender/blender/pulls/117234 --- .../blender/editors/animation/anim_markers.cc | 6 +- source/blender/editors/armature/pose_lib_2.cc | 6 +- source/blender/editors/armature/pose_slide.cc | 32 +++++----- .../editors/gpencil_legacy/annotate_paint.cc | 22 +++---- .../editors/gpencil_legacy/gpencil_fill.cc | 10 ++-- .../gpencil_legacy/gpencil_interpolate.cc | 4 +- .../editors/gpencil_legacy/gpencil_paint.cc | 23 ++++---- .../gpencil_legacy/gpencil_primitive.cc | 34 ++++++----- .../gpencil_legacy/gpencil_sculpt_paint.cc | 6 +- .../editors/gpencil_legacy/gpencil_uv.cc | 2 +- .../gpencil_legacy/gpencil_vertex_paint.cc | 4 +- .../gpencil_legacy/gpencil_weight_paint.cc | 10 ++-- .../eyedroppers/eyedropper_gpencil_color.cc | 2 +- .../interface/interface_region_menu_popup.cc | 6 +- .../editors/interface/interface_templates.cc | 12 ++-- source/blender/editors/mesh/editmesh_bevel.cc | 30 +++++----- .../blender/editors/mesh/editmesh_bisect.cc | 4 +- source/blender/editors/mesh/editmesh_inset.cc | 2 +- source/blender/editors/mesh/editmesh_knife.cc | 14 ++--- .../blender/editors/mesh/editmesh_loopcut.cc | 6 +- source/blender/editors/mesh/editmesh_tools.cc | 10 ++-- .../blender/editors/object/object_remesh.cc | 2 +- .../editors/sculpt_paint/paint_image.cc | 7 ++- .../editors/sculpt_paint/sculpt_detail.cc | 4 +- .../sculpt_paint/sculpt_filter_mesh.cc | 4 +- .../editors/space_clip/tracking_ops.cc | 2 +- .../editors/space_graph/graph_slider_ops.cc | 8 +-- .../blender/editors/space_info/info_stats.cc | 59 ++++++++++--------- .../editors/space_sequencer/sequencer_edit.cc | 4 +- source/blender/editors/transform/transform.cc | 20 +++---- .../transform/transform_constraints.cc | 16 ++--- .../editors/transform/transform_mode.cc | 24 ++++---- .../editors/transform/transform_mode_align.cc | 2 +- .../transform/transform_mode_baketime.cc | 8 +-- .../transform/transform_mode_bbone_resize.cc | 6 +- .../editors/transform/transform_mode_bend.cc | 4 +- .../transform/transform_mode_boneenvelope.cc | 4 +- .../transform/transform_mode_boneroll.cc | 4 +- .../transform_mode_curveshrinkfatten.cc | 4 +- .../transform/transform_mode_customdata.cc | 4 +- .../transform_mode_edge_seq_slide.cc | 2 +- .../transform/transform_mode_gpopacity.cc | 4 +- .../transform_mode_gpshrinkfatten.cc | 4 +- .../transform_mode_maskshrinkfatten.cc | 4 +- .../transform/transform_mode_mirror.cc | 6 +- .../transform/transform_mode_push_pull.cc | 4 +- .../editors/transform/transform_mode_shear.cc | 4 +- .../transform/transform_mode_shrink_fatten.cc | 4 +- .../editors/transform/transform_mode_tilt.cc | 5 +- .../transform/transform_mode_timescale.cc | 2 +- .../transform/transform_mode_timeslide.cc | 2 +- .../transform/transform_mode_timetranslate.cc | 4 +- .../transform/transform_mode_tosphere.cc | 4 +- .../transform/transform_mode_trackball.cc | 6 +- .../transform/transform_mode_translate.cc | 11 ++-- .../transform/transform_mode_vert_slide.cc | 8 +-- source/blender/editors/util/ed_draw.cc | 14 ++--- .../editors/uvedit/uvedit_smart_stitch.cc | 4 +- .../editors/uvedit/uvedit_unwrap_ops.cc | 4 +- .../windowmanager/intern/wm_event_system.cc | 4 +- 60 files changed, 273 insertions(+), 258 deletions(-) diff --git a/source/blender/editors/animation/anim_markers.cc b/source/blender/editors/animation/anim_markers.cc index b29ecb463fa..b05667494f6 100644 --- a/source/blender/editors/animation/anim_markers.cc +++ b/source/blender/editors/animation/anim_markers.cc @@ -866,14 +866,14 @@ static void ed_marker_move_update_header(bContext *C, wmOperator *op) if (totmark == 1 && selmarker) { /* we print current marker value */ if (use_time) { - SNPRINTF(str, RPT_("Marker %.2f offset %s"), FRA2TIME(selmarker->frame), str_ofs); + SNPRINTF(str, IFACE_("Marker %.2f offset %s"), FRA2TIME(selmarker->frame), str_ofs); } else { - SNPRINTF(str, RPT_("Marker %d offset %s"), selmarker->frame, str_ofs); + SNPRINTF(str, IFACE_("Marker %d offset %s"), selmarker->frame, str_ofs); } } else { - SNPRINTF(str, RPT_("Marker offset %s"), str_ofs); + SNPRINTF(str, IFACE_("Marker offset %s"), str_ofs); } ED_area_status_text(CTX_wm_area(C), str); diff --git a/source/blender/editors/armature/pose_lib_2.cc b/source/blender/editors/armature/pose_lib_2.cc index c710af9d0ee..96d6dd5981c 100644 --- a/source/blender/editors/armature/pose_lib_2.cc +++ b/source/blender/editors/armature/pose_lib_2.cc @@ -502,13 +502,13 @@ static int poselib_blend_modal(bContext *C, wmOperator *op, const wmEvent *event ED_slider_status_string_get(pbd->slider, slider_string, sizeof(slider_string)); if (pbd->state == POSE_BLEND_BLENDING) { - STRNCPY(tab_string, RPT_("[Tab] - Show original pose")); + STRNCPY(tab_string, IFACE_("[Tab] - Show original pose")); } else { - STRNCPY(tab_string, RPT_("[Tab] - Show blended pose")); + STRNCPY(tab_string, IFACE_("[Tab] - Show blended pose")); } - SNPRINTF(status_string, "%s | %s | [Ctrl] - Flip Pose", tab_string, slider_string); + SNPRINTF(status_string, IFACE_("%s | %s | [Ctrl] - Flip Pose"), tab_string, slider_string); ED_workspace_status_text(C, status_string); poselib_blend_apply(C, op); diff --git a/source/blender/editors/armature/pose_slide.cc b/source/blender/editors/armature/pose_slide.cc index 2b2052f513e..d2c80ba0bef 100644 --- a/source/blender/editors/armature/pose_slide.cc +++ b/source/blender/editors/armature/pose_slide.cc @@ -908,38 +908,38 @@ static void pose_slide_draw_status(bContext *C, tPoseSlideOp *pso) switch (pso->mode) { case POSESLIDE_PUSH: - STRNCPY(mode_str, RPT_("Push Pose")); + STRNCPY(mode_str, IFACE_("Push Pose")); break; case POSESLIDE_RELAX: - STRNCPY(mode_str, RPT_("Relax Pose")); + STRNCPY(mode_str, IFACE_("Relax Pose")); break; case POSESLIDE_BREAKDOWN: - STRNCPY(mode_str, RPT_("Breakdown")); + STRNCPY(mode_str, IFACE_("Breakdown")); break; case POSESLIDE_BLEND: - STRNCPY(mode_str, RPT_("Blend to Neighbor")); + STRNCPY(mode_str, IFACE_("Blend to Neighbor")); break; default: /* Unknown. */ - STRNCPY(mode_str, RPT_("Sliding-Tool")); + STRNCPY(mode_str, IFACE_("Sliding-Tool")); break; } switch (pso->axislock) { case PS_LOCK_X: - STRNCPY(axis_str, RPT_("[X]/Y/Z axis only (X to clear)")); + STRNCPY(axis_str, IFACE_("[X]/Y/Z axis only (X to clear)")); break; case PS_LOCK_Y: - STRNCPY(axis_str, RPT_("X/[Y]/Z axis only (Y to clear)")); + STRNCPY(axis_str, IFACE_("X/[Y]/Z axis only (Y to clear)")); break; case PS_LOCK_Z: - STRNCPY(axis_str, RPT_("X/Y/[Z] axis only (Z to clear)")); + STRNCPY(axis_str, IFACE_("X/Y/[Z] axis only (Z to clear)")); break; default: if (ELEM(pso->channels, PS_TFM_LOC, PS_TFM_ROT, PS_TFM_SIZE)) { - STRNCPY(axis_str, RPT_("X/Y/Z = Axis Constraint")); + STRNCPY(axis_str, IFACE_("X/Y/Z = Axis Constraint")); } else { axis_str[0] = '\0'; @@ -949,26 +949,26 @@ static void pose_slide_draw_status(bContext *C, tPoseSlideOp *pso) switch (pso->channels) { case PS_TFM_LOC: - SNPRINTF(limits_str, RPT_("[G]/R/S/B/C - Location only (G to clear) | %s"), axis_str); + SNPRINTF(limits_str, IFACE_("[G]/R/S/B/C - Location only (G to clear) | %s"), axis_str); break; case PS_TFM_ROT: - SNPRINTF(limits_str, RPT_("G/[R]/S/B/C - Rotation only (R to clear) | %s"), axis_str); + SNPRINTF(limits_str, IFACE_("G/[R]/S/B/C - Rotation only (R to clear) | %s"), axis_str); break; case PS_TFM_SIZE: - SNPRINTF(limits_str, RPT_("G/R/[S]/B/C - Scale only (S to clear) | %s"), axis_str); + SNPRINTF(limits_str, IFACE_("G/R/[S]/B/C - Scale only (S to clear) | %s"), axis_str); break; case PS_TFM_BBONE_SHAPE: - STRNCPY(limits_str, RPT_("G/R/S/[B]/C - Bendy Bone properties only (B to clear) | %s")); + STRNCPY(limits_str, IFACE_("G/R/S/[B]/C - Bendy Bone properties only (B to clear) | %s")); break; case PS_TFM_PROPS: - STRNCPY(limits_str, RPT_("G/R/S/B/[C] - Custom Properties only (C to clear) | %s")); + STRNCPY(limits_str, IFACE_("G/R/S/B/[C] - Custom Properties only (C to clear) | %s")); break; default: - STRNCPY(limits_str, RPT_("G/R/S/B/C - Limit to Transform/Property Set")); + STRNCPY(limits_str, IFACE_("G/R/S/B/C - Limit to Transform/Property Set")); break; } - STRNCPY(bone_vis_str, RPT_("[H] - Toggle bone visibility")); + STRNCPY(bone_vis_str, IFACE_("[H] - Toggle bone visibility")); ED_slider_status_string_get(pso->slider, slider_str, sizeof(slider_str)); diff --git a/source/blender/editors/gpencil_legacy/annotate_paint.cc b/source/blender/editors/gpencil_legacy/annotate_paint.cc index 5835d309e27..f5701212b6f 100644 --- a/source/blender/editors/gpencil_legacy/annotate_paint.cc +++ b/source/blender/editors/gpencil_legacy/annotate_paint.cc @@ -1959,8 +1959,8 @@ static void annotation_draw_status_indicators(bContext *C, tGPsdata *p) /* Provide usage tips, since this is modal, and unintuitive without hints */ ED_workspace_status_text( C, - RPT_("Annotation Create Poly: LMB click to place next stroke vertex | " - "ESC/Enter to end (or click outside this area)")); + IFACE_("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 @@ -1975,29 +1975,29 @@ static void annotation_draw_status_indicators(bContext *C, tGPsdata *p) switch (p->paintmode) { case GP_PAINTMODE_ERASER: ED_workspace_status_text(C, - RPT_("Annotation Eraser: Hold and drag LMB or RMB to erase | " - "ESC/Enter to end (or click outside this area)")); + IFACE_("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, - RPT_("Annotation Line Draw: Hold and drag LMB to draw | " - "ESC/Enter to end (or click outside this area)")); + IFACE_("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, - RPT_("Annotation Freehand Draw: Hold and drag LMB to draw | " - "E/ESC/Enter to end (or click outside this area)")); + IFACE_("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, - RPT_("Annotation Create Poly: LMB click to place next stroke vertex | " - "ESC/Enter to end (or click outside this area)")); + IFACE_("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, RPT_("Annotation Session: ESC/Enter to end (or click outside this area)")); + C, IFACE_("Annotation Session: ESC/Enter to end (or click outside this area)")); break; } break; diff --git a/source/blender/editors/gpencil_legacy/gpencil_fill.cc b/source/blender/editors/gpencil_legacy/gpencil_fill.cc index f4ec5a4ad25..9a8e3f5e1fc 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_fill.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_fill.cc @@ -2298,11 +2298,11 @@ static void gpencil_fill_status_indicators(tGPDfill *tgpf) char status_str[UI_MAX_DRAW_STR]; SNPRINTF(status_str, - RPT_("Fill: ESC/RMB cancel, LMB Fill, Shift Draw on Back, MMB Adjust Extend, S: " - "Switch Mode, D: " - "Stroke Collision | %s %s (%.3f)"), - (is_extend) ? RPT_("Extend") : RPT_("Radius"), - (is_extend && use_stroke_collide) ? RPT_("Stroke: ON") : RPT_("Stroke: OFF"), + IFACE_("Fill: ESC/RMB cancel, LMB Fill, Shift Draw on Back, MMB Adjust Extend, S: " + "Switch Mode, D: " + "Stroke Collision | %s %s (%.3f)"), + (is_extend) ? IFACE_("Extend") : IFACE_("Radius"), + (is_extend && use_stroke_collide) ? IFACE_("Stroke: ON") : IFACE_("Stroke: OFF"), tgpf->fill_extend_fac); ED_workspace_status_text(tgpf->C, status_str); diff --git a/source/blender/editors/gpencil_legacy/gpencil_interpolate.cc b/source/blender/editors/gpencil_legacy/gpencil_interpolate.cc index ffee9a7ae69..7bc0cea1134 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_interpolate.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_interpolate.cc @@ -598,7 +598,7 @@ static void gpencil_interpolate_status_indicators(bContext *C, tGPDinterpolate * char status_str[UI_MAX_DRAW_STR]; char msg_str[UI_MAX_DRAW_STR]; - STRNCPY(msg_str, RPT_("GPencil Interpolation: ")); + STRNCPY(msg_str, IFACE_("GPencil Interpolation: ")); if (hasNumInput(&p->num)) { char str_ofs[NUM_STR_REP_LEN]; @@ -612,7 +612,7 @@ static void gpencil_interpolate_status_indicators(bContext *C, tGPDinterpolate * ED_area_status_text(p->area, status_str); ED_workspace_status_text( - C, RPT_("ESC/RMB to cancel, Enter/LMB to confirm, WHEEL/MOVE to adjust factor")); + C, IFACE_("ESC/RMB to cancel, Enter/LMB to confirm, WHEEL/MOVE to adjust factor")); } /* Update screen and stroke */ diff --git a/source/blender/editors/gpencil_legacy/gpencil_paint.cc b/source/blender/editors/gpencil_legacy/gpencil_paint.cc index 396f3d279f9..cc9bf609adb 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_paint.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_paint.cc @@ -2614,21 +2614,22 @@ static void gpencil_draw_status_indicators(bContext *C, tGPsdata *p) case GP_PAINTMODE_ERASER: { ED_workspace_status_text( C, - RPT_("Grease Pencil Erase Session: Hold and drag LMB or RMB to erase | " - "ESC/Enter to end (or click outside this area)")); + IFACE_("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, - RPT_("Grease Pencil Line Session: Hold and drag LMB to draw | " - "ESC/Enter to end (or click outside this area)")); + 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)")); break; } case GP_PAINTMODE_SET_CP: { ED_workspace_status_text( C, - RPT_("Grease Pencil Guides: LMB click and release to place reference point | " - "Esc/RMB to cancel")); + IFACE_("Grease Pencil Guides: LMB click and release to place reference point | " + "Esc/RMB to cancel")); break; } case GP_PAINTMODE_DRAW: { @@ -2636,19 +2637,19 @@ static void gpencil_draw_status_indicators(bContext *C, tGPsdata *p) if (guide->use_guide) { ED_workspace_status_text( C, - RPT_("Grease Pencil Freehand Session: Hold and drag LMB to draw | " - "M key to flip guide | O key to move reference point")); + IFACE_("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, RPT_("Grease Pencil Freehand Session: Hold and drag LMB to draw")); + C, IFACE_("Grease Pencil Freehand Session: Hold and drag LMB to draw")); } break; } default: /* unhandled future cases */ { ED_workspace_status_text( - C, RPT_("Grease Pencil Session: ESC/Enter to end (or click outside this area)")); + C, IFACE_("Grease Pencil Session: ESC/Enter to end (or click outside this area)")); break; } } diff --git a/source/blender/editors/gpencil_legacy/gpencil_primitive.cc b/source/blender/editors/gpencil_legacy/gpencil_primitive.cc index f1f9543b870..3ade731e97f 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_primitive.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_primitive.cc @@ -420,40 +420,42 @@ static void gpencil_primitive_status_indicators(bContext *C, tGPDprimitive *tgpi if (tgpi->type == GP_STROKE_LINE) { BLI_strncpy( msg_str, - RPT_("Line: ESC to cancel, LMB set origin, Enter/MMB to confirm, WHEEL/+- to " - "adjust subdivision number, Shift to align, Alt to center, E: extrude, G: grab"), + 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, G: grab"), UI_MAX_DRAW_STR); } else if (tgpi->type == GP_STROKE_POLYLINE) { BLI_strncpy(msg_str, - RPT_("Polyline: ESC to cancel, LMB to set, Enter/MMB to confirm, WHEEL/+- to " - "adjust subdivision number, Shift to align, G: grab"), + IFACE_("Polyline: ESC to cancel, LMB to set, Enter/MMB to confirm, WHEEL/+- to " + "adjust subdivision number, Shift to align, G: grab"), UI_MAX_DRAW_STR); } else if (tgpi->type == GP_STROKE_BOX) { BLI_strncpy(msg_str, - RPT_("Rectangle: ESC to cancel, LMB set origin, Enter/MMB to confirm, WHEEL/+- " - "to adjust subdivision number, Shift to square, Alt to center, G: grab"), + IFACE_("Rectangle: ESC to cancel, LMB set origin, Enter/MMB to confirm, WHEEL/+- " + "to adjust subdivision number, Shift to square, Alt to center, G: grab"), UI_MAX_DRAW_STR); } else if (tgpi->type == GP_STROKE_CIRCLE) { - BLI_strncpy(msg_str, - RPT_("Circle: ESC to cancel, Enter/MMB to confirm, WHEEL/+- to adjust subdivision " - "number, Shift to square, Alt to center, G: grab"), - UI_MAX_DRAW_STR); + BLI_strncpy( + msg_str, + IFACE_("Circle: ESC to cancel, Enter/MMB to confirm, WHEEL/+- to adjust subdivision " + "number, Shift to square, Alt to center, G: grab"), + UI_MAX_DRAW_STR); } else if (tgpi->type == GP_STROKE_ARC) { BLI_strncpy( msg_str, - RPT_("Arc: ESC to cancel, Enter/MMB to confirm, WHEEL/+- to adjust subdivision number, " - "Shift to square, Alt to center, M: Flip, E: extrude, G: grab"), + IFACE_("Arc: ESC to cancel, Enter/MMB to confirm, WHEEL/+- to adjust subdivision number, " + "Shift to square, Alt to center, M: Flip, E: extrude, G: grab"), UI_MAX_DRAW_STR); } else if (tgpi->type == GP_STROKE_CURVE) { - BLI_strncpy(msg_str, - RPT_("Curve: ESC to cancel, Enter/MMB to confirm, WHEEL/+- to adjust subdivision " - "number, Shift to square, Alt to center, E: extrude, G: grab"), - UI_MAX_DRAW_STR); + BLI_strncpy( + msg_str, + IFACE_("Curve: ESC to cancel, Enter/MMB to confirm, WHEEL/+- to adjust subdivision " + "number, Shift to square, Alt to center, E: extrude, G: grab"), + UI_MAX_DRAW_STR); } if (ELEM(tgpi->type, diff --git a/source/blender/editors/gpencil_legacy/gpencil_sculpt_paint.cc b/source/blender/editors/gpencil_legacy/gpencil_sculpt_paint.cc index 3645001f1fb..89767ecd6cc 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_sculpt_paint.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_sculpt_paint.cc @@ -1137,9 +1137,9 @@ static void gpencil_sculpt_brush_header_set(bContext *C, tGP_BrushEditData *gso) char str[UI_MAX_DRAW_STR] = ""; SNPRINTF(str, - RPT_("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"), + 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"), brush->id.name + 2); ED_workspace_status_text(C, str); diff --git a/source/blender/editors/gpencil_legacy/gpencil_uv.cc b/source/blender/editors/gpencil_legacy/gpencil_uv.cc index e5279f94c1f..bd8fd7ec82f 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_uv.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_uv.cc @@ -79,7 +79,7 @@ enum { static void gpencil_uv_transform_update_header(wmOperator *op, bContext *C) { const int mode = RNA_enum_get(op->ptr, "mode"); - const char *str = RPT_("Confirm: Enter/LMB, Cancel: (Esc/RMB) %s"); + const char *str = IFACE_("Confirm: Enter/LMB, Cancel: (Esc/RMB) %s"); char msg[UI_MAX_DRAW_STR]; ScrArea *area = CTX_wm_area(C); diff --git a/source/blender/editors/gpencil_legacy/gpencil_vertex_paint.cc b/source/blender/editors/gpencil_legacy/gpencil_vertex_paint.cc index e10e866db62..a6d73a2a5ca 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_vertex_paint.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_vertex_paint.cc @@ -691,8 +691,8 @@ static bool brush_smear_apply(tGP_BrushVertexpaintData *gso, static void gpencil_vertexpaint_brush_header_set(bContext *C) { ED_workspace_status_text(C, - RPT_("GPencil Vertex Paint: LMB to paint | RMB/Escape to Exit" - " | Ctrl to Invert Action")); + IFACE_("GPencil Vertex Paint: LMB to paint | RMB/Escape to Exit" + " | Ctrl to Invert Action")); } /* ************************************************ */ diff --git a/source/blender/editors/gpencil_legacy/gpencil_weight_paint.cc b/source/blender/editors/gpencil_legacy/gpencil_weight_paint.cc index 595b773fbd4..fa811bbaa71 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_weight_paint.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_weight_paint.cc @@ -716,17 +716,19 @@ static void gpencil_weightpaint_brush_header_set(bContext *C, tGP_BrushWeightpai { switch (gso->brush->gpencil_weight_tool) { case GPWEIGHT_TOOL_DRAW: - ED_workspace_status_text(C, RPT_("GPencil Weight Paint: LMB to paint | RMB/Escape to Exit")); + ED_workspace_status_text(C, + IFACE_("GPencil Weight Paint: LMB to paint | RMB/Escape to Exit")); break; case GPWEIGHT_TOOL_BLUR: - ED_workspace_status_text(C, RPT_("GPencil Weight Blur: LMB to blur | RMB/Escape to Exit")); + ED_workspace_status_text(C, IFACE_("GPencil Weight Blur: LMB to blur | RMB/Escape to Exit")); break; case GPWEIGHT_TOOL_AVERAGE: ED_workspace_status_text( - C, RPT_("GPencil Weight Average: LMB to set average | RMB/Escape to Exit")); + C, IFACE_("GPencil Weight Average: LMB to set average | RMB/Escape to Exit")); break; case GPWEIGHT_TOOL_SMEAR: - ED_workspace_status_text(C, RPT_("GPencil Weight Smear: LMB to smear | RMB/Escape to Exit")); + ED_workspace_status_text(C, + IFACE_("GPencil Weight Smear: LMB to smear | RMB/Escape to Exit")); break; } } diff --git a/source/blender/editors/interface/eyedroppers/eyedropper_gpencil_color.cc b/source/blender/editors/interface/eyedroppers/eyedropper_gpencil_color.cc index d2e17f6f3a6..1e7f0aaf8d2 100644 --- a/source/blender/editors/interface/eyedroppers/eyedropper_gpencil_color.cc +++ b/source/blender/editors/interface/eyedroppers/eyedropper_gpencil_color.cc @@ -67,7 +67,7 @@ struct EyedropperGPencil { static void eyedropper_gpencil_status_indicators(bContext *C) { char msg_str[UI_MAX_DRAW_STR]; - STRNCPY(msg_str, RPT_("LMB: Stroke - Shift: Fill - Shift+Ctrl: Stroke + Fill")); + STRNCPY(msg_str, IFACE_("LMB: Stroke - Shift: Fill - Shift+Ctrl: Stroke + Fill")); ED_workspace_status_text(C, msg_str); } diff --git a/source/blender/editors/interface/interface_region_menu_popup.cc b/source/blender/editors/interface/interface_region_menu_popup.cc index 7cfeba6f656..223703f904b 100644 --- a/source/blender/editors/interface/interface_region_menu_popup.cc +++ b/source/blender/editors/interface/interface_region_menu_popup.cc @@ -404,7 +404,7 @@ static uiPopupBlockHandle *ui_popup_menu_create( pup->but = but; if (but->type == UI_BTYPE_PULLDOWN) { - ED_workspace_status_text(C, TIP_("Press spacebar to search...")); + ED_workspace_status_text(C, IFACE_("Press spacebar to search...")); } } @@ -625,10 +625,10 @@ static void ui_popup_menu_create_from_menutype(bContext *C, handle->can_refresh = true; if (bool(mt->flag & MenuTypeFlag::SearchOnKeyPress)) { - ED_workspace_status_text(C, RPT_("Type to search...")); + ED_workspace_status_text(C, IFACE_("Type to search...")); } else if (mt->idname[0]) { - ED_workspace_status_text(C, RPT_("Press spacebar to search...")); + ED_workspace_status_text(C, IFACE_("Press spacebar to search...")); } } diff --git a/source/blender/editors/interface/interface_templates.cc b/source/blender/editors/interface/interface_templates.cc index c8a39e5ce4c..a71d4215890 100644 --- a/source/blender/editors/interface/interface_templates.cc +++ b/source/blender/editors/interface/interface_templates.cc @@ -6486,10 +6486,10 @@ void uiTemplateInputStatus(uiLayout *layout, bContext *C) uiLayout *row = uiLayoutRow(col, true); uiLayoutSetAlignment(row, UI_LAYOUT_ALIGN_LEFT); - const char *msg = CTX_RPT_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, - WM_window_cursor_keymap_status_get(win, i, 0)); - const char *msg_drag = CTX_RPT_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, - WM_window_cursor_keymap_status_get(win, i, 1)); + const char *msg = CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, + WM_window_cursor_keymap_status_get(win, i, 0)); + const char *msg_drag = CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, + WM_window_cursor_keymap_status_get(win, i, 1)); if (msg || (msg_drag == nullptr)) { uiItemL(row, msg ? msg : "", (ICON_MOUSE_LMB + i)); @@ -6739,13 +6739,13 @@ bool uiTemplateEventFromKeymapItem(uiLayout *layout, for (int j = 0; j < ARRAY_SIZE(icon_mod) && icon_mod[j]; j++) { uiItemL(layout, "", icon_mod[j]); } - uiItemL(layout, CTX_RPT_(BLT_I18NCONTEXT_ID_WINDOWMANAGER, text), icon); + uiItemL(layout, CTX_IFACE_(BLT_I18NCONTEXT_ID_WINDOWMANAGER, text), icon); ok = true; } else if (text_fallback) { const char *event_text = WM_key_event_string(kmi->type, true); uiItemL(layout, event_text, ICON_NONE); - uiItemL(layout, CTX_RPT_(BLT_I18NCONTEXT_ID_WINDOWMANAGER, text), ICON_NONE); + uiItemL(layout, CTX_IFACE_(BLT_I18NCONTEXT_ID_WINDOWMANAGER, text), ICON_NONE); ok = true; } return ok; diff --git a/source/blender/editors/mesh/editmesh_bevel.cc b/source/blender/editors/mesh/editmesh_bevel.cc index e5852ecc4a0..f024e0751b8 100644 --- a/source/blender/editors/mesh/editmesh_bevel.cc +++ b/source/blender/editors/mesh/editmesh_bevel.cc @@ -171,21 +171,21 @@ static void edbm_bevel_update_status_text(bContext *C, wmOperator *op) C, op->ptr, prop, RNA_property_enum_get(op->ptr, prop), &affect_str); SNPRINTF(status_text, - RPT_("%s: Confirm, " - "%s: Cancel, " - "%s: Width Type (%s), " - "%s: Width (%s), " - "%s: Segments (%d), " - "%s: Profile (%.3f), " - "%s: Clamp Overlap (%s), " - "%s: Affect (%s), " - "%s: Outer Miter (%s), " - "%s: Inner Miter (%s), " - "%s: Harden Normals (%s), " - "%s: Mark Seam (%s), " - "%s: Mark Sharp (%s), " - "%s: Profile Type (%s), " - "%s: Intersection (%s)"), + IFACE_("%s: Confirm, " + "%s: Cancel, " + "%s: Width Type (%s), " + "%s: Width (%s), " + "%s: Segments (%d), " + "%s: Profile (%.3f), " + "%s: Clamp Overlap (%s), " + "%s: Affect (%s), " + "%s: Outer Miter (%s), " + "%s: Inner Miter (%s), " + "%s: Harden Normals (%s), " + "%s: Mark Seam (%s), " + "%s: Mark Sharp (%s), " + "%s: Profile Type (%s), " + "%s: Intersection (%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.cc b/source/blender/editors/mesh/editmesh_bisect.cc index 6c7b7ef6686..4c25f9ec506 100644 --- a/source/blender/editors/mesh/editmesh_bisect.cc +++ b/source/blender/editors/mesh/editmesh_bisect.cc @@ -172,7 +172,7 @@ static int mesh_bisect_invoke(bContext *C, wmOperator *op, const wmEvent *event) G.moving = G_TRANSFORM_EDIT; /* Initialize modal callout. */ - ED_workspace_status_text(C, RPT_("LMB: Click and drag to draw cut line")); + ED_workspace_status_text(C, IFACE_("LMB: Click and drag to draw cut line")); } return ret; } @@ -201,7 +201,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, RPT_("LMB: Release to confirm cut line")); + ED_workspace_status_text(C, IFACE_("LMB: Release to confirm cut line")); } else { ED_workspace_status_text(C, nullptr); diff --git a/source/blender/editors/mesh/editmesh_inset.cc b/source/blender/editors/mesh/editmesh_inset.cc index 23e8f2fd08e..0b6d9f9ae62 100644 --- a/source/blender/editors/mesh/editmesh_inset.cc +++ b/source/blender/editors/mesh/editmesh_inset.cc @@ -73,7 +73,7 @@ static void edbm_inset_update_header(wmOperator *op, bContext *C) { InsetData *opdata = static_cast(op->customdata); - const char *str = RPT_( + const char *str = IFACE_( "Confirm: Enter/LMB, Cancel: (Esc/RMB), 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.cc b/source/blender/editors/mesh/editmesh_knife.cc index 6bc7931457b..ac5caf5b34a 100644 --- a/source/blender/editors/mesh/editmesh_knife.cc +++ b/source/blender/editors/mesh/editmesh_knife.cc @@ -1111,13 +1111,13 @@ static void knife_update_header(bContext *C, wmOperator *op, KnifeTool_OpData *k SNPRINTF( header, - RPT_("%s: confirm, %s: cancel, %s: undo, " - "%s: start/define cut, %s: close cut, %s: new cut, " - "%s: midpoint snap (%s), %s: ignore snap (%s), " - "%s: angle constraint %.2f(%.2f) (%s%s%s%s), %s: cut through (%s), " - "%s: panning, %s%s%s: orientation lock (%s), " - "%s: distance/angle measurements (%s), " - "%s: x-ray (%s)"), + IFACE_("%s: confirm, %s: cancel, %s: undo, " + "%s: start/define cut, %s: close cut, %s: new cut, " + "%s: midpoint snap (%s), %s: ignore snap (%s), " + "%s: angle constraint %.2f(%.2f) (%s%s%s%s), %s: cut through (%s), " + "%s: panning, %s%s%s: orientation lock (%s), " + "%s: distance/angle measurements (%s), " + "%s: x-ray (%s)"), WM_MODALKEY(KNF_MODAL_CONFIRM), WM_MODALKEY(KNF_MODAL_CANCEL), WM_MODALKEY(KNF_MODAL_UNDO), diff --git a/source/blender/editors/mesh/editmesh_loopcut.cc b/source/blender/editors/mesh/editmesh_loopcut.cc index aae89e60256..9c86d97622b 100644 --- a/source/blender/editors/mesh/editmesh_loopcut.cc +++ b/source/blender/editors/mesh/editmesh_loopcut.cc @@ -463,8 +463,8 @@ static int loopcut_init(bContext *C, wmOperator *op, const wmEvent *event) if (is_interactive) { ED_workspace_status_text( C, - RPT_("Select a ring to be cut, use mouse-wheel or page-up/down for number of cuts, " - "hold Alt for smooth")); + IFACE_("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; } @@ -685,7 +685,7 @@ static int loopcut_modal(bContext *C, wmOperator *op, const wmEvent *event) BLI_snprintf(str_rep + NUM_STR_REP_LEN, NUM_STR_REP_LEN, "%.2f", smoothness); } SNPRINTF( - buf, RPT_("Number of Cuts: %s, Smooth: %s (Alt)"), str_rep, str_rep + NUM_STR_REP_LEN); + buf, IFACE_("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.cc b/source/blender/editors/mesh/editmesh_tools.cc index 2fea0d08dda..ddec89f378c 100644 --- a/source/blender/editors/mesh/editmesh_tools.cc +++ b/source/blender/editors/mesh/editmesh_tools.cc @@ -8360,11 +8360,11 @@ static void point_normals_update_header(bContext *C, wmOperator *op) op->type, (_id), true, UI_MAX_SHORTCUT_STR, &available_len, &p) SNPRINTF(header, - RPT_("%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)"), + 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)"), 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/object/object_remesh.cc b/source/blender/editors/object/object_remesh.cc index 334bccd5b0f..4b716f86986 100644 --- a/source/blender/editors/object/object_remesh.cc +++ b/source/blender/editors/object/object_remesh.cc @@ -592,7 +592,7 @@ static int voxel_size_edit_invoke(bContext *C, wmOperator *op, const wmEvent *ev ED_region_tag_redraw(region); - const char *status_str = RPT_( + const char *status_str = IFACE_( "Move the mouse to change the voxel size. CTRL: Relative Scale, SHIFT: Precision Mode, " "ENTER/LMB: Confirm Size, ESC/RMB: Cancel"); ED_workspace_status_text(C, status_str); diff --git a/source/blender/editors/sculpt_paint/paint_image.cc b/source/blender/editors/sculpt_paint/paint_image.cc index 5f185be6467..472f9687958 100644 --- a/source/blender/editors/sculpt_paint/paint_image.cc +++ b/source/blender/editors/sculpt_paint/paint_image.cc @@ -631,9 +631,10 @@ static void sample_color_update_header(SampleColorData *data, bContext *C) if (area) { SNPRINTF(msg, - RPT_("Sample color for %s"), - !data->sample_palette ? RPT_("Brush. Use Left Click to sample for palette instead") : - RPT_("Palette. Use Left Click to sample more colors")); + IFACE_("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")); ED_workspace_status_text(C, msg); } } diff --git a/source/blender/editors/sculpt_paint/sculpt_detail.cc b/source/blender/editors/sculpt_paint/sculpt_detail.cc index 77214e225c8..e43317cedf7 100644 --- a/source/blender/editors/sculpt_paint/sculpt_detail.cc +++ b/source/blender/editors/sculpt_paint/sculpt_detail.cc @@ -314,7 +314,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 * /*event*/) { - ED_workspace_status_text(C, RPT_("Click on the mesh to set the detail")); + ED_workspace_status_text(C, IFACE_("Click on the mesh to set the detail")); WM_cursor_modal_set(CTX_wm_window(C), WM_CURSOR_EYEDROPPER); WM_event_add_modal_handler(C, op); return OPERATOR_RUNNING_MODAL; @@ -764,7 +764,7 @@ static int dyntopo_detail_size_edit_invoke(bContext *C, wmOperator *op, const wm ss->draw_faded_cursor = true; - const char *status_str = RPT_( + const char *status_str = IFACE_( "Move the mouse to change the dyntopo detail size. LMB: confirm size, ESC/RMB: cancel, " "SHIFT: precision mode, CTRL: sample detail size"); ED_workspace_status_text(C, status_str); diff --git a/source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc b/source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc index 4b6701e75d5..05d7b1f774d 100644 --- a/source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc +++ b/source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc @@ -704,13 +704,13 @@ static void sculpt_mesh_update_status_bar(bContext *C, wmOperator *op) op->type, (_id), true, UI_MAX_SHORTCUT_STR, &available_len, &p) SNPRINTF(header, - RPT_("%s: Confirm, %s: Cancel"), + IFACE_("%s: Confirm, %s: Cancel"), WM_MODALKEY(FILTER_MESH_MODAL_CONFIRM), WM_MODALKEY(FILTER_MESH_MODAL_CANCEL)); #undef WM_MODALKEY - ED_workspace_status_text(C, RPT_(header)); + ED_workspace_status_text(C, header); } static void sculpt_mesh_filter_apply(bContext *C, wmOperator *op) diff --git a/source/blender/editors/space_clip/tracking_ops.cc b/source/blender/editors/space_clip/tracking_ops.cc index 6643c5b7f2e..dc2d2334bb8 100644 --- a/source/blender/editors/space_clip/tracking_ops.cc +++ b/source/blender/editors/space_clip/tracking_ops.cc @@ -146,7 +146,7 @@ void CLIP_OT_add_marker(wmOperatorType *ot) static int add_marker_at_click_invoke(bContext *C, wmOperator *op, const wmEvent * /*event*/) { - ED_workspace_status_text(C, RPT_("Use LMB click to define location where place the marker")); + ED_workspace_status_text(C, IFACE_("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_slider_ops.cc b/source/blender/editors/space_graph/graph_slider_ops.cc index 4027843aa1f..363a882194b 100644 --- a/source/blender/editors/space_graph/graph_slider_ops.cc +++ b/source/blender/editors/space_graph/graph_slider_ops.cc @@ -127,7 +127,7 @@ static void common_draw_status_header(bContext *C, tGraphSliderOp *gso, const ch ED_slider_status_string_get(gso->slider, slider_string, UI_MAX_DRAW_STR); - STRNCPY(mode_str, RPT_(operator_name)); + STRNCPY(mode_str, IFACE_(operator_name)); if (hasNumInput(&gso->num)) { char str_ofs[NUM_STR_REP_LEN]; @@ -451,7 +451,7 @@ static void decimate_draw_status(bContext *C, tGraphSliderOp *gso) ED_slider_status_string_get(gso->slider, slider_string, UI_MAX_DRAW_STR); - STRNCPY(mode_str, RPT_("Decimate Keyframes")); + STRNCPY(mode_str, IFACE_("Decimate Keyframes")); if (hasNumInput(&gso->num)) { char str_ofs[NUM_STR_REP_LEN]; @@ -1451,7 +1451,7 @@ static void shear_draw_status_header(bContext *C, tGraphSliderOp *gso) char slider_string[UI_MAX_DRAW_STR]; ED_slider_status_string_get(gso->slider, slider_string, UI_MAX_DRAW_STR); - STRNCPY(mode_str, RPT_("Shear Keys")); + STRNCPY(mode_str, IFACE_("Shear Keys")); if (hasNumInput(&gso->num)) { char str_ofs[NUM_STR_REP_LEN]; @@ -2338,7 +2338,7 @@ static void scale_from_neighbor_draw_status_header(bContext *C, wmOperator *op) break; } - STRNCPY(mode_str, RPT_("Scale from Neighbor Keys")); + STRNCPY(mode_str, IFACE_("Scale from Neighbor Keys")); if (hasNumInput(&gso->num)) { char str_ofs[NUM_STR_REP_LEN]; diff --git a/source/blender/editors/space_info/info_stats.cc b/source/blender/editors/space_info/info_stats.cc index ba573bee88f..adc48915562 100644 --- a/source/blender/editors/space_info/info_stats.cc +++ b/source/blender/editors/space_info/info_stats.cc @@ -559,14 +559,14 @@ static void get_stats_string(char *info, if (obedit) { if (BKE_keyblock_from_object(obedit)) { - *ofs += BLI_strncpy_rlen(info + *ofs, RPT_("(Key) "), len - *ofs); + *ofs += BLI_strncpy_rlen(info + *ofs, IFACE_("(Key) "), len - *ofs); } if (obedit->type == OB_MESH) { *ofs += BLI_snprintf_rlen(info + *ofs, len - *ofs, - RPT_("Verts:%s/%s | Edges:%s/%s | Faces:%s/%s | Tris:%s"), + IFACE_("Verts:%s/%s | Edges:%s/%s | Faces:%s/%s | Tris:%s"), stats_fmt->totvertsel, stats_fmt->totvert, stats_fmt->totedgesel, @@ -579,26 +579,29 @@ static void get_stats_string(char *info, *ofs += BLI_snprintf_rlen(info + *ofs, len - *ofs, - RPT_("Joints:%s/%s | Bones:%s/%s"), + IFACE_("Joints:%s/%s | Bones:%s/%s"), stats_fmt->totvertsel, stats_fmt->totvert, stats_fmt->totbonesel, stats_fmt->totbone); } else { - *ofs += BLI_snprintf_rlen( - info + *ofs, len - *ofs, RPT_("Verts:%s/%s"), stats_fmt->totvertsel, stats_fmt->totvert); + *ofs += BLI_snprintf_rlen(info + *ofs, + len - *ofs, + IFACE_("Verts:%s/%s"), + stats_fmt->totvertsel, + stats_fmt->totvert); } } else if (ob && (object_mode & OB_MODE_POSE)) { *ofs += BLI_snprintf_rlen( - info + *ofs, len - *ofs, RPT_("Bones:%s/%s"), stats_fmt->totbonesel, stats_fmt->totbone); + info + *ofs, len - *ofs, IFACE_("Bones:%s/%s"), stats_fmt->totbonesel, stats_fmt->totbone); } else if ((ob) && (ob->type == OB_GPENCIL_LEGACY)) { *ofs += BLI_snprintf_rlen(info + *ofs, len - *ofs, - RPT_("Layers:%s | Frames:%s | Strokes:%s | Points:%s"), + IFACE_("Layers:%s | Frames:%s | Strokes:%s | Points:%s"), stats_fmt->totgplayer, stats_fmt->totgpframe, stats_fmt->totgpstroke, @@ -609,7 +612,7 @@ static void get_stats_string(char *info, *ofs += BLI_snprintf_rlen(info + *ofs, len - *ofs, - RPT_("Verts:%s | Tris:%s"), + IFACE_("Verts:%s | Tris:%s"), stats_fmt->totvertsculpt, stats_fmt->tottri); } @@ -617,7 +620,7 @@ static void get_stats_string(char *info, *ofs += BLI_snprintf_rlen(info + *ofs, len - *ofs, - RPT_("Verts:%s | Faces:%s"), + IFACE_("Verts:%s | Faces:%s"), stats_fmt->totvertsculpt, stats_fmt->totfacesculpt); } @@ -626,7 +629,7 @@ static void get_stats_string(char *info, *ofs += BLI_snprintf_rlen(info + *ofs, len - *ofs, - RPT_("Verts:%s | Faces:%s | Tris:%s"), + IFACE_("Verts:%s | Faces:%s | Tris:%s"), stats_fmt->totvert, stats_fmt->totface, stats_fmt->tottri); @@ -636,7 +639,7 @@ static void get_stats_string(char *info, *ofs += BLI_snprintf_rlen(info + *ofs, len - *ofs, - RPT_(" | Objects:%s/%s"), + IFACE_(" | Objects:%s/%s"), stats_fmt->totobjsel, stats_fmt->totobj); } @@ -675,7 +678,7 @@ const char *ED_info_statusbar_string_ex(Main *bmain, ofs += BLI_snprintf_rlen(info + ofs, len - ofs, - RPT_("Duration: %s (Frame %i/%i)"), + IFACE_("Duration: %s (Frame %i/%i)"), timecode, relative_current_frame, frame_count); @@ -688,7 +691,7 @@ const char *ED_info_statusbar_string_ex(Main *bmain, } uintptr_t mem_in_use = MEM_get_memory_in_use(); BLI_str_format_byte_unit(formatted_mem, mem_in_use, false); - ofs += BLI_snprintf_rlen(info + ofs, len, RPT_("Memory: %s"), formatted_mem); + ofs += BLI_snprintf_rlen(info + ofs, len, IFACE_("Memory: %s"), formatted_mem); } /* GPU VRAM status. */ @@ -704,13 +707,13 @@ const char *ED_info_statusbar_string_ex(Main *bmain, ofs += BLI_snprintf_rlen(info + ofs, len - ofs, - RPT_("VRAM: %.1f/%.1f GiB"), + IFACE_("VRAM: %.1f/%.1f GiB"), gpu_total_gb - gpu_free_gb, gpu_total_gb); } else { /* Can only show amount of GPU VRAM available. */ - ofs += BLI_snprintf_rlen(info + ofs, len - ofs, RPT_("VRAM: %.1f GiB Free"), gpu_free_gb); + ofs += BLI_snprintf_rlen(info + ofs, len - ofs, IFACE_("VRAM: %.1f GiB Free"), gpu_free_gb); } } @@ -719,7 +722,7 @@ const char *ED_info_statusbar_string_ex(Main *bmain, if (info[0]) { ofs += BLI_snprintf_rlen(info + ofs, len - ofs, " | "); } - ofs += BLI_snprintf_rlen(info + ofs, len - ofs, RPT_("%s"), BKE_blender_version_string()); + ofs += BLI_snprintf_rlen(info + ofs, len - ofs, IFACE_("%s"), BKE_blender_version_string()); } return info; @@ -790,18 +793,18 @@ void ED_info_draw_stats( }; char labels[MAX_LABELS_COUNT][64]; - STRNCPY_UTF8(labels[OBJ], RPT_("Objects")); - STRNCPY_UTF8(labels[VERTS], RPT_("Vertices")); - STRNCPY_UTF8(labels[EDGES], RPT_("Edges")); - STRNCPY_UTF8(labels[FACES], RPT_("Faces")); - STRNCPY_UTF8(labels[TRIS], RPT_("Triangles")); - STRNCPY_UTF8(labels[JOINTS], RPT_("Joints")); - STRNCPY_UTF8(labels[BONES], RPT_("Bones")); - STRNCPY_UTF8(labels[LAYERS], RPT_("Layers")); - STRNCPY_UTF8(labels[FRAMES], RPT_("Frames")); - STRNCPY_UTF8(labels[STROKES], RPT_("Strokes")); - STRNCPY_UTF8(labels[POINTS], RPT_("Points")); - STRNCPY_UTF8(labels[LIGHTS], RPT_("Lights")); + STRNCPY_UTF8(labels[OBJ], IFACE_("Objects")); + STRNCPY_UTF8(labels[VERTS], IFACE_("Vertices")); + STRNCPY_UTF8(labels[EDGES], IFACE_("Edges")); + STRNCPY_UTF8(labels[FACES], IFACE_("Faces")); + STRNCPY_UTF8(labels[TRIS], IFACE_("Triangles")); + STRNCPY_UTF8(labels[JOINTS], IFACE_("Joints")); + STRNCPY_UTF8(labels[BONES], IFACE_("Bones")); + STRNCPY_UTF8(labels[LAYERS], IFACE_("Layers")); + STRNCPY_UTF8(labels[FRAMES], IFACE_("Frames")); + STRNCPY_UTF8(labels[STROKES], IFACE_("Strokes")); + STRNCPY_UTF8(labels[POINTS], IFACE_("Points")); + STRNCPY_UTF8(labels[LIGHTS], IFACE_("Lights")); int longest_label = 0; for (int i = 0; i < MAX_LABELS_COUNT; ++i) { diff --git a/source/blender/editors/space_sequencer/sequencer_edit.cc b/source/blender/editors/space_sequencer/sequencer_edit.cc index d0568a546ef..b8b7706ea6e 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.cc +++ b/source/blender/editors/space_sequencer/sequencer_edit.cc @@ -643,10 +643,10 @@ static void sequencer_slip_update_header(Scene *scene, ScrArea *area, SlipData * if (hasNumInput(&data->num_input)) { char num_str[NUM_STR_REP_LEN]; outputNumInput(&data->num_input, num_str, &scene->unit); - SNPRINTF(msg, RPT_("Slip offset: %s"), num_str); + SNPRINTF(msg, IFACE_("Slip offset: %s"), num_str); } else { - SNPRINTF(msg, RPT_("Slip offset: %d"), offset); + SNPRINTF(msg, IFACE_("Slip offset: %d"), offset); } } diff --git a/source/blender/editors/transform/transform.cc b/source/blender/editors/transform/transform.cc index 31700800f58..b17eafd9c24 100644 --- a/source/blender/editors/transform/transform.cc +++ b/source/blender/editors/transform/transform.cc @@ -883,30 +883,30 @@ static bool transform_event_modal_constraint(TransInfo *t, short modal_type) /* Initialize */ switch (modal_type) { case TFM_MODAL_AXIS_X: - msg_2d = RPT_("along X"); - msg_3d = RPT_("along %s X"); + msg_2d = IFACE_("along X"); + msg_3d = IFACE_("along %s X"); constraint_new = CON_AXIS0; break; case TFM_MODAL_AXIS_Y: - msg_2d = RPT_("along Y"); - msg_3d = RPT_("along %s Y"); + msg_2d = IFACE_("along Y"); + msg_3d = IFACE_("along %s Y"); constraint_new = CON_AXIS1; break; case TFM_MODAL_AXIS_Z: - msg_2d = RPT_("along Z"); - msg_3d = RPT_("along %s Z"); + msg_2d = IFACE_("along Z"); + msg_3d = IFACE_("along %s Z"); constraint_new = CON_AXIS2; break; case TFM_MODAL_PLANE_X: - msg_3d = RPT_("locking %s X"); + msg_3d = IFACE_("locking %s X"); constraint_new = CON_AXIS1 | CON_AXIS2; break; case TFM_MODAL_PLANE_Y: - msg_3d = RPT_("locking %s Y"); + msg_3d = IFACE_("locking %s Y"); constraint_new = CON_AXIS0 | CON_AXIS2; break; case TFM_MODAL_PLANE_Z: - msg_3d = RPT_("locking %s Z"); + msg_3d = IFACE_("locking %s Z"); constraint_new = CON_AXIS0 | CON_AXIS1; break; default: @@ -1250,7 +1250,7 @@ int transformEvent(TransInfo *t, const wmEvent *event) if (t->options & CTX_CAMERA) { /* Exception for switching to dolly, or trackball, in camera view. */ if (t->mode == TFM_TRANSLATION) { - setLocalConstraint(t, (CON_AXIS2), RPT_("along local Z")); + setLocalConstraint(t, (CON_AXIS2), IFACE_("along local Z")); } else if (t->mode == TFM_ROTATION) { restoreTransObjects(t); diff --git a/source/blender/editors/transform/transform_constraints.cc b/source/blender/editors/transform/transform_constraints.cc index b8329db9cd3..55bff083a4d 100644 --- a/source/blender/editors/transform/transform_constraints.cc +++ b/source/blender/editors/transform/transform_constraints.cc @@ -1081,11 +1081,11 @@ static void setNearestAxis2d(TransInfo *t) blender::float2 dvec = t->mval - t->mouse.imval; if (abs(dvec.x) < abs(dvec.y)) { t->con.mode |= CON_AXIS1; - STRNCPY(t->con.text, RPT_(" along Y axis")); + STRNCPY(t->con.text, IFACE_(" along Y axis")); } else { t->con.mode |= CON_AXIS0; - STRNCPY(t->con.text, RPT_(" along X axis")); + STRNCPY(t->con.text, IFACE_(" along X axis")); } } @@ -1139,31 +1139,31 @@ static void setNearestAxis3d(TransInfo *t) if (len[0] <= len[1] && len[0] <= len[2]) { if (t->modifiers & MOD_CONSTRAINT_SELECT_PLANE) { t->con.mode |= (CON_AXIS1 | CON_AXIS2); - SNPRINTF(t->con.text, RPT_(" locking %s X axis"), t->spacename); + SNPRINTF(t->con.text, IFACE_(" locking %s X axis"), t->spacename); } else { t->con.mode |= CON_AXIS0; - SNPRINTF(t->con.text, RPT_(" along %s X axis"), t->spacename); + SNPRINTF(t->con.text, IFACE_(" along %s X axis"), t->spacename); } } else if (len[1] <= len[0] && len[1] <= len[2]) { if (t->modifiers & MOD_CONSTRAINT_SELECT_PLANE) { t->con.mode |= (CON_AXIS0 | CON_AXIS2); - SNPRINTF(t->con.text, RPT_(" locking %s Y axis"), t->spacename); + SNPRINTF(t->con.text, IFACE_(" locking %s Y axis"), t->spacename); } else { t->con.mode |= CON_AXIS1; - SNPRINTF(t->con.text, RPT_(" along %s Y axis"), t->spacename); + SNPRINTF(t->con.text, IFACE_(" along %s Y axis"), t->spacename); } } else if (len[2] <= len[1] && len[2] <= len[0]) { if (t->modifiers & MOD_CONSTRAINT_SELECT_PLANE) { t->con.mode |= (CON_AXIS0 | CON_AXIS1); - SNPRINTF(t->con.text, RPT_(" locking %s Z axis"), t->spacename); + SNPRINTF(t->con.text, IFACE_(" locking %s Z axis"), t->spacename); } else { t->con.mode |= CON_AXIS2; - SNPRINTF(t->con.text, RPT_(" along %s Z axis"), t->spacename); + SNPRINTF(t->con.text, IFACE_(" along %s Z axis"), t->spacename); } } } diff --git a/source/blender/editors/transform/transform_mode.cc b/source/blender/editors/transform/transform_mode.cc index 62a7e586617..6352fccb820 100644 --- a/source/blender/editors/transform/transform_mode.cc +++ b/source/blender/editors/transform/transform_mode.cc @@ -534,12 +534,12 @@ void headerRotation(TransInfo *t, char *str, const int str_size, float final) outputNumInput(&(t->num), c, &t->scene->unit); ofs += BLI_snprintf_rlen( - str + ofs, str_size - ofs, RPT_("Rotation: %s %s %s"), &c[0], t->con.text, t->proptext); + str + ofs, str_size - ofs, IFACE_("Rotation: %s %s %s"), &c[0], t->con.text, t->proptext); } else { ofs += BLI_snprintf_rlen(str + ofs, str_size - ofs, - RPT_("Rotation: %.2f%s %s"), + IFACE_("Rotation: %.2f%s %s"), RAD2DEGF(final), t->con.text, t->proptext); @@ -547,7 +547,7 @@ void headerRotation(TransInfo *t, char *str, const int str_size, float final) if (t->flag & T_PROP_EDIT_ALL) { ofs += BLI_snprintf_rlen( - str + ofs, str_size - ofs, RPT_(" Proportional size: %.2f"), t->prop_size); + str + ofs, str_size - ofs, IFACE_(" Proportional size: %.2f"), t->prop_size); } } @@ -847,13 +847,17 @@ void headerResize(TransInfo *t, const float vec[3], char *str, const int str_siz if (t->con.mode & CON_APPLY) { switch (t->num.idx_max) { case 0: - ofs += BLI_snprintf_rlen( - str + ofs, str_size - ofs, RPT_("Scale: %s%s %s"), &tvec[0], t->con.text, t->proptext); + ofs += BLI_snprintf_rlen(str + ofs, + str_size - ofs, + IFACE_("Scale: %s%s %s"), + &tvec[0], + t->con.text, + t->proptext); break; case 1: ofs += BLI_snprintf_rlen(str + ofs, str_size - ofs, - RPT_("Scale: %s : %s%s %s"), + IFACE_("Scale: %s : %s%s %s"), &tvec[0], &tvec[NUM_STR_REP_LEN], t->con.text, @@ -862,7 +866,7 @@ void headerResize(TransInfo *t, const float vec[3], char *str, const int str_siz case 2: ofs += BLI_snprintf_rlen(str + ofs, str_size - ofs, - RPT_("Scale: %s : %s : %s%s %s"), + IFACE_("Scale: %s : %s : %s%s %s"), &tvec[0], &tvec[NUM_STR_REP_LEN], &tvec[NUM_STR_REP_LEN * 2], @@ -875,7 +879,7 @@ void headerResize(TransInfo *t, const float vec[3], char *str, const int str_siz if (t->flag & T_2D_EDIT) { ofs += BLI_snprintf_rlen(str + ofs, str_size - ofs, - RPT_("Scale X: %s Y: %s%s %s"), + IFACE_("Scale X: %s Y: %s%s %s"), &tvec[0], &tvec[NUM_STR_REP_LEN], t->con.text, @@ -884,7 +888,7 @@ void headerResize(TransInfo *t, const float vec[3], char *str, const int str_siz else { ofs += BLI_snprintf_rlen(str + ofs, str_size - ofs, - RPT_("Scale X: %s Y: %s Z: %s%s %s"), + IFACE_("Scale X: %s Y: %s Z: %s%s %s"), &tvec[0], &tvec[NUM_STR_REP_LEN], &tvec[NUM_STR_REP_LEN * 2], @@ -895,7 +899,7 @@ void headerResize(TransInfo *t, const float vec[3], char *str, const int str_siz if (t->flag & T_PROP_EDIT_ALL) { ofs += BLI_snprintf_rlen( - str + ofs, str_size - ofs, RPT_(" Proportional size: %.2f"), t->prop_size); + str + ofs, str_size - ofs, IFACE_(" Proportional size: %.2f"), t->prop_size); } } diff --git a/source/blender/editors/transform/transform_mode_align.cc b/source/blender/editors/transform/transform_mode_align.cc index 6f3b401a3c5..1d4ce84856f 100644 --- a/source/blender/editors/transform/transform_mode_align.cc +++ b/source/blender/editors/transform/transform_mode_align.cc @@ -64,7 +64,7 @@ static void applyAlign(TransInfo *t) recalc_data(t); - ED_area_status_text(t->area, RPT_("Align")); + ED_area_status_text(t->area, IFACE_("Align")); } static void initAlign(TransInfo *t, wmOperator * /*op*/) diff --git a/source/blender/editors/transform/transform_mode_baketime.cc b/source/blender/editors/transform/transform_mode_baketime.cc index ff531bea213..69bcb7f4c92 100644 --- a/source/blender/editors/transform/transform_mode_baketime.cc +++ b/source/blender/editors/transform/transform_mode_baketime.cc @@ -63,19 +63,19 @@ static void applyBakeTime(TransInfo *t) outputNumInput(&(t->num), c, &t->scene->unit); if (time >= 0.0f) { - SNPRINTF(str, RPT_("Time: +%s %s"), c, t->proptext); + SNPRINTF(str, IFACE_("Time: +%s %s"), c, t->proptext); } else { - SNPRINTF(str, RPT_("Time: %s %s"), c, t->proptext); + SNPRINTF(str, IFACE_("Time: %s %s"), c, t->proptext); } } else { /* default header print */ if (time >= 0.0f) { - SNPRINTF(str, RPT_("Time: +%.3f %s"), time, t->proptext); + SNPRINTF(str, IFACE_("Time: +%.3f %s"), time, t->proptext); } else { - SNPRINTF(str, RPT_("Time: %.3f %s"), time, t->proptext); + SNPRINTF(str, IFACE_("Time: %.3f %s"), time, t->proptext); } } diff --git a/source/blender/editors/transform/transform_mode_bbone_resize.cc b/source/blender/editors/transform/transform_mode_bbone_resize.cc index 9879b5988d8..3af6196346e 100644 --- a/source/blender/editors/transform/transform_mode_bbone_resize.cc +++ b/source/blender/editors/transform/transform_mode_bbone_resize.cc @@ -48,12 +48,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, RPT_("ScaleB: %s%s %s"), &tvec[0], t->con.text, t->proptext); + str, UI_MAX_DRAW_STR, IFACE_("ScaleB: %s%s %s"), &tvec[0], t->con.text, t->proptext); } else { BLI_snprintf(str, UI_MAX_DRAW_STR, - RPT_("ScaleB: %s : %s : %s%s %s"), + IFACE_("ScaleB: %s : %s : %s%s %s"), &tvec[0], &tvec[NUM_STR_REP_LEN], &tvec[NUM_STR_REP_LEN * 2], @@ -64,7 +64,7 @@ static void headerBoneSize(TransInfo *t, const float vec[3], char str[UI_MAX_DRA else { BLI_snprintf(str, UI_MAX_DRAW_STR, - RPT_("ScaleB X: %s Y: %s Z: %s%s %s"), + IFACE_("ScaleB X: %s Y: %s Z: %s%s %s"), &tvec[0], &tvec[NUM_STR_REP_LEN], &tvec[NUM_STR_REP_LEN * 2], diff --git a/source/blender/editors/transform/transform_mode_bend.cc b/source/blender/editors/transform/transform_mode_bend.cc index 80a08500651..c7582e036ec 100644 --- a/source/blender/editors/transform/transform_mode_bend.cc +++ b/source/blender/editors/transform/transform_mode_bend.cc @@ -229,7 +229,7 @@ static void Bend(TransInfo *t) outputNumInput(&(t->num), c, &t->scene->unit); SNPRINTF(str, - RPT_("Bend Angle: %s, Radius: %s, Alt: Clamp %s"), + IFACE_("Bend Angle: %s, Radius: %s, Alt: Clamp %s"), &c[0], &c[NUM_STR_REP_LEN], WM_bool_as_string(is_clamp)); @@ -237,7 +237,7 @@ static void Bend(TransInfo *t) else { /* default header print */ SNPRINTF(str, - RPT_("Bend Angle: %.3f, Radius: %.4f, Alt: Clamp %s"), + IFACE_("Bend Angle: %.3f, Radius: %.4f, Alt: Clamp %s"), RAD2DEGF(values.angle), values.scale * bend_data->warp_init_dist, WM_bool_as_string(is_clamp)); diff --git a/source/blender/editors/transform/transform_mode_boneenvelope.cc b/source/blender/editors/transform/transform_mode_boneenvelope.cc index f2f5365d17d..7ff1ab880ab 100644 --- a/source/blender/editors/transform/transform_mode_boneenvelope.cc +++ b/source/blender/editors/transform/transform_mode_boneenvelope.cc @@ -49,10 +49,10 @@ static void applyBoneEnvelope(TransInfo *t) char c[NUM_STR_REP_LEN]; outputNumInput(&(t->num), c, &t->scene->unit); - SNPRINTF(str, RPT_("Envelope: %s"), c); + SNPRINTF(str, IFACE_("Envelope: %s"), c); } else { - SNPRINTF(str, RPT_("Envelope: %3f"), ratio); + SNPRINTF(str, IFACE_("Envelope: %3f"), ratio); } FOREACH_TRANS_DATA_CONTAINER (t, tc) { diff --git a/source/blender/editors/transform/transform_mode_boneroll.cc b/source/blender/editors/transform/transform_mode_boneroll.cc index 103e66861ef..2507307be43 100644 --- a/source/blender/editors/transform/transform_mode_boneroll.cc +++ b/source/blender/editors/transform/transform_mode_boneroll.cc @@ -51,10 +51,10 @@ static void applyBoneRoll(TransInfo *t) outputNumInput(&(t->num), c, &t->scene->unit); - SNPRINTF(str, RPT_("Roll: %s"), &c[0]); + SNPRINTF(str, IFACE_("Roll: %s"), &c[0]); } else { - SNPRINTF(str, RPT_("Roll: %.2f"), RAD2DEGF(final)); + SNPRINTF(str, IFACE_("Roll: %.2f"), RAD2DEGF(final)); } /* set roll values */ diff --git a/source/blender/editors/transform/transform_mode_curveshrinkfatten.cc b/source/blender/editors/transform/transform_mode_curveshrinkfatten.cc index 701f2337617..5a0ed7cf536 100644 --- a/source/blender/editors/transform/transform_mode_curveshrinkfatten.cc +++ b/source/blender/editors/transform/transform_mode_curveshrinkfatten.cc @@ -50,10 +50,10 @@ static void applyCurveShrinkFatten(TransInfo *t) char c[NUM_STR_REP_LEN]; outputNumInput(&(t->num), c, &t->scene->unit); - SNPRINTF(str, RPT_("Shrink/Fatten: %s"), c); + SNPRINTF(str, IFACE_("Shrink/Fatten: %s"), c); } else { - SNPRINTF(str, RPT_("Shrink/Fatten: %3f"), ratio); + SNPRINTF(str, IFACE_("Shrink/Fatten: %3f"), ratio); } FOREACH_TRANS_DATA_CONTAINER (t, tc) { diff --git a/source/blender/editors/transform/transform_mode_customdata.cc b/source/blender/editors/transform/transform_mode_customdata.cc index 87c560e3d44..64464171898 100644 --- a/source/blender/editors/transform/transform_mode_customdata.cc +++ b/source/blender/editors/transform/transform_mode_customdata.cc @@ -138,12 +138,12 @@ static void apply_value_impl(TransInfo *t, const char *value_name) static void applyCrease(TransInfo *t) { - apply_value_impl(t, RPT_("Crease")); + apply_value_impl(t, IFACE_("Crease")); } static void applyBevelWeight(TransInfo *t) { - apply_value_impl(t, RPT_("Bevel Weight")); + apply_value_impl(t, IFACE_("Bevel Weight")); } static void init_mode_impl(TransInfo *t) diff --git a/source/blender/editors/transform/transform_mode_edge_seq_slide.cc b/source/blender/editors/transform/transform_mode_edge_seq_slide.cc index 86fe7c50dc4..9bd3ab0f4be 100644 --- a/source/blender/editors/transform/transform_mode_edge_seq_slide.cc +++ b/source/blender/editors/transform/transform_mode_edge_seq_slide.cc @@ -52,7 +52,7 @@ static void headerSeqSlide(TransInfo *t, const float val[2], char str[UI_MAX_DRA } ofs += BLI_snprintf_rlen( - str + ofs, UI_MAX_DRAW_STR - ofs, RPT_("Sequence Slide: %s%s"), &tvec[0], t->con.text); + str + ofs, UI_MAX_DRAW_STR - ofs, IFACE_("Sequence Slide: %s%s"), &tvec[0], t->con.text); } static void applySeqSlideValue(TransInfo *t, const float val[2]) diff --git a/source/blender/editors/transform/transform_mode_gpopacity.cc b/source/blender/editors/transform/transform_mode_gpopacity.cc index d836560f955..483738e49f1 100644 --- a/source/blender/editors/transform/transform_mode_gpopacity.cc +++ b/source/blender/editors/transform/transform_mode_gpopacity.cc @@ -51,10 +51,10 @@ static void applyGPOpacity(TransInfo *t) char c[NUM_STR_REP_LEN]; outputNumInput(&(t->num), c, &t->scene->unit); - SNPRINTF(str, RPT_("Opacity: %s"), c); + SNPRINTF(str, IFACE_("Opacity: %s"), c); } else { - SNPRINTF(str, RPT_("Opacity: %3f"), ratio); + SNPRINTF(str, IFACE_("Opacity: %3f"), ratio); } bool recalc = false; diff --git a/source/blender/editors/transform/transform_mode_gpshrinkfatten.cc b/source/blender/editors/transform/transform_mode_gpshrinkfatten.cc index 29fcecb7bd2..6b59c279be9 100644 --- a/source/blender/editors/transform/transform_mode_gpshrinkfatten.cc +++ b/source/blender/editors/transform/transform_mode_gpshrinkfatten.cc @@ -51,10 +51,10 @@ static void applyGPShrinkFatten(TransInfo *t) char c[NUM_STR_REP_LEN]; outputNumInput(&(t->num), c, &t->scene->unit); - SNPRINTF(str, RPT_("Shrink/Fatten: %s"), c); + SNPRINTF(str, IFACE_("Shrink/Fatten: %s"), c); } else { - SNPRINTF(str, RPT_("Shrink/Fatten: %3f"), ratio); + SNPRINTF(str, IFACE_("Shrink/Fatten: %3f"), ratio); } bool recalc = false; diff --git a/source/blender/editors/transform/transform_mode_maskshrinkfatten.cc b/source/blender/editors/transform/transform_mode_maskshrinkfatten.cc index fa864934cff..ab6922ddfce 100644 --- a/source/blender/editors/transform/transform_mode_maskshrinkfatten.cc +++ b/source/blender/editors/transform/transform_mode_maskshrinkfatten.cc @@ -50,10 +50,10 @@ static void applyMaskShrinkFatten(TransInfo *t) char c[NUM_STR_REP_LEN]; outputNumInput(&(t->num), c, &t->scene->unit); - SNPRINTF(str, RPT_("Feather Shrink/Fatten: %s"), c); + SNPRINTF(str, IFACE_("Feather Shrink/Fatten: %s"), c); } else { - SNPRINTF(str, RPT_("Feather Shrink/Fatten: %3f"), ratio); + SNPRINTF(str, IFACE_("Feather Shrink/Fatten: %3f"), ratio); } /* detect if no points have feather yet */ diff --git a/source/blender/editors/transform/transform_mode_mirror.cc b/source/blender/editors/transform/transform_mode_mirror.cc index 588fbf3c8b7..8ac76511263 100644 --- a/source/blender/editors/transform/transform_mode_mirror.cc +++ b/source/blender/editors/transform/transform_mode_mirror.cc @@ -177,7 +177,7 @@ static void applyMirror(TransInfo *t) special_axis = bitscan_forward_i(special_axis_bitmap); } - SNPRINTF(str, RPT_("Mirror%s"), t->con.text); + SNPRINTF(str, IFACE_("Mirror%s"), t->con.text); FOREACH_TRANS_DATA_CONTAINER (t, tc) { TransData *td = tc->data; @@ -209,10 +209,10 @@ static void applyMirror(TransInfo *t) recalc_data(t); if (t->flag & T_2D_EDIT) { - ED_area_status_text(t->area, RPT_("Select a mirror axis (X, Y)")); + ED_area_status_text(t->area, IFACE_("Select a mirror axis (X, Y)")); } else { - ED_area_status_text(t->area, RPT_("Select a mirror axis (X, Y, Z)")); + ED_area_status_text(t->area, IFACE_("Select a mirror axis (X, Y, Z)")); } } } diff --git a/source/blender/editors/transform/transform_mode_push_pull.cc b/source/blender/editors/transform/transform_mode_push_pull.cc index 58130a17451..f5850d1c6d9 100644 --- a/source/blender/editors/transform/transform_mode_push_pull.cc +++ b/source/blender/editors/transform/transform_mode_push_pull.cc @@ -124,11 +124,11 @@ static void applyPushPull(TransInfo *t) outputNumInput(&(t->num), c, &t->scene->unit); - SNPRINTF(str, RPT_("Push/Pull: %s%s %s"), c, t->con.text, t->proptext); + SNPRINTF(str, IFACE_("Push/Pull: %s%s %s"), c, t->con.text, t->proptext); } else { /* default header print */ - SNPRINTF(str, RPT_("Push/Pull: %.4f%s %s"), distance, t->con.text, t->proptext); + SNPRINTF(str, IFACE_("Push/Pull: %.4f%s %s"), distance, t->con.text, t->proptext); } if (t->con.applyRot && t->con.mode & CON_APPLY) { diff --git a/source/blender/editors/transform/transform_mode_shear.cc b/source/blender/editors/transform/transform_mode_shear.cc index 7727f58f74a..0eeabf2c2d7 100644 --- a/source/blender/editors/transform/transform_mode_shear.cc +++ b/source/blender/editors/transform/transform_mode_shear.cc @@ -307,11 +307,11 @@ static void apply_shear(TransInfo *t) if (hasNumInput(&t->num)) { char c[NUM_STR_REP_LEN]; outputNumInput(&(t->num), c, &t->scene->unit); - SNPRINTF(str, RPT_("Shear: %s %s"), c, t->proptext); + SNPRINTF(str, IFACE_("Shear: %s %s"), c, t->proptext); } else { /* default header print */ - SNPRINTF(str, RPT_("Shear: %.3f %s (Press X or Y to set shear axis)"), value, t->proptext); + SNPRINTF(str, IFACE_("Shear: %.3f %s (Press X or Y to set shear axis)"), value, t->proptext); } ED_area_status_text(t->area, str); diff --git a/source/blender/editors/transform/transform_mode_shrink_fatten.cc b/source/blender/editors/transform/transform_mode_shrink_fatten.cc index cf2dab0e9cf..2de9701c2fe 100644 --- a/source/blender/editors/transform/transform_mode_shrink_fatten.cc +++ b/source/blender/editors/transform/transform_mode_shrink_fatten.cc @@ -105,7 +105,7 @@ static void applyShrinkFatten(TransInfo *t) t->values_final[0] = distance; /* header print for NumInput */ - ofs += BLI_strncpy_rlen(str + ofs, RPT_("Shrink/Fatten: "), sizeof(str) - ofs); + ofs += BLI_strncpy_rlen(str + ofs, IFACE_("Shrink/Fatten: "), sizeof(str) - ofs); if (hasNumInput(&t->num)) { char c[NUM_STR_REP_LEN]; outputNumInput(&(t->num), c, unit); @@ -139,7 +139,7 @@ static void applyShrinkFatten(TransInfo *t) BLI_snprintf(str + ofs, sizeof(str) - ofs, - RPT_(" or Alt) Even Thickness %s"), + IFACE_(" or Alt) Even Thickness %s"), WM_bool_as_string((t->flag & T_ALT_TRANSFORM) != 0)); /* done with header string */ diff --git a/source/blender/editors/transform/transform_mode_tilt.cc b/source/blender/editors/transform/transform_mode_tilt.cc index b71d17bae3e..d81f6c1ee1c 100644 --- a/source/blender/editors/transform/transform_mode_tilt.cc +++ b/source/blender/editors/transform/transform_mode_tilt.cc @@ -51,13 +51,14 @@ static void applyTilt(TransInfo *t) outputNumInput(&(t->num), c, &t->scene->unit); - SNPRINTF(str, RPT_("Tilt: %s" BLI_STR_UTF8_DEGREE_SIGN " %s"), &c[0], t->proptext); + SNPRINTF(str, IFACE_("Tilt: %s" BLI_STR_UTF8_DEGREE_SIGN " %s"), &c[0], t->proptext); /* XXX For some reason, this seems needed for this op, else RNA prop is not updated... :/ */ t->values_final[0] = final; } else { - SNPRINTF(str, RPT_("Tilt: %.2f" BLI_STR_UTF8_DEGREE_SIGN " %s"), RAD2DEGF(final), t->proptext); + SNPRINTF( + str, IFACE_("Tilt: %.2f" BLI_STR_UTF8_DEGREE_SIGN " %s"), RAD2DEGF(final), t->proptext); } FOREACH_TRANS_DATA_CONTAINER (t, tc) { diff --git a/source/blender/editors/transform/transform_mode_timescale.cc b/source/blender/editors/transform/transform_mode_timescale.cc index bfe32f211d6..2501da895de 100644 --- a/source/blender/editors/transform/transform_mode_timescale.cc +++ b/source/blender/editors/transform/transform_mode_timescale.cc @@ -53,7 +53,7 @@ static void headerTimeScale(TransInfo *t, char str[UI_MAX_DRAW_STR]) BLI_snprintf(&tvec[0], NUM_STR_REP_LEN, "%.4f", t->values_final[0]); } - BLI_snprintf(str, UI_MAX_DRAW_STR, RPT_("ScaleX: %s"), &tvec[0]); + BLI_snprintf(str, UI_MAX_DRAW_STR, IFACE_("ScaleX: %s"), &tvec[0]); } static void applyTimeScaleValue(TransInfo *t, float value) diff --git a/source/blender/editors/transform/transform_mode_timeslide.cc b/source/blender/editors/transform/transform_mode_timeslide.cc index 88f0c60ba4b..a689afc5143 100644 --- a/source/blender/editors/transform/transform_mode_timeslide.cc +++ b/source/blender/editors/transform/transform_mode_timeslide.cc @@ -56,7 +56,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, RPT_("TimeSlide: %s"), &tvec[0]); + BLI_snprintf(str, UI_MAX_DRAW_STR, IFACE_("TimeSlide: %s"), &tvec[0]); } static void applyTimeSlideValue(TransInfo *t, float sval, float cval) diff --git a/source/blender/editors/transform/transform_mode_timetranslate.cc b/source/blender/editors/transform/transform_mode_timetranslate.cc index b34177e88a9..26eff134c1d 100644 --- a/source/blender/editors/transform/transform_mode_timetranslate.cc +++ b/source/blender/editors/transform/transform_mode_timetranslate.cc @@ -68,11 +68,11 @@ static void headerTimeTranslate(TransInfo *t, char str[UI_MAX_DRAW_STR]) } } - ofs += BLI_snprintf_rlen(str, UI_MAX_DRAW_STR, RPT_("DeltaX: %s"), &tvec[0]); + ofs += BLI_snprintf_rlen(str, UI_MAX_DRAW_STR, IFACE_("DeltaX: %s"), &tvec[0]); if (t->flag & T_PROP_EDIT_ALL) { ofs += BLI_snprintf_rlen( - str + ofs, UI_MAX_DRAW_STR - ofs, RPT_(" Proportional size: %.2f"), t->prop_size); + str + ofs, UI_MAX_DRAW_STR - ofs, IFACE_(" Proportional size: %.2f"), t->prop_size); } } diff --git a/source/blender/editors/transform/transform_mode_tosphere.cc b/source/blender/editors/transform/transform_mode_tosphere.cc index 93d3fa847e0..e672a87268c 100644 --- a/source/blender/editors/transform/transform_mode_tosphere.cc +++ b/source/blender/editors/transform/transform_mode_tosphere.cc @@ -196,11 +196,11 @@ static void applyToSphere(TransInfo *t) outputNumInput(&(t->num), c, &t->scene->unit); - SNPRINTF(str, RPT_("To Sphere: %s %s"), c, t->proptext); + SNPRINTF(str, IFACE_("To Sphere: %s %s"), c, t->proptext); } else { /* default header print */ - SNPRINTF(str, RPT_("To Sphere: %.4f %s"), ratio, t->proptext); + SNPRINTF(str, IFACE_("To Sphere: %.4f %s"), ratio, t->proptext); } const ToSphereInfo *to_sphere_info = static_cast(t->custom.mode.data); diff --git a/source/blender/editors/transform/transform_mode_trackball.cc b/source/blender/editors/transform/transform_mode_trackball.cc index a6391261a2c..85dd1243cfd 100644 --- a/source/blender/editors/transform/transform_mode_trackball.cc +++ b/source/blender/editors/transform/transform_mode_trackball.cc @@ -145,7 +145,7 @@ static void applyTrackball(TransInfo *t) ofs += BLI_snprintf_rlen(str + ofs, sizeof(str) - ofs, - RPT_("Trackball: %s %s %s"), + IFACE_("Trackball: %s %s %s"), &c[0], &c[NUM_STR_REP_LEN], t->proptext); @@ -153,7 +153,7 @@ static void applyTrackball(TransInfo *t) else { ofs += BLI_snprintf_rlen(str + ofs, sizeof(str) - ofs, - RPT_("Trackball: %.2f %.2f %s"), + IFACE_("Trackball: %.2f %.2f %s"), RAD2DEGF(phi[0]), RAD2DEGF(phi[1]), t->proptext); @@ -161,7 +161,7 @@ static void applyTrackball(TransInfo *t) if (t->flag & T_PROP_EDIT_ALL) { ofs += BLI_snprintf_rlen( - str + ofs, sizeof(str) - ofs, RPT_(" Proportional size: %.2f"), t->prop_size); + str + ofs, sizeof(str) - ofs, IFACE_(" Proportional size: %.2f"), t->prop_size); } float axis_final[3], angle_final; diff --git a/source/blender/editors/transform/transform_mode_translate.cc b/source/blender/editors/transform/transform_mode_translate.cc index 72844a49a16..0ed9c54d0be 100644 --- a/source/blender/editors/transform/transform_mode_translate.cc +++ b/source/blender/editors/transform/transform_mode_translate.cc @@ -264,7 +264,7 @@ static void headerTranslation(TransInfo *t, const float vec[3], char str[UI_MAX_ ofs += BLI_snprintf_rlen(str + ofs, UI_MAX_DRAW_STR - ofs, "%s %s: %s ", - RPT_("Proportional Size"), + IFACE_("Proportional Size"), t->proptext, prop_str); } @@ -273,7 +273,7 @@ static void headerTranslation(TransInfo *t, const float vec[3], char str[UI_MAX_ short chainlen = t->settings->autoik_chainlen; if (chainlen) { ofs += BLI_snprintf_rlen( - str + ofs, UI_MAX_DRAW_STR - ofs, RPT_("Auto IK Length: %d"), chainlen); + str + ofs, UI_MAX_DRAW_STR - ofs, IFACE_("Auto IK Length: %d"), chainlen); ofs += BLI_strncpy_rlen(str + ofs, " ", UI_MAX_DRAW_STR - ofs); } } @@ -310,9 +310,10 @@ static void headerTranslation(TransInfo *t, const float vec[3], char str[UI_MAX_ SpaceNode *snode = (SpaceNode *)t->area->spacedata.first; if (U.uiflag & USER_NODE_AUTO_OFFSET) { const char *str_dir = (snode->insert_ofs_dir == SNODE_INSERTOFS_DIR_RIGHT) ? - RPT_("right") : - RPT_("left"); - ofs += BLI_snprintf_rlen(str, UI_MAX_DRAW_STR, RPT_("Auto-offset direction: %s"), str_dir); + IFACE_("right") : + IFACE_("left"); + ofs += BLI_snprintf_rlen( + str, UI_MAX_DRAW_STR, IFACE_("Auto-offset direction: %s"), str_dir); } } else { diff --git a/source/blender/editors/transform/transform_mode_vert_slide.cc b/source/blender/editors/transform/transform_mode_vert_slide.cc index cf01fc4ba58..ef8ebc556ab 100644 --- a/source/blender/editors/transform/transform_mode_vert_slide.cc +++ b/source/blender/editors/transform/transform_mode_vert_slide.cc @@ -580,7 +580,7 @@ static void applyVertSlide(TransInfo *t) t->values_final[0] = final; /* header string */ - ofs += BLI_strncpy_rlen(str + ofs, RPT_("Vertex Slide: "), sizeof(str) - ofs); + ofs += BLI_strncpy_rlen(str + ofs, IFACE_("Vertex Slide: "), sizeof(str) - ofs); if (hasNumInput(&t->num)) { char c[NUM_STR_REP_LEN]; outputNumInput(&(t->num), c, &t->scene->unit); @@ -590,13 +590,13 @@ static void applyVertSlide(TransInfo *t) ofs += BLI_snprintf_rlen(str + ofs, sizeof(str) - ofs, "%.4f ", final); } ofs += BLI_snprintf_rlen( - str + ofs, sizeof(str) - ofs, RPT_("(E)ven: %s, "), WM_bool_as_string(use_even)); + str + ofs, sizeof(str) - ofs, IFACE_("(E)ven: %s, "), WM_bool_as_string(use_even)); if (use_even) { ofs += BLI_snprintf_rlen( - str + ofs, sizeof(str) - ofs, RPT_("(F)lipped: %s, "), WM_bool_as_string(flipped)); + str + ofs, sizeof(str) - ofs, IFACE_("(F)lipped: %s, "), WM_bool_as_string(flipped)); } ofs += BLI_snprintf_rlen( - str + ofs, sizeof(str) - ofs, RPT_("Alt or (C)lamp: %s"), WM_bool_as_string(is_clamp)); + str + ofs, sizeof(str) - ofs, IFACE_("Alt or (C)lamp: %s"), WM_bool_as_string(is_clamp)); /* done with header string */ /* do stuff here */ diff --git a/source/blender/editors/util/ed_draw.cc b/source/blender/editors/util/ed_draw.cc index 3f6a5f884d9..3741ca4b122 100644 --- a/source/blender/editors/util/ed_draw.cc +++ b/source/blender/editors/util/ed_draw.cc @@ -483,29 +483,29 @@ void ED_slider_status_string_get(const tSlider *slider, if (slider->allow_overshoot_lower || slider->allow_overshoot_upper) { if (slider->overshoot) { - STRNCPY(overshoot_str, RPT_("[E] - Disable overshoot")); + STRNCPY(overshoot_str, IFACE_("[E] - Disable overshoot")); } else { - STRNCPY(overshoot_str, RPT_("[E] - Enable overshoot")); + STRNCPY(overshoot_str, IFACE_("[E] - Enable overshoot")); } } else { - STRNCPY(overshoot_str, RPT_("Overshoot disabled")); + STRNCPY(overshoot_str, IFACE_("Overshoot disabled")); } if (slider->precision) { - STRNCPY(precision_str, RPT_("[Shift] - Precision active")); + STRNCPY(precision_str, IFACE_("[Shift] - Precision active")); } else { - STRNCPY(precision_str, RPT_("Shift - Hold for precision")); + STRNCPY(precision_str, IFACE_("Shift - Hold for precision")); } if (slider->allow_increments) { if (slider->increments) { - STRNCPY(increments_str, RPT_(" | [Ctrl] - Increments active")); + STRNCPY(increments_str, IFACE_(" | [Ctrl] - Increments active")); } else { - STRNCPY(increments_str, RPT_(" | Ctrl - Hold for 10% increments")); + STRNCPY(increments_str, IFACE_(" | Ctrl - Hold for 10% increments")); } } else { diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.cc b/source/blender/editors/uvedit/uvedit_smart_stitch.cc index d411ece6f94..8b878022d36 100644 --- a/source/blender/editors/uvedit/uvedit_smart_stitch.cc +++ b/source/blender/editors/uvedit/uvedit_smart_stitch.cc @@ -271,7 +271,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 = RPT_( + const char *str = IFACE_( "Mode(TAB) %s, " "(S)nap %s, " "(M)idpoints %s, " @@ -285,7 +285,7 @@ static void stitch_update_header(StitchStateContainer *ssc, bContext *C) if (area) { SNPRINTF(msg, str, - ssc->mode == STITCH_VERT ? RPT_("Vertex") : RPT_("Edge"), + ssc->mode == STITCH_VERT ? IFACE_("Vertex") : IFACE_("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.cc b/source/blender/editors/uvedit/uvedit_unwrap_ops.cc index 48d5a0036bd..bbc1ae44d9b 100644 --- a/source/blender/editors/uvedit/uvedit_unwrap_ops.cc +++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.cc @@ -831,9 +831,9 @@ static void minimize_stretch_iteration(bContext *C, wmOperator *op, bool interac blender::geometry::uv_parametrizer_flush(ms->handle); if (area) { - SNPRINTF(str, RPT_("Minimize Stretch. Blend %.2f"), ms->blend); + SNPRINTF(str, IFACE_("Minimize Stretch. Blend %.2f"), ms->blend); ED_area_status_text(area, str); - ED_workspace_status_text(C, RPT_("Press + and -, or scroll wheel to set blending")); + ED_workspace_status_text(C, IFACE_("Press + and -, or scroll wheel to set blending")); } ms->lasttime = BLI_check_seconds_timer(); diff --git a/source/blender/windowmanager/intern/wm_event_system.cc b/source/blender/windowmanager/intern/wm_event_system.cc index 2848b72e4bf..fc37f78cd01 100644 --- a/source/blender/windowmanager/intern/wm_event_system.cc +++ b/source/blender/windowmanager/intern/wm_event_system.cc @@ -1999,8 +1999,8 @@ void WM_operator_name_call_ptr_with_depends_on_cursor(bContext *C, char header_text[UI_MAX_DRAW_STR]; SNPRINTF(header_text, "%s %s", - RPT_("Input pending "), - (drawstr && drawstr[0]) ? drawstr : CTX_RPT_(ot->translation_context, ot->name)); + IFACE_("Input pending "), + (drawstr && drawstr[0]) ? drawstr : CTX_IFACE_(ot->translation_context, ot->name)); if (area != nullptr) { ED_area_status_text(area, header_text); }