From 3bd41cf9bc42a62442469b70b500a4f389f6e8ef Mon Sep 17 00:00:00 2001 From: Damien Picard Date: Thu, 11 Jan 2024 19:49:03 +0100 Subject: [PATCH] I18n: Go over TIP_ and IFACE_ usages, change to RPT_ when relevant The previous commit introduced a new `RPT_()` macro to translate strings which are not tooltips or regular interface elements, but longer reports or statuses. This commit uses the new macro to translate many strings all over the UI. Most of it is a simple replace from `TIP_()` or `IFACE_()` to `RPT_()`, but there are some additional changes: - A few translations inside `BKE_report()` are removed altogether because they are already handled by the translation system. - Messages inside `UI_but_disable()` are no longer translated manually, but they are handled by a new regex in the translation system. Pull Request: https://projects.blender.org/blender/blender/pulls/116804 Pull Request: https://projects.blender.org/blender/blender/pulls/116804 --- intern/cycles/blender/addon/properties.py | 46 +++++++++----- scripts/modules/bl_i18n_utils/settings.py | 3 +- scripts/startup/bl_operators/anim.py | 10 +-- scripts/startup/bl_operators/assets.py | 4 +- scripts/startup/bl_operators/clip.py | 4 +- scripts/startup/bl_operators/file.py | 6 +- scripts/startup/bl_operators/image.py | 6 +- scripts/startup/bl_operators/mesh.py | 8 +-- scripts/startup/bl_operators/node.py | 7 ++- scripts/startup/bl_operators/object.py | 16 ++--- .../bl_operators/object_quick_effects.py | 4 +- scripts/startup/bl_operators/presets.py | 6 +- .../bl_operators/screen_play_rendered_anim.py | 8 +-- scripts/startup/bl_operators/sequencer.py | 4 +- scripts/startup/bl_operators/userpref.py | 28 ++++----- scripts/startup/bl_operators/wm.py | 19 +++--- scripts/startup/bl_ui/properties_data_mesh.py | 4 +- scripts/startup/bl_ui/properties_output.py | 6 +- scripts/startup/bl_ui/properties_particle.py | 7 ++- scripts/startup/bl_ui/properties_render.py | 3 +- scripts/startup/bl_ui/space_clip.py | 5 +- scripts/startup/bl_ui/space_sequencer.py | 3 +- scripts/startup/bl_ui/space_userpref.py | 16 ++--- scripts/startup/bl_ui/space_view3d.py | 32 +++++----- source/blender/animrig/intern/keyframing.cc | 4 +- .../blenkernel/intern/anim_visualization.cc | 2 +- source/blender/blenkernel/intern/curve.cc | 8 +-- .../intern/gpencil_modifier_legacy.cc | 2 +- source/blender/blenkernel/intern/modifier.cc | 8 +-- source/blender/blenkernel/intern/object.cc | 4 +- .../blender/blenkernel/intern/pointcache.cc | 18 +++--- source/blender/blenkernel/intern/report.cc | 28 ++++----- source/blender/blenkernel/intern/scene.cc | 2 +- source/blender/blenloader/intern/readfile.cc | 22 +++---- .../blenloader/intern/versioning_280.cc | 2 +- .../blenloader/intern/versioning_400.cc | 4 +- .../compositor/intern/COM_ExecutionGroup.cc | 2 +- .../intern/COM_FullFrameExecutionModel.cc | 4 +- .../intern/COM_TiledExecutionModel.cc | 6 +- .../draw/engines/eevee/eevee_engine.cc | 4 +- .../draw/engines/eevee/eevee_lightcache.cc | 16 ++--- .../animation/anim_channels_defines.cc | 2 +- .../editors/animation/anim_ipo_utils.cc | 4 +- .../blender/editors/animation/anim_markers.cc | 6 +- .../blender/editors/animation/keyframing.cc | 2 +- source/blender/editors/armature/pose_lib_2.cc | 6 +- source/blender/editors/armature/pose_slide.cc | 32 +++++----- .../blender/editors/asset/intern/asset_ops.cc | 4 +- .../intern/asset_shelf_catalog_selector.cc | 2 +- .../editors/gpencil_legacy/annotate_paint.cc | 12 ++-- .../editors/gpencil_legacy/gpencil_fill.cc | 6 +- .../gpencil_legacy/gpencil_interpolate.cc | 4 +- .../editors/gpencil_legacy/gpencil_paint.cc | 12 ++-- .../gpencil_legacy/gpencil_primitive.cc | 12 ++-- .../gpencil_legacy/gpencil_sculpt_paint.cc | 2 +- .../editors/gpencil_legacy/gpencil_uv.cc | 2 +- .../gpencil_legacy/gpencil_vertex_paint.cc | 2 +- .../gpencil_legacy/gpencil_weight_paint.cc | 8 +-- .../eyedroppers/eyedropper_gpencil_color.cc | 2 +- source/blender/editors/interface/interface.cc | 6 +- .../editors/interface/interface_layout.cc | 2 +- .../interface/interface_region_menu_popup.cc | 6 +- .../editors/interface/interface_templates.cc | 22 +++---- source/blender/editors/mesh/editmesh_bevel.cc | 2 +- .../blender/editors/mesh/editmesh_bisect.cc | 4 +- source/blender/editors/mesh/editmesh_inset.cc | 2 +- source/blender/editors/mesh/editmesh_knife.cc | 2 +- .../blender/editors/mesh/editmesh_loopcut.cc | 4 +- source/blender/editors/mesh/editmesh_tools.cc | 2 +- .../blender/editors/object/object_remesh.cc | 2 +- .../blender/editors/render/render_internal.cc | 12 ++-- .../editors/screen/screen_user_menu.cc | 10 +-- .../sculpt_paint/curves_sculpt_brush.cc | 14 ++--- .../sculpt_paint/curves_sculpt_slide.cc | 5 +- .../editors/sculpt_paint/paint_image.cc | 6 +- .../editors/sculpt_paint/paint_image_proj.cc | 8 +-- .../editors/sculpt_paint/sculpt_detail.cc | 4 +- .../editors/sculpt_paint/sculpt_dyntopo.cc | 8 +-- .../sculpt_paint/sculpt_filter_mesh.cc | 4 +- .../editors/sculpt_paint/sculpt_ops.cc | 12 ++-- .../editors/space_buttons/buttons_texture.cc | 4 +- .../editors/space_clip/clip_buttons.cc | 22 +++---- source/blender/editors/space_clip/clip_ops.cc | 2 +- .../editors/space_clip/tracking_ops.cc | 2 +- .../space_file/asset_catalog_tree_view.cc | 10 +-- .../blender/editors/space_file/file_draw.cc | 8 +-- .../editors/space_graph/graph_buttons.cc | 42 ++++++------- .../blender/editors/space_graph/graph_edit.cc | 2 +- .../editors/space_graph/graph_slider_ops.cc | 8 +-- .../editors/space_image/image_buttons.cc | 24 +++---- .../blender/editors/space_image/image_ops.cc | 2 +- .../blender/editors/space_info/info_stats.cc | 63 +++++++++++-------- .../blender/editors/space_node/node_draw.cc | 2 +- .../editors/space_node/node_templates.cc | 2 +- .../editors/space_outliner/outliner_draw.cc | 2 +- .../editors/space_outliner/outliner_edit.cc | 6 +- .../tree/tree_element_id_library.cc | 4 +- .../tree/tree_element_overrides.cc | 16 ++--- .../editors/space_sequencer/sequencer_edit.cc | 4 +- source/blender/editors/space_text/text_ops.cc | 4 +- source/blender/editors/transform/transform.cc | 20 +++--- .../transform/transform_constraints.cc | 16 ++--- .../editors/transform/transform_mode.cc | 18 +++--- .../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_edge_slide.cc | 8 +-- .../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 | 4 +- .../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 | 10 +-- .../transform/transform_mode_vert_slide.cc | 8 +-- .../transform/transform_orientations.cc | 16 ++--- source/blender/editors/util/ed_draw.cc | 14 ++--- source/blender/editors/util/ed_util.cc | 16 ++--- source/blender/editors/util/numinput.cc | 4 +- .../editors/uvedit/uvedit_smart_stitch.cc | 4 +- .../editors/uvedit/uvedit_unwrap_ops.cc | 4 +- .../blender_interface/FRS_freestyle.cpp | 6 +- .../intern/MOD_gpencil_legacy_lineart.cc | 14 ++--- .../intern/MOD_gpencil_legacy_outline.cc | 2 +- .../intern/MOD_gpencil_legacy_ui_common.cc | 4 +- .../io/alembic/intern/abc_reader_camera.cc | 4 +- .../io/alembic/intern/abc_reader_curves.cc | 6 +- .../io/alembic/intern/abc_reader_mesh.cc | 18 +++--- .../io/alembic/intern/abc_reader_nurbs.cc | 4 +- .../io/alembic/intern/abc_reader_points.cc | 6 +- .../io/alembic/intern/abc_reader_transform.cc | 4 +- .../blender/io/alembic/intern/alembic_capi.cc | 2 +- .../blender/io/usd/intern/usd_capi_import.cc | 2 +- .../blender/makesrna/intern/rna_main_api.cc | 8 +-- .../blender/makesrna/intern/rna_particle.cc | 2 +- source/blender/makesrna/intern/rna_ui.cc | 2 +- .../makesrna/intern/rna_wm_gizmo_api.cc | 2 +- source/blender/modifiers/intern/MOD_cloth.cc | 2 +- .../blender/modifiers/intern/MOD_collision.cc | 2 +- .../blender/modifiers/intern/MOD_decimate.cc | 2 +- .../modifiers/intern/MOD_dynamicpaint.cc | 2 +- source/blender/modifiers/intern/MOD_fluid.cc | 2 +- .../modifiers/intern/MOD_meshcache_mdd.cc | 18 +++--- .../modifiers/intern/MOD_meshcache_pc2.cc | 14 ++--- .../blender/modifiers/intern/MOD_multires.cc | 2 +- source/blender/modifiers/intern/MOD_nodes.cc | 16 ++--- source/blender/modifiers/intern/MOD_ocean.cc | 2 +- .../modifiers/intern/MOD_particlesystem.cc | 2 +- source/blender/modifiers/intern/MOD_remesh.cc | 2 +- .../blender/modifiers/intern/MOD_softbody.cc | 2 +- .../blender/modifiers/intern/MOD_subsurf.cc | 2 +- .../blender/modifiers/intern/MOD_surface.cc | 2 +- .../blender/modifiers/intern/MOD_ui_common.cc | 16 ++--- .../nodes/composite/node_composite_util.cc | 2 +- .../nodes/node_composite_cryptomatte.cc | 4 +- .../composite/nodes/node_composite_denoise.cc | 4 +- .../composite/nodes/node_composite_image.cc | 4 +- .../nodes/function/node_function_util.cc | 2 +- .../nodes/geometry/node_geometry_util.cc | 2 +- .../nodes/geometry/nodes/node_geo_bake.cc | 6 +- source/blender/nodes/intern/node_common.cc | 4 +- .../nodes/intern/node_geometry_exec.cc | 12 ++-- .../blender/nodes/shader/node_shader_util.cc | 4 +- .../nodes/shader/nodes/node_shader_tex_sky.cc | 2 +- .../shader/nodes/node_shader_vertex_color.cc | 2 +- .../nodes/texture/node_texture_util.cc | 2 +- source/blender/render/intern/pipeline.cc | 4 +- .../blender/shader_fx/intern/FX_ui_common.cc | 4 +- .../windowmanager/intern/wm_event_system.cc | 6 +- .../blender/windowmanager/intern/wm_files.cc | 16 ++--- .../windowmanager/intern/wm_operators.cc | 2 +- .../blender/windowmanager/intern/wm_window.cc | 19 +++--- 185 files changed, 704 insertions(+), 676 deletions(-) diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py index f7c52514d74..184835e73bb 100644 --- a/intern/cycles/blender/addon/properties.py +++ b/intern/cycles/blender/addon/properties.py @@ -16,7 +16,7 @@ from bpy.props import ( ) from bpy.app.translations import ( contexts as i18n_contexts, - pgettext_iface as iface_ + pgettext_rpt as rpt_ ) from math import pi @@ -1602,50 +1602,62 @@ class CyclesPreferences(bpy.types.AddonPreferences): if not found_device: col = box.column(align=True) - col.label(text="No compatible GPUs found for Cycles", icon='INFO') + col.label(text=rpt_("No compatible GPUs found for Cycles"), icon='INFO', translate=False) if device_type == 'CUDA': compute_capability = "3.0" - col.label(text=iface_("Requires NVIDIA GPU with compute capability %s") % compute_capability, + col.label(text=rpt_("Requires NVIDIA GPU with compute capability %s") % compute_capability, icon='BLANK1', translate=False) elif device_type == 'OPTIX': compute_capability = "5.0" driver_version = "470" - col.label(text=iface_("Requires NVIDIA GPU with compute capability %s") % compute_capability, + col.label(text=rpt_("Requires NVIDIA GPU with compute capability %s") % compute_capability, icon='BLANK1', translate=False) - col.label(text=iface_("and NVIDIA driver version %s or newer") % driver_version, + col.label(text=rpt_("and NVIDIA driver version %s or newer") % driver_version, icon='BLANK1', translate=False) elif device_type == 'HIP': import sys if sys.platform[:3] == "win": driver_version = "21.Q4" - col.label(text="Requires AMD GPU with Vega or RDNA architecture", icon='BLANK1') - col.label(text=iface_("and AMD Radeon Pro %s driver or newer") % driver_version, + col.label( + text=rpt_("Requires AMD GPU with Vega or RDNA architecture"), + icon='BLANK1', + translate=False) + col.label(text=rpt_("and AMD Radeon Pro %s driver or newer") % driver_version, icon='BLANK1', translate=False) elif sys.platform.startswith("linux"): driver_version = "22.10" - col.label(text="Requires AMD GPU with Vega or RDNA architecture", icon='BLANK1') - col.label(text=iface_("and AMD driver version %s or newer") % driver_version, icon='BLANK1', + col.label( + text=rpt_("Requires AMD GPU with Vega or RDNA architecture"), + icon='BLANK1', + translate=False) + col.label(text=rpt_("and AMD driver version %s or newer") % driver_version, icon='BLANK1', translate=False) elif device_type == 'ONEAPI': import sys if sys.platform.startswith("win"): driver_version = "XX.X.101.4824" - col.label(text="Requires Intel GPU with Xe-HPG architecture", icon='BLANK1') - col.label(text=iface_("and Windows driver version %s or newer") % driver_version, + col.label(text=rpt_("Requires Intel GPU with Xe-HPG architecture"), icon='BLANK1', translate=False) + col.label(text=rpt_("and Windows driver version %s or newer") % driver_version, icon='BLANK1', translate=False) elif sys.platform.startswith("linux"): driver_version = "XX.XX.25812.14" - col.label(text="Requires Intel GPU with Xe-HPG architecture and", icon='BLANK1') - col.label(text=" - intel-level-zero-gpu or intel-compute-runtime version", icon='BLANK1') - col.label(text=iface_(" %s or newer") % driver_version, icon='BLANK1', translate=False) - col.label(text=" - oneAPI Level-Zero Loader", icon='BLANK1') + col.label( + text=rpt_("Requires Intel GPU with Xe-HPG architecture and"), + icon='BLANK1', + translate=False) + col.label( + text=rpt_(" - intel-level-zero-gpu or intel-compute-runtime version"), + icon='BLANK1', + translate=False) + col.label(text=rpt_(" %s or newer") % driver_version, icon='BLANK1', translate=False) + col.label(text=rpt_(" - oneAPI Level-Zero Loader"), icon='BLANK1', translate=False) elif device_type == 'METAL': silicon_mac_version = "12.2" amd_mac_version = "12.3" - col.label(text=iface_("Requires Apple Silicon with macOS %s or newer") % silicon_mac_version, + col.label(text=rpt_("Requires Apple Silicon with macOS %s or newer") % silicon_mac_version, icon='BLANK1', translate=False) - col.label(text=iface_("or AMD with macOS %s or newer") % amd_mac_version, icon='BLANK1', + col.label(text=rpt_("or AMD with macOS %s or newer") % amd_mac_version, icon='BLANK1', translate=False) return diff --git a/scripts/modules/bl_i18n_utils/settings.py b/scripts/modules/bl_i18n_utils/settings.py index 1f0515c3e3e..3e5f3c98205 100644 --- a/scripts/modules/bl_i18n_utils/settings.py +++ b/scripts/modules/bl_i18n_utils/settings.py @@ -250,7 +250,8 @@ PYGETTEXT_KEYWORDS = (() + tuple(("{}\\((?:[^\"',]+,){{1,2}}\\s*" + _msg_re + r"\s*(?:\)|,)").format(it) for it in ("BKE_report", "BKE_reportf", "BKE_reports_prepend", "BKE_reports_prependf", - "CTX_wm_operator_poll_msg_set", "WM_report", "WM_reportf")) + + "CTX_wm_operator_poll_msg_set", "WM_report", "WM_reportf", + "UI_but_disable")) + # bmesh operator errors tuple(("{}\\((?:[^\"',]+,){{3}}\\s*" + _msg_re + r"\s*\)").format(it) diff --git a/scripts/startup/bl_operators/anim.py b/scripts/startup/bl_operators/anim.py index 9846b8e2010..054a88ced37 100644 --- a/scripts/startup/bl_operators/anim.py +++ b/scripts/startup/bl_operators/anim.py @@ -14,7 +14,7 @@ from bpy.props import ( StringProperty, ) from bpy.app.translations import ( - pgettext_tip as tip_, + pgettext_rpt as rpt_, contexts as i18n_contexts, ) @@ -114,7 +114,7 @@ class ANIM_OT_keying_set_export(Operator): if not found: self.report( {'WARN'}, - tip_("Could not find material or light using Shader Node Tree - %s") % + rpt_("Could not find material or light using Shader Node Tree - %s") % (ksp.id)) elif ksp.id.bl_rna.identifier.startswith("CompositorNodeTree"): # Find compositor node-tree using this node tree. @@ -123,7 +123,7 @@ class ANIM_OT_keying_set_export(Operator): id_bpy_path = "bpy.data.scenes[\"%s\"].node_tree" % (scene.name) break else: - self.report({'WARN'}, tip_("Could not find scene using Compositor Node Tree - %s") % (ksp.id)) + self.report({'WARN'}, rpt_("Could not find scene using Compositor Node Tree - %s") % (ksp.id)) elif ksp.id.bl_rna.name == "Key": # "keys" conflicts with a Python keyword, hence the simple solution won't work id_bpy_path = "bpy.data.shape_keys[\"%s\"]" % (ksp.id.name) @@ -358,7 +358,7 @@ class ClearUselessActions(Operator): action.user_clear() removed += 1 - self.report({'INFO'}, tip_("Removed %d empty and/or fake-user only Actions") + self.report({'INFO'}, rpt_("Removed %d empty and/or fake-user only Actions") % removed) return {'FINISHED'} @@ -443,7 +443,7 @@ class UpdateAnimatedTransformConstraint(Operator): print(log) text = bpy.data.texts.new("UpdateAnimatedTransformConstraint Report") text.from_string(log) - self.report({'INFO'}, tip_("Complete report available on '%s' text datablock") % text.name) + self.report({'INFO'}, rpt_("Complete report available on '%s' text datablock") % text.name) return {'FINISHED'} diff --git a/scripts/startup/bl_operators/assets.py b/scripts/startup/bl_operators/assets.py index e840dcd5d6b..d0b0c898d5e 100644 --- a/scripts/startup/bl_operators/assets.py +++ b/scripts/startup/bl_operators/assets.py @@ -8,7 +8,7 @@ import bpy from bpy.types import Operator from bpy.app.translations import ( pgettext_data as data_, - pgettext_tip as tip_, + pgettext_rpt as rpt_, ) @@ -125,7 +125,7 @@ class ASSET_OT_open_containing_blend_file(Operator): return {'RUNNING_MODAL'} if returncode: - self.report({'WARNING'}, tip_("Blender sub-process exited with error code %d") % returncode) + self.report({'WARNING'}, rpt_("Blender sub-process exited with error code %d") % returncode) if bpy.ops.asset.library_refresh.poll(): bpy.ops.asset.library_refresh() diff --git a/scripts/startup/bl_operators/clip.py b/scripts/startup/bl_operators/clip.py index de346087afa..99aa2b8043c 100644 --- a/scripts/startup/bl_operators/clip.py +++ b/scripts/startup/bl_operators/clip.py @@ -9,7 +9,7 @@ from mathutils import ( Vector, Matrix, ) -from bpy.app.translations import pgettext_tip as tip_ +from bpy.app.translations import pgettext_rpt as rpt_ def CLIP_spaces_walk(context, all_screens, tarea, tspace, callback, *args): @@ -197,7 +197,7 @@ class CLIP_OT_filter_tracks(Operator): def execute(self, context): num_tracks = self._filter_values(context, self.track_threshold) - self.report({'INFO'}, tip_("Identified %d problematic tracks") % num_tracks) + self.report({'INFO'}, rpt_("Identified %d problematic tracks") % num_tracks) return {'FINISHED'} diff --git a/scripts/startup/bl_operators/file.py b/scripts/startup/bl_operators/file.py index 27a0eda3e02..db1348a5a28 100644 --- a/scripts/startup/bl_operators/file.py +++ b/scripts/startup/bl_operators/file.py @@ -12,7 +12,7 @@ from bpy.props import ( CollectionProperty, StringProperty, ) -from bpy.app.translations import pgettext_tip as tip_ +from bpy.app.translations import pgettext_rpt as rpt_ # ########## Datablock previews... ########## @@ -126,7 +126,7 @@ class WM_OT_previews_batch_generate(Operator): if not self.use_backups: cmd.append("--no_backups") if subprocess.call(cmd): - self.report({'ERROR'}, tip_("Previews generation process failed for file '%s'!") % blen_path) + self.report({'ERROR'}, rpt_("Previews generation process failed for file '%s'!") % blen_path) context.window_manager.progress_end() return {'CANCELLED'} context.window_manager.progress_update(i + 1) @@ -237,7 +237,7 @@ class WM_OT_previews_batch_clear(Operator): if not self.use_backups: cmd.append("--no_backups") if subprocess.call(cmd): - self.report({'ERROR'}, tip_("Previews clear process failed for file '%s'!") % blen_path) + self.report({'ERROR'}, rpt_("Previews clear process failed for file '%s'!") % blen_path) context.window_manager.progress_end() return {'CANCELLED'} context.window_manager.progress_update(i + 1) diff --git a/scripts/startup/bl_operators/image.py b/scripts/startup/bl_operators/image.py index b200c3db778..8cb06d7fbb9 100644 --- a/scripts/startup/bl_operators/image.py +++ b/scripts/startup/bl_operators/image.py @@ -5,7 +5,7 @@ import bpy from bpy.types import Operator from bpy.props import StringProperty -from bpy.app.translations import pgettext_tip as tip_ +from bpy.app.translations import pgettext_rpt as rpt_ class EditExternally(Operator): @@ -55,7 +55,7 @@ class EditExternally(Operator): if not os.path.exists(filepath) or not os.path.isfile(filepath): self.report({'ERROR'}, - tip_("Image path %r not found, image may be packed or " + rpt_("Image path %r not found, image may be packed or " "unsaved") % filepath) return {'CANCELLED'} @@ -182,7 +182,7 @@ class ProjectApply(Operator): image_name = ProjectEdit._proj_hack[0] # TODO, deal with this nicer image = bpy.data.images.get((image_name, None)) if image is None: - self.report({'ERROR'}, tip_("Could not find image '%s'") % image_name) + self.report({'ERROR'}, rpt_("Could not find image '%s'") % image_name) return {'CANCELLED'} image.reload() diff --git a/scripts/startup/bl_operators/mesh.py b/scripts/startup/bl_operators/mesh.py index 2f7a8d96237..e4110f04eb7 100644 --- a/scripts/startup/bl_operators/mesh.py +++ b/scripts/startup/bl_operators/mesh.py @@ -9,7 +9,7 @@ from bpy.props import ( EnumProperty, IntProperty, ) -from bpy.app.translations import pgettext_tip as tip_ +from bpy.app.translations import pgettext_rpt as rpt_ class MeshMirrorUV(Operator): @@ -169,18 +169,18 @@ class MeshMirrorUV(Operator): if total_duplicates and total_no_active_UV: self.report({'WARNING'}, - tip_("%d mesh(es) with no active UV layer, " + rpt_("%d mesh(es) with no active UV layer, " "%d duplicates found in %d mesh(es), mirror may be incomplete") % (total_no_active_UV, total_duplicates, meshes_with_duplicates)) elif total_no_active_UV: self.report({'WARNING'}, - tip_("%d mesh(es) with no active UV layer") + rpt_("%d mesh(es) with no active UV layer") % (total_no_active_UV,)) elif total_duplicates: self.report({'WARNING'}, - tip_("%d duplicates found in %d mesh(es), mirror may be incomplete") + rpt_("%d duplicates found in %d mesh(es), mirror may be incomplete") % (total_duplicates, meshes_with_duplicates)) return {'FINISHED'} diff --git a/scripts/startup/bl_operators/node.py b/scripts/startup/bl_operators/node.py index f9b4a5e0800..c9d22b55aa4 100644 --- a/scripts/startup/bl_operators/node.py +++ b/scripts/startup/bl_operators/node.py @@ -20,7 +20,10 @@ from mathutils import ( Vector, ) -from bpy.app.translations import pgettext_tip as tip_ +from bpy.app.translations import ( + pgettext_tip as tip_, + pgettext_rpt as rpt_, +) class NodeSetting(PropertyGroup): @@ -94,7 +97,7 @@ class NodeAddOperator: except AttributeError as ex: self.report( {'ERROR_INVALID_INPUT'}, - tip_("Node has no attribute %s") % setting.name) + rpt_("Node has no attribute %s") % setting.name) print(str(ex)) # Continue despite invalid attribute diff --git a/scripts/startup/bl_operators/object.py b/scripts/startup/bl_operators/object.py index 1d02d0b653c..c965f262883 100644 --- a/scripts/startup/bl_operators/object.py +++ b/scripts/startup/bl_operators/object.py @@ -10,7 +10,7 @@ from bpy.props import ( IntProperty, StringProperty, ) -from bpy.app.translations import pgettext_tip as tip_ +from bpy.app.translations import pgettext_rpt as rpt_ class SelectPattern(Operator): @@ -367,12 +367,12 @@ class ShapeTransfer(Operator): for ob_other in objects: if ob_other.type != 'MESH': self.report({'WARNING'}, - tip_("Skipping '%s', not a mesh") % ob_other.name) + rpt_("Skipping '%s', not a mesh") % ob_other.name) continue me_other = ob_other.data if len(me_other.vertices) != len(me.vertices): self.report({'WARNING'}, - tip_("Skipping '%s', vertex count differs") % ob_other.name) + rpt_("Skipping '%s', vertex count differs") % ob_other.name) continue target_normals = me_nos(me_other.vertices) @@ -511,7 +511,7 @@ class JoinUVs(Operator): if not mesh.uv_layers: self.report({'WARNING'}, - tip_("Object: %s, Mesh: '%s' has no UVs") + rpt_("Object: %s, Mesh: '%s' has no UVs") % (obj.name, mesh.name)) else: nbr_loops = len(mesh.loops) @@ -535,7 +535,7 @@ class JoinUVs(Operator): if len(mesh_other.loops) != nbr_loops: self.report({'WARNING'}, - tip_("Object: %s, Mesh: " + rpt_("Object: %s, Mesh: " "'%s' has %d loops (for %d faces)," " expected %d\n") % (obj_other.name, @@ -552,7 +552,7 @@ class JoinUVs(Operator): uv_other = mesh_other.uv_layers.active if not uv_other: self.report({'ERROR'}, - tip_("Could not add " + rpt_("Could not add " "a new UV map to object " "'%s' (Mesh '%s')\n") % (obj_other.name, @@ -795,7 +795,7 @@ class TransformsToDeltasAnim(Operator): adt = obj.animation_data if (adt is None) or (adt.action is None): self.report({'WARNING'}, - tip_("No animation data to convert on object: %r") + rpt_("No animation data to convert on object: %r") % obj.name) continue @@ -822,7 +822,7 @@ class TransformsToDeltasAnim(Operator): if fcu.array_index in existingFCurves[dpath]: # conflict self.report({'ERROR'}, - tip_("Object '%r' already has '%r' F-Curve(s). " + rpt_("Object '%r' already has '%r' F-Curve(s). " "Remove these before trying again") % (obj.name, dpath)) return {'CANCELLED'} diff --git a/scripts/startup/bl_operators/object_quick_effects.py b/scripts/startup/bl_operators/object_quick_effects.py index 924034cb965..487765aee20 100644 --- a/scripts/startup/bl_operators/object_quick_effects.py +++ b/scripts/startup/bl_operators/object_quick_effects.py @@ -12,7 +12,7 @@ from bpy.props import ( IntProperty, ) from bpy.app.translations import ( - pgettext_tip as tip_, + pgettext_rpt as rpt_, pgettext_data as data_, ) @@ -282,7 +282,7 @@ class QuickExplode(ObjectModeOperator, Operator): for obj in mesh_objects: if obj.particle_systems: self.report({'ERROR'}, - tip_("Object %r already has a " + rpt_("Object %r already has a " "particle system") % obj.name) return {'CANCELLED'} diff --git a/scripts/startup/bl_operators/presets.py b/scripts/startup/bl_operators/presets.py index e6bf691c45d..1f588367dc7 100644 --- a/scripts/startup/bl_operators/presets.py +++ b/scripts/startup/bl_operators/presets.py @@ -13,7 +13,7 @@ from bpy.props import ( StringProperty, ) from bpy.app.translations import ( - pgettext_tip as tip_, + pgettext_rpt as rpt_, pgettext_data as data_, ) @@ -191,7 +191,7 @@ class AddPresetBase: else: os.remove(filepath) except BaseException as ex: - self.report({'ERROR'}, tip_("Unable to remove preset: %r") % ex) + self.report({'ERROR'}, rpt_("Unable to remove preset: %r") % ex) import traceback traceback.print_exc() return {'CANCELLED'} @@ -241,7 +241,7 @@ class ExecutePreset(Operator): ext = splitext(filepath)[1].lower() if ext not in {".py", ".xml"}: - self.report({'ERROR'}, tip_("Unknown file type: %r") % ext) + self.report({'ERROR'}, rpt_("Unknown file type: %r") % ext) return {'CANCELLED'} if hasattr(preset_class, "reset_cb"): diff --git a/scripts/startup/bl_operators/screen_play_rendered_anim.py b/scripts/startup/bl_operators/screen_play_rendered_anim.py index 65a35a01061..d870997f8af 100644 --- a/scripts/startup/bl_operators/screen_play_rendered_anim.py +++ b/scripts/startup/bl_operators/screen_play_rendered_anim.py @@ -6,7 +6,7 @@ import bpy from bpy.types import Operator -from bpy.app.translations import pgettext_tip as tip_ +from bpy.app.translations import pgettext_rpt as rpt_ def guess_player_path(preset): @@ -119,7 +119,7 @@ class PlayRenderedAnim(Operator): file = rd.frame_path(frame=scene.frame_start, preview=scene.use_preview_range, view=view_suffix) file = bpy.path.abspath(file) # expand '//' if not os.path.exists(file): - err_msg = tip_("File %r not found") % file + err_msg = rpt_("File %r not found") % file self.report({'WARNING'}, err_msg) path_valid = False @@ -127,7 +127,7 @@ class PlayRenderedAnim(Operator): if scene.use_preview_range and not path_valid: file = rd.frame_path(frame=scene.frame_start, preview=False, view=view_suffix) file = bpy.path.abspath(file) # expand '//' - err_msg = tip_("File %r not found") % file + err_msg = rpt_("File %r not found") % file if not os.path.exists(file): self.report({'WARNING'}, err_msg) @@ -195,7 +195,7 @@ class PlayRenderedAnim(Operator): try: subprocess.Popen(cmd) except BaseException as ex: - err_msg = tip_("Couldn't run external animation player with command %r\n%s") % (cmd, ex) + err_msg = rpt_("Couldn't run external animation player with command %r\n%s") % (cmd, ex) self.report( {'ERROR'}, err_msg, diff --git a/scripts/startup/bl_operators/sequencer.py b/scripts/startup/bl_operators/sequencer.py index 893d8359042..63c7f943457 100644 --- a/scripts/startup/bl_operators/sequencer.py +++ b/scripts/startup/bl_operators/sequencer.py @@ -10,7 +10,7 @@ from bpy.props import ( FloatProperty, IntProperty, ) -from bpy.app.translations import pgettext_tip as tip_ +from bpy.app.translations import pgettext_rpt as rpt_ class SequencerCrossfadeSounds(Operator): @@ -236,7 +236,7 @@ class SequencerFadesAdd(Operator): sequence.invalidate_cache('COMPOSITE') sequence_string = "sequence" if len(faded_sequences) == 1 else "sequences" - self.report({'INFO'}, tip_("Added fade animation to %d %s") % (len(faded_sequences), sequence_string)) + self.report({'INFO'}, rpt_("Added fade animation to %d %s") % (len(faded_sequences), sequence_string)) return {'FINISHED'} def calculate_fade_duration(self, context, sequence): diff --git a/scripts/startup/bl_operators/userpref.py b/scripts/startup/bl_operators/userpref.py index 2c22fce602c..1bfcd716ef2 100644 --- a/scripts/startup/bl_operators/userpref.py +++ b/scripts/startup/bl_operators/userpref.py @@ -16,7 +16,7 @@ from bpy.props import ( ) from bpy.app.translations import ( pgettext_iface as iface_, - pgettext_tip as tip_, + pgettext_tip as rpt_, ) @@ -229,7 +229,7 @@ class PREFERENCES_OT_keyconfig_import(Operator): else: shutil.move(self.filepath, path) except BaseException as ex: - self.report({'ERROR'}, tip_("Installing keymap failed: %s") % ex) + self.report({'ERROR'}, rpt_("Installing keymap failed: %s") % ex) return {'CANCELLED'} # sneaky way to check we're actually running the code. @@ -455,7 +455,7 @@ class PREFERENCES_OT_addon_enable(Operator): if info_ver > bpy.app.version: self.report( {'WARNING'}, - tip_("This script was written Blender " + rpt_("This script was written Blender " "version %d.%d.%d and might not " "function (correctly), " "though it is enabled") @@ -543,7 +543,7 @@ class PREFERENCES_OT_theme_install(Operator): if not self.overwrite: if os.path.exists(path_dest): - self.report({'WARNING'}, tip_("File already installed to %r\n") % path_dest) + self.report({'WARNING'}, rpt_("File already installed to %r\n") % path_dest) return {'CANCELLED'} try: @@ -657,7 +657,7 @@ class PREFERENCES_OT_addon_install(Operator): pyfile_dir = os.path.dirname(pyfile) for addon_path in addon_utils.paths(): if os.path.samefile(pyfile_dir, addon_path): - self.report({'ERROR'}, tip_("Source file is in the add-on search path: %r") % addon_path) + self.report({'ERROR'}, rpt_("Source file is in the add-on search path: %r") % addon_path) return {'CANCELLED'} del addon_path del pyfile_dir @@ -681,7 +681,7 @@ class PREFERENCES_OT_addon_install(Operator): for f in file_to_extract_root: path_dest = os.path.join(path_addons, os.path.basename(f)) if os.path.exists(path_dest): - self.report({'WARNING'}, tip_("File already installed to %r\n") % path_dest) + self.report({'WARNING'}, rpt_("File already installed to %r\n") % path_dest) return {'CANCELLED'} try: # extract the file to "addons" @@ -696,7 +696,7 @@ class PREFERENCES_OT_addon_install(Operator): if self.overwrite: _module_filesystem_remove(path_addons, os.path.basename(pyfile)) elif os.path.exists(path_dest): - self.report({'WARNING'}, tip_("File already installed to %r\n") % path_dest) + self.report({'WARNING'}, rpt_("File already installed to %r\n") % path_dest) return {'CANCELLED'} # if not compressed file just copy into the addon path @@ -731,7 +731,7 @@ class PREFERENCES_OT_addon_install(Operator): # print message msg = ( - tip_("Modules Installed (%s) from %r into %r") % + rpt_("Modules Installed (%s) from %r into %r") % (", ".join(sorted(addons_new)), pyfile, path_addons) ) print(msg) @@ -776,7 +776,7 @@ class PREFERENCES_OT_addon_remove(Operator): path, isdir = PREFERENCES_OT_addon_remove.path_from_addon(self.module) if path is None: - self.report({'WARNING'}, tip_("Add-on path %r could not be found") % path) + self.report({'WARNING'}, rpt_("Add-on path %r could not be found") % path) return {'CANCELLED'} # in case its enabled @@ -926,7 +926,7 @@ class PREFERENCES_OT_app_template_install(Operator): for f in file_to_extract_root: path_dest = os.path.join(path_app_templates, os.path.basename(f)) if os.path.exists(path_dest): - self.report({'WARNING'}, tip_("File already installed to %r\n") % path_dest) + self.report({'WARNING'}, rpt_("File already installed to %r\n") % path_dest) return {'CANCELLED'} try: # extract the file to "bl_app_templates_user" @@ -937,7 +937,7 @@ class PREFERENCES_OT_app_template_install(Operator): else: # Only support installing zip-files. - self.report({'WARNING'}, tip_("Expected a zip-file %r\n") % filepath) + self.report({'WARNING'}, rpt_("Expected a zip-file %r\n") % filepath) return {'CANCELLED'} app_templates_new = set(os.listdir(path_app_templates)) - app_templates_old @@ -947,7 +947,7 @@ class PREFERENCES_OT_app_template_install(Operator): # print message msg = ( - tip_("Template Installed (%s) from %r into %r") % + rpt_("Template Installed (%s) from %r into %r") % (", ".join(sorted(app_templates_new)), filepath, path_app_templates) ) print(msg) @@ -1011,7 +1011,7 @@ class PREFERENCES_OT_studiolight_install(Operator): # print message msg = ( - tip_("StudioLight Installed %r into %r") % + rpt_("StudioLight Installed %r into %r") % (", ".join(e.name for e in self.files), path_studiolights) ) print(msg) @@ -1069,7 +1069,7 @@ class PREFERENCES_OT_studiolight_new(Operator): # print message msg = ( - tip_("StudioLight Installed %r into %r") % + rpt_("StudioLight Installed %r into %r") % (self.filename, str(path_studiolights)) ) print(msg) diff --git a/scripts/startup/bl_operators/wm.py b/scripts/startup/bl_operators/wm.py index 2371dac1a45..d252efe1614 100644 --- a/scripts/startup/bl_operators/wm.py +++ b/scripts/startup/bl_operators/wm.py @@ -23,6 +23,7 @@ from bpy.props import ( from bpy.app.translations import ( pgettext_iface as iface_, pgettext_tip as tip_, + pgettext_rpt as rpt_, contexts as i18n_contexts, ) @@ -778,7 +779,7 @@ class WM_OT_operator_pie_enum(Operator): try: op_rna = op.get_rna_type() except KeyError: - self.report({'ERROR'}, tip_("Operator not found: bpy.ops.%s") % data_path) + self.report({'ERROR'}, rpt_("Operator not found: bpy.ops.%s") % data_path) return {'CANCELLED'} def draw_cb(self, context): @@ -878,7 +879,7 @@ class WM_OT_context_collection_boolean_set(Operator): elif value_orig is False: pass else: - self.report({'WARNING'}, tip_("Non boolean value found: %s[ ].%s") % + self.report({'WARNING'}, rpt_("Non boolean value found: %s[ ].%s") % (data_path_iter, data_path_item)) return {'CANCELLED'} @@ -981,7 +982,7 @@ class WM_OT_context_modal_mouse(Operator): (item, ) = self._values.keys() header_text = header_text % eval("item.%s" % self.data_path_item) else: - header_text = (self.header_text % delta) + tip_(" (delta)") + header_text = (self.header_text % delta) + rpt_(" (delta)") context.area.header_text_set(header_text) elif 'LEFTMOUSE' == event_type: @@ -1001,7 +1002,7 @@ class WM_OT_context_modal_mouse(Operator): self._values_store(context) if not self._values: - self.report({'WARNING'}, tip_("Nothing to operate on: %s[ ].%s") % + self.report({'WARNING'}, rpt_("Nothing to operate on: %s[ ].%s") % (self.data_path_iter, self.data_path_item)) return {'CANCELLED'} @@ -1168,7 +1169,7 @@ class WM_OT_path_open(Operator): filepath = os.path.normpath(filepath) if not os.path.exists(filepath): - self.report({'ERROR'}, tip_("File '%s' not found") % filepath) + self.report({'ERROR'}, rpt_("File '%s' not found") % filepath) return {'CANCELLED'} if sys.platform[:3] == "win": @@ -1239,7 +1240,7 @@ def _wm_doc_get_id(doc_id, *, do_url=True, url_prefix="", report=None): if rna_class is None: if report is not None: - report({'ERROR'}, tip_("Type \"%s\" can not be found") % class_name) + report({'ERROR'}, rpt_("Type \"%s\" can not be found") % class_name) return None # Detect if this is a inherited member and use that name instead. @@ -1334,7 +1335,7 @@ class WM_OT_doc_view_manual(Operator): if url is None: self.report( {'WARNING'}, - tip_("No reference available %r, " + rpt_("No reference available %r, " "Update info in 'rna_manual_reference.py' " "or callback to bpy.utils.manual_map()") % self.doc_id @@ -2317,7 +2318,7 @@ class WM_OT_tool_set_by_id(Operator): tool_settings.workspace_tool_type = 'FALLBACK' return {'FINISHED'} else: - self.report({'WARNING'}, tip_("Tool %r not found for space %r") % (self.name, space_type)) + self.report({'WARNING'}, rpt_("Tool %r not found for space %r") % (self.name, space_type)) return {'CANCELLED'} @@ -3188,7 +3189,7 @@ class WM_OT_batch_rename(Operator): change_len += 1 total_len += 1 - self.report({'INFO'}, tip_("Renamed %d of %d %s") % (change_len, total_len, descr)) + self.report({'INFO'}, rpt_("Renamed %d of %d %s") % (change_len, total_len, descr)) return {'FINISHED'} diff --git a/scripts/startup/bl_ui/properties_data_mesh.py b/scripts/startup/bl_ui/properties_data_mesh.py index 73cb93af67d..d8a9488bc4e 100644 --- a/scripts/startup/bl_ui/properties_data_mesh.py +++ b/scripts/startup/bl_ui/properties_data_mesh.py @@ -8,7 +8,7 @@ from rna_prop_ui import PropertyPanel from bpy.app.translations import ( pgettext_iface as iface_, - pgettext_tip as tip_, + pgettext_tip as rpt_, ) @@ -581,7 +581,7 @@ def draw_attribute_warnings(context, layout): if not colliding_names: return - layout.label(text=tip_("Name collisions: ") + ", ".join(set(colliding_names)), + layout.label(text=rpt_("Name collisions: ") + ", ".join(set(colliding_names)), icon='ERROR', translate=False) diff --git a/scripts/startup/bl_ui/properties_output.py b/scripts/startup/bl_ui/properties_output.py index c3bbcf41ec1..21891585f03 100644 --- a/scripts/startup/bl_ui/properties_output.py +++ b/scripts/startup/bl_ui/properties_output.py @@ -8,7 +8,7 @@ from bl_ui.utils import PresetPanel from bpy.app.translations import ( contexts as i18n_contexts, - pgettext_tip as tip_, + pgettext_iface as iface_, ) @@ -75,10 +75,10 @@ class RENDER_PT_format(RenderOutputButtonsPanel, Panel): custom_framerate = (fps_rate not in {23.98, 24, 25, 29.97, 30, 50, 59.94, 60, 120, 240}) if custom_framerate is True: - fps_label_text = tip_("Custom (%.4g fps)") % fps_rate + fps_label_text = iface_("Custom (%.4g fps)") % fps_rate show_framerate = True else: - fps_label_text = tip_("%.4g fps") % fps_rate + fps_label_text = iface_("%.4g fps") % fps_rate show_framerate = (preset_label == "Custom") RENDER_PT_format._frame_rate_args_prev = args diff --git a/scripts/startup/bl_ui/properties_particle.py b/scripts/startup/bl_ui/properties_particle.py index 6d0ca4b5110..92dfd092f7b 100644 --- a/scripts/startup/bl_ui/properties_particle.py +++ b/scripts/startup/bl_ui/properties_particle.py @@ -8,6 +8,7 @@ from rna_prop_ui import PropertyPanel from bpy.app.translations import ( contexts as i18n_contexts, pgettext_iface as iface_, + pgettext_rpt as rpt_, ) from bl_ui.utils import PresetPanel @@ -221,7 +222,7 @@ class PARTICLE_PT_context_particles(ParticleButtonsPanel, Panel): row.template_ID(psys, "settings", new="particle.new") if part.is_fluid: - layout.label(text=iface_("%d fluid particles for this frame") % part.count, translate=False) + layout.label(text=rpt_("%d fluid particles for this frame") % part.count, translate=False) return row = layout.row() @@ -432,10 +433,10 @@ class PARTICLE_PT_hair_dynamics(ParticleButtonsPanel, Panel): label = "ERROR" icon = 'ERROR' box.label(text=label, icon=icon) - box.label(text=iface_("Iterations: %d .. %d (avg. %d)") % + box.label(text=rpt_("Iterations: %d .. %d (avg. %d)") % (result.min_iterations, result.max_iterations, result.avg_iterations), translate=False) - box.label(text=iface_("Error: %.5f .. %.5f (avg. %.5f)") + box.label(text=rpt_("Error: %.5f .. %.5f (avg. %.5f)") % (result.min_error, result.max_error, result.avg_error), translate=False) diff --git a/scripts/startup/bl_ui/properties_render.py b/scripts/startup/bl_ui/properties_render.py index 48a65bf8fe0..440da92e96d 100644 --- a/scripts/startup/bl_ui/properties_render.py +++ b/scripts/startup/bl_ui/properties_render.py @@ -10,6 +10,7 @@ from bl_ui.space_view3d import ( VIEW3D_PT_shading_options, ) from bl_ui.utils import PresetPanel +from bpy.app.translations import pgettext_rpt as rpt_ class RenderButtonsPanel: @@ -829,7 +830,7 @@ class RENDER_PT_eevee_indirect_lighting(RenderButtonsPanel, Panel): cache_info = scene.eevee.gi_cache_info if cache_info: - col.label(text=cache_info) + col.label(text=rpt_(cache_info), translate=False) col.prop(props, "gi_auto_bake") diff --git a/scripts/startup/bl_ui/space_clip.py b/scripts/startup/bl_ui/space_clip.py index 6b8b430243c..a2d5f7e29c9 100644 --- a/scripts/startup/bl_ui/space_clip.py +++ b/scripts/startup/bl_ui/space_clip.py @@ -6,6 +6,7 @@ import bpy from bpy.types import Panel, Header, Menu, UIList from bpy.app.translations import ( pgettext_iface as iface_, + pgettext_rpt as rpt_, contexts as i18n_contexts, ) from bl_ui.utils import PresetPanel @@ -170,7 +171,7 @@ class CLIP_HT_header(Header): r = active_object.reconstruction if r.is_valid and sc.view == 'CLIP': - layout.label(text=iface_("Solve error: %.2f px") % + layout.label(text=rpt_("Solve error: %.2f px") % (r.average_error), translate=False) @@ -769,7 +770,7 @@ class CLIP_PT_track(CLIP_PT_tracking_panel, Panel): layout.prop(act_track, "weight_stab") if act_track.has_bundle: - label_text = iface_("Average Error: %.2f px") % (act_track.average_error) + label_text = rpt_("Average Error: %.2f px") % (act_track.average_error) layout.label(text=label_text, translate=False) layout.use_property_split = False diff --git a/scripts/startup/bl_ui/space_sequencer.py b/scripts/startup/bl_ui/space_sequencer.py index 633c9a4004f..fb0aacf74c3 100644 --- a/scripts/startup/bl_ui/space_sequencer.py +++ b/scripts/startup/bl_ui/space_sequencer.py @@ -11,6 +11,7 @@ from bpy.types import ( from bpy.app.translations import ( contexts as i18n_contexts, pgettext_iface as iface_, + pgettext_rpt as rpt_, ) from bl_ui.properties_grease_pencil_common import ( AnnotationDataPanel, @@ -1905,7 +1906,7 @@ class SEQUENCER_PT_mask(SequencerButtonsPanel, Panel): if mask: sta = mask.frame_start end = mask.frame_end - layout.label(text=iface_("Original frame range: %d-%d (%d)") % (sta, end, end - sta + 1), translate=False) + layout.label(text=rpt_("Original frame range: %d-%d (%d)") % (sta, end, end - sta + 1), translate=False) class SEQUENCER_PT_time(SequencerButtonsPanel, Panel): diff --git a/scripts/startup/bl_ui/space_userpref.py b/scripts/startup/bl_ui/space_userpref.py index f845cde10f2..cc5c118c4a2 100644 --- a/scripts/startup/bl_ui/space_userpref.py +++ b/scripts/startup/bl_ui/space_userpref.py @@ -11,7 +11,7 @@ from bpy.types import ( from bpy.app.translations import ( contexts as i18n_contexts, pgettext_iface as iface_, - pgettext_tip as tip_, + pgettext_rpt as rpt_, ) from bl_ui.utils import PresetPanel @@ -2240,11 +2240,11 @@ class USERPREF_PT_addons(AddOnPanel, Panel): if info["description"]: split = colsub.row().split(factor=0.15) split.label(text="Description:") - split.label(text=tip_(info["description"])) + split.label(text=iface_(info["description"])) if info["location"]: split = colsub.row().split(factor=0.15) split.label(text="Location:") - split.label(text=tip_(info["location"])) + split.label(text=iface_(info["location"])) if mod: split = colsub.row().split(factor=0.15) split.label(text="File:") @@ -2260,7 +2260,7 @@ class USERPREF_PT_addons(AddOnPanel, Panel): if info["warning"]: split = colsub.row().split(factor=0.15) split.label(text="Warning:") - split.label(text=" " + info["warning"], icon='ERROR') + split.label(text=" " + iface_(info["warning"]), icon='ERROR') user_addon = USERPREF_PT_addons.is_user_addon(mod, user_addon_paths) if info["doc_url"] or info.get("tracker_url"): @@ -2371,7 +2371,7 @@ class StudioLightPanelMixin: layout.label(text=self.get_error_message()) def get_error_message(self): - return tip_("No custom %s configured") % self.bl_label + return rpt_("No custom %s configured") % self.bl_label def draw_studio_light(self, layout, studio_light): box = layout.box() @@ -2399,7 +2399,7 @@ class USERPREF_PT_studiolight_matcaps(StudioLightPanel, StudioLightPanelMixin, P layout.separator() def get_error_message(self): - return tip_("No custom MatCaps configured") + return rpt_("No custom MatCaps configured") class USERPREF_PT_studiolight_world(StudioLightPanel, StudioLightPanelMixin, Panel): @@ -2412,7 +2412,7 @@ class USERPREF_PT_studiolight_world(StudioLightPanel, StudioLightPanelMixin, Pan layout.separator() def get_error_message(self): - return tip_("No custom HDRIs configured") + return rpt_("No custom HDRIs configured") class USERPREF_PT_studiolight_lights(StudioLightPanel, StudioLightPanelMixin, Panel): @@ -2427,7 +2427,7 @@ class USERPREF_PT_studiolight_lights(StudioLightPanel, StudioLightPanelMixin, Pa layout.separator() def get_error_message(self): - return tip_("No custom Studio Lights configured") + return rpt_("No custom Studio Lights configured") class USERPREF_PT_studiolight_light_editor(StudioLightPanel, Panel): diff --git a/scripts/startup/bl_ui/space_view3d.py b/scripts/startup/bl_ui/space_view3d.py index 31b18250be4..e452eb92eef 100644 --- a/scripts/startup/bl_ui/space_view3d.py +++ b/scripts/startup/bl_ui/space_view3d.py @@ -24,7 +24,7 @@ from bl_ui.space_toolsystem_common import ( ) from bpy.app.translations import ( pgettext_iface as iface_, - pgettext_tip as tip_, + pgettext_rpt as rpt_, contexts as i18n_contexts, ) @@ -2865,16 +2865,16 @@ class VIEW3D_MT_object_context_menu(Menu): props.data_path_item = "data.lens" props.input_scale = 0.1 if obj.data.lens_unit == 'MILLIMETERS': - props.header_text = tip_("Camera Focal Length: %.1fmm") + props.header_text = rpt_("Camera Focal Length: %.1fmm") else: - props.header_text = tip_("Camera Focal Length: %.1f\u00B0") + props.header_text = rpt_("Camera Focal Length: %.1f\u00B0") else: props = layout.operator("wm.context_modal_mouse", text="Camera Lens Scale") props.data_path_iter = "selected_editable_objects" props.data_path_item = "data.ortho_scale" props.input_scale = 0.01 - props.header_text = tip_("Camera Lens Scale: %.3f") + props.header_text = rpt_("Camera Lens Scale: %.3f") if not obj.data.dof.focus_object: if view and view.camera == obj and view.region_3d.view_perspective == 'CAMERA': @@ -2884,7 +2884,7 @@ class VIEW3D_MT_object_context_menu(Menu): props.data_path_iter = "selected_editable_objects" props.data_path_item = "data.dof.focus_distance" props.input_scale = 0.02 - props.header_text = tip_("Focus Distance: %.3f") + props.header_text = rpt_("Focus Distance: %.3f") layout.separator() @@ -2895,13 +2895,13 @@ class VIEW3D_MT_object_context_menu(Menu): props.data_path_iter = "selected_editable_objects" props.data_path_item = "data.extrude" props.input_scale = 0.01 - props.header_text = tip_("Extrude: %.3f") + props.header_text = rpt_("Extrude: %.3f") props = layout.operator("wm.context_modal_mouse", text="Adjust Offset") props.data_path_iter = "selected_editable_objects" props.data_path_item = "data.offset" props.input_scale = 0.01 - props.header_text = tip_("Offset: %.3f") + props.header_text = rpt_("Offset: %.3f") layout.separator() @@ -2912,7 +2912,7 @@ class VIEW3D_MT_object_context_menu(Menu): props.data_path_iter = "selected_editable_objects" props.data_path_item = "empty_display_size" props.input_scale = 0.01 - props.header_text = tip_("Empty Display Size: %.3f") + props.header_text = rpt_("Empty Display Size: %.3f") layout.separator() @@ -2930,36 +2930,36 @@ class VIEW3D_MT_object_context_menu(Menu): props.data_path_iter = "selected_editable_objects" props.data_path_item = "data.energy" props.input_scale = 1.0 - props.header_text = tip_("Light Power: %.3f") + props.header_text = rpt_("Light Power: %.3f") if light.type == 'AREA': if light.shape in {'RECTANGLE', 'ELLIPSE'}: props = layout.operator("wm.context_modal_mouse", text="Adjust Area Light X Size") props.data_path_iter = "selected_editable_objects" props.data_path_item = "data.size" - props.header_text = tip_("Light Size X: %.3f") + props.header_text = rpt_("Light Size X: %.3f") props = layout.operator("wm.context_modal_mouse", text="Adjust Area Light Y Size") props.data_path_iter = "selected_editable_objects" props.data_path_item = "data.size_y" - props.header_text = tip_("Light Size Y: %.3f") + props.header_text = rpt_("Light Size Y: %.3f") else: props = layout.operator("wm.context_modal_mouse", text="Adjust Area Light Size") props.data_path_iter = "selected_editable_objects" props.data_path_item = "data.size" - props.header_text = tip_("Light Size: %.3f") + props.header_text = rpt_("Light Size: %.3f") elif light.type in {'SPOT', 'POINT'}: props = layout.operator("wm.context_modal_mouse", text="Adjust Light Radius") props.data_path_iter = "selected_editable_objects" props.data_path_item = "data.shadow_soft_size" - props.header_text = tip_("Light Radius: %.3f") + props.header_text = rpt_("Light Radius: %.3f") elif light.type == 'SUN': props = layout.operator("wm.context_modal_mouse", text="Adjust Sun Light Angle") props.data_path_iter = "selected_editable_objects" props.data_path_item = "data.angle" - props.header_text = tip_("Light Angle: %.3f") + props.header_text = rpt_("Light Angle: %.3f") if light.type == 'SPOT': layout.separator() @@ -2968,13 +2968,13 @@ class VIEW3D_MT_object_context_menu(Menu): props.data_path_iter = "selected_editable_objects" props.data_path_item = "data.spot_size" props.input_scale = 0.01 - props.header_text = tip_("Spot Size: %.2f") + props.header_text = rpt_("Spot Size: %.2f") props = layout.operator("wm.context_modal_mouse", text="Adjust Spot Light Blend") props.data_path_iter = "selected_editable_objects" props.data_path_item = "data.spot_blend" props.input_scale = -0.01 - props.header_text = tip_("Spot Blend: %.2f") + props.header_text = rpt_("Spot Blend: %.2f") layout.separator() diff --git a/source/blender/animrig/intern/keyframing.cc b/source/blender/animrig/intern/keyframing.cc index e7b8389895c..7560be080d2 100644 --- a/source/blender/animrig/intern/keyframing.cc +++ b/source/blender/animrig/intern/keyframing.cc @@ -375,7 +375,7 @@ bool insert_keyframe_direct(ReportList *reports, PointerRNA tmp_ptr; if (RNA_path_resolve_property(&ptr, fcu->rna_path, &tmp_ptr, &prop) == false) { - const char *idname = (ptr.owner_id) ? ptr.owner_id->name : TIP_(""); + const char *idname = (ptr.owner_id) ? ptr.owner_id->name : RPT_(""); BKE_reportf(reports, RPT_ERROR, @@ -529,7 +529,7 @@ int insert_keyframe(Main *bmain, reports, RPT_ERROR, "Could not insert keyframe, as RNA path is invalid for the given ID (ID = %s, path = %s)", - (id) ? id->name : TIP_(""), + (id) ? id->name : RPT_(""), rna_path); return 0; } diff --git a/source/blender/blenkernel/intern/anim_visualization.cc b/source/blender/blenkernel/intern/anim_visualization.cc index d91c266e242..28f2a1ef9ce 100644 --- a/source/blender/blenkernel/intern/anim_visualization.cc +++ b/source/blender/blenkernel/intern/anim_visualization.cc @@ -137,7 +137,7 @@ bMotionPath *animviz_verify_motionpaths(ReportList *reports, (pchan) ? pchan->name : ob->id.name, avs->path_sf, avs->path_ef, - (avs->path_sf == avs->path_ef) ? TIP_(", cannot have single-frame paths") : ""); + (avs->path_sf == avs->path_ef) ? RPT_(", cannot have single-frame paths") : ""); return nullptr; } diff --git a/source/blender/blenkernel/intern/curve.cc b/source/blender/blenkernel/intern/curve.cc index 434b95d7a48..4a47226e0ce 100644 --- a/source/blender/blenkernel/intern/curve.cc +++ b/source/blender/blenkernel/intern/curve.cc @@ -4761,16 +4761,16 @@ bool BKE_nurb_valid_message(const int pnts, message_dst[0] = 0; return false; } - msg_template = TIP_("At least two points required"); + msg_template = RPT_("At least two points required"); break; case NURBSValidationStatus::MorePointsThanOrderRequired: - msg_template = TIP_("Must have more control points than Order"); + msg_template = RPT_("Must have more control points than Order"); break; case NURBSValidationStatus::MoreRowsForBezierRequired: - msg_template = TIP_("%d more %s row(s) needed for Bezier"); + msg_template = RPT_("%d more %s row(s) needed for Bezier"); break; case NURBSValidationStatus::MorePointsForBezierRequired: - msg_template = TIP_("%d more point(s) needed for Bezier"); + msg_template = RPT_("%d more point(s) needed for Bezier"); break; } diff --git a/source/blender/blenkernel/intern/gpencil_modifier_legacy.cc b/source/blender/blenkernel/intern/gpencil_modifier_legacy.cc index fd2c7eb9800..bdacece4ea9 100644 --- a/source/blender/blenkernel/intern/gpencil_modifier_legacy.cc +++ b/source/blender/blenkernel/intern/gpencil_modifier_legacy.cc @@ -542,7 +542,7 @@ void BKE_gpencil_modifier_set_error(GpencilModifierData *md, const char *format, { char buffer[512]; va_list ap; - const char *format_tip = TIP_(format); + const char *format_tip = RPT_(format); va_start(ap, format); vsnprintf(buffer, sizeof(buffer), format_tip, ap); diff --git a/source/blender/blenkernel/intern/modifier.cc b/source/blender/blenkernel/intern/modifier.cc index a76839cd5cf..e7abff6286d 100644 --- a/source/blender/blenkernel/intern/modifier.cc +++ b/source/blender/blenkernel/intern/modifier.cc @@ -419,7 +419,7 @@ void BKE_modifier_set_error(const Object *ob, ModifierData *md, const char *_for { char buffer[512]; va_list ap; - const char *format = TIP_(_format); + const char *format = RPT_(_format); va_start(ap, _format); vsnprintf(buffer, sizeof(buffer), format, ap); @@ -446,7 +446,7 @@ void BKE_modifier_set_warning(const Object *ob, ModifierData *md, const char *_f { char buffer[512]; va_list ap; - const char *format = TIP_(_format); + const char *format = RPT_(_format); va_start(ap, _format); vsnprintf(buffer, sizeof(buffer), format, ap); @@ -1263,7 +1263,7 @@ void BKE_modifier_blend_read_data(BlendDataReader *reader, ListBase *lb, Object BLO_reportf_wrap( BLO_read_data_reports(reader), RPT_WARNING, - TIP_("Possible data loss when saving this file! %s modifier is deprecated (Object: %s)"), + RPT_("Possible data loss when saving this file! %s modifier is deprecated (Object: %s)"), md->name, ob->id.name + 2); md = modifier_replace_with_fluid(reader, ob, lb, md); @@ -1273,7 +1273,7 @@ void BKE_modifier_blend_read_data(BlendDataReader *reader, ListBase *lb, Object BLO_reportf_wrap( BLO_read_data_reports(reader), RPT_WARNING, - TIP_("Possible data loss when saving this file! %s modifier is deprecated (Object: %s)"), + RPT_("Possible data loss when saving this file! %s modifier is deprecated (Object: %s)"), md->name, ob->id.name + 2); md = modifier_replace_with_fluid(reader, ob, lb, md); diff --git a/source/blender/blenkernel/intern/object.cc b/source/blender/blenkernel/intern/object.cc index e32348c211f..66b9d089961 100644 --- a/source/blender/blenkernel/intern/object.cc +++ b/source/blender/blenkernel/intern/object.cc @@ -915,12 +915,12 @@ static void object_blend_read_after_liblink(BlendLibReader *reader, ID *id) if (ob->id.lib) { BLO_reportf_wrap(reports, RPT_INFO, - TIP_("Can't find object data of %s lib %s"), + RPT_("Can't find object data of %s lib %s"), ob->id.name + 2, ob->id.lib->filepath); } else { - BLO_reportf_wrap(reports, RPT_INFO, TIP_("Object %s lost data"), ob->id.name + 2); + BLO_reportf_wrap(reports, RPT_INFO, RPT_("Object %s lost data"), ob->id.name + 2); } reports->count.missing_obdata++; } diff --git a/source/blender/blenkernel/intern/pointcache.cc b/source/blender/blenkernel/intern/pointcache.cc index 336a206c0a9..47eb3adf72a 100644 --- a/source/blender/blenkernel/intern/pointcache.cc +++ b/source/blender/blenkernel/intern/pointcache.cc @@ -3691,13 +3691,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) { - SNPRINTF(cache->info, TIP_("%i frames found!"), totframes); + SNPRINTF(cache->info, RPT_("%i frames found!"), totframes); } else if (totframes && cache->totpoint) { - SNPRINTF(cache->info, TIP_("%i points found!"), cache->totpoint); + SNPRINTF(cache->info, RPT_("%i points found!"), cache->totpoint); } else { - STRNCPY(cache->info, TIP_("No valid data to read!")); + STRNCPY(cache->info, RPT_("No valid data to read!")); } return; } @@ -3707,10 +3707,10 @@ void BKE_ptcache_update_info(PTCacheID *pid) int totpoint = pid->totpoint(pid->calldata, 0); if (cache->totpoint > totpoint) { - SNPRINTF(mem_info, TIP_("%i cells + High Resolution cached"), totpoint); + SNPRINTF(mem_info, RPT_("%i cells + High Resolution cached"), totpoint); } else { - SNPRINTF(mem_info, TIP_("%i cells cached"), totpoint); + SNPRINTF(mem_info, RPT_("%i cells cached"), totpoint); } } else { @@ -3722,7 +3722,7 @@ void BKE_ptcache_update_info(PTCacheID *pid) } } - SNPRINTF(mem_info, TIP_("%i frames on disk"), totframes); + SNPRINTF(mem_info, RPT_("%i frames on disk"), totframes); } } else { @@ -3750,14 +3750,14 @@ void BKE_ptcache_update_info(PTCacheID *pid) BLI_str_format_int_grouped(formatted_tot, totframes); BLI_str_format_byte_unit(formatted_mem, bytes, false); - SNPRINTF(mem_info, TIP_("%s frames in memory (%s)"), formatted_tot, formatted_mem); + SNPRINTF(mem_info, RPT_("%s frames in memory (%s)"), formatted_tot, formatted_mem); } if (cache->flag & PTCACHE_OUTDATED) { - SNPRINTF(cache->info, TIP_("%s, cache is outdated!"), mem_info); + SNPRINTF(cache->info, RPT_("%s, cache is outdated!"), mem_info); } else if (cache->flag & PTCACHE_FRAMES_SKIPPED) { - SNPRINTF(cache->info, TIP_("%s, not exact since frame %i"), mem_info, cache->last_exact); + SNPRINTF(cache->info, RPT_("%s, not exact since frame %i"), mem_info, cache->last_exact); } else { SNPRINTF(cache->info, "%s.", mem_info); diff --git a/source/blender/blenkernel/intern/report.cc b/source/blender/blenkernel/intern/report.cc index a47aafff9d0..ae709f0fd56 100644 --- a/source/blender/blenkernel/intern/report.cc +++ b/source/blender/blenkernel/intern/report.cc @@ -29,25 +29,25 @@ const char *BKE_report_type_str(eReportType type) { switch (type) { case RPT_DEBUG: - return TIP_("Debug"); + return RPT_("Debug"); case RPT_INFO: - return TIP_("Info"); + return RPT_("Info"); case RPT_OPERATOR: - return TIP_("Operator"); + return RPT_("Operator"); case RPT_PROPERTY: - return TIP_("Property"); + return RPT_("Property"); case RPT_WARNING: - return TIP_("Warning"); + return RPT_("Warning"); case RPT_ERROR: - return TIP_("Error"); + return RPT_("Error"); case RPT_ERROR_INVALID_INPUT: - return TIP_("Invalid Input Error"); + return RPT_("Invalid Input Error"); case RPT_ERROR_INVALID_CONTEXT: - return TIP_("Invalid Context Error"); + return RPT_("Invalid Context Error"); case RPT_ERROR_OUT_OF_MEMORY: - return TIP_("Out Of Memory Error"); + return RPT_("Out Of Memory Error"); default: - return TIP_("Undefined Type"); + return RPT_("Undefined Type"); } } @@ -126,7 +126,7 @@ void BKE_report(ReportList *reports, eReportType type, const char *_message) { Report *report; int len; - const char *message = TIP_(_message); + const char *message = RPT_(_message); if (BKE_reports_print_test(reports, type)) { printf("%s: %s\n", BKE_report_type_str(type), message); @@ -154,7 +154,7 @@ void BKE_reportf(ReportList *reports, eReportType type, const char *_format, ... { Report *report; va_list args; - const char *format = TIP_(_format); + const char *format = RPT_(_format); if (BKE_reports_print_test(reports, type)) { printf("%s: ", BKE_report_type_str(type)); @@ -207,7 +207,7 @@ void BKE_reports_prepend(ReportList *reports, const char *prepend) if (!reports || !reports->list.first) { return; } - reports_prepend_impl(reports, TIP_(prepend)); + reports_prepend_impl(reports, RPT_(prepend)); } void BKE_reports_prependf(ReportList *reports, const char *prepend_format, ...) @@ -217,7 +217,7 @@ void BKE_reports_prependf(ReportList *reports, const char *prepend_format, ...) } va_list args; va_start(args, prepend_format); - char *prepend = BLI_vsprintfN(TIP_(prepend_format), args); + char *prepend = BLI_vsprintfN(RPT_(prepend_format), args); va_end(args); reports_prepend_impl(reports, prepend); diff --git a/source/blender/blenkernel/intern/scene.cc b/source/blender/blenkernel/intern/scene.cc index 033a4c4b1da..2b679640e78 100644 --- a/source/blender/blenkernel/intern/scene.cc +++ b/source/blender/blenkernel/intern/scene.cc @@ -1543,7 +1543,7 @@ static void scene_blend_read_after_liblink(BlendLibReader *reader, ID *id) if (base_legacy->object == nullptr) { BLO_reportf_wrap(BLO_read_lib_reports(reader), RPT_WARNING, - TIP_("LIB: object lost from scene: '%s'"), + RPT_("LIB: object lost from scene: '%s'"), sce->id.name + 2); BLI_remlink(&sce->base, base_legacy); if (base_legacy == sce->basact) { diff --git a/source/blender/blenloader/intern/readfile.cc b/source/blender/blenloader/intern/readfile.cc index ca21eb72529..fc4981d88f0 100644 --- a/source/blender/blenloader/intern/readfile.cc +++ b/source/blender/blenloader/intern/readfile.cc @@ -1113,7 +1113,7 @@ static bool is_minversion_older_than_blender(FileData *fd, ReportList *reports) } BKE_reportf(reports, RPT_ERROR, - TIP_("The file was saved by a newer version, open it with Blender %s or later"), + "The file was saved by a newer version, open it with Blender %s or later", min_reader_ver_str); CLOG_WARN(&LOG, "%s: File saved by a newer version of Blender (%s), Blender %s or later is " @@ -1172,7 +1172,7 @@ static FileData *blo_filedata_from_file_descriptor(const char *filepath, RPT_WARNING, "Unable to read '%s': %s", filepath, - errno ? strerror(errno) : TIP_("insufficient content")); + errno ? strerror(errno) : RPT_("insufficient content")); if (rawfile) { rawfile->close(rawfile); } @@ -1232,7 +1232,7 @@ static FileData *blo_filedata_from_file_open(const char *filepath, BlendFileRead RPT_WARNING, "Unable to open '%s': %s", filepath, - errno ? strerror(errno) : TIP_("unknown error reading file")); + errno ? strerror(errno) : RPT_("unknown error reading file")); return nullptr; } return blo_filedata_from_file_descriptor(filepath, reports, file); @@ -1272,7 +1272,7 @@ FileData *blo_filedata_from_memory(const void *mem, int memsize, BlendFileReadRe { if (!mem || memsize < SIZEOFBLENDERHEADER) { BKE_report( - reports->reports, RPT_WARNING, (mem) ? TIP_("Unable to read") : TIP_("Unable to open")); + reports->reports, RPT_WARNING, (mem) ? RPT_("Unable to read") : RPT_("Unable to open")); return nullptr; } @@ -2275,7 +2275,7 @@ static void direct_link_library(FileData *fd, Library *lib, Main *main) if (BLI_path_cmp(newmain->curlib->filepath_abs, lib->filepath_abs) == 0) { BLO_reportf_wrap(fd->reports, RPT_WARNING, - TIP_("Library '%s', '%s' had multiple instances, save and reload!"), + RPT_("Library '%s', '%s' had multiple instances, save and reload!"), lib->filepath, lib->filepath_abs); @@ -4032,7 +4032,7 @@ static void expand_doit_library(void *fdhandle, Main *mainvar, void *old) BLO_reportf_wrap(fd->reports, RPT_WARNING, - TIP_("LIB: Data refers to main .blend file: '%s' from %s"), + RPT_("LIB: Data refers to main .blend file: '%s' from %s"), idname, mainvar->curlib->filepath_abs); return; @@ -4546,7 +4546,7 @@ static void read_library_linked_id( if (!is_valid) { BLO_reportf_wrap(basefd->reports, RPT_ERROR, - TIP_("LIB: %s: '%s' is directly linked from '%s' (parent '%s'), but is a " + RPT_("LIB: %s: '%s' is directly linked from '%s' (parent '%s'), but is a " "non-linkable data type"), BKE_idtype_idcode_to_name(GS(id->name)), id->name + 2, @@ -4565,7 +4565,7 @@ static void read_library_linked_id( else { BLO_reportf_wrap(basefd->reports, RPT_INFO, - TIP_("LIB: %s: '%s' missing from '%s', parent '%s'"), + RPT_("LIB: %s: '%s' missing from '%s', parent '%s'"), BKE_idtype_idcode_to_name(GS(id->name)), id->name + 2, mainvar->curlib->filepath_abs, @@ -4679,7 +4679,7 @@ static FileData *read_library_file_data(FileData *basefd, BLO_reportf_wrap(basefd->reports, RPT_INFO, - TIP_("Read packed library: '%s', parent '%s'"), + RPT_("Read packed library: '%s', parent '%s'"), mainptr->curlib->filepath, library_parent_filepath(mainptr->curlib)); fd = blo_filedata_from_memory(pf->data, pf->size, basefd->reports); @@ -4691,7 +4691,7 @@ static FileData *read_library_file_data(FileData *basefd, /* Read file on disk. */ BLO_reportf_wrap(basefd->reports, RPT_INFO, - TIP_("Read library: '%s', '%s', parent '%s'"), + RPT_("Read library: '%s', '%s', parent '%s'"), mainptr->curlib->filepath_abs, mainptr->curlib->filepath, library_parent_filepath(mainptr->curlib)); @@ -4732,7 +4732,7 @@ static FileData *read_library_file_data(FileData *basefd, if (fd == nullptr) { BLO_reportf_wrap( - basefd->reports, RPT_INFO, TIP_("Cannot find lib '%s'"), mainptr->curlib->filepath_abs); + basefd->reports, RPT_INFO, RPT_("Cannot find lib '%s'"), mainptr->curlib->filepath_abs); basefd->reports->count.missing_libraries++; } diff --git a/source/blender/blenloader/intern/versioning_280.cc b/source/blender/blenloader/intern/versioning_280.cc index c8400205640..d04d1eafa5e 100644 --- a/source/blender/blenloader/intern/versioning_280.cc +++ b/source/blender/blenloader/intern/versioning_280.cc @@ -2961,7 +2961,7 @@ void do_versions_after_linking_280(FileData *fd, Main *bmain) if (ob->type != OB_EMPTY && ob->instance_collection != nullptr) { BLO_reportf_wrap(fd->reports, RPT_INFO, - TIP_("Non-Empty object '%s' cannot duplicate collection '%s' " + RPT_("Non-Empty object '%s' cannot duplicate collection '%s' " "anymore in Blender 2.80 and later, removed instancing"), ob->id.name + 2, ob->instance_collection->id.name + 2); diff --git a/source/blender/blenloader/intern/versioning_400.cc b/source/blender/blenloader/intern/versioning_400.cc index bb86d03527f..c7b145cc921 100644 --- a/source/blender/blenloader/intern/versioning_400.cc +++ b/source/blender/blenloader/intern/versioning_400.cc @@ -393,14 +393,14 @@ void do_versions_after_linking_400(FileData *fd, Main *bmain) if (ob->id.lib) { BLO_reportf_wrap(fd->reports, RPT_INFO, - TIP_("Proxy lost from object %s lib %s\n"), + RPT_("Proxy lost from object %s lib %s\n"), ob->id.name + 2, ob->id.lib->filepath); } else { BLO_reportf_wrap(fd->reports, RPT_INFO, - TIP_("Proxy lost from object %s lib \n"), + RPT_("Proxy lost from object %s lib \n"), ob->id.name + 2); } fd->reports->count.missing_obproxies++; diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.cc b/source/blender/compositor/intern/COM_ExecutionGroup.cc index 3ea313191fe..f65d01af3f9 100644 --- a/source/blender/compositor/intern/COM_ExecutionGroup.cc +++ b/source/blender/compositor/intern/COM_ExecutionGroup.cc @@ -421,7 +421,7 @@ void ExecutionGroup::finalize_chunk_execution(int chunk_number, MemoryBuffer **m bTree_->runtime->progress(bTree_->runtime->prh, progress); char buf[128]; - SNPRINTF(buf, TIP_("Compositing | Tile %u-%u"), chunks_finished_, chunks_len_); + SNPRINTF(buf, RPT_("Compositing | Tile %u-%u"), chunks_finished_, chunks_len_); bTree_->runtime->stats_draw(bTree_->runtime->sdh, buf); } } diff --git a/source/blender/compositor/intern/COM_FullFrameExecutionModel.cc b/source/blender/compositor/intern/COM_FullFrameExecutionModel.cc index 7e1d01925e4..1ac1d2d4be7 100644 --- a/source/blender/compositor/intern/COM_FullFrameExecutionModel.cc +++ b/source/blender/compositor/intern/COM_FullFrameExecutionModel.cc @@ -36,7 +36,7 @@ void FullFrameExecutionModel::execute(ExecutionSystem &exec_system) { const bNodeTree *node_tree = this->context_.get_bnodetree(); node_tree->runtime->stats_draw(node_tree->runtime->sdh, - TIP_("Compositing | Initializing execution")); + RPT_("Compositing | Initializing execution")); DebugInfo::graphviz(&exec_system, "compositor_prior_rendering"); @@ -281,7 +281,7 @@ void FullFrameExecutionModel::update_progress_bar() char buf[128]; SNPRINTF(buf, - TIP_("Compositing | Operation %i-%li"), + RPT_("Compositing | Operation %i-%li"), num_operations_finished_ + 1, operations_.size()); tree->runtime->stats_draw(tree->runtime->sdh, buf); diff --git a/source/blender/compositor/intern/COM_TiledExecutionModel.cc b/source/blender/compositor/intern/COM_TiledExecutionModel.cc index ae5c767e61b..62d4b1e0189 100644 --- a/source/blender/compositor/intern/COM_TiledExecutionModel.cc +++ b/source/blender/compositor/intern/COM_TiledExecutionModel.cc @@ -23,7 +23,7 @@ TiledExecutionModel::TiledExecutionModel(CompositorContext &context, { const bNodeTree *node_tree = context.get_bnodetree(); node_tree->runtime->stats_draw(node_tree->runtime->sdh, - TIP_("Compositing | Determining resolution")); + RPT_("Compositing | Determining resolution")); uint resolution[2]; for (ExecutionGroup *group : groups_) { @@ -103,7 +103,7 @@ void TiledExecutionModel::execute(ExecutionSystem &exec_system) const bNodeTree *editingtree = this->context_.get_bnodetree(); editingtree->runtime->stats_draw(editingtree->runtime->sdh, - TIP_("Compositing | Initializing execution")); + RPT_("Compositing | Initializing execution")); update_read_buffer_offset(operations_); @@ -122,7 +122,7 @@ void TiledExecutionModel::execute(ExecutionSystem &exec_system) WorkScheduler::stop(); editingtree->runtime->stats_draw(editingtree->runtime->sdh, - TIP_("Compositing | De-initializing execution")); + RPT_("Compositing | De-initializing execution")); for (NodeOperation *operation : operations_) { operation->deinit_execution(); diff --git a/source/blender/draw/engines/eevee/eevee_engine.cc b/source/blender/draw/engines/eevee/eevee_engine.cc index 55f194afbcc..165f21270f3 100644 --- a/source/blender/draw/engines/eevee/eevee_engine.cc +++ b/source/blender/draw/engines/eevee/eevee_engine.cc @@ -183,11 +183,11 @@ static void eevee_cache_finish(void *vedata) } if (g_data->queued_shaders_count > 0) { - SNPRINTF(ved->info, TIP_("Compiling Shaders (%d remaining)"), g_data->queued_shaders_count); + SNPRINTF(ved->info, RPT_("Compiling Shaders (%d remaining)"), g_data->queued_shaders_count); } else if (g_data->queued_optimise_shaders_count > 0) { SNPRINTF(ved->info, - TIP_("Optimizing Shaders (%d remaining)"), + RPT_("Optimizing Shaders (%d remaining)"), g_data->queued_optimise_shaders_count); } } diff --git a/source/blender/draw/engines/eevee/eevee_lightcache.cc b/source/blender/draw/engines/eevee/eevee_lightcache.cc index 12c5df63759..8849ea8142a 100644 --- a/source/blender/draw/engines/eevee/eevee_lightcache.cc +++ b/source/blender/draw/engines/eevee/eevee_lightcache.cc @@ -225,31 +225,31 @@ void EEVEE_lightcache_info_update(SceneEEVEE *eevee) if (lcache != nullptr) { if (!eevee_lightcache_version_check(lcache)) { BLI_strncpy(eevee->light_cache_info, - TIP_("Incompatible Light cache version, please bake again"), + N_("Incompatible Light cache version, please bake again"), sizeof(eevee->light_cache_info)); return; } if (lcache->cube_tx.tex_size[2] > GPU_max_texture_layers()) { STRNCPY(eevee->light_cache_info, - TIP_("Error: Light cache is too big for the GPU to be loaded")); + N_("Error: Light cache is too big for the GPU to be loaded")); return; } if (lcache->flag & LIGHTCACHE_INVALID) { STRNCPY(eevee->light_cache_info, - TIP_("Error: Light cache dimensions not supported by the GPU")); + N_("Error: Light cache dimensions not supported by the GPU")); return; } if (lcache->flag & LIGHTCACHE_BAKING) { - STRNCPY(eevee->light_cache_info, TIP_("Baking light cache")); + STRNCPY(eevee->light_cache_info, N_("Baking light cache")); return; } if (!eevee_lightcache_can_be_saved(lcache)) { STRNCPY(eevee->light_cache_info, - TIP_("Error: LightCache is too large and will not be saved to disk")); + N_("Error: LightCache is too large and will not be saved to disk")); return; } @@ -258,14 +258,16 @@ void EEVEE_lightcache_info_update(SceneEEVEE *eevee) int irr_samples = eevee_lightcache_irradiance_sample_count(lcache); + /* This message needs to be translated here instead of the UI code, otherwise it would already + * be formatted and translation would not work. */ SNPRINTF(eevee->light_cache_info, - TIP_("%d Ref. Cubemaps, %d Irr. Samples (%s in memory)"), + RPT_("%d Ref. Cubemaps, %d Irr. Samples (%s in memory)"), lcache->cube_len - 1, irr_samples, formatted_mem); } else { - STRNCPY(eevee->light_cache_info, TIP_("No light cache in this scene")); + STRNCPY(eevee->light_cache_info, N_("No light cache in this scene")); } } diff --git a/source/blender/editors/animation/anim_channels_defines.cc b/source/blender/editors/animation/anim_channels_defines.cc index 19c66cd485a..1c773e8428d 100644 --- a/source/blender/editors/animation/anim_channels_defines.cc +++ b/source/blender/editors/animation/anim_channels_defines.cc @@ -5430,7 +5430,7 @@ static void draw_setting_widget(bAnimContext *ac, !BKE_id_is_editable(ac->bmain, ale->id))) { if (setting != ACHANNEL_SETTING_EXPAND) { - UI_but_disable(but, TIP_("Can't edit this property from a linked data-block")); + UI_but_disable(but, "Can't edit this property from a linked data-block"); } } diff --git a/source/blender/editors/animation/anim_ipo_utils.cc b/source/blender/editors/animation/anim_ipo_utils.cc index 5069b903749..c2da8147791 100644 --- a/source/blender/editors/animation/anim_ipo_utils.cc +++ b/source/blender/editors/animation/anim_ipo_utils.cc @@ -46,10 +46,10 @@ int getname_anim_fcurve(char *name, ID *id, FCurve *fcu) if (ELEM(nullptr, id, fcu, fcu->rna_path)) { if (fcu == nullptr) { - BLI_strncpy(name, TIP_(""), name_maxncpy); + BLI_strncpy(name, RPT_(""), name_maxncpy); } else if (fcu->rna_path == nullptr) { - BLI_strncpy(name, TIP_(""), name_maxncpy); + BLI_strncpy(name, RPT_(""), name_maxncpy); } else { /* id == nullptr */ BLI_snprintf(name, name_maxncpy, "%s[%d]", fcu->rna_path, fcu->array_index); diff --git a/source/blender/editors/animation/anim_markers.cc b/source/blender/editors/animation/anim_markers.cc index e7cdeac8d48..85b88e057a4 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, TIP_("Marker %.2f offset %s"), FRA2TIME(selmarker->frame), str_ofs); + SNPRINTF(str, RPT_("Marker %.2f offset %s"), FRA2TIME(selmarker->frame), str_ofs); } else { - SNPRINTF(str, TIP_("Marker %d offset %s"), selmarker->frame, str_ofs); + SNPRINTF(str, RPT_("Marker %d offset %s"), selmarker->frame, str_ofs); } } else { - SNPRINTF(str, TIP_("Marker offset %s"), str_ofs); + SNPRINTF(str, RPT_("Marker offset %s"), str_ofs); } ED_area_status_text(CTX_wm_area(C), str); diff --git a/source/blender/editors/animation/keyframing.cc b/source/blender/editors/animation/keyframing.cc index e57fb634720..0f35bba3e60 100644 --- a/source/blender/editors/animation/keyframing.cc +++ b/source/blender/editors/animation/keyframing.cc @@ -129,7 +129,7 @@ void update_autoflags_fcurve(FCurve *fcu, bContext *C, ReportList *reports, Poin /* try to get property we should be affecting */ if (RNA_path_resolve_property(ptr, fcu->rna_path, &tmp_ptr, &prop) == false) { /* property not found... */ - const char *idname = (ptr->owner_id) ? ptr->owner_id->name : TIP_(""); + const char *idname = (ptr->owner_id) ? ptr->owner_id->name : RPT_(""); BKE_reportf(reports, RPT_ERROR, diff --git a/source/blender/editors/armature/pose_lib_2.cc b/source/blender/editors/armature/pose_lib_2.cc index 94799aad2f9..a6e8515cc2b 100644 --- a/source/blender/editors/armature/pose_lib_2.cc +++ b/source/blender/editors/armature/pose_lib_2.cc @@ -321,7 +321,7 @@ static bool poselib_blend_init_data(bContext *C, wmOperator *op, const wmEvent * /* check if valid poselib */ Object *ob = get_poselib_object(C); if (ELEM(nullptr, ob, ob->pose, ob->data)) { - BKE_report(op->reports, RPT_ERROR, TIP_("Pose lib is only for armatures in pose mode")); + BKE_report(op->reports, RPT_ERROR, "Pose lib is only for armatures in pose mode"); return false; } @@ -500,10 +500,10 @@ 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, TIP_("[Tab] - Show original pose")); + STRNCPY(tab_string, RPT_("[Tab] - Show original pose")); } else { - STRNCPY(tab_string, TIP_("[Tab] - Show blended pose")); + STRNCPY(tab_string, RPT_("[Tab] - Show blended pose")); } SNPRINTF(status_string, "%s | %s | [Ctrl] - Flip Pose", tab_string, slider_string); diff --git a/source/blender/editors/armature/pose_slide.cc b/source/blender/editors/armature/pose_slide.cc index 5597d3cd76b..751d0b16233 100644 --- a/source/blender/editors/armature/pose_slide.cc +++ b/source/blender/editors/armature/pose_slide.cc @@ -922,38 +922,38 @@ static void pose_slide_draw_status(bContext *C, tPoseSlideOp *pso) switch (pso->mode) { case POSESLIDE_PUSH: - STRNCPY(mode_str, TIP_("Push Pose")); + STRNCPY(mode_str, RPT_("Push Pose")); break; case POSESLIDE_RELAX: - STRNCPY(mode_str, TIP_("Relax Pose")); + STRNCPY(mode_str, RPT_("Relax Pose")); break; case POSESLIDE_BREAKDOWN: - STRNCPY(mode_str, TIP_("Breakdown")); + STRNCPY(mode_str, RPT_("Breakdown")); break; case POSESLIDE_BLEND: - STRNCPY(mode_str, TIP_("Blend to Neighbor")); + STRNCPY(mode_str, RPT_("Blend to Neighbor")); break; default: /* Unknown. */ - STRNCPY(mode_str, TIP_("Sliding-Tool")); + STRNCPY(mode_str, RPT_("Sliding-Tool")); break; } switch (pso->axislock) { case PS_LOCK_X: - STRNCPY(axis_str, TIP_("[X]/Y/Z axis only (X to clear)")); + STRNCPY(axis_str, RPT_("[X]/Y/Z axis only (X to clear)")); break; case PS_LOCK_Y: - STRNCPY(axis_str, TIP_("X/[Y]/Z axis only (Y to clear)")); + STRNCPY(axis_str, RPT_("X/[Y]/Z axis only (Y to clear)")); break; case PS_LOCK_Z: - STRNCPY(axis_str, TIP_("X/Y/[Z] axis only (Z to clear)")); + STRNCPY(axis_str, RPT_("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, TIP_("X/Y/Z = Axis Constraint")); + STRNCPY(axis_str, RPT_("X/Y/Z = Axis Constraint")); } else { axis_str[0] = '\0'; @@ -963,26 +963,26 @@ static void pose_slide_draw_status(bContext *C, tPoseSlideOp *pso) switch (pso->channels) { case PS_TFM_LOC: - SNPRINTF(limits_str, TIP_("[G]/R/S/B/C - Location only (G to clear) | %s"), axis_str); + SNPRINTF(limits_str, RPT_("[G]/R/S/B/C - Location only (G to clear) | %s"), axis_str); break; case PS_TFM_ROT: - SNPRINTF(limits_str, TIP_("G/[R]/S/B/C - Rotation only (R to clear) | %s"), axis_str); + SNPRINTF(limits_str, RPT_("G/[R]/S/B/C - Rotation only (R to clear) | %s"), axis_str); break; case PS_TFM_SIZE: - SNPRINTF(limits_str, TIP_("G/R/[S]/B/C - Scale only (S to clear) | %s"), axis_str); + SNPRINTF(limits_str, RPT_("G/R/[S]/B/C - Scale only (S to clear) | %s"), axis_str); break; case PS_TFM_BBONE_SHAPE: - STRNCPY(limits_str, TIP_("G/R/S/[B]/C - Bendy Bone properties only (B to clear) | %s")); + STRNCPY(limits_str, RPT_("G/R/S/[B]/C - Bendy Bone properties only (B to clear) | %s")); break; case PS_TFM_PROPS: - STRNCPY(limits_str, TIP_("G/R/S/B/[C] - Custom Properties only (C to clear) | %s")); + STRNCPY(limits_str, RPT_("G/R/S/B/[C] - Custom Properties only (C to clear) | %s")); break; default: - STRNCPY(limits_str, TIP_("G/R/S/B/C - Limit to Transform/Property Set")); + STRNCPY(limits_str, RPT_("G/R/S/B/C - Limit to Transform/Property Set")); break; } - STRNCPY(bone_vis_str, TIP_("[H] - Toggle bone visibility")); + STRNCPY(bone_vis_str, RPT_("[H] - Toggle bone visibility")); ED_slider_status_string_get(pso->slider, slider_str, sizeof(slider_str)); diff --git a/source/blender/editors/asset/intern/asset_ops.cc b/source/blender/editors/asset/intern/asset_ops.cc index 97bb23962ed..6f28a112cfc 100644 --- a/source/blender/editors/asset/intern/asset_ops.cc +++ b/source/blender/editors/asset/intern/asset_ops.cc @@ -363,8 +363,8 @@ static bool asset_clear_poll(bContext *C, const PointerRNAVec &ids) IDVecStats ctx_stats = asset_operation_get_id_vec_stats_from_ids(ids); if (!ctx_stats.has_asset) { - const char *msg_single = TIP_("Data-block is not marked as asset"); - const char *msg_multiple = TIP_("No data-block selected that is marked as asset"); + const char *msg_single = N_("Data-block is not marked as asset"); + const char *msg_multiple = N_("No data-block selected that is marked as asset"); CTX_wm_operator_poll_msg_set(C, ctx_stats.is_single ? msg_single : msg_multiple); return false; } diff --git a/source/blender/editors/asset/intern/asset_shelf_catalog_selector.cc b/source/blender/editors/asset/intern/asset_shelf_catalog_selector.cc index 2bb1cd029e9..3478cf90326 100644 --- a/source/blender/editors/asset/intern/asset_shelf_catalog_selector.cc +++ b/source/blender/editors/asset/intern/asset_shelf_catalog_selector.cc @@ -59,7 +59,7 @@ class AssetCatalogSelectorTree : public ui::AbstractTreeView { void build_tree() override { if (catalog_tree_.is_empty()) { - auto &item = add_tree_item(TIP_("No applicable assets found"), + auto &item = add_tree_item(RPT_("No applicable assets found"), ICON_INFO); item.disable_interaction(); return; diff --git a/source/blender/editors/gpencil_legacy/annotate_paint.cc b/source/blender/editors/gpencil_legacy/annotate_paint.cc index 499af64579b..b930f90dc46 100644 --- a/source/blender/editors/gpencil_legacy/annotate_paint.cc +++ b/source/blender/editors/gpencil_legacy/annotate_paint.cc @@ -1960,7 +1960,7 @@ 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, - TIP_("Annotation Create Poly: LMB click to place next stroke vertex | " + RPT_("Annotation Create Poly: LMB click to place next stroke vertex | " "ESC/Enter to end (or click outside this area)")); break; default: @@ -1976,29 +1976,29 @@ static void annotation_draw_status_indicators(bContext *C, tGPsdata *p) switch (p->paintmode) { case GP_PAINTMODE_ERASER: ED_workspace_status_text(C, - TIP_("Annotation Eraser: Hold and drag LMB or RMB to erase | " + RPT_("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, - TIP_("Annotation Line Draw: Hold and drag LMB to draw | " + RPT_("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, - TIP_("Annotation Freehand Draw: Hold and drag LMB to draw | " + RPT_("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, - TIP_("Annotation Create Poly: LMB click to place next stroke vertex | " + RPT_("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, TIP_("Annotation Session: ESC/Enter to end (or click outside this area)")); + C, RPT_("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 3a5e253c0cb..f43d66e2791 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, - TIP_("Fill: ESC/RMB cancel, LMB Fill, Shift Draw on Back, MMB Adjust Extend, S: " + 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) ? TIP_("Extend") : TIP_("Radius"), - (is_extend && use_stroke_collide) ? TIP_("Stroke: ON") : TIP_("Stroke: OFF"), + (is_extend) ? RPT_("Extend") : RPT_("Radius"), + (is_extend && use_stroke_collide) ? RPT_("Stroke: ON") : RPT_("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 6ddb465f86a..ffee9a7ae69 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, TIP_("GPencil Interpolation: ")); + STRNCPY(msg_str, RPT_("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, TIP_("ESC/RMB to cancel, Enter/LMB to confirm, WHEEL/MOVE to adjust factor")); + C, RPT_("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 4cf4c477492..11130bb43c8 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_paint.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_paint.cc @@ -2615,20 +2615,20 @@ static void gpencil_draw_status_indicators(bContext *C, tGPsdata *p) case GP_PAINTMODE_ERASER: { ED_workspace_status_text( C, - TIP_("Grease Pencil Erase Session: Hold and drag LMB or RMB to erase | " + RPT_("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, - TIP_("Grease Pencil Line Session: Hold and drag LMB to draw | " + RPT_("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, - TIP_("Grease Pencil Guides: LMB click and release to place reference point | " + RPT_("Grease Pencil Guides: LMB click and release to place reference point | " "Esc/RMB to cancel")); break; } @@ -2637,19 +2637,19 @@ static void gpencil_draw_status_indicators(bContext *C, tGPsdata *p) if (guide->use_guide) { ED_workspace_status_text( C, - TIP_("Grease Pencil Freehand Session: Hold and drag LMB to draw | " + RPT_("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, TIP_("Grease Pencil Freehand Session: Hold and drag LMB to draw")); + C, RPT_("Grease Pencil Freehand Session: Hold and drag LMB to draw")); } break; } default: /* unhandled future cases */ { ED_workspace_status_text( - C, TIP_("Grease Pencil Session: ESC/Enter to end (or click outside this area)")); + C, RPT_("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 c3ca3c7cba4..4c8c1c048a7 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_primitive.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_primitive.cc @@ -421,38 +421,38 @@ static void gpencil_primitive_status_indicators(bContext *C, tGPDprimitive *tgpi if (tgpi->type == GP_STROKE_LINE) { BLI_strncpy( msg_str, - TIP_("Line: ESC to cancel, LMB set origin, Enter/MMB to confirm, WHEEL/+- to " + 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"), UI_MAX_DRAW_STR); } else if (tgpi->type == GP_STROKE_POLYLINE) { BLI_strncpy(msg_str, - TIP_("Polyline: ESC to cancel, LMB to set, Enter/MMB to confirm, WHEEL/+- to " + RPT_("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, - TIP_("Rectangle: ESC to cancel, LMB set origin, Enter/MMB to confirm, WHEEL/+- " + 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"), UI_MAX_DRAW_STR); } else if (tgpi->type == GP_STROKE_CIRCLE) { BLI_strncpy(msg_str, - TIP_("Circle: ESC to cancel, Enter/MMB to confirm, WHEEL/+- to adjust subdivision " + 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); } else if (tgpi->type == GP_STROKE_ARC) { BLI_strncpy( msg_str, - TIP_("Arc: ESC to cancel, Enter/MMB to confirm, WHEEL/+- to adjust subdivision number, " + 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"), UI_MAX_DRAW_STR); } else if (tgpi->type == GP_STROKE_CURVE) { BLI_strncpy(msg_str, - TIP_("Curve: ESC to cancel, Enter/MMB to confirm, WHEEL/+- to adjust subdivision " + 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); } diff --git a/source/blender/editors/gpencil_legacy/gpencil_sculpt_paint.cc b/source/blender/editors/gpencil_legacy/gpencil_sculpt_paint.cc index dd0fc532630..4f0e2e60bc7 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_sculpt_paint.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_sculpt_paint.cc @@ -1138,7 +1138,7 @@ static void gpencil_sculpt_brush_header_set(bContext *C, tGP_BrushEditData *gso) char str[UI_MAX_DRAW_STR] = ""; SNPRINTF(str, - TIP_("GPencil Sculpt: %s Stroke | LMB to paint | RMB/Escape to Exit" + 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"), brush->id.name + 2); diff --git a/source/blender/editors/gpencil_legacy/gpencil_uv.cc b/source/blender/editors/gpencil_legacy/gpencil_uv.cc index 365c15de85b..0052d0639e4 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 = TIP_("Confirm: Enter/LClick, Cancel: (Esc/RClick) %s"); + const char *str = RPT_("Confirm: Enter/LClick, Cancel: (Esc/RClick) %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 dd32caea43d..e10e866db62 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_vertex_paint.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_vertex_paint.cc @@ -691,7 +691,7 @@ static bool brush_smear_apply(tGP_BrushVertexpaintData *gso, static void gpencil_vertexpaint_brush_header_set(bContext *C) { ED_workspace_status_text(C, - TIP_("GPencil Vertex Paint: LMB to paint | RMB/Escape to Exit" + RPT_("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 a83d37adf74..bd5401af5d9 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_weight_paint.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_weight_paint.cc @@ -716,17 +716,17 @@ 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, TIP_("GPencil Weight Paint: LMB to paint | RMB/Escape to Exit")); + ED_workspace_status_text(C, RPT_("GPencil Weight Paint: LMB to paint | RMB/Escape to Exit")); break; case GPWEIGHT_TOOL_BLUR: - ED_workspace_status_text(C, TIP_("GPencil Weight Blur: LMB to blur | RMB/Escape to Exit")); + ED_workspace_status_text(C, RPT_("GPencil Weight Blur: LMB to blur | RMB/Escape to Exit")); break; case GPWEIGHT_TOOL_AVERAGE: ED_workspace_status_text( - C, TIP_("GPencil Weight Average: LMB to set average | RMB/Escape to Exit")); + C, RPT_("GPencil Weight Average: LMB to set average | RMB/Escape to Exit")); break; case GPWEIGHT_TOOL_SMEAR: - ED_workspace_status_text(C, TIP_("GPencil Weight Smear: LMB to smear | RMB/Escape to Exit")); + ED_workspace_status_text(C, RPT_("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 2522c5bee93..b78a43ce43d 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, TIP_("LMB: Stroke - Shift: Fill - Shift+Ctrl: Stroke + Fill")); + STRNCPY(msg_str, RPT_("LMB: Stroke - Shift: Fill - Shift+Ctrl: Stroke + Fill")); ED_workspace_status_text(C, msg_str); } diff --git a/source/blender/editors/interface/interface.cc b/source/blender/editors/interface/interface.cc index e591d92e1d3..85876802a1c 100644 --- a/source/blender/editors/interface/interface.cc +++ b/source/blender/editors/interface/interface.cc @@ -3035,7 +3035,7 @@ char *ui_but_string_get_dynamic(uiBut *but, int *r_str_size) * Report a generic error prefix when evaluating a string with #BPY_run_string_as_number * as the Python error on its own doesn't provide enough context. */ -#define UI_NUMBER_EVAL_ERROR_PREFIX IFACE_("Error evaluating number, see Info editor for details") +#define UI_NUMBER_EVAL_ERROR_PREFIX RPT_("Error evaluating number, see Info editor for details") static bool ui_number_from_string_units( bContext *C, const char *str, const int unit_type, const UnitSettings *unit, double *r_value) @@ -4542,7 +4542,7 @@ static void ui_def_but_rna__panel_type(bContext *C, uiLayout *layout, void *but_ } else { char msg[256]; - SNPRINTF(msg, TIP_("Missing Panel: %s"), panel_type); + SNPRINTF(msg, RPT_("Missing Panel: %s"), panel_type); uiItemL(layout, msg, ICON_NONE); } } @@ -4571,7 +4571,7 @@ static void ui_def_but_rna__menu_type(bContext *C, uiLayout *layout, void *but_p } else { char msg[256]; - SNPRINTF(msg, TIP_("Missing Menu: %s"), menu_type); + SNPRINTF(msg, RPT_("Missing Menu: %s"), menu_type); uiItemL(layout, msg, ICON_NONE); } } diff --git a/source/blender/editors/interface/interface_layout.cc b/source/blender/editors/interface/interface_layout.cc index fe4bbd32264..7f8b72e77a9 100644 --- a/source/blender/editors/interface/interface_layout.cc +++ b/source/blender/editors/interface/interface_layout.cc @@ -1336,7 +1336,7 @@ static void ui_item_menu_hold(bContext *C, ARegion *butregion, uiBut *but) UI_menutype_draw(C, mt, layout); } else { - uiItemL(layout, TIP_("Menu Missing:"), ICON_NONE); + uiItemL(layout, RPT_("Menu Missing:"), ICON_NONE); uiItemL(layout, menu_id, ICON_NONE); } UI_popup_menu_end(C, pup); diff --git a/source/blender/editors/interface/interface_region_menu_popup.cc b/source/blender/editors/interface/interface_region_menu_popup.cc index 9a2762307eb..01be642743a 100644 --- a/source/blender/editors/interface/interface_region_menu_popup.cc +++ b/source/blender/editors/interface/interface_region_menu_popup.cc @@ -578,7 +578,7 @@ void UI_popup_menu_reports(bContext *C, ReportList *reports) if (pup == nullptr) { char title[UI_MAX_DRAW_STR]; - SNPRINTF(title, "%s: %s", IFACE_("Report"), report->typestr); + SNPRINTF(title, "%s: %s", RPT_("Report"), report->typestr); /* popup_menu stuff does just what we need (but pass meaningful block name) */ pup = UI_popup_menu_begin_ex(C, title, __func__, ICON_NONE); layout = UI_popup_menu_layout(pup); @@ -627,10 +627,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, TIP_("Type to search...")); + ED_workspace_status_text(C, RPT_("Type to search...")); } else if (mt->idname[0]) { - ED_workspace_status_text(C, TIP_("Press spacebar to search...")); + ED_workspace_status_text(C, RPT_("Press spacebar to search...")); } } diff --git a/source/blender/editors/interface/interface_templates.cc b/source/blender/editors/interface/interface_templates.cc index 893e91b9691..b83ca7264b8 100644 --- a/source/blender/editors/interface/interface_templates.cc +++ b/source/blender/editors/interface/interface_templates.cc @@ -2599,7 +2599,7 @@ void uiTemplateGpencilModifiers(uiLayout * /*layout*/, bContext *C) /** \} */ -#define ERROR_LIBDATA_MESSAGE TIP_("Can't edit external library data") +#define ERROR_LIBDATA_MESSAGE N_("Can't edit external library data") /* -------------------------------------------------------------------- */ /** \name ShaderFx Template @@ -2715,7 +2715,7 @@ static eAutoPropButsReturn template_operator_property_buts_draw_single( /* poll() on this operator may still fail, * at the moment there is no nice feedback when this happens just fails silently. */ if (!WM_operator_repeat_check(C, op)) { - UI_block_lock_set(block, true, "Operator can't redo"); + UI_block_lock_set(block, true, N_("Operator cannot redo")); return return_info; } @@ -2974,7 +2974,7 @@ void uiTemplateOperatorRedoProperties(uiLayout *layout, const bContext *C) /** \name Constraint Header Template * \{ */ -#define ERROR_LIBDATA_MESSAGE TIP_("Can't edit external library data") +#define ERROR_LIBDATA_MESSAGE N_("Can't edit external library data") static void constraint_active_func(bContext * /*C*/, void *ob_v, void *con_v) { @@ -6537,9 +6537,9 @@ void uiTemplateInputStatus(uiLayout *layout, bContext *C) uiLayout *row = uiLayoutRow(col, true); uiLayoutSetAlignment(row, UI_LAYOUT_ALIGN_LEFT); - const char *msg = CTX_TIP_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, + const char *msg = CTX_RPT_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, WM_window_cursor_keymap_status_get(win, i, 0)); - const char *msg_drag = CTX_TIP_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, + const char *msg_drag = CTX_RPT_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, WM_window_cursor_keymap_status_get(win, i, 1)); if (msg || (msg_drag == nullptr)) { @@ -6638,7 +6638,7 @@ void uiTemplateStatusInfo(uiLayout *layout, bContext *C) BKE_blender_version_blendfile_string_from_values( writer_ver_str, sizeof(writer_ver_str), bmain->versionfile, -1); SNPRINTF(compat_error_msg, - TIP_("File saved by newer Blender\n(%s), expect loss of data"), + RPT_("File saved by newer Blender\n(%s), expect loss of data"), writer_ver_str); but = uiDefIconBut(block, UI_BTYPE_BUT, @@ -6790,13 +6790,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_TIP_(BLT_I18NCONTEXT_ID_WINDOWMANAGER, text), icon); + uiItemL(layout, CTX_RPT_(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_TIP_(BLT_I18NCONTEXT_ID_WINDOWMANAGER, text), ICON_NONE); + uiItemL(layout, CTX_RPT_(BLT_I18NCONTEXT_ID_WINDOWMANAGER, text), ICON_NONE); ok = true; } return ok; @@ -6980,7 +6980,7 @@ void uiTemplateCacheFileProcedural(uiLayout *layout, const bContext *C, PointerR if (!is_alembic) { row = uiLayoutRow(layout, false); - uiItemL(row, TIP_("Only Alembic Procedurals supported"), ICON_INFO); + uiItemL(row, RPT_("Only Alembic Procedurals supported"), ICON_INFO); } else if (!engine_supports_procedural) { row = uiLayoutRow(layout, false); @@ -6988,13 +6988,13 @@ void uiTemplateCacheFileProcedural(uiLayout *layout, const bContext *C, PointerR if (BKE_scene_uses_cycles(scene) && !BKE_scene_uses_cycles_experimental_features(scene)) { uiItemL( row, - TIP_( + RPT_( "The Cycles Alembic Procedural is only available with the experimental feature set"), ICON_INFO); } else { uiItemL( - row, TIP_("The active render engine does not have an Alembic Procedural"), ICON_INFO); + row, RPT_("The active render engine does not have an Alembic Procedural"), ICON_INFO); } } diff --git a/source/blender/editors/mesh/editmesh_bevel.cc b/source/blender/editors/mesh/editmesh_bevel.cc index 93eb9f5843d..0c3a9c42310 100644 --- a/source/blender/editors/mesh/editmesh_bevel.cc +++ b/source/blender/editors/mesh/editmesh_bevel.cc @@ -170,7 +170,7 @@ 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, - TIP_("%s: Confirm, " + RPT_("%s: Confirm, " "%s: Cancel, " "%s: Width Type (%s), " "%s: Width (%s), " diff --git a/source/blender/editors/mesh/editmesh_bisect.cc b/source/blender/editors/mesh/editmesh_bisect.cc index 07d48b7c4ca..e994c4b69a4 100644 --- a/source/blender/editors/mesh/editmesh_bisect.cc +++ b/source/blender/editors/mesh/editmesh_bisect.cc @@ -173,7 +173,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, TIP_("LMB: Click and drag to draw cut line")); + ED_workspace_status_text(C, RPT_("LMB: Click and drag to draw cut line")); } MEM_freeN(objects); return ret; @@ -203,7 +203,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, TIP_("LMB: Release to confirm cut line")); + ED_workspace_status_text(C, RPT_("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 3c452209153..5cf1df25d8d 100644 --- a/source/blender/editors/mesh/editmesh_inset.cc +++ b/source/blender/editors/mesh/editmesh_inset.cc @@ -71,7 +71,7 @@ static void edbm_inset_update_header(wmOperator *op, bContext *C) { InsetData *opdata = static_cast(op->customdata); - const char *str = TIP_( + const char *str = RPT_( "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.cc b/source/blender/editors/mesh/editmesh_knife.cc index 5357ffaf9c5..8f1db3fedce 100644 --- a/source/blender/editors/mesh/editmesh_knife.cc +++ b/source/blender/editors/mesh/editmesh_knife.cc @@ -1113,7 +1113,7 @@ static void knife_update_header(bContext *C, wmOperator *op, KnifeTool_OpData *k SNPRINTF( header, - TIP_("%s: confirm, %s: cancel, %s: undo, " + 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), " diff --git a/source/blender/editors/mesh/editmesh_loopcut.cc b/source/blender/editors/mesh/editmesh_loopcut.cc index 8c3fa8940c5..287a1747b31 100644 --- a/source/blender/editors/mesh/editmesh_loopcut.cc +++ b/source/blender/editors/mesh/editmesh_loopcut.cc @@ -477,7 +477,7 @@ static int loopcut_init(bContext *C, wmOperator *op, const wmEvent *event) if (is_interactive) { ED_workspace_status_text( C, - TIP_("Select a ring to be cut, use mouse-wheel or page-up/down for number of cuts, " + RPT_("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; } @@ -699,7 +699,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, TIP_("Number of Cuts: %s, Smooth: %s (Alt)"), str_rep, str_rep + NUM_STR_REP_LEN); + buf, RPT_("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 d00510dbe67..cb825bd1ae3 100644 --- a/source/blender/editors/mesh/editmesh_tools.cc +++ b/source/blender/editors/mesh/editmesh_tools.cc @@ -8501,7 +8501,7 @@ static void point_normals_update_header(bContext *C, wmOperator *op) op->type, (_id), true, UI_MAX_SHORTCUT_STR, &available_len, &p) SNPRINTF(header, - TIP_("%s: confirm, %s: cancel, " + 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, " diff --git a/source/blender/editors/object/object_remesh.cc b/source/blender/editors/object/object_remesh.cc index f474feea898..0c2c4f46f50 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 = TIP_( + const char *status_str = RPT_( "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/render/render_internal.cc b/source/blender/editors/render/render_internal.cc index 40323d8bc25..bccdd2db788 100644 --- a/source/blender/editors/render/render_internal.cc +++ b/source/blender/editors/render/render_internal.cc @@ -432,17 +432,17 @@ static void make_renderinfo_string(const RenderStats *rs, /* local view */ if (rs->localview) { - ret_array[i++] = TIP_("3D Local View "); + ret_array[i++] = RPT_("3D Local View "); ret_array[i++] = info_sep; } else if (v3d_override) { - ret_array[i++] = TIP_("3D View "); + ret_array[i++] = RPT_("3D View "); ret_array[i++] = info_sep; } /* frame number */ SNPRINTF(info_buffers.frame, "%d ", scene->r.cfra); - ret_array[i++] = TIP_("Frame:"); + ret_array[i++] = RPT_("Frame:"); ret_array[i++] = info_buffers.frame; /* Previous and elapsed time. */ @@ -464,7 +464,7 @@ static void make_renderinfo_string(const RenderStats *rs, PIL_check_seconds_timer() - rs->starttime); } - ret_array[i++] = TIP_("Time:"); + ret_array[i++] = RPT_("Time:"); ret_array[i++] = info_time; ret_array[i++] = info_space; @@ -479,13 +479,13 @@ static void make_renderinfo_string(const RenderStats *rs, else { if (rs->mem_peak == 0.0f) { SNPRINTF(info_buffers.statistics, - TIP_("Mem:%.2fM (Peak %.2fM)"), + RPT_("Mem:%.2fM (Peak %.2fM)"), megs_used_memory, megs_peak_memory); } else { SNPRINTF( - info_buffers.statistics, TIP_("Mem:%.2fM, Peak: %.2fM"), rs->mem_used, rs->mem_peak); + info_buffers.statistics, RPT_("Mem:%.2fM, Peak: %.2fM"), rs->mem_used, rs->mem_peak); } info_statistics = info_buffers.statistics; } diff --git a/source/blender/editors/screen/screen_user_menu.cc b/source/blender/editors/screen/screen_user_menu.cc index 6d09a327cdb..6212223c4ee 100644 --- a/source/blender/editors/screen/screen_user_menu.cc +++ b/source/blender/editors/screen/screen_user_menu.cc @@ -250,7 +250,7 @@ static void screen_user_menu_draw(const bContext *C, Menu *menu) } else { if (show_missing) { - SNPRINTF(label, TIP_("Missing: %s"), umi_op->op_idname); + SNPRINTF(label, RPT_("Missing: %s"), umi_op->op_idname); uiItemL(menu->layout, label, ICON_NONE); } } @@ -264,7 +264,7 @@ static void screen_user_menu_draw(const bContext *C, Menu *menu) } else { if (show_missing) { - SNPRINTF(label, TIP_("Missing: %s"), umi_mt->mt_idname); + SNPRINTF(label, RPT_("Missing: %s"), umi_mt->mt_idname); uiItemL(menu->layout, label, ICON_NONE); } } @@ -313,7 +313,7 @@ static void screen_user_menu_draw(const bContext *C, Menu *menu) } if (!ok) { if (show_missing) { - SNPRINTF(label, TIP_("Missing: %s.%s"), umi_pr->context_data_path, umi_pr->prop_id); + SNPRINTF(label, RPT_("Missing: %s.%s"), umi_pr->context_data_path, umi_pr->prop_id); uiItemL(menu->layout, label, ICON_NONE); } } @@ -328,8 +328,8 @@ static void screen_user_menu_draw(const bContext *C, Menu *menu) } if (is_empty) { - 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); + uiItemL(menu->layout, RPT_("No menu items found"), ICON_NONE); + uiItemL(menu->layout, RPT_("Right click on buttons to add them to this menu"), ICON_NONE); } } diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_brush.cc b/source/blender/editors/sculpt_paint/curves_sculpt_brush.cc index 0b460db6133..8a5ef3d9588 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_brush.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_brush.cc @@ -403,34 +403,32 @@ CurvesSculptCommonContext::CurvesSculptCommonContext(const bContext &C) void report_empty_original_surface(ReportList *reports) { - BKE_report(reports, RPT_WARNING, TIP_("Original surface mesh is empty")); + BKE_report(reports, RPT_WARNING, "Original surface mesh is empty"); } void report_empty_evaluated_surface(ReportList *reports) { - BKE_report(reports, RPT_WARNING, TIP_("Evaluated surface mesh is empty")); + BKE_report(reports, RPT_WARNING, "Evaluated surface mesh is empty"); } void report_missing_surface(ReportList *reports) { - BKE_report(reports, RPT_WARNING, TIP_("Missing surface mesh")); + BKE_report(reports, RPT_WARNING, "Missing surface mesh"); } void report_missing_uv_map_on_original_surface(ReportList *reports) { - BKE_report( - reports, RPT_WARNING, TIP_("Missing UV map for attaching curves on original surface")); + BKE_report(reports, RPT_WARNING, "Missing UV map for attaching curves on original surface"); } void report_missing_uv_map_on_evaluated_surface(ReportList *reports) { - BKE_report( - reports, RPT_WARNING, TIP_("Missing UV map for attaching curves on evaluated surface")); + BKE_report(reports, RPT_WARNING, "Missing UV map for attaching curves on evaluated surface"); } void report_invalid_uv_map(ReportList *reports) { - BKE_report(reports, RPT_WARNING, TIP_("Invalid UV map: UV islands must not overlap")); + BKE_report(reports, RPT_WARNING, "Invalid UV map: UV islands must not overlap"); } void CurvesConstraintSolver::initialize(const bke::CurvesGeometry &curves, diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_slide.cc b/source/blender/editors/sculpt_paint/curves_sculpt_slide.cc index 40f2789c602..302b317a502 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_slide.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_slide.cc @@ -144,7 +144,7 @@ struct SlideOperationExecutor { if (curves_orig_->surface_uv_coords().is_empty()) { BKE_report(stroke_extension.reports, RPT_WARNING, - TIP_("Curves do not have surface attachment information")); + "Curves do not have surface attachment information"); return; } const StringRefNull uv_map_name = curves_id_orig_->surface_uv_map; @@ -217,8 +217,7 @@ struct SlideOperationExecutor { this->slide_with_symmetry(); if (found_invalid_uv_mapping_) { - BKE_report( - stroke_extension.reports, RPT_WARNING, TIP_("UV map or surface attachment is invalid")); + BKE_report(stroke_extension.reports, RPT_WARNING, "UV map or surface attachment is invalid"); } curves_orig_->tag_positions_changed(); diff --git a/source/blender/editors/sculpt_paint/paint_image.cc b/source/blender/editors/sculpt_paint/paint_image.cc index cf6073d725b..b73b58dd75f 100644 --- a/source/blender/editors/sculpt_paint/paint_image.cc +++ b/source/blender/editors/sculpt_paint/paint_image.cc @@ -631,9 +631,9 @@ static void sample_color_update_header(SampleColorData *data, bContext *C) if (area) { SNPRINTF(msg, - TIP_("Sample color for %s"), - !data->sample_palette ? TIP_("Brush. Use Left Click to sample for palette instead") : - TIP_("Palette. Use Left Click to sample more colors")); + 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")); ED_workspace_status_text(C, msg); } } diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.cc b/source/blender/editors/sculpt_paint/paint_image_proj.cc index 69044c792f6..7987b68daa1 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.cc +++ b/source/blender/editors/sculpt_paint/paint_image_proj.cc @@ -6405,10 +6405,10 @@ void ED_paint_data_warning( BKE_reportf(reports, RPT_WARNING, "Missing%s%s%s%s detected!", - !has_uvs ? TIP_(" UVs,") : "", - !has_mat ? TIP_(" Materials,") : "", - !has_tex ? TIP_(" Textures (or linked),") : "", - !has_stencil ? TIP_(" Stencil,") : ""); + !has_uvs ? RPT_(" UVs,") : "", + !has_mat ? RPT_(" Materials,") : "", + !has_tex ? RPT_(" Textures (or linked),") : "", + !has_stencil ? RPT_(" Stencil,") : ""); } bool ED_paint_proj_mesh_data_check(Scene *scene, diff --git a/source/blender/editors/sculpt_paint/sculpt_detail.cc b/source/blender/editors/sculpt_paint/sculpt_detail.cc index f872fde4df0..1bec42e215d 100644 --- a/source/blender/editors/sculpt_paint/sculpt_detail.cc +++ b/source/blender/editors/sculpt_paint/sculpt_detail.cc @@ -315,7 +315,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, TIP_("Click on the mesh to set the detail")); + ED_workspace_status_text(C, RPT_("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; @@ -765,7 +765,7 @@ static int dyntopo_detail_size_edit_invoke(bContext *C, wmOperator *op, const wm ss->draw_faded_cursor = true; - const char *status_str = TIP_( + const char *status_str = RPT_( "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_dyntopo.cc b/source/blender/editors/sculpt_paint/sculpt_dyntopo.cc index 63995510236..1d4d19a3d84 100644 --- a/source/blender/editors/sculpt_paint/sculpt_dyntopo.cc +++ b/source/blender/editors/sculpt_paint/sculpt_dyntopo.cc @@ -266,16 +266,16 @@ static int dyntopo_warning_popup(bContext *C, wmOperatorType *ot, enum WarnFlag uiLayout *layout = UI_popup_menu_layout(pup); if (flag & (VDATA | EDATA | LDATA)) { - const char *msg_error = TIP_("Attribute Data Detected"); - const char *msg = TIP_("Dyntopo will not preserve colors, UVs, or other attributes"); + const char *msg_error = RPT_("Attribute Data Detected"); + const char *msg = RPT_("Dyntopo will not preserve colors, UVs, or other attributes"); uiItemL(layout, msg_error, ICON_INFO); uiItemL(layout, msg, ICON_NONE); uiItemS(layout); } if (flag & MODIFIER) { - const char *msg_error = TIP_("Generative Modifiers Detected!"); - const char *msg = TIP_( + const char *msg_error = RPT_("Generative Modifiers Detected!"); + const char *msg = RPT_( "Keeping the modifiers will increase polycount when returning to object mode"); uiItemL(layout, msg_error, ICON_INFO); diff --git a/source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc b/source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc index 617094969d4..06c63bff0e1 100644 --- a/source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc +++ b/source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc @@ -714,13 +714,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, - TIP_("%s: Confirm, %s: Cancel"), + RPT_("%s: Confirm, %s: Cancel"), WM_MODALKEY(FILTER_MESH_MODAL_CONFIRM), WM_MODALKEY(FILTER_MESH_MODAL_CANCEL)); #undef WM_MODALKEY - ED_workspace_status_text(C, TIP_(header)); + ED_workspace_status_text(C, RPT_(header)); } static void sculpt_mesh_filter_apply(bContext *C, wmOperator *op) diff --git a/source/blender/editors/sculpt_paint/sculpt_ops.cc b/source/blender/editors/sculpt_paint/sculpt_ops.cc index 327fbe1dc66..8b0056729fe 100644 --- a/source/blender/editors/sculpt_paint/sculpt_ops.cc +++ b/source/blender/editors/sculpt_paint/sculpt_ops.cc @@ -370,10 +370,10 @@ void ED_object_sculptmode_enter_ex(Main *bmain, const char *message_unsupported = nullptr; if (mesh->corners_num != mesh->faces_num * 3) { - message_unsupported = TIP_("non-triangle face"); + message_unsupported = RPT_("non-triangle face"); } else if (mmd != nullptr) { - message_unsupported = TIP_("multi-res modifier"); + message_unsupported = RPT_("multi-res modifier"); } else { dyntopo::WarnFlag flag = dyntopo::check_attribute_warning(scene, ob); @@ -381,16 +381,16 @@ void ED_object_sculptmode_enter_ex(Main *bmain, /* pass */ } else if (flag & dyntopo::VDATA) { - message_unsupported = TIP_("vertex data"); + message_unsupported = RPT_("vertex data"); } else if (flag & dyntopo::EDATA) { - message_unsupported = TIP_("edge data"); + message_unsupported = RPT_("edge data"); } else if (flag & dyntopo::LDATA) { - message_unsupported = TIP_("face data"); + message_unsupported = RPT_("face data"); } else if (flag & dyntopo::MODIFIER) { - message_unsupported = TIP_("constructive modifier"); + message_unsupported = RPT_("constructive modifier"); } else { BLI_assert(0); diff --git a/source/blender/editors/space_buttons/buttons_texture.cc b/source/blender/editors/space_buttons/buttons_texture.cc index 35e788e2476..7f76a15705b 100644 --- a/source/blender/editors/space_buttons/buttons_texture.cc +++ b/source/blender/editors/space_buttons/buttons_texture.cc @@ -698,9 +698,9 @@ void uiTemplateTextureShow(uiLayout *layout, const bContext *C, PointerRNA *ptr, user_found ? user->ptr.data : nullptr, user_found ? user->prop : nullptr); if (ct == nullptr) { - UI_but_disable(but, TIP_("No (unpinned) Properties Editor found to display texture in")); + UI_but_disable(but, "No (unpinned) Properties Editor found to display texture in"); } else if (!user_found) { - UI_but_disable(but, TIP_("No texture user found")); + UI_but_disable(but, "No texture user found"); } } diff --git a/source/blender/editors/space_clip/clip_buttons.cc b/source/blender/editors/space_clip/clip_buttons.cc index 451069cb00e..c0d03a560b1 100644 --- a/source/blender/editors/space_clip/clip_buttons.cc +++ b/source/blender/editors/space_clip/clip_buttons.cc @@ -800,27 +800,27 @@ void uiTemplateMovieclipInformation(uiLayout *layout, char str[1024]; size_t ofs = 0; - ofs += BLI_snprintf_rlen(str + ofs, sizeof(str) - ofs, TIP_("%d x %d"), width, height); + ofs += BLI_snprintf_rlen(str + ofs, sizeof(str) - ofs, RPT_("%d x %d"), width, height); if (ibuf) { if (ibuf->float_buffer.data) { if (ibuf->channels != 4) { ofs += BLI_snprintf_rlen( - str + ofs, sizeof(str) - ofs, TIP_(", %d float channel(s)"), ibuf->channels); + str + ofs, sizeof(str) - ofs, RPT_(", %d float channel(s)"), ibuf->channels); } else if (ibuf->planes == R_IMF_PLANES_RGBA) { - ofs += BLI_strncpy_rlen(str + ofs, TIP_(", RGBA float"), sizeof(str) - ofs); + ofs += BLI_strncpy_rlen(str + ofs, RPT_(", RGBA float"), sizeof(str) - ofs); } else { - ofs += BLI_strncpy_rlen(str + ofs, TIP_(", RGB float"), sizeof(str) - ofs); + ofs += BLI_strncpy_rlen(str + ofs, RPT_(", RGB float"), sizeof(str) - ofs); } } else { if (ibuf->planes == R_IMF_PLANES_RGBA) { - ofs += BLI_strncpy_rlen(str + ofs, TIP_(", RGBA byte"), sizeof(str) - ofs); + ofs += BLI_strncpy_rlen(str + ofs, RPT_(", RGBA byte"), sizeof(str) - ofs); } else { - ofs += BLI_strncpy_rlen(str + ofs, TIP_(", RGB byte"), sizeof(str) - ofs); + ofs += BLI_strncpy_rlen(str + ofs, RPT_(", RGB byte"), sizeof(str) - ofs); } } @@ -829,12 +829,12 @@ void uiTemplateMovieclipInformation(uiLayout *layout, float frs_sec_base; if (IMB_anim_get_fps(clip->anim, true, &frs_sec, &frs_sec_base)) { ofs += BLI_snprintf_rlen( - str + ofs, sizeof(str) - ofs, TIP_(", %.2f fps"), float(frs_sec) / frs_sec_base); + str + ofs, sizeof(str) - ofs, RPT_(", %.2f fps"), float(frs_sec) / frs_sec_base); } } } else { - ofs += BLI_strncpy_rlen(str + ofs, TIP_(", failed to load"), sizeof(str) - ofs); + ofs += BLI_strncpy_rlen(str + ofs, RPT_(", failed to load"), sizeof(str) - ofs); } uiItemL(col, str, ICON_NONE); @@ -842,10 +842,10 @@ void uiTemplateMovieclipInformation(uiLayout *layout, /* Display current frame number. */ int framenr = BKE_movieclip_remap_scene_to_clip_frame(clip, user->framenr); if (framenr <= clip->len) { - SNPRINTF(str, TIP_("Frame: %d / %d"), framenr, clip->len); + SNPRINTF(str, RPT_("Frame: %d / %d"), framenr, clip->len); } else { - SNPRINTF(str, TIP_("Frame: - / %d"), clip->len); + SNPRINTF(str, RPT_("Frame: - / %d"), clip->len); } uiItemL(col, str, ICON_NONE); @@ -862,7 +862,7 @@ void uiTemplateMovieclipInformation(uiLayout *layout, file = "-"; } - SNPRINTF(str, TIP_("File: %s"), file); + SNPRINTF(str, RPT_("File: %s"), file); uiItemL(col, str, ICON_NONE); } diff --git a/source/blender/editors/space_clip/clip_ops.cc b/source/blender/editors/space_clip/clip_ops.cc index 0f02ee9aaa9..b85fcd6b6d9 100644 --- a/source/blender/editors/space_clip/clip_ops.cc +++ b/source/blender/editors/space_clip/clip_ops.cc @@ -224,7 +224,7 @@ static int open_exec(bContext *C, wmOperator *op) RPT_ERROR, "Cannot read '%s': %s", filepath, - errno ? strerror(errno) : TIP_("unsupported movie clip format")); + errno ? strerror(errno) : RPT_("unsupported movie clip format")); return OPERATOR_CANCELLED; } diff --git a/source/blender/editors/space_clip/tracking_ops.cc b/source/blender/editors/space_clip/tracking_ops.cc index 2ba7c6cfdc8..109578bddac 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, TIP_("Use LMB click to define location where place the marker")); + ED_workspace_status_text(C, RPT_("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_file/asset_catalog_tree_view.cc b/source/blender/editors/space_file/asset_catalog_tree_view.cc index 9ac91457fc8..2c5f9ce4cc8 100644 --- a/source/blender/editors/space_file/asset_catalog_tree_view.cc +++ b/source/blender/editors/space_file/asset_catalog_tree_view.cc @@ -376,11 +376,11 @@ bool AssetCatalogDropTarget::can_drop(const wmDrag &drag, const char **r_disable * path and the catalog system will generate missing parents from the path). But it does * appear broken to users, so disabling entirely. */ if (catalog_item_.catalog_path().is_contained_in(drag_catalog->path)) { - *r_disabled_hint = TIP_("Catalog cannot be dropped into itself"); + *r_disabled_hint = RPT_("Catalog cannot be dropped into itself"); return false; } if (catalog_item_.catalog_path() == drag_catalog->path.parent()) { - *r_disabled_hint = TIP_("Catalog is already placed inside this catalog"); + *r_disabled_hint = RPT_("Catalog is already placed inside this catalog"); return false; } return true; @@ -521,7 +521,7 @@ bool AssetCatalogDropTarget::has_droppable_asset(const wmDrag &drag, const char } } - *r_disabled_hint = TIP_("Only assets from this current file can be moved between catalogs"); + *r_disabled_hint = RPT_("Only assets from this current file can be moved between catalogs"); return false; } @@ -529,7 +529,7 @@ bool AssetCatalogDropTarget::can_modify_catalogs(const ::AssetLibrary &library, const char **r_disabled_hint) { if (ED_asset_catalogs_read_only(library)) { - *r_disabled_hint = TIP_("Catalogs cannot be edited in this asset library"); + *r_disabled_hint = RPT_("Catalogs cannot be edited in this asset library"); return false; } return true; @@ -607,7 +607,7 @@ bool AssetCatalogTreeViewAllItem::DropTarget::can_drop(const wmDrag &drag, const AssetCatalog *drag_catalog = AssetCatalogDropTarget::get_drag_catalog(drag, library); if (drag_catalog->path.parent() == "") { - *r_disabled_hint = TIP_("Catalog is already placed at the highest level"); + *r_disabled_hint = RPT_("Catalog is already placed at the highest level"); return false; } diff --git a/source/blender/editors/space_file/file_draw.cc b/source/blender/editors/space_file/file_draw.cc index f8a3aed0379..d8394d12fe7 100644 --- a/source/blender/editors/space_file/file_draw.cc +++ b/source/blender/editors/space_file/file_draw.cc @@ -1451,7 +1451,7 @@ static void file_draw_invalid_asset_library_hint(const bContext *C, int sy = v2d->tot.ymax; { - const char *message = TIP_("Path to asset library does not exist:"); + const char *message = RPT_("Path to asset library does not exist:"); file_draw_string_multiline(sx, sy, message, width, line_height, text_col, nullptr, &sy); sy -= line_height; @@ -1464,7 +1464,7 @@ static void file_draw_invalid_asset_library_hint(const bContext *C, { UI_icon_draw(sx, sy - UI_UNIT_Y, ICON_INFO); - const char *suggestion = TIP_( + const char *suggestion = RPT_( "Asset Libraries are local directories that can contain .blend files with assets inside.\n" "Manage Asset Libraries from the File Paths section in Preferences"); file_draw_string_multiline( @@ -1508,7 +1508,7 @@ static void file_draw_invalid_library_hint(const bContext * /*C*/, int sy = v2d->tot.ymax; { - const char *message = TIP_("Unreadable Blender library file:"); + const char *message = RPT_("Unreadable Blender library file:"); file_draw_string_multiline(sx, sy, message, width, line_height, text_col, nullptr, &sy); sy -= line_height; @@ -1532,7 +1532,7 @@ static void file_draw_invalid_library_hint(const bContext * /*C*/, file_draw_string_multiline(sx + UI_UNIT_X, sy, - TIP_(report->message), + RPT_(report->message), width - UI_UNIT_X, line_height, text_col, diff --git a/source/blender/editors/space_graph/graph_buttons.cc b/source/blender/editors/space_graph/graph_buttons.cc index 533728ff483..95b61f01be5 100644 --- a/source/blender/editors/space_graph/graph_buttons.cc +++ b/source/blender/editors/space_graph/graph_buttons.cc @@ -587,17 +587,17 @@ static void graph_panel_key_properties(const bContext *C, Panel *panel) else { if ((fcu->bezt == nullptr) && (fcu->modifiers.first)) { /* modifiers only - so no keyframes to be active */ - uiItemL(layout, TIP_("F-Curve only has F-Modifiers"), ICON_NONE); - uiItemL(layout, TIP_("See Modifiers panel below"), ICON_INFO); + uiItemL(layout, RPT_("F-Curve only has F-Modifiers"), ICON_NONE); + uiItemL(layout, RPT_("See Modifiers panel below"), ICON_INFO); } else if (fcu->fpt) { /* samples only */ uiItemL(layout, - TIP_("F-Curve doesn't have any keyframes as it only contains sampled points"), + RPT_("F-Curve doesn't have any keyframes as it only contains sampled points"), ICON_NONE); } else { - uiItemL(layout, TIP_("No active keyframe on F-Curve"), ICON_NONE); + uiItemL(layout, RPT_("No active keyframe on F-Curve"), ICON_NONE); } } @@ -686,30 +686,30 @@ static void driver_dvar_invalid_name_query_cb(bContext *C, void *dvar_v, void * DriverVar *dvar = (DriverVar *)dvar_v; if (dvar->flag & DVAR_FLAG_INVALID_EMPTY) { - uiItemL(layout, TIP_("It cannot be left blank"), ICON_ERROR); + uiItemL(layout, RPT_("It cannot be left blank"), ICON_ERROR); } if (dvar->flag & DVAR_FLAG_INVALID_START_NUM) { - uiItemL(layout, TIP_("It cannot start with a number"), ICON_ERROR); + uiItemL(layout, RPT_("It cannot start with a number"), ICON_ERROR); } if (dvar->flag & DVAR_FLAG_INVALID_START_CHAR) { uiItemL(layout, - TIP_("It cannot start with a special character," + RPT_("It cannot start with a special character," " including '$', '@', '!', '~', '+', '-', '_', '.', or ' '"), ICON_NONE); } if (dvar->flag & DVAR_FLAG_INVALID_HAS_SPACE) { - uiItemL(layout, TIP_("It cannot contain spaces (e.g. 'a space')"), ICON_ERROR); + uiItemL(layout, RPT_("It cannot contain spaces (e.g. 'a space')"), ICON_ERROR); } if (dvar->flag & DVAR_FLAG_INVALID_HAS_DOT) { - uiItemL(layout, TIP_("It cannot contain dots (e.g. 'a.dot')"), ICON_ERROR); + uiItemL(layout, RPT_("It cannot contain dots (e.g. 'a.dot')"), ICON_ERROR); } if (dvar->flag & DVAR_FLAG_INVALID_HAS_SPECIAL) { uiItemL(layout, - TIP_("It cannot contain special (non-alphabetical/numeric) characters"), + RPT_("It cannot contain special (non-alphabetical/numeric) characters"), ICON_ERROR); } if (dvar->flag & DVAR_FLAG_INVALID_PY_KEYWORD) { - uiItemL(layout, TIP_("It cannot be a reserved keyword in Python"), ICON_INFO); + uiItemL(layout, RPT_("It cannot be a reserved keyword in Python"), ICON_INFO); } UI_popup_menu_end(C, pup); @@ -1054,28 +1054,28 @@ static void graph_draw_driver_settings_panel(uiLayout *layout, block = uiLayoutGetBlock(col); if (driver->flag & DRIVER_FLAG_INVALID) { - uiItemL(col, TIP_("ERROR: Invalid Python expression"), ICON_CANCEL); + uiItemL(col, RPT_("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, TIP_("Python restricted for security"), ICON_ERROR); + uiItemL(col, RPT_("Python restricted for security"), ICON_ERROR); } else { - uiItemL(col, TIP_("Slow Python expression"), ICON_INFO); + uiItemL(col, RPT_("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, TIP_("WARNING: Driver expression may not work correctly"), ICON_HELP); + uiItemL(col, RPT_("WARNING: Driver expression may not work correctly"), ICON_HELP); if (bpy_data_expr_error) { - uiItemL(col, TIP_("TIP: Use variables instead of bpy.data paths (see below)"), ICON_ERROR); + uiItemL(col, RPT_("TIP: Use variables instead of bpy.data paths (see below)"), ICON_ERROR); } if (bpy_ctx_expr_error) { - uiItemL(col, TIP_("TIP: bpy.context is not safe for renderfarm usage"), ICON_ERROR); + uiItemL(col, RPT_("TIP: bpy.context is not safe for renderfarm usage"), ICON_ERROR); } } } @@ -1085,7 +1085,7 @@ static void graph_draw_driver_settings_panel(uiLayout *layout, block = uiLayoutGetBlock(col); if (driver->flag & DRIVER_FLAG_INVALID) { - uiItemL(col, TIP_("ERROR: Invalid target channel(s)"), ICON_ERROR); + uiItemL(col, RPT_("ERROR: Invalid target channel(s)"), ICON_ERROR); } /* Warnings about a lack of variables @@ -1095,11 +1095,11 @@ static void graph_draw_driver_settings_panel(uiLayout *layout, * property animation */ if (BLI_listbase_is_empty(&driver->variables)) { - uiItemL(col, TIP_("ERROR: Driver is useless without any inputs"), ICON_ERROR); + uiItemL(col, RPT_("ERROR: Driver is useless without any inputs"), ICON_ERROR); if (!BLI_listbase_is_empty(&fcu->modifiers)) { - 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); + uiItemL(col, RPT_("TIP: Use F-Curves for procedural animation instead"), ICON_INFO); + uiItemL(col, RPT_("F-Modifiers can generate curves for those too"), ICON_INFO); } } } diff --git a/source/blender/editors/space_graph/graph_edit.cc b/source/blender/editors/space_graph/graph_edit.cc index 6966cd3ad4f..6c7d414d0c0 100644 --- a/source/blender/editors/space_graph/graph_edit.cc +++ b/source/blender/editors/space_graph/graph_edit.cc @@ -1802,7 +1802,7 @@ static ListBase /*tEulerFilter*/ euler_filter_group_channels( BKE_reportf(reports, RPT_WARNING, "Euler Rotation F-Curve has invalid index (ID='%s', Path='%s', Index=%d)", - (ale->id) ? ale->id->name : TIP_(""), + (ale->id) ? ale->id->name : RPT_(""), fcu->rna_path, fcu->array_index); continue; diff --git a/source/blender/editors/space_graph/graph_slider_ops.cc b/source/blender/editors/space_graph/graph_slider_ops.cc index 21d75a448cd..1e18718b1c3 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, TIP_(operator_name)); + STRNCPY(mode_str, RPT_(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, TIP_("Decimate Keyframes")); + STRNCPY(mode_str, RPT_("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, TIP_("Shear Keys")); + STRNCPY(mode_str, RPT_("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, TIP_("Scale from Neighbor Keys")); + STRNCPY(mode_str, RPT_("Scale from Neighbor Keys")); if (hasNumInput(&gso->num)) { char str_ofs[NUM_STR_REP_LEN]; diff --git a/source/blender/editors/space_image/image_buttons.cc b/source/blender/editors/space_image/image_buttons.cc index 8cf4e4fa740..5e15a87d254 100644 --- a/source/blender/editors/space_image/image_buttons.cc +++ b/source/blender/editors/space_image/image_buttons.cc @@ -1039,7 +1039,7 @@ void uiTemplateImageSettings(uiLayout *layout, PointerRNA *imfptr, bool color_ma if (imf->imtype == R_IMF_IMTYPE_CINEON) { #if 1 - uiItemL(col, TIP_("Hard coded Non-Linear, Gamma:1.7"), ICON_NONE); + uiItemL(col, RPT_("Hard coded Non-Linear, Gamma:1.7"), ICON_NONE); #else uiItemR(col, imfptr, "use_cineon_log", UI_ITEM_NONE, nullptr, ICON_NONE); uiItemR(col, imfptr, "cineon_black", UI_ITEM_NONE, nullptr, ICON_NONE); @@ -1195,40 +1195,40 @@ void uiTemplateImageInfo(uiLayout *layout, bContext *C, Image *ima, ImageUser *i uiLayoutSetAlignment(col, UI_LAYOUT_ALIGN_RIGHT); if (ibuf == nullptr) { - uiItemL(col, TIP_("Can't Load Image"), ICON_NONE); + uiItemL(col, RPT_("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_rlen(str + ofs, len - ofs, TIP_("%d \u00D7 %d, "), ibuf->x, ibuf->y); + ofs += BLI_snprintf_rlen(str + ofs, len - ofs, RPT_("%d \u00D7 %d, "), ibuf->x, ibuf->y); if (ibuf->float_buffer.data) { if (ibuf->channels != 4) { ofs += BLI_snprintf_rlen( - str + ofs, len - ofs, TIP_("%d float channel(s)"), ibuf->channels); + str + ofs, len - ofs, RPT_("%d float channel(s)"), ibuf->channels); } else if (ibuf->planes == R_IMF_PLANES_RGBA) { - ofs += BLI_strncpy_rlen(str + ofs, TIP_(" RGBA float"), len - ofs); + ofs += BLI_strncpy_rlen(str + ofs, RPT_(" RGBA float"), len - ofs); } else { - ofs += BLI_strncpy_rlen(str + ofs, TIP_(" RGB float"), len - ofs); + ofs += BLI_strncpy_rlen(str + ofs, RPT_(" RGB float"), len - ofs); } } else { if (ibuf->planes == R_IMF_PLANES_RGBA) { - ofs += BLI_strncpy_rlen(str + ofs, TIP_(" RGBA byte"), len - ofs); + ofs += BLI_strncpy_rlen(str + ofs, RPT_(" RGBA byte"), len - ofs); } else { - ofs += BLI_strncpy_rlen(str + ofs, TIP_(" RGB byte"), len - ofs); + ofs += BLI_strncpy_rlen(str + ofs, RPT_(" RGB byte"), len - ofs); } } eGPUTextureFormat texture_format = IMB_gpu_get_texture_format( ibuf, ima->flag & IMA_HIGH_BITDEPTH, ibuf->planes >= 8); const char *texture_format_description = GPU_texture_format_name(texture_format); - ofs += BLI_snprintf_rlen(str + ofs, len - ofs, TIP_(", %s"), texture_format_description); + ofs += BLI_snprintf_rlen(str + ofs, len - ofs, RPT_(", %s"), texture_format_description); uiItemL(col, str, ICON_NONE); } @@ -1250,16 +1250,16 @@ void uiTemplateImageInfo(uiLayout *layout, bContext *C, Image *ima, ImageUser *i if (duration > 0) { /* Movie duration */ - SNPRINTF(str, TIP_("Frame %d / %d"), framenr, duration); + SNPRINTF(str, RPT_("Frame %d / %d"), framenr, duration); } else if (ima->source == IMA_SRC_SEQUENCE && ibuf) { /* Image sequence frame number + filename */ const char *filename = BLI_path_basename(ibuf->filepath); - SNPRINTF(str, TIP_("Frame %d: %s"), framenr, filename); + SNPRINTF(str, RPT_("Frame %d: %s"), framenr, filename); } else { /* Frame number */ - SNPRINTF(str, TIP_("Frame %d"), framenr); + SNPRINTF(str, RPT_("Frame %d"), framenr); } uiItemL(col, str, ICON_NONE); diff --git a/source/blender/editors/space_image/image_ops.cc b/source/blender/editors/space_image/image_ops.cc index 027ae8d1f52..084d0235029 100644 --- a/source/blender/editors/space_image/image_ops.cc +++ b/source/blender/editors/space_image/image_ops.cc @@ -1287,7 +1287,7 @@ static Image *image_open_single(Main *bmain, RPT_ERROR, "Cannot read '%s': %s", range->filepath, - errno ? strerror(errno) : TIP_("unsupported image format")); + errno ? strerror(errno) : RPT_("unsupported image format")); return nullptr; } diff --git a/source/blender/editors/space_info/info_stats.cc b/source/blender/editors/space_info/info_stats.cc index 48b19f8de7e..f6d7d2b0e0a 100644 --- a/source/blender/editors/space_info/info_stats.cc +++ b/source/blender/editors/space_info/info_stats.cc @@ -559,13 +559,14 @@ static void get_stats_string(char *info, if (obedit) { if (BKE_keyblock_from_object(obedit)) { - *ofs += BLI_strncpy_rlen(info + *ofs, TIP_("(Key) "), len - *ofs); + *ofs += BLI_strncpy_rlen(info + *ofs, RPT_("(Key) "), len - *ofs); } if (obedit->type == OB_MESH) { *ofs += BLI_snprintf_rlen(info + *ofs, len - *ofs, - TIP_("Verts:%s/%s | Edges:%s/%s | Faces:%s/%s | Tris:%s"), + + RPT_("Verts:%s/%s | Edges:%s/%s | Faces:%s/%s | Tris:%s"), stats_fmt->totvertsel, stats_fmt->totvert, stats_fmt->totedgesel, @@ -577,7 +578,8 @@ static void get_stats_string(char *info, else if (obedit->type == OB_ARMATURE) { *ofs += BLI_snprintf_rlen(info + *ofs, len - *ofs, - TIP_("Joints:%s/%s | Bones:%s/%s"), + + RPT_("Joints:%s/%s | Bones:%s/%s"), stats_fmt->totvertsel, stats_fmt->totvert, stats_fmt->totbonesel, @@ -585,17 +587,18 @@ static void get_stats_string(char *info, } else { *ofs += BLI_snprintf_rlen( - info + *ofs, len - *ofs, TIP_("Verts:%s/%s"), stats_fmt->totvertsel, stats_fmt->totvert); + info + *ofs, len - *ofs, RPT_("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, TIP_("Bones:%s/%s"), stats_fmt->totbonesel, stats_fmt->totbone); + info + *ofs, len - *ofs, RPT_("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, - TIP_("Layers:%s | Frames:%s | Strokes:%s | Points:%s"), + + RPT_("Layers:%s | Frames:%s | Strokes:%s | Points:%s"), stats_fmt->totgplayer, stats_fmt->totgpframe, stats_fmt->totgpstroke, @@ -605,14 +608,16 @@ static void get_stats_string(char *info, if (stats_is_object_dynamic_topology_sculpt(ob)) { *ofs += BLI_snprintf_rlen(info + *ofs, len - *ofs, - TIP_("Verts:%s | Tris:%s"), + + RPT_("Verts:%s | Tris:%s"), stats_fmt->totvertsculpt, stats_fmt->tottri); } else { *ofs += BLI_snprintf_rlen(info + *ofs, len - *ofs, - TIP_("Verts:%s | Faces:%s"), + + RPT_("Verts:%s | Faces:%s"), stats_fmt->totvertsculpt, stats_fmt->totfacesculpt); } @@ -620,7 +625,8 @@ static void get_stats_string(char *info, else { *ofs += BLI_snprintf_rlen(info + *ofs, len - *ofs, - TIP_("Verts:%s | Faces:%s | Tris:%s"), + + RPT_("Verts:%s | Faces:%s | Tris:%s"), stats_fmt->totvert, stats_fmt->totface, stats_fmt->tottri); @@ -629,7 +635,8 @@ static void get_stats_string(char *info, if (!STREQ(&stats_fmt->totobj[0], "0")) { *ofs += BLI_snprintf_rlen(info + *ofs, len - *ofs, - TIP_(" | Objects:%s/%s"), + + RPT_(" | Objects:%s/%s"), stats_fmt->totobjsel, stats_fmt->totobj); } @@ -667,7 +674,8 @@ const char *ED_info_statusbar_string_ex(Main *bmain, timecode, sizeof(timecode), -2, FRA2TIME(frame_count), FPS, U.timecode_style); ofs += BLI_snprintf_rlen(info + ofs, len - ofs, - TIP_("Duration: %s (Frame %i/%i)"), + + RPT_("Duration: %s (Frame %i/%i)"), timecode, relative_current_frame, frame_count); @@ -680,7 +688,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, TIP_("Memory: %s"), formatted_mem); + ofs += BLI_snprintf_rlen(info + ofs, len, RPT_("Memory: %s"), formatted_mem); } /* GPU VRAM status. */ @@ -695,13 +703,14 @@ const char *ED_info_statusbar_string_ex(Main *bmain, if (gpu_free_mem_kb && gpu_tot_mem_kb) { ofs += BLI_snprintf_rlen(info + ofs, len - ofs, - TIP_("VRAM: %.1f/%.1f GiB"), + + RPT_("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, TIP_("VRAM: %.1f GiB Free"), gpu_free_gb); + ofs += BLI_snprintf_rlen(info + ofs, len - ofs, RPT_("VRAM: %.1f GiB Free"), gpu_free_gb); } } @@ -710,7 +719,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, TIP_("%s"), BKE_blender_version_string()); + ofs += BLI_snprintf_rlen(info + ofs, len - ofs, RPT_("%s"), BKE_blender_version_string()); } return info; @@ -785,18 +794,18 @@ void ED_info_draw_stats( }; char labels[MAX_LABELS_COUNT][64]; - 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")); + 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")); int longest_label = 0; for (int i = 0; i < MAX_LABELS_COUNT; ++i) { diff --git a/source/blender/editors/space_node/node_draw.cc b/source/blender/editors/space_node/node_draw.cc index afc830b4598..fe35c1877a8 100644 --- a/source/blender/editors/space_node/node_draw.cc +++ b/source/blender/editors/space_node/node_draw.cc @@ -2554,7 +2554,7 @@ static NodeExtraInfoRow row_from_used_named_attribute( NodeExtraInfoRow row; row.text = std::to_string(attributes_num) + - (attributes_num == 1 ? TIP_(" Named Attribute") : TIP_(" Named Attributes")); + (attributes_num == 1 ? RPT_(" Named Attribute") : RPT_(" Named Attributes")); row.icon = ICON_SPREADSHEET; row.tooltip_fn = named_attribute_tooltip; row.tooltip_fn_arg = new NamedAttributeTooltipArg{usage_by_attribute_name}; diff --git a/source/blender/editors/space_node/node_templates.cc b/source/blender/editors/space_node/node_templates.cc index 5f6831c030c..4f2d26f61b4 100644 --- a/source/blender/editors/space_node/node_templates.cc +++ b/source/blender/editors/space_node/node_templates.cc @@ -939,7 +939,7 @@ static void ui_node_draw_input(uiLayout &layout, } if (dependency_loop) { - uiItemL(row, IFACE_("Dependency Loop"), ICON_ERROR); + uiItemL(row, RPT_("Dependency Loop"), ICON_ERROR); add_dummy_decorator = true; } else if (lnode) { diff --git a/source/blender/editors/space_outliner/outliner_draw.cc b/source/blender/editors/space_outliner/outliner_draw.cc index 71e0e0f3595..4cea31781f8 100644 --- a/source/blender/editors/space_outliner/outliner_draw.cc +++ b/source/blender/editors/space_outliner/outliner_draw.cc @@ -2271,7 +2271,7 @@ static void outliner_draw_mode_column_toggle(uiBlock *block, (ID_IS_OVERRIDE_LIBRARY_REAL(ob) && (ob->id.override_library->flag & LIBOVERRIDE_FLAG_SYSTEM_DEFINED) != 0)) { - UI_but_disable(but, TIP_("Can't edit library or non-editable override data")); + UI_but_disable(but, "Can't edit library or non-editable override data"); } } diff --git a/source/blender/editors/space_outliner/outliner_edit.cc b/source/blender/editors/space_outliner/outliner_edit.cc index dced5b95f6b..584e5011486 100644 --- a/source/blender/editors/space_outliner/outliner_edit.cc +++ b/source/blender/editors/space_outliner/outliner_edit.cc @@ -2145,7 +2145,7 @@ static int outliner_orphans_purge_invoke(bContext *C, wmOperator *op, const wmEv } DynStr *dyn_str = BLI_dynstr_new(); - BLI_dynstr_appendf(dyn_str, TIP_("Purging %d unused data-blocks ("), num_tagged[INDEX_ID_NULL]); + BLI_dynstr_appendf(dyn_str, RPT_("Purging %d unused data-blocks ("), num_tagged[INDEX_ID_NULL]); bool is_first = true; for (int i = 0; i < INDEX_ID_MAX - 2; i++) { if (num_tagged[i] != 0) { @@ -2158,10 +2158,10 @@ static int outliner_orphans_purge_invoke(bContext *C, wmOperator *op, const wmEv BLI_dynstr_appendf(dyn_str, "%d %s", num_tagged[i], - TIP_(BKE_idtype_idcode_to_name_plural(BKE_idtype_idcode_from_index(i)))); + RPT_(BKE_idtype_idcode_to_name_plural(BKE_idtype_idcode_from_index(i)))); } } - BLI_dynstr_append(dyn_str, TIP_("). Click here to proceed...")); + BLI_dynstr_append(dyn_str, RPT_("). Click here to proceed...")); char *message = BLI_dynstr_get_cstring(dyn_str); int ret = WM_operator_confirm_message(C, op, message); diff --git a/source/blender/editors/space_outliner/tree/tree_element_id_library.cc b/source/blender/editors/space_outliner/tree/tree_element_id_library.cc index 7d4688595e6..86db6746aa0 100644 --- a/source/blender/editors/space_outliner/tree/tree_element_id_library.cc +++ b/source/blender/editors/space_outliner/tree/tree_element_id_library.cc @@ -28,13 +28,13 @@ StringRefNull TreeElementIDLibrary::get_warning() const Library &library = reinterpret_cast(id_); if (library.tag & LIBRARY_TAG_RESYNC_REQUIRED) { - return TIP_( + return RPT_( "Contains linked library overrides that need to be resynced, updating the library is " "recommended"); } if (library.id.tag & LIB_TAG_MISSING) { - return TIP_("Missing library"); + return RPT_("Missing library"); } return {}; diff --git a/source/blender/editors/space_outliner/tree/tree_element_overrides.cc b/source/blender/editors/space_outliner/tree/tree_element_overrides.cc index ddf1999d48e..145143ca52b 100644 --- a/source/blender/editors/space_outliner/tree/tree_element_overrides.cc +++ b/source/blender/editors/space_outliner/tree/tree_element_overrides.cc @@ -77,11 +77,11 @@ TreeElementOverridesBase::TreeElementOverridesBase(TreeElement &legacy_te, ID &i StringRefNull TreeElementOverridesBase::get_warning() const { if (id.flag & LIB_LIB_OVERRIDE_RESYNC_LEFTOVER) { - return TIP_("This override data-block is not needed anymore, but was detected as user-edited"); + return RPT_("This override data-block is not needed anymore, but was detected as user-edited"); } if (ID_IS_OVERRIDE_LIBRARY_REAL(&id) && ID_REAL_USERS(&id) == 0) { - return TIP_("This override data-block is unused"); + return RPT_("This override data-block is unused"); } return {}; @@ -185,7 +185,7 @@ TreeElementOverridesProperty::TreeElementOverridesProperty(TreeElement &legacy_t StringRefNull TreeElementOverridesProperty::get_warning() const { if (!is_rna_path_valid) { - return TIP_( + return RPT_( "This override property does not exist in current data, it will be removed on " "next .blend file save"); } @@ -235,20 +235,20 @@ StringRefNull TreeElementOverridesPropertyOperation::get_override_operation_labe switch (operation_->operation) { case LIBOVERRIDE_OP_INSERT_AFTER: case LIBOVERRIDE_OP_INSERT_BEFORE: - return TIP_("Added through override"); + return RPT_("Added through override"); case LIBOVERRIDE_OP_REPLACE: /* Returning nothing so that drawing code shows actual RNA button instead. */ return {}; /* Following cases are not expected in regular situation, but could be found in experimental * files. */ case LIBOVERRIDE_OP_NOOP: - return TIP_("Protected from override"); + return RPT_("Protected from override"); case LIBOVERRIDE_OP_ADD: - return TIP_("Additive override"); + return RPT_("Additive override"); case LIBOVERRIDE_OP_SUBTRACT: - return TIP_("Subtractive override"); + return RPT_("Subtractive override"); case LIBOVERRIDE_OP_MULTIPLY: - return TIP_("Multiplicative override"); + return RPT_("Multiplicative override"); default: BLI_assert_unreachable(); return {}; diff --git a/source/blender/editors/space_sequencer/sequencer_edit.cc b/source/blender/editors/space_sequencer/sequencer_edit.cc index 494942c9a77..a2bab7fd804 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, TIP_("Slip offset: %s"), num_str); + SNPRINTF(msg, RPT_("Slip offset: %s"), num_str); } else { - SNPRINTF(msg, TIP_("Slip offset: %d"), offset); + SNPRINTF(msg, RPT_("Slip offset: %d"), offset); } } diff --git a/source/blender/editors/space_text/text_ops.cc b/source/blender/editors/space_text/text_ops.cc index 7b0a0a1ad71..b9047c3acbf 100644 --- a/source/blender/editors/space_text/text_ops.cc +++ b/source/blender/editors/space_text/text_ops.cc @@ -675,7 +675,7 @@ static void txt_write_file(Main *bmain, Text *text, ReportList *reports) RPT_ERROR, "Unable to save '%s': %s", filepath, - errno ? strerror(errno) : TIP_("unknown error writing file")); + errno ? strerror(errno) : RPT_("unknown error writing file")); return; } @@ -700,7 +700,7 @@ static void txt_write_file(Main *bmain, Text *text, ReportList *reports) RPT_WARNING, "Unable to stat '%s': %s", filepath, - errno ? strerror(errno) : TIP_("unknown error statting file")); + errno ? strerror(errno) : RPT_("unknown error statting file")); } text->flags &= ~TXT_ISDIRTY; diff --git a/source/blender/editors/transform/transform.cc b/source/blender/editors/transform/transform.cc index 3874ed24de2..b64fd8b3700 100644 --- a/source/blender/editors/transform/transform.cc +++ b/source/blender/editors/transform/transform.cc @@ -886,30 +886,30 @@ static bool transform_event_modal_constraint(TransInfo *t, short modal_type) /* Initialize */ switch (modal_type) { case TFM_MODAL_AXIS_X: - msg_2d = TIP_("along X"); - msg_3d = TIP_("along %s X"); + msg_2d = RPT_("along X"); + msg_3d = RPT_("along %s X"); constraint_new = CON_AXIS0; break; case TFM_MODAL_AXIS_Y: - msg_2d = TIP_("along Y"); - msg_3d = TIP_("along %s Y"); + msg_2d = RPT_("along Y"); + msg_3d = RPT_("along %s Y"); constraint_new = CON_AXIS1; break; case TFM_MODAL_AXIS_Z: - msg_2d = TIP_("along Z"); - msg_3d = TIP_("along %s Z"); + msg_2d = RPT_("along Z"); + msg_3d = RPT_("along %s Z"); constraint_new = CON_AXIS2; break; case TFM_MODAL_PLANE_X: - msg_3d = TIP_("locking %s X"); + msg_3d = RPT_("locking %s X"); constraint_new = CON_AXIS1 | CON_AXIS2; break; case TFM_MODAL_PLANE_Y: - msg_3d = TIP_("locking %s Y"); + msg_3d = RPT_("locking %s Y"); constraint_new = CON_AXIS0 | CON_AXIS2; break; case TFM_MODAL_PLANE_Z: - msg_3d = TIP_("locking %s Z"); + msg_3d = RPT_("locking %s Z"); constraint_new = CON_AXIS0 | CON_AXIS1; break; default: @@ -1253,7 +1253,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), TIP_("along local Z")); + setLocalConstraint(t, (CON_AXIS2), RPT_("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 c95c96afcc0..b8329db9cd3 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, TIP_(" along Y axis")); + STRNCPY(t->con.text, RPT_(" along Y axis")); } else { t->con.mode |= CON_AXIS0; - STRNCPY(t->con.text, TIP_(" along X axis")); + STRNCPY(t->con.text, RPT_(" 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, TIP_(" locking %s X axis"), t->spacename); + SNPRINTF(t->con.text, RPT_(" locking %s X axis"), t->spacename); } else { t->con.mode |= CON_AXIS0; - SNPRINTF(t->con.text, TIP_(" along %s X axis"), t->spacename); + SNPRINTF(t->con.text, RPT_(" 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, TIP_(" locking %s Y axis"), t->spacename); + SNPRINTF(t->con.text, RPT_(" locking %s Y axis"), t->spacename); } else { t->con.mode |= CON_AXIS1; - SNPRINTF(t->con.text, TIP_(" along %s Y axis"), t->spacename); + SNPRINTF(t->con.text, RPT_(" 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, TIP_(" locking %s Z axis"), t->spacename); + SNPRINTF(t->con.text, RPT_(" locking %s Z axis"), t->spacename); } else { t->con.mode |= CON_AXIS2; - SNPRINTF(t->con.text, TIP_(" along %s Z axis"), t->spacename); + SNPRINTF(t->con.text, RPT_(" 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 c2d6c11a222..62a7e586617 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, TIP_("Rotation: %s %s %s"), &c[0], t->con.text, t->proptext); + str + ofs, str_size - ofs, RPT_("Rotation: %s %s %s"), &c[0], t->con.text, t->proptext); } else { ofs += BLI_snprintf_rlen(str + ofs, str_size - ofs, - TIP_("Rotation: %.2f%s %s"), + RPT_("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, TIP_(" Proportional size: %.2f"), t->prop_size); + str + ofs, str_size - ofs, RPT_(" Proportional size: %.2f"), t->prop_size); } } @@ -848,12 +848,12 @@ void headerResize(TransInfo *t, const float vec[3], char *str, const int str_siz switch (t->num.idx_max) { case 0: ofs += BLI_snprintf_rlen( - str + ofs, str_size - ofs, TIP_("Scale: %s%s %s"), &tvec[0], t->con.text, t->proptext); + str + ofs, str_size - ofs, RPT_("Scale: %s%s %s"), &tvec[0], t->con.text, t->proptext); break; case 1: ofs += BLI_snprintf_rlen(str + ofs, str_size - ofs, - TIP_("Scale: %s : %s%s %s"), + RPT_("Scale: %s : %s%s %s"), &tvec[0], &tvec[NUM_STR_REP_LEN], t->con.text, @@ -862,7 +862,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, - TIP_("Scale: %s : %s : %s%s %s"), + RPT_("Scale: %s : %s : %s%s %s"), &tvec[0], &tvec[NUM_STR_REP_LEN], &tvec[NUM_STR_REP_LEN * 2], @@ -875,7 +875,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, - TIP_("Scale X: %s Y: %s%s %s"), + RPT_("Scale X: %s Y: %s%s %s"), &tvec[0], &tvec[NUM_STR_REP_LEN], t->con.text, @@ -884,7 +884,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, - TIP_("Scale X: %s Y: %s Z: %s%s %s"), + RPT_("Scale X: %s Y: %s Z: %s%s %s"), &tvec[0], &tvec[NUM_STR_REP_LEN], &tvec[NUM_STR_REP_LEN * 2], @@ -895,7 +895,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, TIP_(" Proportional size: %.2f"), t->prop_size); + str + ofs, str_size - ofs, RPT_(" 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 17f0662eb62..6f3b401a3c5 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, TIP_("Align")); + ED_area_status_text(t->area, RPT_("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 2208dce1c45..ff531bea213 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, TIP_("Time: +%s %s"), c, t->proptext); + SNPRINTF(str, RPT_("Time: +%s %s"), c, t->proptext); } else { - SNPRINTF(str, TIP_("Time: %s %s"), c, t->proptext); + SNPRINTF(str, RPT_("Time: %s %s"), c, t->proptext); } } else { /* default header print */ if (time >= 0.0f) { - SNPRINTF(str, TIP_("Time: +%.3f %s"), time, t->proptext); + SNPRINTF(str, RPT_("Time: +%.3f %s"), time, t->proptext); } else { - SNPRINTF(str, TIP_("Time: %.3f %s"), time, t->proptext); + SNPRINTF(str, RPT_("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 7874dab75dc..9879b5988d8 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, TIP_("ScaleB: %s%s %s"), &tvec[0], t->con.text, t->proptext); + str, UI_MAX_DRAW_STR, RPT_("ScaleB: %s%s %s"), &tvec[0], t->con.text, t->proptext); } else { BLI_snprintf(str, UI_MAX_DRAW_STR, - TIP_("ScaleB: %s : %s : %s%s %s"), + RPT_("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, - TIP_("ScaleB X: %s Y: %s Z: %s%s %s"), + RPT_("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 45aff06312e..61ab53374be 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, - TIP_("Bend Angle: %s Radius: %s Alt, Clamp %s"), + RPT_("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, - TIP_("Bend Angle: %.3f Radius: %.4f, Alt, Clamp %s"), + RPT_("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 7f61e970b0c..f2f5365d17d 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, TIP_("Envelope: %s"), c); + SNPRINTF(str, RPT_("Envelope: %s"), c); } else { - SNPRINTF(str, TIP_("Envelope: %3f"), ratio); + SNPRINTF(str, RPT_("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 8a17937a548..103e66861ef 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, TIP_("Roll: %s"), &c[0]); + SNPRINTF(str, RPT_("Roll: %s"), &c[0]); } else { - SNPRINTF(str, TIP_("Roll: %.2f"), RAD2DEGF(final)); + SNPRINTF(str, RPT_("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 44508d7e913..701f2337617 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, TIP_("Shrink/Fatten: %s"), c); + SNPRINTF(str, RPT_("Shrink/Fatten: %s"), c); } else { - SNPRINTF(str, TIP_("Shrink/Fatten: %3f"), ratio); + SNPRINTF(str, RPT_("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 64b4cff55f1..87c560e3d44 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, TIP_("Crease")); + apply_value_impl(t, RPT_("Crease")); } static void applyBevelWeight(TransInfo *t) { - apply_value_impl(t, TIP_("Bevel Weight")); + apply_value_impl(t, RPT_("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 4693ba0b0b7..86fe7c50dc4 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, TIP_("Sequence Slide: %s%s"), &tvec[0], t->con.text); + str + ofs, UI_MAX_DRAW_STR - ofs, RPT_("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_edge_slide.cc b/source/blender/editors/transform/transform_mode_edge_slide.cc index d5a57837052..2c4f856d722 100644 --- a/source/blender/editors/transform/transform_mode_edge_slide.cc +++ b/source/blender/editors/transform/transform_mode_edge_slide.cc @@ -1453,7 +1453,7 @@ static void applyEdgeSlide(TransInfo *t) t->values_final[0] = final; /* header string */ - ofs += BLI_strncpy_rlen(str + ofs, TIP_("Edge Slide: "), sizeof(str) - ofs); + ofs += BLI_strncpy_rlen(str + ofs, RPT_("Edge Slide: "), sizeof(str) - ofs); if (hasNumInput(&t->num)) { char c[NUM_STR_REP_LEN]; outputNumInput(&(t->num), c, &t->scene->unit); @@ -1463,13 +1463,13 @@ static void applyEdgeSlide(TransInfo *t) ofs += BLI_snprintf_rlen(str + ofs, sizeof(str) - ofs, "%.4f ", final); } ofs += BLI_snprintf_rlen( - str + ofs, sizeof(str) - ofs, TIP_("(E)ven: %s, "), WM_bool_as_string(use_even)); + str + ofs, sizeof(str) - ofs, RPT_("(E)ven: %s, "), WM_bool_as_string(use_even)); if (use_even) { ofs += BLI_snprintf_rlen( - str + ofs, sizeof(str) - ofs, TIP_("(F)lipped: %s, "), WM_bool_as_string(flipped)); + str + ofs, sizeof(str) - ofs, RPT_("(F)lipped: %s, "), WM_bool_as_string(flipped)); } ofs += BLI_snprintf_rlen( - str + ofs, sizeof(str) - ofs, TIP_("Alt or (C)lamp: %s"), WM_bool_as_string(is_clamp)); + str + ofs, sizeof(str) - ofs, RPT_("Alt or (C)lamp: %s"), WM_bool_as_string(is_clamp)); /* done with header string */ /* do stuff here */ diff --git a/source/blender/editors/transform/transform_mode_gpopacity.cc b/source/blender/editors/transform/transform_mode_gpopacity.cc index c6ece2f1671..d836560f955 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, TIP_("Opacity: %s"), c); + SNPRINTF(str, RPT_("Opacity: %s"), c); } else { - SNPRINTF(str, TIP_("Opacity: %3f"), ratio); + SNPRINTF(str, RPT_("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 7024e66ae41..29fcecb7bd2 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, TIP_("Shrink/Fatten: %s"), c); + SNPRINTF(str, RPT_("Shrink/Fatten: %s"), c); } else { - SNPRINTF(str, TIP_("Shrink/Fatten: %3f"), ratio); + SNPRINTF(str, RPT_("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 838d9307a25..fa864934cff 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, TIP_("Feather Shrink/Fatten: %s"), c); + SNPRINTF(str, RPT_("Feather Shrink/Fatten: %s"), c); } else { - SNPRINTF(str, TIP_("Feather Shrink/Fatten: %3f"), ratio); + SNPRINTF(str, RPT_("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 05ff6a51db1..588fbf3c8b7 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, TIP_("Mirror%s"), t->con.text); + SNPRINTF(str, RPT_("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, TIP_("Select a mirror axis (X, Y)")); + ED_area_status_text(t->area, RPT_("Select a mirror axis (X, Y)")); } else { - ED_area_status_text(t->area, TIP_("Select a mirror axis (X, Y, Z)")); + ED_area_status_text(t->area, RPT_("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 32688ecb55a..58130a17451 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, TIP_("Push/Pull: %s%s %s"), c, t->con.text, t->proptext); + SNPRINTF(str, RPT_("Push/Pull: %s%s %s"), c, t->con.text, t->proptext); } else { /* default header print */ - SNPRINTF(str, TIP_("Push/Pull: %.4f%s %s"), distance, t->con.text, t->proptext); + SNPRINTF(str, RPT_("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 4bc10288f9a..7727f58f74a 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, TIP_("Shear: %s %s"), c, t->proptext); + SNPRINTF(str, RPT_("Shear: %s %s"), c, t->proptext); } else { /* default header print */ - SNPRINTF(str, TIP_("Shear: %.3f %s (Press X or Y to set shear axis)"), value, t->proptext); + SNPRINTF(str, RPT_("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 f12f604db4a..cf2dab0e9cf 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, TIP_("Shrink/Fatten: "), sizeof(str) - ofs); + ofs += BLI_strncpy_rlen(str + ofs, RPT_("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, - TIP_(" or Alt) Even Thickness %s"), + RPT_(" 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 de0e6fc74d9..b71d17bae3e 100644 --- a/source/blender/editors/transform/transform_mode_tilt.cc +++ b/source/blender/editors/transform/transform_mode_tilt.cc @@ -51,13 +51,13 @@ static void applyTilt(TransInfo *t) outputNumInput(&(t->num), c, &t->scene->unit); - SNPRINTF(str, TIP_("Tilt: %s" BLI_STR_UTF8_DEGREE_SIGN " %s"), &c[0], t->proptext); + SNPRINTF(str, RPT_("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, TIP_("Tilt: %.2f" BLI_STR_UTF8_DEGREE_SIGN " %s"), RAD2DEGF(final), t->proptext); + SNPRINTF(str, RPT_("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 e7cf9123373..bfe32f211d6 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, TIP_("ScaleX: %s"), &tvec[0]); + BLI_snprintf(str, UI_MAX_DRAW_STR, RPT_("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 d1631bc6f69..c92354ae579 100644 --- a/source/blender/editors/transform/transform_mode_timeslide.cc +++ b/source/blender/editors/transform/transform_mode_timeslide.cc @@ -55,7 +55,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, TIP_("TimeSlide: %s"), &tvec[0]); + BLI_snprintf(str, UI_MAX_DRAW_STR, RPT_("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 9e072f5d244..b34177e88a9 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, TIP_("DeltaX: %s"), &tvec[0]); + ofs += BLI_snprintf_rlen(str, UI_MAX_DRAW_STR, RPT_("DeltaX: %s"), &tvec[0]); if (t->flag & T_PROP_EDIT_ALL) { ofs += BLI_snprintf_rlen( - str + ofs, UI_MAX_DRAW_STR - ofs, TIP_(" Proportional size: %.2f"), t->prop_size); + str + ofs, UI_MAX_DRAW_STR - ofs, RPT_(" 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 25cf8be5bec..93d3fa847e0 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, TIP_("To Sphere: %s %s"), c, t->proptext); + SNPRINTF(str, RPT_("To Sphere: %s %s"), c, t->proptext); } else { /* default header print */ - SNPRINTF(str, TIP_("To Sphere: %.4f %s"), ratio, t->proptext); + SNPRINTF(str, RPT_("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 c13525e2a9e..a6391261a2c 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, - TIP_("Trackball: %s %s %s"), + RPT_("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, - TIP_("Trackball: %.2f %.2f %s"), + RPT_("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, TIP_(" Proportional size: %.2f"), t->prop_size); + str + ofs, sizeof(str) - ofs, RPT_(" 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 2316c33fb33..73becd3cefb 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 ", - TIP_("Proportional Size"), + RPT_("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, TIP_("Auto IK Length: %d"), chainlen); + str + ofs, UI_MAX_DRAW_STR - ofs, RPT_("Auto IK Length: %d"), chainlen); ofs += BLI_strncpy_rlen(str + ofs, " ", UI_MAX_DRAW_STR - ofs); } } @@ -310,9 +310,9 @@ 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) ? - TIP_("right") : - TIP_("left"); - ofs += BLI_snprintf_rlen(str, UI_MAX_DRAW_STR, TIP_("Auto-offset direction: %s"), str_dir); + RPT_("right") : + RPT_("left"); + ofs += BLI_snprintf_rlen(str, UI_MAX_DRAW_STR, RPT_("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 a7c9ae10bc3..cf01fc4ba58 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, TIP_("Vertex Slide: "), sizeof(str) - ofs); + ofs += BLI_strncpy_rlen(str + ofs, RPT_("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, TIP_("(E)ven: %s, "), WM_bool_as_string(use_even)); + str + ofs, sizeof(str) - ofs, RPT_("(E)ven: %s, "), WM_bool_as_string(use_even)); if (use_even) { ofs += BLI_snprintf_rlen( - str + ofs, sizeof(str) - ofs, TIP_("(F)lipped: %s, "), WM_bool_as_string(flipped)); + str + ofs, sizeof(str) - ofs, RPT_("(F)lipped: %s, "), WM_bool_as_string(flipped)); } ofs += BLI_snprintf_rlen( - str + ofs, sizeof(str) - ofs, TIP_("Alt or (C)lamp: %s"), WM_bool_as_string(is_clamp)); + str + ofs, sizeof(str) - ofs, RPT_("Alt or (C)lamp: %s"), WM_bool_as_string(is_clamp)); /* done with header string */ /* do stuff here */ diff --git a/source/blender/editors/transform/transform_orientations.cc b/source/blender/editors/transform/transform_orientations.cc index eded68ccfa7..85cb8912dc7 100644 --- a/source/blender/editors/transform/transform_orientations.cc +++ b/source/blender/editors/transform/transform_orientations.cc @@ -782,21 +782,21 @@ const char *transform_orientations_spacename_get(TransInfo *t, const short orien { switch (orient_type) { case V3D_ORIENT_GLOBAL: - return TIP_("global"); + return RPT_("global"); case V3D_ORIENT_GIMBAL: - return TIP_("gimbal"); + return RPT_("gimbal"); case V3D_ORIENT_NORMAL: - return TIP_("normal"); + return RPT_("normal"); case V3D_ORIENT_LOCAL: - return TIP_("local"); + return RPT_("local"); case V3D_ORIENT_VIEW: - return TIP_("view"); + return RPT_("view"); case V3D_ORIENT_CURSOR: - return TIP_("cursor"); + return RPT_("cursor"); case V3D_ORIENT_PARENT: - return TIP_("parent"); + return RPT_("parent"); case V3D_ORIENT_CUSTOM_MATRIX: - return TIP_("custom"); + return RPT_("custom"); case V3D_ORIENT_CUSTOM: default: BLI_assert(orient_type >= V3D_ORIENT_CUSTOM); diff --git a/source/blender/editors/util/ed_draw.cc b/source/blender/editors/util/ed_draw.cc index 750c8cf6a60..880970b93bb 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, TIP_("[E] - Disable overshoot")); + STRNCPY(overshoot_str, RPT_("[E] - Disable overshoot")); } else { - STRNCPY(overshoot_str, TIP_("[E] - Enable overshoot")); + STRNCPY(overshoot_str, RPT_("[E] - Enable overshoot")); } } else { - STRNCPY(overshoot_str, TIP_("Overshoot disabled")); + STRNCPY(overshoot_str, RPT_("Overshoot disabled")); } if (slider->precision) { - STRNCPY(precision_str, TIP_("[Shift] - Precision active")); + STRNCPY(precision_str, RPT_("[Shift] - Precision active")); } else { - STRNCPY(precision_str, TIP_("Shift - Hold for precision")); + STRNCPY(precision_str, RPT_("Shift - Hold for precision")); } if (slider->allow_increments) { if (slider->increments) { - STRNCPY(increments_str, TIP_(" | [Ctrl] - Increments active")); + STRNCPY(increments_str, RPT_(" | [Ctrl] - Increments active")); } else { - STRNCPY(increments_str, TIP_(" | Ctrl - Hold for 10% increments")); + STRNCPY(increments_str, RPT_(" | Ctrl - Hold for 10% increments")); } } else { diff --git a/source/blender/editors/util/ed_util.cc b/source/blender/editors/util/ed_util.cc index 53e150fa1e2..53fb1d61fef 100644 --- a/source/blender/editors/util/ed_util.cc +++ b/source/blender/editors/util/ed_util.cc @@ -391,7 +391,7 @@ void unpack_menu(bContext *C, if (!STREQ(abs_name, local_name)) { switch (BKE_packedfile_compare_to_file(blendfile_path, local_name, pf)) { case PF_CMP_NOFILE: - SNPRINTF(line, TIP_("Create %s"), local_name); + SNPRINTF(line, IFACE_("Create %s"), local_name); uiItemFullO_ptr( layout, ot, line, ICON_NONE, nullptr, WM_OP_EXEC_DEFAULT, UI_ITEM_NONE, &props_ptr); RNA_enum_set(&props_ptr, "method", PF_WRITE_LOCAL); @@ -399,7 +399,7 @@ void unpack_menu(bContext *C, break; case PF_CMP_EQUAL: - SNPRINTF(line, TIP_("Use %s (identical)"), local_name); + SNPRINTF(line, IFACE_("Use %s (identical)"), local_name); // uiItemEnumO_ptr(layout, ot, line, ICON_NONE, "method", PF_USE_LOCAL); uiItemFullO_ptr( layout, ot, line, ICON_NONE, nullptr, WM_OP_EXEC_DEFAULT, UI_ITEM_NONE, &props_ptr); @@ -408,14 +408,14 @@ void unpack_menu(bContext *C, break; case PF_CMP_DIFFERS: - SNPRINTF(line, TIP_("Use %s (differs)"), local_name); + SNPRINTF(line, IFACE_("Use %s (differs)"), local_name); // uiItemEnumO_ptr(layout, ot, line, ICON_NONE, "method", PF_USE_LOCAL); uiItemFullO_ptr( layout, ot, line, ICON_NONE, nullptr, WM_OP_EXEC_DEFAULT, UI_ITEM_NONE, &props_ptr); RNA_enum_set(&props_ptr, "method", PF_USE_LOCAL); RNA_string_set(&props_ptr, "id", id_name); - SNPRINTF(line, TIP_("Overwrite %s"), local_name); + SNPRINTF(line, IFACE_("Overwrite %s"), local_name); // uiItemEnumO_ptr(layout, ot, line, ICON_NONE, "method", PF_WRITE_LOCAL); uiItemFullO_ptr( layout, ot, line, ICON_NONE, nullptr, WM_OP_EXEC_DEFAULT, UI_ITEM_NONE, &props_ptr); @@ -428,7 +428,7 @@ void unpack_menu(bContext *C, switch (BKE_packedfile_compare_to_file(blendfile_path, abs_name, pf)) { case PF_CMP_NOFILE: - SNPRINTF(line, TIP_("Create %s"), abs_name); + SNPRINTF(line, IFACE_("Create %s"), abs_name); // uiItemEnumO_ptr(layout, ot, line, ICON_NONE, "method", PF_WRITE_ORIGINAL); uiItemFullO_ptr( layout, ot, line, ICON_NONE, nullptr, WM_OP_EXEC_DEFAULT, UI_ITEM_NONE, &props_ptr); @@ -436,7 +436,7 @@ void unpack_menu(bContext *C, RNA_string_set(&props_ptr, "id", id_name); break; case PF_CMP_EQUAL: - SNPRINTF(line, TIP_("Use %s (identical)"), abs_name); + SNPRINTF(line, IFACE_("Use %s (identical)"), abs_name); // uiItemEnumO_ptr(layout, ot, line, ICON_NONE, "method", PF_USE_ORIGINAL); uiItemFullO_ptr( layout, ot, line, ICON_NONE, nullptr, WM_OP_EXEC_DEFAULT, UI_ITEM_NONE, &props_ptr); @@ -444,14 +444,14 @@ void unpack_menu(bContext *C, RNA_string_set(&props_ptr, "id", id_name); break; case PF_CMP_DIFFERS: - SNPRINTF(line, TIP_("Use %s (differs)"), abs_name); + SNPRINTF(line, IFACE_("Use %s (differs)"), abs_name); // uiItemEnumO_ptr(layout, ot, line, ICON_NONE, "method", PF_USE_ORIGINAL); uiItemFullO_ptr( layout, ot, line, ICON_NONE, nullptr, WM_OP_EXEC_DEFAULT, UI_ITEM_NONE, &props_ptr); RNA_enum_set(&props_ptr, "method", PF_USE_ORIGINAL); RNA_string_set(&props_ptr, "id", id_name); - SNPRINTF(line, TIP_("Overwrite %s"), abs_name); + SNPRINTF(line, IFACE_("Overwrite %s"), abs_name); // uiItemEnumO_ptr(layout, ot, line, ICON_NONE, "method", PF_WRITE_ORIGINAL); uiItemFullO_ptr( layout, ot, line, ICON_NONE, nullptr, WM_OP_EXEC_DEFAULT, UI_ITEM_NONE, &props_ptr); diff --git a/source/blender/editors/util/numinput.cc b/source/blender/editors/util/numinput.cc index b0fbc051055..8db7455c1b5 100644 --- a/source/blender/editors/util/numinput.cc +++ b/source/blender/editors/util/numinput.cc @@ -120,7 +120,7 @@ void outputNumInput(NumInput *n, char *str, UnitSettings *unit_settings) #endif if (n->val_flag[i] & NUM_INVALID) { - STRNCPY(val, TIP_("Invalid")); + STRNCPY(val, RPT_("Invalid")); } else { BKE_unit_value_as_string_adaptive(val, @@ -589,7 +589,7 @@ bool handleNumInput(bContext *C, NumInput *n, const wmEvent *event) ReportList *reports = CTX_wm_reports(C); printf("%s\n", error); BKE_report(reports, RPT_ERROR, error); - BKE_report(reports, RPT_ERROR, IFACE_("Numeric input evaluation")); + BKE_report(reports, RPT_ERROR, "Numeric input evaluation"); MEM_freeN(error); } diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.cc b/source/blender/editors/uvedit/uvedit_smart_stitch.cc index 0a0772c3514..10824dca5a7 100644 --- a/source/blender/editors/uvedit/uvedit_smart_stitch.cc +++ b/source/blender/editors/uvedit/uvedit_smart_stitch.cc @@ -269,7 +269,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 = TIP_( + const char *str = RPT_( "Mode(TAB) %s, " "(S)nap %s, " "(M)idpoints %s, " @@ -283,7 +283,7 @@ static void stitch_update_header(StitchStateContainer *ssc, bContext *C) if (area) { SNPRINTF(msg, str, - ssc->mode == STITCH_VERT ? TIP_("Vertex") : TIP_("Edge"), + ssc->mode == STITCH_VERT ? RPT_("Vertex") : RPT_("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 fed05798785..86bd55901a6 100644 --- a/source/blender/editors/uvedit/uvedit_unwrap_ops.cc +++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.cc @@ -838,9 +838,9 @@ static void minimize_stretch_iteration(bContext *C, wmOperator *op, bool interac blender::geometry::uv_parametrizer_flush(ms->handle); if (area) { - SNPRINTF(str, TIP_("Minimize Stretch. Blend %.2f"), ms->blend); + SNPRINTF(str, RPT_("Minimize Stretch. Blend %.2f"), ms->blend); ED_area_status_text(area, str); - ED_workspace_status_text(C, TIP_("Press + and -, or scroll wheel to set blending")); + ED_workspace_status_text(C, RPT_("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 207c8dde105..5fb50bcba33 100644 --- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp +++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp @@ -279,7 +279,7 @@ static bool test_edge_type_conditions(edge_type_condition *conditions, static void prepare(Render *re, ViewLayer *view_layer, Depsgraph *depsgraph) { // load mesh - re->i.infostr = TIP_("Freestyle: Mesh loading"); + re->i.infostr = RPT_("Freestyle: Mesh loading"); re->stats_draw(&re->i); re->i.infostr = nullptr; if (controller->LoadMesh(re, view_layer, depsgraph)) { @@ -466,7 +466,7 @@ static void prepare(Render *re, ViewLayer *view_layer, Depsgraph *depsgraph) } // compute view map - re->i.infostr = TIP_("Freestyle: View map creation"); + re->i.infostr = RPT_("Freestyle: View map creation"); re->stats_draw(&re->i); re->i.infostr = nullptr; controller->ComputeViewMap(); @@ -640,7 +640,7 @@ void FRS_do_stroke_rendering(Render *re, ViewLayer *view_layer) // render and composite Freestyle result if (controller->_ViewMap) { // render strokes - re->i.infostr = TIP_("Freestyle: Stroke rendering"); + re->i.infostr = RPT_("Freestyle: Stroke rendering"); re->stats_draw(&re->i); re->i.infostr = nullptr; g_freestyle.scene = DEG_get_evaluated_scene(depsgraph); diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_lineart.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_lineart.cc index c5463cb106a..010bfd4c815 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_lineart.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_lineart.cc @@ -475,7 +475,7 @@ static void options_panel_draw(const bContext * /*C*/, Panel *panel) uiLayoutSetEnabled(layout, !is_baked); if (use_cache && !is_first) { - uiItemL(layout, TIP_("Cached from the first line art modifier"), ICON_INFO); + uiItemL(layout, RPT_("Cached from the first line art modifier"), ICON_INFO); return; } @@ -521,7 +521,7 @@ static void occlusion_panel_draw(const bContext * /*C*/, Panel *panel) uiLayoutSetEnabled(layout, !is_baked); if (!show_in_front) { - uiItemL(layout, TIP_("Object is not in front"), ICON_INFO); + uiItemL(layout, RPT_("Object is not in front"), ICON_INFO); } layout = uiLayoutColumn(layout, false); @@ -655,7 +655,7 @@ static void face_mark_panel_draw(const bContext * /*C*/, Panel *panel) uiLayoutSetEnabled(layout, !is_baked); if (use_cache && !is_first) { - uiItemL(layout, TIP_("Cached from the first line art modifier"), ICON_INFO); + uiItemL(layout, RPT_("Cached from the first line art modifier"), ICON_INFO); return; } @@ -686,7 +686,7 @@ static void chaining_panel_draw(const bContext * /*C*/, Panel *panel) uiLayoutSetEnabled(layout, !is_baked); if (use_cache && !is_first) { - uiItemL(layout, TIP_("Cached from the first line art modifier"), ICON_INFO); + uiItemL(layout, RPT_("Cached from the first line art modifier"), ICON_INFO); return; } @@ -727,7 +727,7 @@ static void vgroup_panel_draw(const bContext * /*C*/, Panel *panel) uiLayoutSetEnabled(layout, !is_baked); if (use_cache && !is_first) { - uiItemL(layout, TIP_("Cached from the first line art modifier"), ICON_INFO); + uiItemL(layout, RPT_("Cached from the first line art modifier"), ICON_INFO); return; } @@ -761,7 +761,7 @@ static void bake_panel_draw(const bContext * /*C*/, Panel *panel) if (is_baked) { uiLayout *col = uiLayoutColumn(layout, false); uiLayoutSetPropSep(col, false); - uiItemL(col, TIP_("Modifier has baked data"), ICON_NONE); + uiItemL(col, RPT_("Modifier has baked data"), ICON_NONE); uiItemR( col, ptr, "is_baked", UI_ITEM_R_TOGGLE, IFACE_("Continue Without Clearing"), ICON_NONE); } @@ -791,7 +791,7 @@ static void composition_panel_draw(const bContext * /*C*/, Panel *panel) uiItemR(layout, ptr, "use_image_boundary_trimming", UI_ITEM_NONE, nullptr, ICON_NONE); if (show_in_front) { - uiItemL(layout, TIP_("Object is shown in front"), ICON_ERROR); + uiItemL(layout, RPT_("Object is shown in front"), ICON_ERROR); } uiLayout *col = uiLayoutColumn(layout, false); diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_outline.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_outline.cc index 4ad61ee8ae8..33a1da7f96a 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_outline.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_outline.cc @@ -307,7 +307,7 @@ static void panel_draw(const bContext *C, Panel *panel) Scene *scene = CTX_data_scene(C); if (scene->camera == nullptr) { - uiItemL(layout, IFACE_("Outline requires an active camera"), ICON_ERROR); + uiItemL(layout, RPT_("Outline requires an active camera"), ICON_ERROR); } gpencil_modifier_panel_end(layout, ptr); diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_ui_common.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_ui_common.cc index 35ce523e4c2..8e62ec57a98 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_ui_common.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_ui_common.cc @@ -198,14 +198,14 @@ void gpencil_modifier_panel_end(uiLayout *layout, PointerRNA *ptr) GpencilModifierData *md = static_cast(ptr->data); if (md->error) { uiLayout *row = uiLayoutRow(layout, false); - uiItemL(row, IFACE_(md->error), ICON_ERROR); + uiItemL(row, RPT_(md->error), ICON_ERROR); } } /** * Gets RNA pointers for the active object and the panel's modifier data. */ -#define ERROR_LIBDATA_MESSAGE TIP_("External library data") +#define ERROR_LIBDATA_MESSAGE N_("External library data") PointerRNA *gpencil_modifier_panel_get_property_pointers(Panel *panel, PointerRNA *r_ob_ptr) { PointerRNA *ptr = UI_panel_custom_data_get(panel); diff --git a/source/blender/io/alembic/intern/abc_reader_camera.cc b/source/blender/io/alembic/intern/abc_reader_camera.cc index a68463e10c3..cf4641ce126 100644 --- a/source/blender/io/alembic/intern/abc_reader_camera.cc +++ b/source/blender/io/alembic/intern/abc_reader_camera.cc @@ -49,14 +49,14 @@ bool AbcCameraReader::accepts_object_type( const char **err_str) const { if (!Alembic::AbcGeom::ICamera::matches(alembic_header)) { - *err_str = TIP_( + *err_str = RPT_( "Object type mismatch, Alembic object path pointed to Camera when importing, but not any " "more"); return false; } if (ob->type != OB_CAMERA) { - *err_str = TIP_("Object type mismatch, Alembic object path points to Camera"); + *err_str = RPT_("Object type mismatch, Alembic object path points to Camera"); return false; } diff --git a/source/blender/io/alembic/intern/abc_reader_curves.cc b/source/blender/io/alembic/intern/abc_reader_curves.cc index fd8dbbb422e..d397fe73b57 100644 --- a/source/blender/io/alembic/intern/abc_reader_curves.cc +++ b/source/blender/io/alembic/intern/abc_reader_curves.cc @@ -63,14 +63,14 @@ bool AbcCurveReader::accepts_object_type( const char **err_str) const { if (!Alembic::AbcGeom::ICurves::matches(alembic_header)) { - *err_str = TIP_( + *err_str = RPT_( "Object type mismatch, Alembic object path pointed to Curves when importing, but not any " "more"); return false; } if (ob->type != OB_CURVES_LEGACY) { - *err_str = TIP_("Object type mismatch, Alembic object path points to Curves"); + *err_str = RPT_("Object type mismatch, Alembic object path points to Curves"); return false; } @@ -274,7 +274,7 @@ Mesh *AbcCurveReader::read_mesh(Mesh *existing_mesh, sample = m_curves_schema.getValue(sample_sel); } catch (Alembic::Util::Exception &ex) { - *err_str = TIP_("Error reading curve sample; more detail on the console"); + *err_str = RPT_("Error reading curve sample; more detail on the console"); printf("Alembic: error reading curve sample for '%s/%s' at time %f: %s\n", m_iobject.getFullName().c_str(), m_curves_schema.getName().c_str(), diff --git a/source/blender/io/alembic/intern/abc_reader_mesh.cc b/source/blender/io/alembic/intern/abc_reader_mesh.cc index 5840c0122ae..3b63a6bcdbc 100644 --- a/source/blender/io/alembic/intern/abc_reader_mesh.cc +++ b/source/blender/io/alembic/intern/abc_reader_mesh.cc @@ -610,14 +610,14 @@ bool AbcMeshReader::accepts_object_type( const char **err_str) const { if (!Alembic::AbcGeom::IPolyMesh::matches(alembic_header)) { - *err_str = TIP_( + *err_str = RPT_( "Object type mismatch, Alembic object path pointed to PolyMesh when importing, but not " "any more"); return false; } if (ob->type != OB_MESH) { - *err_str = TIP_("Object type mismatch, Alembic object path points to PolyMesh"); + *err_str = RPT_("Object type mismatch, Alembic object path points to PolyMesh"); return false; } @@ -700,7 +700,7 @@ Mesh *AbcMeshReader::read_mesh(Mesh *existing_mesh, } catch (Alembic::Util::Exception &ex) { if (err_str != nullptr) { - *err_str = TIP_("Error reading mesh sample; more detail on the console"); + *err_str = RPT_("Error reading mesh sample; more detail on the console"); } printf("Alembic: error reading mesh sample for '%s/%s' at time %f: %s\n", m_iobject.getFullName().c_str(), @@ -720,7 +720,7 @@ Mesh *AbcMeshReader::read_mesh(Mesh *existing_mesh, /* This is the same test as in poly_to_tri_count(). */ if (poly_count > 0 && loop_count < poly_count * 2) { if (err_str != nullptr) { - *err_str = TIP_("Invalid mesh; more detail on the console"); + *err_str = RPT_("Invalid mesh; more detail on the console"); } printf("Alembic: invalid mesh sample for '%s/%s' at time %f, less than 2 loops per face\n", m_iobject.getFullName().c_str(), @@ -753,7 +753,7 @@ Mesh *AbcMeshReader::read_mesh(Mesh *existing_mesh, settings.read_flag = MOD_MESHSEQ_READ_VERT; if (err_str) { - *err_str = TIP_( + *err_str = RPT_( "Topology has changed, perhaps by triangulating the mesh. Only vertices will be " "read!"); } @@ -980,14 +980,14 @@ bool AbcSubDReader::accepts_object_type( const char **err_str) const { if (!Alembic::AbcGeom::ISubD::matches(alembic_header)) { - *err_str = TIP_( + *err_str = RPT_( "Object type mismatch, Alembic object path pointed to SubD when importing, but not any " "more"); return false; } if (ob->type != OB_MESH) { - *err_str = TIP_("Object type mismatch, Alembic object path points to SubD"); + *err_str = RPT_("Object type mismatch, Alembic object path points to SubD"); return false; } @@ -1045,7 +1045,7 @@ Mesh *AbcSubDReader::read_mesh(Mesh *existing_mesh, } catch (Alembic::Util::Exception &ex) { if (err_str != nullptr) { - *err_str = TIP_("Error reading mesh sample; more detail on the console"); + *err_str = RPT_("Error reading mesh sample; more detail on the console"); } printf("Alembic: error reading mesh sample for '%s/%s' at time %f: %s\n", m_iobject.getFullName().c_str(), @@ -1082,7 +1082,7 @@ Mesh *AbcSubDReader::read_mesh(Mesh *existing_mesh, settings.read_flag = MOD_MESHSEQ_READ_VERT; if (err_str) { - *err_str = TIP_( + *err_str = RPT_( "Topology has changed, perhaps by triangulating the mesh. Only vertices will be " "read!"); } diff --git a/source/blender/io/alembic/intern/abc_reader_nurbs.cc b/source/blender/io/alembic/intern/abc_reader_nurbs.cc index 917b567b3a1..e558d7e626b 100644 --- a/source/blender/io/alembic/intern/abc_reader_nurbs.cc +++ b/source/blender/io/alembic/intern/abc_reader_nurbs.cc @@ -67,14 +67,14 @@ bool AbcNurbsReader::accepts_object_type( const char **err_str) const { if (!Alembic::AbcGeom::INuPatch::matches(alembic_header)) { - *err_str = TIP_( + *err_str = RPT_( "Object type mismatch, Alembic object path pointed to NURBS when importing, but not any " "more"); return false; } if (ob->type != OB_CURVES_LEGACY) { - *err_str = TIP_("Object type mismatch, Alembic object path points to NURBS"); + *err_str = RPT_("Object type mismatch, Alembic object path points to NURBS"); return false; } diff --git a/source/blender/io/alembic/intern/abc_reader_points.cc b/source/blender/io/alembic/intern/abc_reader_points.cc index 0204e405ea7..fd774f65e40 100644 --- a/source/blender/io/alembic/intern/abc_reader_points.cc +++ b/source/blender/io/alembic/intern/abc_reader_points.cc @@ -52,14 +52,14 @@ bool AbcPointsReader::accepts_object_type( const char **err_str) const { if (!Alembic::AbcGeom::IPoints::matches(alembic_header)) { - *err_str = TIP_( + *err_str = RPT_( "Object type mismatch, Alembic object path pointed to Points when importing, but not any " "more"); return false; } if (ob->type != OB_MESH) { - *err_str = TIP_("Object type mismatch, Alembic object path points to Points"); + *err_str = RPT_("Object type mismatch, Alembic object path points to Points"); return false; } @@ -131,7 +131,7 @@ Mesh *AbcPointsReader::read_mesh(Mesh *existing_mesh, sample = m_schema.getValue(sample_sel); } catch (Alembic::Util::Exception &ex) { - *err_str = TIP_("Error reading points sample; more detail on the console"); + *err_str = RPT_("Error reading points sample; more detail on the console"); printf("Alembic: error reading points sample for '%s/%s' at time %f: %s\n", m_iobject.getFullName().c_str(), m_schema.getName().c_str(), diff --git a/source/blender/io/alembic/intern/abc_reader_transform.cc b/source/blender/io/alembic/intern/abc_reader_transform.cc index 098186f97eb..6918452c869 100644 --- a/source/blender/io/alembic/intern/abc_reader_transform.cc +++ b/source/blender/io/alembic/intern/abc_reader_transform.cc @@ -45,14 +45,14 @@ bool AbcEmptyReader::accepts_object_type( const char **err_str) const { if (!Alembic::AbcGeom::IXform::matches(alembic_header)) { - *err_str = TIP_( + *err_str = RPT_( "Object type mismatch, Alembic object path pointed to XForm when importing, but not any " "more"); return false; } if (ob->type != OB_EMPTY) { - *err_str = TIP_("Object type mismatch, Alembic object path points to XForm"); + *err_str = RPT_("Object type mismatch, Alembic object path points to XForm"); return false; } diff --git a/source/blender/io/alembic/intern/alembic_capi.cc b/source/blender/io/alembic/intern/alembic_capi.cc index 8e83640d708..b45a7333dbe 100644 --- a/source/blender/io/alembic/intern/alembic_capi.cc +++ b/source/blender/io/alembic/intern/alembic_capi.cc @@ -772,7 +772,7 @@ static AbcObjectReader *get_abc_reader(CacheReader *reader, Object *ob, const ch IObject iobject = abc_reader->iobject(); if (!iobject.valid()) { - *err_str = TIP_("Invalid object: verify object path"); + *err_str = RPT_("Invalid object: verify object path"); return nullptr; } diff --git a/source/blender/io/usd/intern/usd_capi_import.cc b/source/blender/io/usd/intern/usd_capi_import.cc index 7f58ffeed2b..069109e7c58 100644 --- a/source/blender/io/usd/intern/usd_capi_import.cc +++ b/source/blender/io/usd/intern/usd_capi_import.cc @@ -556,7 +556,7 @@ static USDPrimReader *get_usd_reader(CacheReader *reader, pxr::UsdPrim iobject = usd_reader->prim(); if (!iobject.IsValid()) { - *err_str = TIP_("Invalid object: verify object path"); + *err_str = RPT_("Invalid object: verify object path"); return nullptr; } diff --git a/source/blender/makesrna/intern/rna_main_api.cc b/source/blender/makesrna/intern/rna_main_api.cc index 42b950b8071..46ad7aad465 100644 --- a/source/blender/makesrna/intern/rna_main_api.cc +++ b/source/blender/makesrna/intern/rna_main_api.cc @@ -406,7 +406,7 @@ static Image *rna_Main_images_load(Main *bmain, RPT_ERROR, "Cannot read '%s': %s", filepath, - errno ? strerror(errno) : TIP_("unsupported image format")); + errno ? strerror(errno) : RPT_("unsupported image format")); } id_us_min((ID *)ima); @@ -475,7 +475,7 @@ static VFont *rna_Main_fonts_load(Main *bmain, RPT_ERROR, "Cannot read '%s': %s", filepath, - errno ? strerror(errno) : TIP_("unsupported font format")); + errno ? strerror(errno) : RPT_("unsupported font format")); } WM_main_add_notifier(NC_ID | NA_ADDED, nullptr); @@ -600,7 +600,7 @@ static Text *rna_Main_texts_load(Main *bmain, RPT_ERROR, "Cannot read '%s': %s", filepath, - errno ? strerror(errno) : TIP_("unable to load text")); + errno ? strerror(errno) : RPT_("unable to load text")); } WM_main_add_notifier(NC_ID | NA_ADDED, nullptr); @@ -685,7 +685,7 @@ static MovieClip *rna_Main_movieclip_load(Main *bmain, RPT_ERROR, "Cannot read '%s': %s", filepath, - errno ? strerror(errno) : TIP_("unable to load movie clip")); + errno ? strerror(errno) : RPT_("unable to load movie clip")); } id_us_min((ID *)clip); diff --git a/source/blender/makesrna/intern/rna_particle.cc b/source/blender/makesrna/intern/rna_particle.cc index 98c17e7a5c1..017167b4028 100644 --- a/source/blender/makesrna/intern/rna_particle.cc +++ b/source/blender/makesrna/intern/rna_particle.cc @@ -1207,7 +1207,7 @@ static size_t rna_ParticleTarget_name_get_impl(PointerRNA *ptr, } } - return BLI_strncpy_rlen(value, TIP_("Invalid target!"), value_maxncpy); + return BLI_strncpy_rlen(value, RPT_("Invalid target!"), value_maxncpy); } static void rna_ParticleTarget_name_get(PointerRNA *ptr, char *value) diff --git a/source/blender/makesrna/intern/rna_ui.cc b/source/blender/makesrna/intern/rna_ui.cc index 67bc2d987a6..9adbbb4d0f8 100644 --- a/source/blender/makesrna/intern/rna_ui.cc +++ b/source/blender/makesrna/intern/rna_ui.cc @@ -249,7 +249,7 @@ static StructRNA *rna_Panel_register(Main *bmain, StructCallbackFunc call, StructFreeFunc free) { - const char *error_prefix = TIP_("Registering panel class:"); + const char *error_prefix = RPT_("Registering panel class:"); ARegionType *art; PanelType *pt, *parent = nullptr, dummy_pt = {nullptr}; Panel dummy_panel = {nullptr}; diff --git a/source/blender/makesrna/intern/rna_wm_gizmo_api.cc b/source/blender/makesrna/intern/rna_wm_gizmo_api.cc index 4be6183bc48..a23b2c6afb3 100644 --- a/source/blender/makesrna/intern/rna_wm_gizmo_api.cc +++ b/source/blender/makesrna/intern/rna_wm_gizmo_api.cc @@ -156,7 +156,7 @@ static PointerRNA rna_gizmo_target_set_operator(wmGizmo *gz, BKE_reportf(reports, RPT_ERROR, "%s '%s'", - ot ? TIP_("Unknown operator") : TIP_("Operator missing srna"), + ot ? RPT_("Unknown operator") : RPT_("Operator missing srna"), opname); return PointerRNA_NULL; } diff --git a/source/blender/modifiers/intern/MOD_cloth.cc b/source/blender/modifiers/intern/MOD_cloth.cc index c987805f305..75965db4959 100644 --- a/source/blender/modifiers/intern/MOD_cloth.cc +++ b/source/blender/modifiers/intern/MOD_cloth.cc @@ -261,7 +261,7 @@ static void panel_draw(const bContext * /*C*/, Panel *panel) PointerRNA *ptr = modifier_panel_get_property_pointers(panel, nullptr); - uiItemL(layout, TIP_("Settings are inside the Physics tab"), ICON_NONE); + uiItemL(layout, RPT_("Settings are inside the Physics tab"), ICON_NONE); modifier_panel_end(layout, ptr); } diff --git a/source/blender/modifiers/intern/MOD_collision.cc b/source/blender/modifiers/intern/MOD_collision.cc index faccf52d18e..68c7b805197 100644 --- a/source/blender/modifiers/intern/MOD_collision.cc +++ b/source/blender/modifiers/intern/MOD_collision.cc @@ -246,7 +246,7 @@ static void panel_draw(const bContext * /*C*/, Panel *panel) PointerRNA *ptr = modifier_panel_get_property_pointers(panel, nullptr); - uiItemL(layout, TIP_("Settings are inside the Physics tab"), ICON_NONE); + uiItemL(layout, RPT_("Settings are inside the Physics tab"), ICON_NONE); modifier_panel_end(layout, ptr); } diff --git a/source/blender/modifiers/intern/MOD_decimate.cc b/source/blender/modifiers/intern/MOD_decimate.cc index 71f0903a737..df9c7c1912c 100644 --- a/source/blender/modifiers/intern/MOD_decimate.cc +++ b/source/blender/modifiers/intern/MOD_decimate.cc @@ -228,7 +228,7 @@ static void panel_draw(const bContext * /*C*/, Panel *panel) int decimate_type = RNA_enum_get(ptr, "decimate_type"); char count_info[64]; - SNPRINTF(count_info, TIP_("Face Count: %d"), RNA_int_get(ptr, "face_count")); + SNPRINTF(count_info, RPT_("Face Count: %d"), RNA_int_get(ptr, "face_count")); uiItemR(layout, ptr, "decimate_type", UI_ITEM_R_EXPAND, nullptr, ICON_NONE); diff --git a/source/blender/modifiers/intern/MOD_dynamicpaint.cc b/source/blender/modifiers/intern/MOD_dynamicpaint.cc index f1e258289ef..658e51975ca 100644 --- a/source/blender/modifiers/intern/MOD_dynamicpaint.cc +++ b/source/blender/modifiers/intern/MOD_dynamicpaint.cc @@ -180,7 +180,7 @@ static void panel_draw(const bContext * /*C*/, Panel *panel) PointerRNA *ptr = modifier_panel_get_property_pointers(panel, nullptr); - uiItemL(layout, TIP_("Settings are inside the Physics tab"), ICON_NONE); + uiItemL(layout, RPT_("Settings are inside the Physics tab"), ICON_NONE); modifier_panel_end(layout, ptr); } diff --git a/source/blender/modifiers/intern/MOD_fluid.cc b/source/blender/modifiers/intern/MOD_fluid.cc index da5f9674a17..e7559403fdd 100644 --- a/source/blender/modifiers/intern/MOD_fluid.cc +++ b/source/blender/modifiers/intern/MOD_fluid.cc @@ -221,7 +221,7 @@ static void panel_draw(const bContext * /*C*/, Panel *panel) PointerRNA *ptr = modifier_panel_get_property_pointers(panel, nullptr); - uiItemL(layout, TIP_("Settings are inside the Physics tab"), ICON_NONE); + uiItemL(layout, RPT_("Settings are inside the Physics tab"), ICON_NONE); modifier_panel_end(layout, ptr); } diff --git a/source/blender/modifiers/intern/MOD_meshcache_mdd.cc b/source/blender/modifiers/intern/MOD_meshcache_mdd.cc index 4f8269379dc..60c71340a1d 100644 --- a/source/blender/modifiers/intern/MOD_meshcache_mdd.cc +++ b/source/blender/modifiers/intern/MOD_meshcache_mdd.cc @@ -38,7 +38,7 @@ static bool meshcache_read_mdd_head(FILE *fp, const char **err_str) { if (!fread(mdd_head, sizeof(*mdd_head), 1, fp)) { - *err_str = TIP_("Missing header"); + *err_str = RPT_("Missing header"); return false; } @@ -47,12 +47,12 @@ static bool meshcache_read_mdd_head(FILE *fp, #endif if (mdd_head->verts_tot != verts_tot) { - *err_str = TIP_("Vertex count mismatch"); + *err_str = RPT_("Vertex count mismatch"); return false; } if (mdd_head->frame_tot <= 0) { - *err_str = TIP_("Invalid frame total"); + *err_str = RPT_("Invalid frame total"); return false; } /* Intentionally don't seek back. */ @@ -116,7 +116,7 @@ static bool meshcache_read_mdd_range_from_time(FILE *fp, } if (frames_num_read != frames_num_expect) { - *err_str = errno ? strerror(errno) : TIP_("Timestamp read failed"); + *err_str = errno ? strerror(errno) : RPT_("Timestamp read failed"); return false; } @@ -152,12 +152,12 @@ bool MOD_meshcache_read_mdd_index(FILE *fp, } if (BLI_fseek(fp, mdd_head.frame_tot * sizeof(int), SEEK_CUR) != 0) { - *err_str = TIP_("Header seek failed"); + *err_str = RPT_("Header seek failed"); return false; } if (BLI_fseek(fp, sizeof(float[3]) * index * mdd_head.verts_tot, SEEK_CUR) != 0) { - *err_str = TIP_("Failed to seek frame"); + *err_str = RPT_("Failed to seek frame"); return false; } @@ -179,7 +179,7 @@ bool MOD_meshcache_read_mdd_index(FILE *fp, #else /* no blending */ if (!fread(vertexCos, sizeof(float[3]), mdd_head.verts_tot, f)) { - *err_str = errno ? strerror(errno) : TIP_("Failed to read frame"); + *err_str = errno ? strerror(errno) : RPT_("Failed to read frame"); return false; } # ifdef __LITTLE_ENDIAN__ @@ -208,7 +208,7 @@ bool MOD_meshcache_read_mdd_index(FILE *fp, } if (verts_read_num != mdd_head.verts_tot) { - *err_str = errno ? strerror(errno) : TIP_("Vertex coordinate read failed"); + *err_str = errno ? strerror(errno) : RPT_("Vertex coordinate read failed"); return false; } @@ -274,7 +274,7 @@ bool MOD_meshcache_read_mdd_times(const char *filepath, bool ok; if (fp == nullptr) { - *err_str = errno ? strerror(errno) : TIP_("Unknown error opening file"); + *err_str = errno ? strerror(errno) : RPT_("Unknown error opening file"); return false; } diff --git a/source/blender/modifiers/intern/MOD_meshcache_pc2.cc b/source/blender/modifiers/intern/MOD_meshcache_pc2.cc index 9ec953e7653..159bce2e933 100644 --- a/source/blender/modifiers/intern/MOD_meshcache_pc2.cc +++ b/source/blender/modifiers/intern/MOD_meshcache_pc2.cc @@ -42,12 +42,12 @@ static bool meshcache_read_pc2_head(FILE *fp, const char **err_str) { if (!fread(pc2_head, sizeof(*pc2_head), 1, fp)) { - *err_str = TIP_("Missing header"); + *err_str = RPT_("Missing header"); return false; } if (!STREQ(pc2_head->header, "POINTCACHE2")) { - *err_str = TIP_("Invalid header"); + *err_str = RPT_("Invalid header"); return false; } @@ -57,12 +57,12 @@ static bool meshcache_read_pc2_head(FILE *fp, #endif if (pc2_head->verts_tot != verts_tot) { - *err_str = TIP_("Vertex count mismatch"); + *err_str = RPT_("Vertex count mismatch"); return false; } if (pc2_head->frame_tot <= 0) { - *err_str = TIP_("Invalid frame total"); + *err_str = RPT_("Invalid frame total"); return false; } /* Intentionally don't seek back. */ @@ -137,7 +137,7 @@ bool MOD_meshcache_read_pc2_index(FILE *fp, } if (BLI_fseek(fp, sizeof(float[3]) * index * pc2_head.verts_tot, SEEK_CUR) != 0) { - *err_str = TIP_("Failed to seek frame"); + *err_str = RPT_("Failed to seek frame"); return false; } @@ -177,7 +177,7 @@ bool MOD_meshcache_read_pc2_index(FILE *fp, } if (verts_read_num != pc2_head.verts_tot) { - *err_str = errno ? strerror(errno) : TIP_("Vertex coordinate read failed"); + *err_str = errno ? strerror(errno) : RPT_("Vertex coordinate read failed"); return false; } @@ -243,7 +243,7 @@ bool MOD_meshcache_read_pc2_times(const char *filepath, bool ok; if (fp == nullptr) { - *err_str = errno ? strerror(errno) : TIP_("Unknown error opening file"); + *err_str = errno ? strerror(errno) : RPT_("Unknown error opening file"); return false; } diff --git a/source/blender/modifiers/intern/MOD_multires.cc b/source/blender/modifiers/intern/MOD_multires.cc index d440aab75bf..b71d3d85e3b 100644 --- a/source/blender/modifiers/intern/MOD_multires.cc +++ b/source/blender/modifiers/intern/MOD_multires.cc @@ -329,7 +329,7 @@ static void panel_draw(const bContext *C, Panel *panel) const bool is_sculpt_mode = CTX_data_active_object(C)->mode & OB_MODE_SCULPT; uiBlock *block = uiLayoutGetBlock(panel->layout); - UI_block_lock_set(block, !is_sculpt_mode, IFACE_("Sculpt Base Mesh")); + UI_block_lock_set(block, !is_sculpt_mode, N_("Sculpt Base Mesh")); uiItemR(col, ptr, "use_sculpt_base_mesh", UI_ITEM_NONE, IFACE_("Sculpt Base Mesh"), ICON_NONE); UI_block_lock_clear(block); diff --git a/source/blender/modifiers/intern/MOD_nodes.cc b/source/blender/modifiers/intern/MOD_nodes.cc index ce3ced3fd61..380c4f25f34 100644 --- a/source/blender/modifiers/intern/MOD_nodes.cc +++ b/source/blender/modifiers/intern/MOD_nodes.cc @@ -1408,7 +1408,7 @@ class NodesModifierBakeParams : public nodes::GeoNodesBakeParams { { if (frame_cache.meta_path && frame_cache.state.items_by_id.is_empty()) { auto &read_error_info = behavior.emplace(); - read_error_info.message = TIP_("Can not load the baked data"); + read_error_info.message = RPT_("Can not load the baked data"); return true; } return false; @@ -1949,7 +1949,7 @@ static void draw_output_attributes_panel(const bContext *C, } } if (!has_output_attribute) { - uiItemL(layout, TIP_("No group output attributes connected"), ICON_INFO); + uiItemL(layout, RPT_("No group output attributes connected"), ICON_INFO); } } @@ -1972,7 +1972,7 @@ static void draw_internal_dependencies_panel(uiLayout *layout, tree_log->used_named_attributes; if (usage_by_attribute.is_empty()) { - uiItemL(layout, IFACE_("No named attributes used"), ICON_INFO); + uiItemL(layout, RPT_("No named attributes used"), ICON_INFO); return; } @@ -2001,13 +2001,13 @@ static void draw_internal_dependencies_panel(uiLayout *layout, std::stringstream ss; Vector usages; if ((usage & geo_log::NamedAttributeUsage::Read) != geo_log::NamedAttributeUsage::None) { - usages.append(TIP_("Read")); + usages.append(IFACE_("Read")); } if ((usage & geo_log::NamedAttributeUsage::Write) != geo_log::NamedAttributeUsage::None) { - usages.append(TIP_("Write")); + usages.append(IFACE_("Write")); } if ((usage & geo_log::NamedAttributeUsage::Remove) != geo_log::NamedAttributeUsage::None) { - usages.append(TIP_("Remove")); + usages.append(IFACE_("Remove")); } for (const int i : usages.index_range()) { ss << usages[i]; @@ -2070,12 +2070,12 @@ static void panel_draw(const bContext *C, Panel *panel) modifier_panel_end(layout, ptr); if (uiLayout *panel_layout = uiLayoutPanel( - C, layout, TIP_("Output Attributes"), ptr, "open_output_attributes_panel")) + C, layout, IFACE_("Output Attributes"), ptr, "open_output_attributes_panel")) { draw_output_attributes_panel(C, panel_layout, *nmd, ptr); } if (uiLayout *panel_layout = uiLayoutPanel( - C, layout, TIP_("Internal Dependencies"), ptr, "open_internal_dependencies_panel")) + C, layout, IFACE_("Internal Dependencies"), ptr, "open_internal_dependencies_panel")) { draw_internal_dependencies_panel(panel_layout, ptr, *nmd); } diff --git a/source/blender/modifiers/intern/MOD_ocean.cc b/source/blender/modifiers/intern/MOD_ocean.cc index f6c02159ef8..ec007719f4e 100644 --- a/source/blender/modifiers/intern/MOD_ocean.cc +++ b/source/blender/modifiers/intern/MOD_ocean.cc @@ -513,7 +513,7 @@ static void panel_draw(const bContext * /*C*/, Panel *panel) modifier_panel_end(layout, ptr); #else /* WITH_OCEANSIM */ - uiItemL(layout, TIP_("Built without Ocean modifier"), ICON_NONE); + uiItemL(layout, RPT_("Built without Ocean modifier"), ICON_NONE); #endif /* WITH_OCEANSIM */ } diff --git a/source/blender/modifiers/intern/MOD_particlesystem.cc b/source/blender/modifiers/intern/MOD_particlesystem.cc index 210dd9d2f20..9fc5844ee44 100644 --- a/source/blender/modifiers/intern/MOD_particlesystem.cc +++ b/source/blender/modifiers/intern/MOD_particlesystem.cc @@ -226,7 +226,7 @@ static void panel_draw(const bContext * /*C*/, Panel *panel) ModifierData *md = (ModifierData *)ptr->data; ParticleSystem *psys = ((ParticleSystemModifierData *)md)->psys; - uiItemL(layout, TIP_("Settings are in the particle tab"), ICON_NONE); + uiItemL(layout, RPT_("Settings are in the particle tab"), ICON_NONE); if (!(ob->mode & OB_MODE_PARTICLE_EDIT)) { if (ELEM(psys->part->ren_as, PART_DRAW_GR, PART_DRAW_OB)) { diff --git a/source/blender/modifiers/intern/MOD_remesh.cc b/source/blender/modifiers/intern/MOD_remesh.cc index 7d50107a26a..d188e244c73 100644 --- a/source/blender/modifiers/intern/MOD_remesh.cc +++ b/source/blender/modifiers/intern/MOD_remesh.cc @@ -252,7 +252,7 @@ static void panel_draw(const bContext * /*C*/, Panel *panel) modifier_panel_end(layout, ptr); #else /* WITH_MOD_REMESH */ - uiItemL(layout, TIP_("Built without Remesh modifier"), ICON_NONE); + uiItemL(layout, RPT_("Built without Remesh modifier"), ICON_NONE); #endif /* WITH_MOD_REMESH */ } diff --git a/source/blender/modifiers/intern/MOD_softbody.cc b/source/blender/modifiers/intern/MOD_softbody.cc index 3e7870be48c..b33f8bdfaff 100644 --- a/source/blender/modifiers/intern/MOD_softbody.cc +++ b/source/blender/modifiers/intern/MOD_softbody.cc @@ -79,7 +79,7 @@ static void panel_draw(const bContext * /*C*/, Panel *panel) PointerRNA *ptr = modifier_panel_get_property_pointers(panel, nullptr); - uiItemL(layout, TIP_("Settings are inside the Physics tab"), ICON_NONE); + uiItemL(layout, RPT_("Settings are inside the Physics tab"), ICON_NONE); modifier_panel_end(layout, ptr); } diff --git a/source/blender/modifiers/intern/MOD_subsurf.cc b/source/blender/modifiers/intern/MOD_subsurf.cc index d85e1439bb6..8f2cd162f48 100644 --- a/source/blender/modifiers/intern/MOD_subsurf.cc +++ b/source/blender/modifiers/intern/MOD_subsurf.cc @@ -393,7 +393,7 @@ static void panel_draw(const bContext *C, Panel *panel) RNA_float_get(&ob_cycles_ptr, "dicing_rate"), 0.1f); char output[256]; - SNPRINTF(output, TIP_("Final Scale: Render %.2f px, Viewport %.2f px"), render, preview); + SNPRINTF(output, RPT_("Final Scale: Render %.2f px, Viewport %.2f px"), render, preview); uiItemL(layout, output, ICON_NONE); uiItemS(layout); diff --git a/source/blender/modifiers/intern/MOD_surface.cc b/source/blender/modifiers/intern/MOD_surface.cc index 4d81bbe1e76..277f3bd5474 100644 --- a/source/blender/modifiers/intern/MOD_surface.cc +++ b/source/blender/modifiers/intern/MOD_surface.cc @@ -184,7 +184,7 @@ static void panel_draw(const bContext * /*C*/, Panel *panel) PointerRNA *ptr = modifier_panel_get_property_pointers(panel, nullptr); - uiItemL(layout, TIP_("Settings are inside the Physics tab"), ICON_NONE); + uiItemL(layout, RPT_("Settings are inside the Physics tab"), ICON_NONE); modifier_panel_end(layout, ptr); } diff --git a/source/blender/modifiers/intern/MOD_ui_common.cc b/source/blender/modifiers/intern/MOD_ui_common.cc index 56903551f5c..f75f1f0a1ab 100644 --- a/source/blender/modifiers/intern/MOD_ui_common.cc +++ b/source/blender/modifiers/intern/MOD_ui_common.cc @@ -95,7 +95,7 @@ void modifier_panel_end(uiLayout *layout, PointerRNA *ptr) ModifierData *md = static_cast(ptr->data); if (md->error) { uiLayout *row = uiLayoutRow(layout, false); - uiItemL(row, TIP_(md->error), ICON_ERROR); + uiItemL(row, RPT_(md->error), ICON_ERROR); } } @@ -105,7 +105,7 @@ void modifier_panel_end(uiLayout *layout, PointerRNA *ptr) * * \note The modifier #PointerRNA is owned by the panel so we only need a pointer to it. */ -#define ERROR_LIBDATA_MESSAGE TIP_("External library data") +#define ERROR_LIBDATA_MESSAGE N_("External library data") PointerRNA *modifier_panel_get_property_pointers(Panel *panel, PointerRNA *r_ob_ptr) { PointerRNA *ptr = UI_panel_custom_data_get(panel); @@ -364,9 +364,9 @@ static void modifier_panel_header(const bContext *C, Panel *panel) 0.0, 0.0, 0.0, - TIP_("Apply on Spline")); - UI_but_disable( - but, TIP_("This modifier can only deform filled curve/surface, not the control points")); + RPT_("Apply on Spline")); + UI_but_disable(but, + "This modifier can only deform filled curve/surface, not the control points"); buttons_number++; } /* Some modifiers can work with pre-tessellated curves only. */ @@ -390,9 +390,9 @@ static void modifier_panel_header(const bContext *C, Panel *panel) 0.0, 0.0, 0.0, - TIP_("Apply on Spline")); - UI_but_disable( - but, TIP_("This modifier can only deform control points, not the filled curve/surface")); + RPT_("Apply on Spline")); + UI_but_disable(but, + "This modifier can only deform control points, not the filled curve/surface"); buttons_number++; } else if (mti->type != ModifierTypeType::Constructive) { diff --git a/source/blender/nodes/composite/node_composite_util.cc b/source/blender/nodes/composite/node_composite_util.cc index 34bdb5c26a8..74bf2bcd398 100644 --- a/source/blender/nodes/composite/node_composite_util.cc +++ b/source/blender/nodes/composite/node_composite_util.cc @@ -17,7 +17,7 @@ bool cmp_node_poll_default(const bNodeType * /*ntype*/, const char **r_disabled_hint) { if (!STREQ(ntree->idname, "CompositorNodeTree")) { - *r_disabled_hint = TIP_("Not a compositor node tree"); + *r_disabled_hint = RPT_("Not a compositor node tree"); return false; } return true; diff --git a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc index 92b74f1edd9..c752bf0b787 100644 --- a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc @@ -319,12 +319,12 @@ static bool node_poll_cryptomatte(const bNodeType * /*ntype*/, } if (scene == nullptr) { - *r_disabled_hint = TIP_( + *r_disabled_hint = RPT_( "The node tree must be the compositing node tree of any scene in the file"); } return scene != nullptr; } - *r_disabled_hint = TIP_("Not a compositor node tree"); + *r_disabled_hint = RPT_("Not a compositor node tree"); return false; } diff --git a/source/blender/nodes/composite/nodes/node_composite_denoise.cc b/source/blender/nodes/composite/nodes/node_composite_denoise.cc index 47709e1c5d1..9aae8fb1359 100644 --- a/source/blender/nodes/composite/nodes/node_composite_denoise.cc +++ b/source/blender/nodes/composite/nodes/node_composite_denoise.cc @@ -59,12 +59,12 @@ static void node_composit_init_denonise(bNodeTree * /*ntree*/, bNode *node) static void node_composit_buts_denoise(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { #ifndef WITH_OPENIMAGEDENOISE - uiItemL(layout, IFACE_("Disabled, built without OpenImageDenoise"), ICON_ERROR); + uiItemL(layout, RPT_("Disabled, built without OpenImageDenoise"), ICON_ERROR); #else /* Always supported through Accelerate framework BNNS on macOS. */ # ifndef __APPLE__ if (!BLI_cpu_support_sse41()) { - uiItemL(layout, IFACE_("Disabled, CPU with SSE4.1 is required"), ICON_ERROR); + uiItemL(layout, RPT_("Disabled, CPU with SSE4.1 is required"), ICON_ERROR); } # endif #endif diff --git a/source/blender/nodes/composite/nodes/node_composite_image.cc b/source/blender/nodes/composite/nodes/node_composite_image.cc index 44b2d97f8b2..32d3b6c85c7 100644 --- a/source/blender/nodes/composite/nodes/node_composite_image.cc +++ b/source/blender/nodes/composite/nodes/node_composite_image.cc @@ -579,7 +579,7 @@ static bool node_composit_poll_rlayers(const bNodeType * /*ntype*/, const char **r_disabled_hint) { if (!STREQ(ntree->idname, "CompositorNodeTree")) { - *r_disabled_hint = TIP_("Not a compositor node tree"); + *r_disabled_hint = RPT_("Not a compositor node tree"); return false; } @@ -596,7 +596,7 @@ static bool node_composit_poll_rlayers(const bNodeType * /*ntype*/, } if (scene == nullptr) { - *r_disabled_hint = TIP_( + *r_disabled_hint = RPT_( "The node tree must be the compositing node tree of any scene in the file"); return false; } diff --git a/source/blender/nodes/function/node_function_util.cc b/source/blender/nodes/function/node_function_util.cc index 33c7eeff0ed..1bbdeec26f4 100644 --- a/source/blender/nodes/function/node_function_util.cc +++ b/source/blender/nodes/function/node_function_util.cc @@ -13,7 +13,7 @@ static bool fn_node_poll_default(const bNodeType * /*ntype*/, { /* Function nodes are only supported in simulation node trees so far. */ if (!STREQ(ntree->idname, "GeometryNodeTree")) { - *r_disabled_hint = TIP_("Not a geometry node tree"); + *r_disabled_hint = RPT_("Not a geometry node tree"); return false; } return true; diff --git a/source/blender/nodes/geometry/node_geometry_util.cc b/source/blender/nodes/geometry/node_geometry_util.cc index 04f98ba09b3..7da1b446611 100644 --- a/source/blender/nodes/geometry/node_geometry_util.cc +++ b/source/blender/nodes/geometry/node_geometry_util.cc @@ -146,7 +146,7 @@ bool geo_node_poll_default(const bNodeType * /*ntype*/, const char **r_disabled_hint) { if (!STREQ(ntree->idname, "GeometryNodeTree")) { - *r_disabled_hint = TIP_("Not a geometry node tree"); + *r_disabled_hint = RPT_("Not a geometry node tree"); return false; } return true; diff --git a/source/blender/nodes/geometry/nodes/node_geo_bake.cc b/source/blender/nodes/geometry/nodes/node_geo_bake.cc index d3cb87c5bbe..f71de8e4bef 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_bake.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_bake.cc @@ -467,9 +467,9 @@ struct BakeDrawContext { static std::string get_baked_string(const BakeDrawContext &ctx) { if (ctx.bake_still && ctx.baked_range->size() == 1) { - return fmt::format(TIP_("Baked Frame {}"), ctx.baked_range->first()); + return fmt::format(RPT_("Baked Frame {}"), ctx.baked_range->first()); } - return fmt::format(TIP_("Baked {} - {}"), ctx.baked_range->first(), ctx.baked_range->last()); + return fmt::format(RPT_("Baked {} - {}"), ctx.baked_range->first(), ctx.baked_range->last()); } static void draw_bake_button(uiLayout *layout, const BakeDrawContext &ctx) @@ -480,7 +480,7 @@ static void draw_bake_button(uiLayout *layout, const BakeDrawContext &ctx) PointerRNA ptr; uiItemFullO(row, "OBJECT_OT_geometry_node_bake_single", - TIP_("Bake"), + IFACE_("Bake"), ICON_NONE, nullptr, WM_OP_INVOKE_DEFAULT, diff --git a/source/blender/nodes/intern/node_common.cc b/source/blender/nodes/intern/node_common.cc index ed2db5c111f..172e5f854fb 100644 --- a/source/blender/nodes/intern/node_common.cc +++ b/source/blender/nodes/intern/node_common.cc @@ -110,13 +110,13 @@ bool nodeGroupPoll(const bNodeTree *nodetree, if (nodetree == grouptree) { if (r_disabled_hint) { - *r_disabled_hint = TIP_("Nesting a node group inside of itself is not allowed"); + *r_disabled_hint = RPT_("Nesting a node group inside of itself is not allowed"); } return false; } if (nodetree->type != grouptree->type) { if (r_disabled_hint) { - *r_disabled_hint = TIP_("Node group has different type"); + *r_disabled_hint = RPT_("Node group has different type"); } return false; } diff --git a/source/blender/nodes/intern/node_geometry_exec.cc b/source/blender/nodes/intern/node_geometry_exec.cc index bf24746b0e3..d452ebcb37f 100644 --- a/source/blender/nodes/intern/node_geometry_exec.cc +++ b/source/blender/nodes/intern/node_geometry_exec.cc @@ -73,14 +73,14 @@ void GeoNodeExecParams::check_input_geometry_set(StringRef identifier, if (supported_types.contains(type)) { continue; } - std::string message = TIP_("Input geometry has unsupported type: "); + std::string message = RPT_("Input geometry has unsupported type: "); switch (type) { case GeometryComponent::Type::Mesh: { - message += TIP_("Mesh"); + message += RPT_("Mesh"); break; } case GeometryComponent::Type::PointCloud: { - message += TIP_("Point Cloud"); + message += RPT_("Point Cloud"); break; } case GeometryComponent::Type::Instance: { @@ -88,18 +88,18 @@ void GeoNodeExecParams::check_input_geometry_set(StringRef identifier, break; } case GeometryComponent::Type::Volume: { - message += CTX_TIP_(BLT_I18NCONTEXT_ID_ID, "Volume"); + message += CTX_RPT_(BLT_I18NCONTEXT_ID_ID, "Volume"); break; } case GeometryComponent::Type::Curve: { - message += TIP_("Curve"); + message += RPT_("Curve"); break; } case GeometryComponent::Type::Edit: { continue; } case GeometryComponent::Type::GreasePencil: { - message += TIP_("Grease Pencil"); + message += RPT_("Grease Pencil"); break; } } diff --git a/source/blender/nodes/shader/node_shader_util.cc b/source/blender/nodes/shader/node_shader_util.cc index 38dde90ee8b..9de7be9670f 100644 --- a/source/blender/nodes/shader/node_shader_util.cc +++ b/source/blender/nodes/shader/node_shader_util.cc @@ -30,7 +30,7 @@ bool sh_node_poll_default(const bNodeType * /*ntype*/, const char **r_disabled_hint) { if (!STREQ(ntree->idname, "ShaderNodeTree")) { - *r_disabled_hint = TIP_("Not a shader node tree"); + *r_disabled_hint = RPT_("Not a shader node tree"); return false; } return true; @@ -41,7 +41,7 @@ static bool sh_fn_poll_default(const bNodeType * /*ntype*/, const char **r_disabled_hint) { if (!STR_ELEM(ntree->idname, "ShaderNodeTree", "GeometryNodeTree")) { - *r_disabled_hint = TIP_("Not a shader or geometry node tree"); + *r_disabled_hint = RPT_("Not a shader or geometry node tree"); return false; } return true; diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_sky.cc b/source/blender/nodes/shader/nodes/node_shader_tex_sky.cc index 546dd35bd9d..159ce3747b4 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_sky.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_sky.cc @@ -44,7 +44,7 @@ static void node_shader_buts_tex_sky(uiLayout *layout, bContext *C, PointerRNA * if (RNA_enum_get(ptr, "sky_type") == SHD_SKY_NISHITA) { Scene *scene = CTX_data_scene(C); if (BKE_scene_uses_blender_eevee(scene)) { - uiItemL(layout, TIP_("Sun disc not available in EEVEE"), ICON_ERROR); + uiItemL(layout, RPT_("Sun disc not available in EEVEE"), ICON_ERROR); } uiItemR(layout, ptr, "sun_disc", UI_ITEM_R_SPLIT_EMPTY_NAME, nullptr, ICON_NONE); diff --git a/source/blender/nodes/shader/nodes/node_shader_vertex_color.cc b/source/blender/nodes/shader/nodes/node_shader_vertex_color.cc index ab41e9a0fb3..eae7136bde3 100644 --- a/source/blender/nodes/shader/nodes/node_shader_vertex_color.cc +++ b/source/blender/nodes/shader/nodes/node_shader_vertex_color.cc @@ -34,7 +34,7 @@ static void node_shader_buts_vertex_color(uiLayout *layout, bContext *C, Pointer uiItemPointerR(layout, ptr, "layer_name", &dataptr, "color_attributes", "", ICON_GROUP_VCOL); } else { - uiItemL(layout, TIP_("No mesh in active object"), ICON_ERROR); + uiItemL(layout, RPT_("No mesh in active object"), ICON_ERROR); } } diff --git a/source/blender/nodes/texture/node_texture_util.cc b/source/blender/nodes/texture/node_texture_util.cc index ff356a14157..351d9870a9f 100644 --- a/source/blender/nodes/texture/node_texture_util.cc +++ b/source/blender/nodes/texture/node_texture_util.cc @@ -34,7 +34,7 @@ bool tex_node_poll_default(const bNodeType * /*ntype*/, const char **r_disabled_hint) { if (!STREQ(ntree->idname, "TextureNodeTree")) { - *r_disabled_hint = TIP_("Not a texture node tree"); + *r_disabled_hint = RPT_("Not a texture node tree"); return false; } return true; diff --git a/source/blender/render/intern/pipeline.cc b/source/blender/render/intern/pipeline.cc index 00511f90b56..650f3ff2eb0 100644 --- a/source/blender/render/intern/pipeline.cc +++ b/source/blender/render/intern/pipeline.cc @@ -210,12 +210,12 @@ static void stats_background(void * /*arg*/, RenderStats *rs) BLI_mutex_lock(&mutex); fprintf(stdout, - TIP_("Fra:%d Mem:%.2fM (Peak %.2fM) "), + RPT_("Fra:%d Mem:%.2fM (Peak %.2fM) "), rs->cfra, megs_used_memory, megs_peak_memory); - fprintf(stdout, TIP_("| Time:%s | "), info_time_str); + fprintf(stdout, RPT_("| Time:%s | "), info_time_str); fprintf(stdout, "%s", rs->infostr); diff --git a/source/blender/shader_fx/intern/FX_ui_common.cc b/source/blender/shader_fx/intern/FX_ui_common.cc index 2d5b4c7eeea..941c2703df2 100644 --- a/source/blender/shader_fx/intern/FX_ui_common.cc +++ b/source/blender/shader_fx/intern/FX_ui_common.cc @@ -88,7 +88,7 @@ void shaderfx_panel_end(uiLayout *layout, PointerRNA *ptr) ShaderFxData *fx = static_cast(ptr->data); if (fx->error) { uiLayout *row = uiLayoutRow(layout, false); - uiItemL(row, TIP_(fx->error), ICON_ERROR); + uiItemL(row, RPT_(fx->error), ICON_ERROR); } } @@ -106,7 +106,7 @@ PointerRNA *shaderfx_panel_get_property_pointers(Panel *panel, PointerRNA *r_ob_ return ptr; } -#define ERROR_LIBDATA_MESSAGE TIP_("External library data") +#define ERROR_LIBDATA_MESSAGE N_("External library data") static void gpencil_shaderfx_ops_extra_draw(bContext *C, uiLayout *layout, void *fx_v) { diff --git a/source/blender/windowmanager/intern/wm_event_system.cc b/source/blender/windowmanager/intern/wm_event_system.cc index af3b129118e..a38aa18ec69 100644 --- a/source/blender/windowmanager/intern/wm_event_system.cc +++ b/source/blender/windowmanager/intern/wm_event_system.cc @@ -963,7 +963,7 @@ void WM_reportf(eReportType type, const char *format, ...) { va_list args; - format = TIP_(format); + format = RPT_(format); va_start(args, format); char *str = BLI_vsprintfN(format, args); WM_report(type, str); @@ -2001,8 +2001,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", - IFACE_("Input pending "), - (drawstr && drawstr[0]) ? drawstr : CTX_IFACE_(ot->translation_context, ot->name)); + RPT_("Input pending "), + (drawstr && drawstr[0]) ? drawstr : CTX_RPT_(ot->translation_context, ot->name)); if (area != nullptr) { ED_area_status_text(area, header_text); } diff --git a/source/blender/windowmanager/intern/wm_files.cc b/source/blender/windowmanager/intern/wm_files.cc index 9318909083f..35c6a2e6663 100644 --- a/source/blender/windowmanager/intern/wm_files.cc +++ b/source/blender/windowmanager/intern/wm_files.cc @@ -1085,7 +1085,7 @@ bool WM_file_read(bContext *C, const char *filepath, ReportList *reports) RPT_ERROR, "Cannot read file \"%s\": %s", filepath, - errno ? strerror(errno) : TIP_("unable to open the file")); + errno ? strerror(errno) : RPT_("unable to open the file")); } else if (retval == BKE_READ_EXOTIC_FAIL_FORMAT) { BKE_reportf(reports, RPT_ERROR, "File format is not supported in file \"%s\"", filepath); @@ -3672,13 +3672,13 @@ static uiBlock *block_create_autorun_warning(bContext *C, ARegion *region, void /* Title and explanation text. */ uiLayout *col = uiLayoutColumn(layout, true); uiItemL_ex(col, - TIP_("For security reasons, automatic execution of Python scripts " + RPT_("For security reasons, automatic execution of Python scripts " "in this file was disabled:"), ICON_NONE, true, false); uiItemL_ex(col, G.autoexec_fail, ICON_NONE, false, true); - uiItemL(col, TIP_("This may lead to unexpected behavior"), ICON_NONE); + uiItemL(col, RPT_("This may lead to unexpected behavior"), ICON_NONE); uiItemS(layout); @@ -3687,7 +3687,7 @@ static uiBlock *block_create_autorun_warning(bContext *C, ARegion *region, void &pref_ptr, "use_scripts_auto_execute", UI_ITEM_NONE, - TIP_("Permanently allow execution of scripts"), + RPT_("Permanently allow execution of scripts"), ICON_NONE); uiItemS_ex(layout, 3.0f); @@ -3885,10 +3885,10 @@ static void file_forwardcompat_detailed_info_show(uiLayout *parent_layout, Main char message_line1[256]; char message_line2[256]; SNPRINTF(message_line1, - TIP_("This file was saved by a newer version of Blender (%s)"), + RPT_("This file was saved by a newer version of Blender (%s)"), writer_ver_str); SNPRINTF(message_line2, - TIP_("Saving it with this Blender (%s) may cause loss of data"), + RPT_("Saving it with this Blender (%s) may cause loss of data"), current_ver_str); uiItemL(layout, message_line1, ICON_NONE); uiItemL(layout, message_line2, ICON_NONE); @@ -4013,7 +4013,7 @@ static uiBlock *block_create_save_file_forwardcompat_dialog(bContext *C, /* Title. */ uiItemL_ex( - layout, TIP_("Overwrite file with an older Blender version?"), ICON_NONE, true, false); + layout, RPT_("Overwrite file with an older Blender version?"), ICON_NONE, true, false); /* Filename. */ const char *blendfile_path = BKE_main_blendfile_path(CTX_data_main(C)); @@ -4243,7 +4243,7 @@ static uiBlock *block_create__close_file_dialog(bContext *C, ARegion *region, vo const bool has_forwardcompat_issues = bmain->has_forward_compatibility_issues; /* Title. */ - uiItemL_ex(layout, TIP_("Save changes before closing?"), ICON_NONE, true, false); + uiItemL_ex(layout, RPT_("Save changes before closing?"), ICON_NONE, true, false); /* Filename. */ const char *blendfile_path = BKE_main_blendfile_path(CTX_data_main(C)); diff --git a/source/blender/windowmanager/intern/wm_operators.cc b/source/blender/windowmanager/intern/wm_operators.cc index 46626ff807e..0fe63905f6e 100644 --- a/source/blender/windowmanager/intern/wm_operators.cc +++ b/source/blender/windowmanager/intern/wm_operators.cc @@ -1542,7 +1542,7 @@ ID *WM_operator_drop_load_path(bContext *C, wmOperator *op, const short idcode) "Cannot read %s '%s': %s", BKE_idtype_idcode_to_name(idcode), filepath, - errno ? strerror(errno) : TIP_("unsupported format")); + errno ? strerror(errno) : RPT_("unsupported format")); return nullptr; } diff --git a/source/blender/windowmanager/intern/wm_window.cc b/source/blender/windowmanager/intern/wm_window.cc index 9a9eff88142..3b9d8fd4d18 100644 --- a/source/blender/windowmanager/intern/wm_window.cc +++ b/source/blender/windowmanager/intern/wm_window.cc @@ -1983,13 +1983,13 @@ static uiBlock *block_create_opengl_usage_warning(bContext *C, ARegion *region, /* Title and explanation text. */ uiLayout *col = uiLayoutColumn(layout, false); - uiItemL_ex(col, TIP_("Python script uses OpenGL for drawing"), ICON_NONE, true, false); - uiItemL(col, TIP_("This may lead to unexpected behavior"), ICON_NONE); + uiItemL_ex(col, RPT_("Python script uses OpenGL for drawing"), ICON_NONE, true, false); + uiItemL(col, RPT_("This may lead to unexpected behavior"), ICON_NONE); uiItemL(col, - TIP_("One of the add-ons or scripts is using OpenGL and will not work correct on Metal"), + RPT_("One of the add-ons or scripts is using OpenGL and will not work correct on Metal"), ICON_NONE); uiItemL(col, - TIP_("Please contact the developer of the add-on to migrate to use 'gpu' module"), + RPT_("Please contact the developer of the add-on to migrate to use 'gpu' module"), ICON_NONE); if (G.opengl_deprecation_usage_filename) { char location[1024]; @@ -1997,7 +1997,7 @@ static uiBlock *block_create_opengl_usage_warning(bContext *C, ARegion *region, location, "%s:%d", G.opengl_deprecation_usage_filename, G.opengl_deprecation_usage_lineno); uiItemL(col, location, ICON_NONE); } - uiItemL(col, TIP_("See system tab in preferences to switch to OpenGL backend"), ICON_NONE); + uiItemL(col, RPT_("See system tab in preferences to switch to OpenGL backend"), ICON_NONE); uiItemS(layout); @@ -2024,11 +2024,10 @@ void wm_test_opengl_deprecation_warning(bContext *C) wmWindowManager *wm = CTX_wm_manager(C); wmWindow *win = static_cast((wm->winactive) ? wm->winactive : wm->windows.first); - BKE_report( - &wm->reports, - RPT_ERROR, - TIP_("One of the add-ons or scripts is using OpenGL and will not work correct on Metal. " - "Please contact the developer of the add-on to migrate to use 'gpu' module")); + BKE_report(&wm->reports, + RPT_ERROR, + "One of the add-ons or scripts is using OpenGL and will not work correct on Metal. " + "Please contact the developer of the add-on to migrate to use 'gpu' module"); if (win) { wmWindow *prevwin = CTX_wm_window(C);