diff options
| author | Xiao Xiangquan <xiaoxiangquan@gmail.com> | 2011-07-02 07:17:09 +0400 |
|---|---|---|
| committer | Xiao Xiangquan <xiaoxiangquan@gmail.com> | 2011-07-02 07:17:09 +0400 |
| commit | 9b8538c69c14aaf9b991ae23e5faa6429c701c37 (patch) | |
| tree | f4e1bcddf227dba241779a866d5028a8541dcc93 /source/blender/editors | |
| parent | 79c129647e2a8c5d5efd2fc1226e3980f356e663 (diff) | |
3D view, graph editor, etc. done
Diffstat (limited to 'source/blender/editors')
52 files changed, 1240 insertions, 1217 deletions
diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c index 8efa4847452..67f2bdf452a 100644 --- a/source/blender/editors/animation/anim_channels_edit.c +++ b/source/blender/editors/animation/anim_channels_edit.c @@ -1076,9 +1076,9 @@ static int animchannels_rearrange_exec(bContext *C, wmOperator *op) static void ANIM_OT_channels_move (wmOperatorType *ot) { /* identifiers */ - ot->name= "Move Channels"; + ot->name= _("Move Channels"); ot->idname= "ANIM_OT_channels_move"; - ot->description = "Rearrange selected animation channels"; + ot->description = _("Rearrange selected animation channels"); /* api callbacks */ ot->exec= animchannels_rearrange_exec; @@ -1088,7 +1088,7 @@ static void ANIM_OT_channels_move (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - ot->prop= RNA_def_enum(ot->srna, "direction", prop_animchannel_rearrange_types, REARRANGE_ANIMCHAN_DOWN, "Direction", ""); + ot->prop= RNA_def_enum(ot->srna, "direction", prop_animchannel_rearrange_types, REARRANGE_ANIMCHAN_DOWN, _("Direction"), ""); } /* ******************** Delete Channel Operator *********************** */ @@ -1179,9 +1179,9 @@ static int animchannels_delete_exec(bContext *C, wmOperator *UNUSED(op)) static void ANIM_OT_channels_delete (wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete Channels"; + ot->name= _("Delete Channels"); ot->idname= "ANIM_OT_channels_delete"; - ot->description= "Delete all selected animation channels"; + ot->description= _("Delete all selected animation channels"); /* api callbacks */ ot->exec= animchannels_delete_exec; @@ -1256,9 +1256,9 @@ static int animchannels_visibility_set_exec(bContext *C, wmOperator *UNUSED(op)) static void ANIM_OT_channels_visibility_set (wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Visibility"; + ot->name= _("Set Visibility"); ot->idname= "ANIM_OT_channels_visibility_set"; - ot->description= "Make only the selected animation channels visible in the Graph Editor"; + ot->description= _("Make only the selected animation channels visible in the Graph Editor"); /* api callbacks */ ot->exec= animchannels_visibility_set_exec; @@ -1329,9 +1329,9 @@ static int animchannels_visibility_toggle_exec(bContext *C, wmOperator *UNUSED(o static void ANIM_OT_channels_visibility_toggle (wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Visibility"; + ot->name= _("Toggle Visibility"); ot->idname= "ANIM_OT_channels_visibility_toggle"; - ot->description= "Toggle visibility in Graph Editor of all selected animation channels"; + ot->description= _("Toggle visibility in Graph Editor of all selected animation channels"); /* api callbacks */ ot->exec= animchannels_visibility_toggle_exec; @@ -1345,18 +1345,18 @@ static void ANIM_OT_channels_visibility_toggle (wmOperatorType *ot) /* defines for setting animation-channel flags */ static EnumPropertyItem prop_animchannel_setflag_types[] = { - {ACHANNEL_SETFLAG_TOGGLE, "TOGGLE", 0, "Toggle", ""}, - {ACHANNEL_SETFLAG_CLEAR, "DISABLE", 0, "Disable", ""}, - {ACHANNEL_SETFLAG_ADD, "ENABLE", 0, "Enable", ""}, - {ACHANNEL_SETFLAG_INVERT, "INVERT", 0, "Invert", ""}, + {ACHANNEL_SETFLAG_TOGGLE, "TOGGLE", 0, N_("Toggle"), ""}, + {ACHANNEL_SETFLAG_CLEAR, "DISABLE", 0, N_("Disable"), ""}, + {ACHANNEL_SETFLAG_ADD, "ENABLE", 0, N_("Enable"), ""}, + {ACHANNEL_SETFLAG_INVERT, "INVERT", 0, N_("Invert"), ""}, {0, NULL, 0, NULL, NULL} }; /* defines for set animation-channel settings */ // TODO: could add some more types, but those are really quite dependent on the mode... static EnumPropertyItem prop_animchannel_settings_types[] = { - {ACHANNEL_SETTING_PROTECT, "PROTECT", 0, "Protect", ""}, - {ACHANNEL_SETTING_MUTE, "MUTE", 0, "Mute", ""}, + {ACHANNEL_SETTING_PROTECT, "PROTECT", 0, N_("Protect"), ""}, + {ACHANNEL_SETTING_MUTE, "MUTE", 0, N_("Mute"), ""}, {0, NULL, 0, NULL, NULL} }; @@ -1461,9 +1461,9 @@ static int animchannels_setflag_exec(bContext *C, wmOperator *op) static void ANIM_OT_channels_setting_enable (wmOperatorType *ot) { /* identifiers */ - ot->name= "Enable Channel Setting"; + ot->name= _("Enable Channel Setting"); ot->idname= "ANIM_OT_channels_setting_enable"; - ot->description= "Enable specified setting on all selected animation channels"; + ot->description= _("Enable specified setting on all selected animation channels"); /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -1475,17 +1475,17 @@ static void ANIM_OT_channels_setting_enable (wmOperatorType *ot) /* props */ /* flag-setting mode */ - RNA_def_enum(ot->srna, "mode", prop_animchannel_setflag_types, ACHANNEL_SETFLAG_ADD, "Mode", ""); + RNA_def_enum(ot->srna, "mode", RNA_enum_items_gettexted(prop_animchannel_setflag_types), ACHANNEL_SETFLAG_ADD, _("Mode"), ""); /* setting to set */ - ot->prop= RNA_def_enum(ot->srna, "type", prop_animchannel_settings_types, 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_animchannel_settings_types), 0, _("Type"), ""); } static void ANIM_OT_channels_setting_disable (wmOperatorType *ot) { /* identifiers */ - ot->name= "Disable Channel Setting"; + ot->name= _("Disable Channel Setting"); ot->idname= "ANIM_OT_channels_setting_disable"; - ot->description= "Disable specified setting on all selected animation channels"; + ot->description= _("Disable specified setting on all selected animation channels"); /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -1497,17 +1497,17 @@ static void ANIM_OT_channels_setting_disable (wmOperatorType *ot) /* props */ /* flag-setting mode */ - RNA_def_enum(ot->srna, "mode", prop_animchannel_setflag_types, ACHANNEL_SETFLAG_CLEAR, "Mode", ""); + RNA_def_enum(ot->srna, "mode", prop_animchannel_setflag_types, ACHANNEL_SETFLAG_CLEAR, _("Mode"), ""); /* setting to set */ - ot->prop= RNA_def_enum(ot->srna, "type", prop_animchannel_settings_types, 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", prop_animchannel_settings_types, 0, _("Type"), ""); } static void ANIM_OT_channels_setting_invert (wmOperatorType *ot) { /* identifiers */ - ot->name= "Invert Channel Setting"; + ot->name= _("Invert Channel Setting"); ot->idname= "ANIM_OT_channels_setting_toggle"; - ot->description= "Invert specified setting on all selected animation channels"; + ot->description= _("Invert specified setting on all selected animation channels"); /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -1519,17 +1519,17 @@ static void ANIM_OT_channels_setting_invert (wmOperatorType *ot) /* props */ /* flag-setting mode */ - RNA_def_enum(ot->srna, "mode", prop_animchannel_setflag_types, ACHANNEL_SETFLAG_INVERT, "Mode", ""); + RNA_def_enum(ot->srna, "mode", prop_animchannel_setflag_types, ACHANNEL_SETFLAG_INVERT, _("Mode"), ""); /* setting to set */ - ot->prop= RNA_def_enum(ot->srna, "type", prop_animchannel_settings_types, 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", prop_animchannel_settings_types, 0, _("Type"), ""); } static void ANIM_OT_channels_setting_toggle (wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Channel Setting"; + ot->name= _("Toggle Channel Setting"); ot->idname= "ANIM_OT_channels_setting_toggle"; - ot->description= "Toggle specified setting on all selected animation channels"; + ot->description= _("Toggle specified setting on all selected animation channels"); /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -1541,17 +1541,17 @@ static void ANIM_OT_channels_setting_toggle (wmOperatorType *ot) /* props */ /* flag-setting mode */ - RNA_def_enum(ot->srna, "mode", prop_animchannel_setflag_types, ACHANNEL_SETFLAG_TOGGLE, "Mode", ""); + RNA_def_enum(ot->srna, "mode", prop_animchannel_setflag_types, ACHANNEL_SETFLAG_TOGGLE, _("Mode"), ""); /* setting to set */ - ot->prop= RNA_def_enum(ot->srna, "type", prop_animchannel_settings_types, 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", prop_animchannel_settings_types, 0, _("Type"), ""); } static void ANIM_OT_channels_editable_toggle (wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Channel Editability"; + ot->name= _("Toggle Channel Editability"); ot->idname= "ANIM_OT_channels_editable_toggle"; - ot->description= "Toggle editability of selected channels"; + ot->description= _("Toggle editability of selected channels"); /* api callbacks */ ot->exec= animchannels_setflag_exec; @@ -1562,9 +1562,9 @@ static void ANIM_OT_channels_editable_toggle (wmOperatorType *ot) /* props */ /* flag-setting mode */ - RNA_def_enum(ot->srna, "mode", prop_animchannel_setflag_types, ACHANNEL_SETFLAG_TOGGLE, "Mode", ""); + RNA_def_enum(ot->srna, "mode", prop_animchannel_setflag_types, ACHANNEL_SETFLAG_TOGGLE, _("Mode"), ""); /* setting to set */ - RNA_def_enum(ot->srna, "type", prop_animchannel_settings_types, ACHANNEL_SETTING_PROTECT, "Type", ""); + RNA_def_enum(ot->srna, "type", prop_animchannel_settings_types, ACHANNEL_SETTING_PROTECT, _("Type"), ""); } /* ********************** Expand Channels Operator *********************** */ @@ -1594,9 +1594,9 @@ static int animchannels_expand_exec (bContext *C, wmOperator *op) static void ANIM_OT_channels_expand (wmOperatorType *ot) { /* identifiers */ - ot->name= "Expand Channels"; + ot->name= _("Expand Channels"); ot->idname= "ANIM_OT_channels_expand"; - ot->description= "Expand (i.e. open) all selected expandable animation channels"; + ot->description= _("Expand (i.e. open) all selected expandable animation channels"); /* api callbacks */ ot->exec= animchannels_expand_exec; @@ -1636,9 +1636,9 @@ static int animchannels_collapse_exec (bContext *C, wmOperator *op) static void ANIM_OT_channels_collapse (wmOperatorType *ot) { /* identifiers */ - ot->name= "Collapse Channels"; + ot->name= _("Collapse Channels"); ot->idname= "ANIM_OT_channels_collapse"; - ot->description= "Collapse (i.e. close) all selected expandable animation channels"; + ot->description= _("Collapse (i.e. close) all selected expandable animation channels"); /* api callbacks */ ot->exec= animchannels_collapse_exec; @@ -1712,9 +1712,9 @@ static int animchannels_enable_exec (bContext *C, wmOperator *UNUSED(op)) static void ANIM_OT_channels_fcurves_enable (wmOperatorType *ot) { /* identifiers */ - ot->name= "Revive Disabled F-Curves"; + ot->name= _("Revive Disabled F-Curves"); ot->idname= "ANIM_OT_channels_fcurves_enable"; - ot->description= "Clears 'disabled' tag from all F-Curves to get broken F-Curves working again"; + ot->description= _("Clears 'disabled' tag from all F-Curves to get broken F-Curves working again"); /* api callbacks */ ot->exec= animchannels_enable_exec; @@ -1749,9 +1749,9 @@ static int animchannels_deselectall_exec (bContext *C, wmOperator *op) static void ANIM_OT_channels_select_all_toggle (wmOperatorType *ot) { /* identifiers */ - ot->name= "Select All"; + ot->name= _("Select All"); ot->idname= "ANIM_OT_channels_select_all_toggle"; - ot->description= "Toggle selection of all animation channels"; + ot->description= _("Toggle selection of all animation channels"); /* api callbacks */ ot->exec= animchannels_deselectall_exec; @@ -1874,9 +1874,9 @@ static int animchannels_borderselect_exec(bContext *C, wmOperator *op) static void ANIM_OT_channels_select_border(wmOperatorType *ot) { /* identifiers */ - ot->name= "Border Select"; + ot->name= _("Border Select"); ot->idname= "ANIM_OT_channels_select_border"; - ot->description= "Select all animation channels within the specified region"; + ot->description= _("Select all animation channels within the specified region"); /* api callbacks */ ot->invoke= WM_border_select_invoke; @@ -2192,9 +2192,9 @@ static int animchannels_mouseclick_invoke(bContext *C, wmOperator *op, wmEvent * static void ANIM_OT_channels_click (wmOperatorType *ot) { /* identifiers */ - ot->name= "Mouse Click on Channels"; + ot->name= _("Mouse Click on Channels"); ot->idname= "ANIM_OT_channels_click"; - ot->description= "Handle mouse-clicks over animation channels"; + ot->description= _("Handle mouse-clicks over animation channels"); /* api callbacks */ ot->invoke= animchannels_mouseclick_invoke; diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c index ce3110dab3d..2fd481b9d86 100644 --- a/source/blender/editors/animation/anim_markers.c +++ b/source/blender/editors/animation/anim_markers.c @@ -578,8 +578,8 @@ static int ed_marker_add(bContext *C, wmOperator *UNUSED(op)) static void MARKER_OT_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Time Marker"; - ot->description= "Add a new time marker"; + ot->name= _("Add Time Marker"); + ot->description= _("Add a new time marker"); ot->idname= "MARKER_OT_add"; /* api callbacks */ @@ -881,8 +881,8 @@ static int ed_marker_move_exec(bContext *C, wmOperator *op) static void MARKER_OT_move(wmOperatorType *ot) { /* identifiers */ - ot->name= "Move Time Marker"; - ot->description= "Move selected time marker(s)"; + ot->name= _("Move Time Marker"); + ot->description= _("Move selected time marker(s)"); ot->idname= "MARKER_OT_move"; /* api callbacks */ @@ -976,8 +976,8 @@ static int ed_marker_duplicate_invoke_wrapper(bContext *C, wmOperator *op, wmEve static void MARKER_OT_duplicate(wmOperatorType *ot) { /* identifiers */ - ot->name= "Duplicate Time Marker"; - ot->description= "Duplicate selected time marker(s)"; + ot->name= _("Duplicate Time Marker"); + ot->description= _("Duplicate selected time marker(s)"); ot->idname= "MARKER_OT_duplicate"; /* api callbacks */ @@ -1099,8 +1099,8 @@ static int ed_marker_select_invoke_wrapper(bContext *C, wmOperator *op, wmEvent static void MARKER_OT_select(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Time Marker"; - ot->description= "Select time marker(s)"; + ot->name= _("Select Time Marker"); + ot->description= _("Select time marker(s)"); ot->idname= "MARKER_OT_select"; /* api callbacks */ @@ -1183,8 +1183,8 @@ static int ed_marker_select_border_invoke_wrapper(bContext *C, wmOperator *op, w static void MARKER_OT_select_border(wmOperatorType *ot) { /* identifiers */ - ot->name= "Marker Border select"; - ot->description= "Select all time markers using border selection"; + ot->name= _("Marker Border select"); + ot->description= _("Select all time markers using border selection"); ot->idname= "MARKER_OT_select_border"; /* api callbacks */ @@ -1240,8 +1240,8 @@ static int ed_marker_select_all_exec(bContext *C, wmOperator *op) static void MARKER_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "(De)select all markers"; - ot->description= "Change selection of all time markers"; + ot->name= _("(De)select all markers"); + ot->description= _("Change selection of all time markers"); ot->idname= "MARKER_OT_select_all"; /* api callbacks */ @@ -1293,8 +1293,8 @@ static int ed_marker_delete_invoke_wrapper(bContext *C, wmOperator *op, wmEvent static void MARKER_OT_delete(wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete Markers"; - ot->description= "Delete selected time marker(s)"; + ot->name= _("Delete Markers"); + ot->description= _("Delete selected time marker(s)"); ot->idname= "MARKER_OT_delete"; /* api callbacks */ @@ -1341,8 +1341,8 @@ static int ed_marker_rename_invoke_wrapper(bContext *C, wmOperator *op, wmEvent static void MARKER_OT_rename(wmOperatorType *ot) { /* identifiers */ - ot->name= "Rename Marker"; - ot->description= "Rename first selected time marker"; + ot->name= _("Rename Marker"); + ot->description= _("Rename first selected time marker"); ot->idname= "MARKER_OT_rename"; /* api callbacks */ @@ -1354,7 +1354,7 @@ static void MARKER_OT_rename(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop = RNA_def_string(ot->srna, "name", "RenamedMarker", sizeof(((TimeMarker *)NULL)->name), "Name", "New name for marker"); + ot->prop = RNA_def_string(ot->srna, "name", "RenamedMarker", sizeof(((TimeMarker *)NULL)->name), _("Name"), _("New name for marker")); //RNA_def_boolean(ot->srna, "ensure_unique", 0, "Ensure Unique", "Ensure that new name is unique within collection of markers"); } @@ -1394,8 +1394,8 @@ static void MARKER_OT_make_links_scene(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Make Links to Scene"; - ot->description= "Copy selected markers to another scene"; + ot->name= _("Make Links to Scene"); + ot->description= _("Copy selected markers to another scene"); ot->idname= "MARKER_OT_make_links_scene"; /* api callbacks */ @@ -1407,7 +1407,7 @@ static void MARKER_OT_make_links_scene(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - prop= RNA_def_enum(ot->srna, "scene", DummyRNA_NULL_items, 0, "Scene", ""); + prop= RNA_def_enum(ot->srna, "scene", DummyRNA_NULL_items, 0, _("Scene"), ""); RNA_def_enum_funcs(prop, RNA_scene_itemf); ot->prop= prop; diff --git a/source/blender/editors/animation/anim_ops.c b/source/blender/editors/animation/anim_ops.c index 1a69f88b382..e3438032fec 100644 --- a/source/blender/editors/animation/anim_ops.c +++ b/source/blender/editors/animation/anim_ops.c @@ -162,9 +162,9 @@ static int change_frame_modal(bContext *C, wmOperator *op, wmEvent *event) static void ANIM_OT_change_frame(wmOperatorType *ot) { /* identifiers */ - ot->name= "Change frame"; + ot->name= _("Change frame"); ot->idname= "ANIM_OT_change_frame"; - ot->description= "Interactively change the current frame number"; + ot->description= _("Interactively change the current frame number"); /* api callbacks */ ot->exec= change_frame_exec; @@ -217,9 +217,9 @@ static int previewrange_define_exec(bContext *C, wmOperator *op) static void ANIM_OT_previewrange_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Preview Range"; + ot->name= _("Set Preview Range"); ot->idname= "ANIM_OT_previewrange_set"; - ot->description= "Interactively define frame range used for playback"; + ot->description= _("Interactively define frame range used for playback"); /* api callbacks */ ot->invoke= WM_border_select_invoke; @@ -265,9 +265,9 @@ static int previewrange_clear_exec(bContext *C, wmOperator *UNUSED(op)) static void ANIM_OT_previewrange_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Preview Range"; + ot->name= _("Clear Preview Range"); ot->idname= "ANIM_OT_previewrange_clear"; - ot->description= "Clear Preview Range"; + ot->description= _("Clear Preview Range"); /* api callbacks */ ot->exec= previewrange_clear_exec; diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c index 5c4a79217c2..deb21719369 100644 --- a/source/blender/editors/animation/keyframing.c +++ b/source/blender/editors/animation/keyframing.c @@ -1142,9 +1142,9 @@ void ANIM_OT_keyframe_insert (wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Insert Keyframe"; + ot->name= _("Insert Keyframe"); ot->idname= "ANIM_OT_keyframe_insert"; - ot->description= "Insert keyframes on the current frame for all properties in the specified Keying Set"; + ot->description= _("Insert keyframes on the current frame for all properties in the specified Keying Set"); /* callbacks */ ot->exec= insert_key_exec; @@ -1154,7 +1154,7 @@ void ANIM_OT_keyframe_insert (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* keyingset to use (dynamic enum) */ - prop= RNA_def_enum(ot->srna, "type", DummyRNA_DEFAULT_items, 0, "Keying Set", "The Keying Set to use"); + prop= RNA_def_enum(ot->srna, "type", DummyRNA_DEFAULT_items, 0, _("Keying Set"), _("The Keying Set to use")); RNA_def_enum_funcs(prop, ANIM_keying_sets_enum_itemf); RNA_def_property_flag(prop, PROP_HIDDEN); ot->prop= prop; @@ -1195,7 +1195,7 @@ void ANIM_OT_keyframe_insert_menu (wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Insert Keyframe Menu"; + ot->name= _("Insert Keyframe Menu"); ot->idname= "ANIM_OT_keyframe_insert_menu"; ot->description= _("Insert Keyframes for specified Keying Set, with menu of available Keying Sets if undefined"); @@ -1208,7 +1208,7 @@ void ANIM_OT_keyframe_insert_menu (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* keyingset to use (dynamic enum) */ - prop= RNA_def_enum(ot->srna, "type", DummyRNA_DEFAULT_items, 0, "Keying Set", "The Keying Set to use"); + prop= RNA_def_enum(ot->srna, "type", DummyRNA_DEFAULT_items, 0, _("Keying Set"), _("The Keying Set to use")); RNA_def_enum_funcs(prop, ANIM_keying_sets_enum_itemf); RNA_def_property_flag(prop, PROP_HIDDEN); ot->prop= prop; @@ -1224,7 +1224,7 @@ void ANIM_OT_keyframe_insert_menu (wmOperatorType *ot) * - by default, the menu should only be shown when there is no active Keying Set (2.5 behaviour), * although in some cases it might be useful to always shown (pre 2.5 behaviour) */ - prop= RNA_def_boolean(ot->srna, "always_prompt", 0, "Always Show Menu", ""); + prop= RNA_def_boolean(ot->srna, "always_prompt", 0, _("Always Show Menu"), ""); RNA_def_property_flag(prop, PROP_HIDDEN); } @@ -1289,9 +1289,9 @@ void ANIM_OT_keyframe_delete (wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Delete Keying-Set Keyframe"; + ot->name= _("Delete Keying-Set Keyframe"); ot->idname= "ANIM_OT_keyframe_delete"; - ot->description= "Delete keyframes on the current frame for all properties in the specified Keying Set"; + ot->description= _("Delete keyframes on the current frame for all properties in the specified Keying Set"); /* callbacks */ ot->exec= delete_key_exec; @@ -1301,7 +1301,7 @@ void ANIM_OT_keyframe_delete (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* keyingset to use (dynamic enum) */ - prop= RNA_def_enum(ot->srna, "type", DummyRNA_DEFAULT_items, 0, "Keying Set", "The Keying Set to use"); + prop= RNA_def_enum(ot->srna, "type", DummyRNA_DEFAULT_items, 0, _("Keying Set"), _("The Keying Set to use")); RNA_def_enum_funcs(prop, ANIM_keying_sets_enum_itemf); RNA_def_property_flag(prop, PROP_HIDDEN); ot->prop= prop; @@ -1361,7 +1361,7 @@ static int delete_key_v3d_exec (bContext *C, wmOperator *op) void ANIM_OT_keyframe_delete_v3d (wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete Keyframe"; + ot->name= _("Delete Keyframe"); ot->description= _("Remove keyframes on current frame for selected object"); ot->idname= "ANIM_OT_keyframe_delete_v3d"; @@ -1451,7 +1451,7 @@ static int insert_key_button_exec (bContext *C, wmOperator *op) void ANIM_OT_keyframe_insert_button (wmOperatorType *ot) { /* identifiers */ - ot->name= "Insert Keyframe (Buttons)"; + ot->name= _("Insert Keyframe (Buttons)"); ot->idname= "ANIM_OT_keyframe_insert_button"; /* callbacks */ @@ -1523,7 +1523,7 @@ static int delete_key_button_exec (bContext *C, wmOperator *op) void ANIM_OT_keyframe_delete_button (wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete Keyframe (Buttons)"; + ot->name= _("Delete Keyframe (Buttons)"); ot->idname= "ANIM_OT_keyframe_delete_button"; /* callbacks */ diff --git a/source/blender/editors/animation/keyingsets.c b/source/blender/editors/animation/keyingsets.c index c04fdc3f82c..2a64894ca2a 100644 --- a/source/blender/editors/animation/keyingsets.c +++ b/source/blender/editors/animation/keyingsets.c @@ -144,9 +144,9 @@ static int add_default_keyingset_exec (bContext *C, wmOperator *UNUSED(op)) void ANIM_OT_keying_set_add (wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Empty Keying Set"; + ot->name= _("Add Empty Keying Set"); ot->idname= "ANIM_OT_keying_set_add"; - ot->description= "Add a new (empty) Keying Set to the active Scene"; + ot->description= _("Add a new (empty) Keying Set to the active Scene"); /* callbacks */ ot->exec= add_default_keyingset_exec; @@ -191,9 +191,9 @@ static int remove_active_keyingset_exec (bContext *C, wmOperator *op) void ANIM_OT_keying_set_remove (wmOperatorType *ot) { /* identifiers */ - ot->name= "Removed Active Keying Set"; + ot->name= _("Removed Active Keying Set"); ot->idname= "ANIM_OT_keying_set_remove"; - ot->description= "Remove the active Keying Set"; + ot->description= _("Remove the active Keying Set"); /* callbacks */ ot->exec= remove_active_keyingset_exec; @@ -233,9 +233,9 @@ static int add_empty_ks_path_exec (bContext *C, wmOperator *op) void ANIM_OT_keying_set_path_add (wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Empty Keying Set Path"; + ot->name= _("Add Empty Keying Set Path"); ot->idname= "ANIM_OT_keying_set_path_add"; - ot->description= "Add empty path to active Keying Set"; + ot->description= _("Add empty path to active Keying Set"); /* callbacks */ ot->exec= add_empty_ks_path_exec; @@ -276,9 +276,9 @@ static int remove_active_ks_path_exec (bContext *C, wmOperator *op) void ANIM_OT_keying_set_path_remove (wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove Active Keying Set Path"; + ot->name= _("Remove Active Keying Set Path"); ot->idname= "ANIM_OT_keying_set_path_remove"; - ot->description= "Remove active Path from active Keying Set"; + ot->description= _("Remove active Path from active Keying Set"); /* callbacks */ ot->exec= remove_active_ks_path_exec; @@ -374,7 +374,7 @@ static int add_keyingset_button_exec (bContext *C, wmOperator *op) void ANIM_OT_keyingset_button_add (wmOperatorType *ot) { /* identifiers */ - ot->name= "Add to Keying Set"; + ot->name= _("Add to Keying Set"); ot->idname= "ANIM_OT_keyingset_button_add"; /* callbacks */ @@ -453,7 +453,7 @@ static int remove_keyingset_button_exec (bContext *C, wmOperator *op) void ANIM_OT_keyingset_button_remove (wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove from Keying Set"; + ot->name= _("Remove from Keying Set"); ot->idname= "ANIM_OT_keyingset_button_remove"; /* callbacks */ @@ -496,7 +496,7 @@ static int keyingset_active_menu_exec (bContext *C, wmOperator *op) void ANIM_OT_keying_set_active_set (wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Active Keying Set"; + ot->name= _("Set Active Keying Set"); ot->idname= "ANIM_OT_keying_set_active_set"; /* callbacks */ diff --git a/source/blender/editors/armature/armature_ops.c b/source/blender/editors/armature/armature_ops.c index 545cff82483..0ea21c83c23 100644 --- a/source/blender/editors/armature/armature_ops.c +++ b/source/blender/editors/armature/armature_ops.c @@ -39,6 +39,7 @@ #include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLF_api.h" #include "RNA_access.h" @@ -172,14 +173,14 @@ void ED_operatormacros_armature(void) wmOperatorType *ot; wmOperatorTypeMacro *otmacro; - ot= WM_operatortype_append_macro("ARMATURE_OT_duplicate_move", "Duplicate", OPTYPE_UNDO|OPTYPE_REGISTER); + ot= WM_operatortype_append_macro("ARMATURE_OT_duplicate_move", _("Duplicate"), OPTYPE_UNDO|OPTYPE_REGISTER); if(ot) { WM_operatortype_macro_define(ot, "ARMATURE_OT_duplicate"); otmacro= WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate"); RNA_enum_set(otmacro->ptr, "proportional", 0); } - ot= WM_operatortype_append_macro("ARMATURE_OT_extrude_move", "Extrude", OPTYPE_UNDO|OPTYPE_REGISTER); + ot= WM_operatortype_append_macro("ARMATURE_OT_extrude_move", _("Extrude"), OPTYPE_UNDO|OPTYPE_REGISTER); if(ot) { otmacro=WM_operatortype_macro_define(ot, "ARMATURE_OT_extrude"); RNA_boolean_set(otmacro->ptr, "forked", 0); @@ -189,7 +190,7 @@ void ED_operatormacros_armature(void) // XXX would it be nicer to just be able to have standard extrude_move, but set the forked property separate? // that would require fixing a properties bug 19733 - ot= WM_operatortype_append_macro("ARMATURE_OT_extrude_forked", "Extrude Forked", OPTYPE_UNDO|OPTYPE_REGISTER); + ot= WM_operatortype_append_macro("ARMATURE_OT_extrude_forked", _("Extrude Forked"), OPTYPE_UNDO|OPTYPE_REGISTER); if(ot) { otmacro=WM_operatortype_macro_define(ot, "ARMATURE_OT_extrude"); RNA_boolean_set(otmacro->ptr, "forked", 1); diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index 1144de4c355..8c1f2fae899 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -716,9 +716,9 @@ static int apply_armature_pose2bones_exec (bContext *C, wmOperator *op) void POSE_OT_armature_apply (wmOperatorType *ot) { /* identifiers */ - ot->name= "Apply Pose as Rest Pose"; + ot->name= _("Apply Pose as Rest Pose"); ot->idname= "POSE_OT_armature_apply"; - ot->description= "Apply the current pose as the new rest pose"; + ot->description= _("Apply the current pose as the new rest pose"); /* callbacks */ ot->exec= apply_armature_pose2bones_exec; @@ -767,9 +767,9 @@ static int pose_visual_transform_apply_exec (bContext *C, wmOperator *UNUSED(op) void POSE_OT_visual_transform_apply (wmOperatorType *ot) { /* identifiers */ - ot->name= "Apply Visual Transform to Pose"; + ot->name= _("Apply Visual Transform to Pose"); ot->idname= "POSE_OT_visual_transform_apply"; - ot->description= "Apply final constrained position of pose bones to their transform."; + ot->description= _("Apply final constrained position of pose bones to their transform."); /* callbacks */ ot->exec= pose_visual_transform_apply_exec; @@ -1230,9 +1230,9 @@ static int separate_armature_exec (bContext *C, wmOperator *UNUSED(op)) void ARMATURE_OT_separate (wmOperatorType *ot) { /* identifiers */ - ot->name= "Separate Bones"; + ot->name= _("Separate Bones"); ot->idname= "ARMATURE_OT_separate"; - ot->description= "Isolate selected bones into a separate armature"; + ot->description= _("Isolate selected bones into a separate armature"); /* callbacks */ ot->invoke= WM_operator_confirm; @@ -1459,9 +1459,9 @@ static EnumPropertyItem prop_bone_setting_modes[] = { void ARMATURE_OT_flags_set (wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Bone Flags"; + ot->name= _("Set Bone Flags"); ot->idname= "ARMATURE_OT_flags_set"; - ot->description= "Set flags for armature bones"; + ot->description= _("Set flags for armature bones"); /* callbacks */ ot->invoke= WM_menu_invoke; @@ -1472,16 +1472,16 @@ void ARMATURE_OT_flags_set (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", prop_bone_setting_types, 0, "Type", ""); - RNA_def_enum(ot->srna, "mode", prop_bone_setting_modes, 0, "Mode", ""); + ot->prop= RNA_def_enum(ot->srna, "type", prop_bone_setting_types, 0, _("Type"), ""); + RNA_def_enum(ot->srna, "mode", prop_bone_setting_modes, 0, _("Mode"), ""); } void POSE_OT_flags_set (wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Bone Flags"; + ot->name= _("Set Bone Flags"); ot->idname= "POSE_OT_flags_set"; - ot->description= "Set flags for armature bones"; + ot->description= _("Set flags for armature bones"); /* callbacks */ ot->invoke= WM_menu_invoke; @@ -1492,8 +1492,8 @@ void POSE_OT_flags_set (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", prop_bone_setting_types, 0, "Type", ""); - RNA_def_enum(ot->srna, "mode", prop_bone_setting_modes, 0, "Mode", ""); + ot->prop= RNA_def_enum(ot->srna, "type", prop_bone_setting_types, 0, _("Type"), ""); + RNA_def_enum(ot->srna, "mode", prop_bone_setting_modes, 0, _("Mode"), ""); } @@ -1673,9 +1673,9 @@ static int armature_select_linked_poll(bContext *C) void ARMATURE_OT_select_linked(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Connected"; + ot->name= _("Select Connected"); ot->idname= "ARMATURE_OT_select_linked"; - ot->description= "Select bones related to selected ones by parent/child relationships"; + ot->description= _("Select bones related to selected ones by parent/child relationships"); /* api callbacks */ ot->exec= NULL; @@ -1858,9 +1858,9 @@ static int armature_delete_selected_exec(bContext *C, wmOperator *UNUSED(op)) void ARMATURE_OT_delete(wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete Selected Bone(s)"; + ot->name= _("Delete Selected Bone(s)"); ot->idname= "ARMATURE_OT_delete"; - ot->description= "Remove selected bones from the armature"; + ot->description= _("Remove selected bones from the armature"); /* api callbacks */ ot->invoke = WM_operator_confirm; @@ -2107,12 +2107,12 @@ float ED_rollBoneToVector(EditBone *bone, const float align_axis[3], const short static EnumPropertyItem prop_calc_roll_types[] = { - {0, "X", 0, "X Axis", ""}, - {1, "Y", 0, "Y Axis", ""}, - {2, "Z", 0, "Z Axis", ""}, - {5, "ACTIVE", 0, "Active Bone", ""}, - {6, "VIEW", 0, "View Axis", ""}, - {7, "CURSOR", 0, "Cursor", ""}, + {0, "X", 0, N_("X Axis"), ""}, + {1, "Y", 0, N_("Y Axis"), ""}, + {2, "Z", 0, N_("Z Axis"), ""}, + {5, "ACTIVE", 0, N_("Active Bone"), ""}, + {6, "VIEW", 0, N_("View Axis"), ""}, + {7, "CURSOR", 0, N_("Cursor"), ""}, {0, NULL, 0, NULL, NULL} }; @@ -2213,9 +2213,9 @@ static int armature_calc_roll_exec(bContext *C, wmOperator *op) void ARMATURE_OT_calculate_roll(wmOperatorType *ot) { /* identifiers */ - ot->name= "Recalculate Roll"; + ot->name= _("Recalculate Roll"); ot->idname= "ARMATURE_OT_calculate_roll"; - ot->description= "Automatically fix alignment of select bones' axes"; + ot->description= _("Automatically fix alignment of select bones' axes"); /* api callbacks */ ot->invoke = WM_menu_invoke; @@ -2226,7 +2226,7 @@ void ARMATURE_OT_calculate_roll(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", prop_calc_roll_types, 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_calc_roll_types), 0, _("Type"), ""); RNA_def_boolean(ot->srna, "axis_flip", 0, _("Flip Axis"), _("Negate the alignment axis.")); RNA_def_boolean(ot->srna, "axis_only", 0, _("Shortest Rotation"), _("Ignore the axis direction, use the shortest rotation to align.")); } @@ -2520,9 +2520,9 @@ static int armature_click_extrude_invoke(bContext *C, wmOperator *op, wmEvent *e void ARMATURE_OT_click_extrude(wmOperatorType *ot) { /* identifiers */ - ot->name= "Click-Extrude"; + ot->name= _("Click-Extrude"); ot->idname= "ARMATURE_OT_click_extrude"; - ot->description= "Create a new bone going from the last selected joint to the mouse position"; + ot->description= _("Create a new bone going from the last selected joint to the mouse position"); /* api callbacks */ ot->invoke = armature_click_extrude_invoke; @@ -2789,9 +2789,9 @@ static int armature_duplicate_selected_exec(bContext *C, wmOperator *UNUSED(op)) void ARMATURE_OT_duplicate(wmOperatorType *ot) { /* identifiers */ - ot->name= "Duplicate Selected Bone(s)"; + ot->name= _("Duplicate Selected Bone(s)"); ot->idname= "ARMATURE_OT_duplicate"; - ot->description= "Make copies of the selected bones within the same armature"; + ot->description= _("Make copies of the selected bones within the same armature"); /* api callbacks */ ot->exec = armature_duplicate_selected_exec; @@ -3063,9 +3063,9 @@ static int armature_fill_bones_exec (bContext *C, wmOperator *op) void ARMATURE_OT_fill (wmOperatorType *ot) { /* identifiers */ - ot->name= "Fill Between Joints"; + ot->name= _("Fill Between Joints"); ot->idname= "ARMATURE_OT_fill"; - ot->description= "Add bone between selected joint(s) and/or 3D-Cursor"; + ot->description= _("Add bone between selected joint(s) and/or 3D-Cursor"); /* callbacks */ ot->exec= armature_fill_bones_exec; @@ -3239,14 +3239,14 @@ static int armature_merge_exec (bContext *C, wmOperator *op) void ARMATURE_OT_merge (wmOperatorType *ot) { static EnumPropertyItem merge_types[] = { - {1, "WITHIN_CHAIN", 0, "Within Chains", ""}, + {1, "WITHIN_CHAIN", 0, N_("Within Chains"), ""}, {0, NULL, 0, NULL, NULL} }; /* identifiers */ - ot->name= "Merge Bones"; + ot->name= _("Merge Bones"); ot->idname= "ARMATURE_OT_merge"; - ot->description= "Merge continuous chains of selected bones"; + ot->description= _("Merge continuous chains of selected bones"); /* callbacks */ ot->invoke= WM_menu_invoke; @@ -3257,7 +3257,7 @@ void ARMATURE_OT_merge (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", merge_types, 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(merge_types), 0, _("Type"), ""); } /* ************** END Add/Remove stuff in editmode ************ */ @@ -3293,9 +3293,9 @@ static int armature_hide_exec(bContext *C, wmOperator *op) void ARMATURE_OT_hide(wmOperatorType *ot) { /* identifiers */ - ot->name= "Hide Selected Bones"; + ot->name= _("Hide Selected Bones"); ot->idname= "ARMATURE_OT_hide"; - ot->description= "Tag selected bones to not be visible in Edit Mode"; + ot->description= _("Tag selected bones to not be visible in Edit Mode"); /* api callbacks */ ot->exec= armature_hide_exec; @@ -3333,9 +3333,9 @@ static int armature_reveal_exec(bContext *C, wmOperator *UNUSED(op)) void ARMATURE_OT_reveal(wmOperatorType *ot) { /* identifiers */ - ot->name= "Reveal Bones"; + ot->name= _("Reveal Bones"); ot->idname= "ARMATURE_OT_reveal"; - ot->description= "Unhide all bones that have been tagged to be hidden in Edit Mode"; + ot->description= _("Unhide all bones that have been tagged to be hidden in Edit Mode"); /* api callbacks */ ot->exec= armature_reveal_exec; @@ -3542,9 +3542,9 @@ static int armature_extrude_exec(bContext *C, wmOperator *op) void ARMATURE_OT_extrude(wmOperatorType *ot) { /* identifiers */ - ot->name= "Extrude"; + ot->name= _("Extrude"); ot->idname= "ARMATURE_OT_extrude"; - ot->description= "Create new bones from the selected joints"; + ot->description= _("Create new bones from the selected joints"); /* api callbacks */ ot->exec= armature_extrude_exec; @@ -3605,9 +3605,9 @@ static int armature_bone_primitive_add_exec(bContext *C, wmOperator *op) void ARMATURE_OT_bone_primitive_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Bone"; + ot->name= _("Add Bone"); ot->idname= "ARMATURE_OT_bone_primitive_add"; - ot->description= "Add a new bone located at the 3D-Cursor"; + ot->description= _("Add a new bone located at the 3D-Cursor"); /* api callbacks */ ot->exec = armature_bone_primitive_add_exec; @@ -3616,7 +3616,7 @@ void ARMATURE_OT_bone_primitive_add(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_string(ot->srna, "name", "Bone", 32, "Name", "Name of the newly created bone"); + RNA_def_string(ot->srna, "name", "Bone", 32, _("Name"), _("Name of the newly created bone")); } @@ -3695,9 +3695,9 @@ static int armature_subdivide_exec(bContext *C, wmOperator *op) void ARMATURE_OT_subdivide(wmOperatorType *ot) { /* identifiers */ - ot->name= "Subdivide Multi"; + ot->name= _("Subdivide Multi"); ot->idname= "ARMATURE_OT_subdivide"; - ot->description= "Break selected bones into chains of smaller bones"; + ot->description= _("Break selected bones into chains of smaller bones"); /* api callbacks */ ot->exec = armature_subdivide_exec; @@ -3707,7 +3707,7 @@ void ARMATURE_OT_subdivide(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* Properties */ - RNA_def_int(ot->srna, "number_cuts", 1, 1, INT_MAX, "Number of Cuts", "", 1, 10); + RNA_def_int(ot->srna, "number_cuts", 1, 1, INT_MAX, _("Number of Cuts"), "", 1, 10); } /* ----------- */ @@ -3797,9 +3797,9 @@ static int armature_switch_direction_exec(bContext *C, wmOperator *UNUSED(op)) void ARMATURE_OT_switch_direction(wmOperatorType *ot) { /* identifiers */ - ot->name= "Switch Direction"; + ot->name= _("Switch Direction"); ot->idname= "ARMATURE_OT_switch_direction"; - ot->description= "Change the direction that a chain of bones points in (head <-> tail swap)"; + ot->description= _("Change the direction that a chain of bones points in (head <-> tail swap)"); /* api callbacks */ ot->exec = armature_switch_direction_exec; @@ -3871,8 +3871,8 @@ static void bone_connect_to_new_parent(ListBase *edbo, EditBone *selbone, EditBo } static EnumPropertyItem prop_editarm_make_parent_types[] = { - {ARM_PAR_CONNECT, "CONNECTED", 0, "Connected", ""}, - {ARM_PAR_OFFSET, "OFFSET", 0, "Keep Offset", ""}, + {ARM_PAR_CONNECT, "CONNECTED", 0, N_("Connected"), ""}, + {ARM_PAR_OFFSET, "OFFSET", 0, N_("Keep Offset"), ""}, {0, NULL, 0, NULL, NULL} }; @@ -3972,9 +3972,9 @@ static int armature_parent_set_invoke(bContext *C, wmOperator *UNUSED(op), wmEve void ARMATURE_OT_parent_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Make Parent"; + ot->name= _("Make Parent"); ot->idname= "ARMATURE_OT_parent_set"; - ot->description= "Set the active bone as the parent of the selected bones"; + ot->description= _("Set the active bone as the parent of the selected bones"); /* api callbacks */ ot->invoke = armature_parent_set_invoke; @@ -3984,12 +3984,12 @@ void ARMATURE_OT_parent_set(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_enum(ot->srna, "type", prop_editarm_make_parent_types, 0, "ParentType", "Type of parenting"); + RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_editarm_make_parent_types), 0, _("ParentType"), _("Type of parenting")); } static EnumPropertyItem prop_editarm_clear_parent_types[] = { - {1, "CLEAR", 0, "Clear Parent", ""}, - {2, "DISCONNECT", 0, "Disconnect Bone", ""}, + {1, "CLEAR", 0, N_("Clear Parent"), ""}, + {2, "DISCONNECT", 0, N_("Disconnect Bone"), ""}, {0, NULL, 0, NULL, NULL} }; @@ -4026,9 +4026,9 @@ static int armature_parent_clear_exec(bContext *C, wmOperator *op) void ARMATURE_OT_parent_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Parent"; + ot->name= _("Clear Parent"); ot->idname= "ARMATURE_OT_parent_clear"; - ot->description= "Remove the parent-child relationship between selected bones and their parents"; + ot->description= _("Remove the parent-child relationship between selected bones and their parents"); /* api callbacks */ ot->invoke = WM_menu_invoke; @@ -4038,7 +4038,7 @@ void ARMATURE_OT_parent_clear(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - ot->prop= RNA_def_enum(ot->srna, "type", prop_editarm_clear_parent_types, 0, "ClearType", "What way to clear parenting"); + ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_editarm_clear_parent_types), 0, _("ClearType"), _("What way to clear parenting")); } /* **************** Selections ******************/ @@ -4063,9 +4063,9 @@ static int armature_select_inverse_exec(bContext *C, wmOperator *UNUSED(op)) void ARMATURE_OT_select_inverse(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Inverse"; + ot->name= _("Select Inverse"); ot->idname= "ARMATURE_OT_select_inverse"; - ot->description= "Flip the selection status of bones (selected -> unselected, unselected -> selected)"; + ot->description= _("Flip the selection status of bones (selected -> unselected, unselected -> selected)"); /* api callbacks */ ot->exec= armature_select_inverse_exec; @@ -4123,9 +4123,9 @@ static int armature_de_select_all_exec(bContext *C, wmOperator *op) void ARMATURE_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select or Deselect All"; + ot->name= _("Select or Deselect All"); ot->idname= "ARMATURE_OT_select_all"; - ot->description= "Toggle selection status of all bones"; + ot->description= _("Toggle selection status of all bones"); /* api callbacks */ ot->exec= armature_de_select_all_exec; @@ -4198,15 +4198,15 @@ static int armature_select_hierarchy_exec(bContext *C, wmOperator *op) void ARMATURE_OT_select_hierarchy(wmOperatorType *ot) { static EnumPropertyItem direction_items[]= { - {BONE_SELECT_PARENT, "PARENT", 0, "Select Parent", ""}, - {BONE_SELECT_CHILD, "CHILD", 0, "Select Child", ""}, + {BONE_SELECT_PARENT, "PARENT", 0, N_("Select Parent"), ""}, + {BONE_SELECT_CHILD, "CHILD", 0, N_("Select Child"), ""}, {0, NULL, 0, NULL, NULL} }; /* identifiers */ - ot->name= "Select Hierarchy"; + ot->name= _("Select Hierarchy"); ot->idname= "ARMATURE_OT_select_hierarchy"; - ot->description= "Select immediate parent/children of selected bones"; + ot->description= _("Select immediate parent/children of selected bones"); /* api callbacks */ ot->exec= armature_select_hierarchy_exec; @@ -4216,8 +4216,8 @@ void ARMATURE_OT_select_hierarchy(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - RNA_def_enum(ot->srna, "direction", direction_items, - BONE_SELECT_PARENT, "Direction", ""); + RNA_def_enum(ot->srna, "direction", RNA_enum_items_gettexted(direction_items), + BONE_SELECT_PARENT, _("Direction"), ""); RNA_def_boolean(ot->srna, "extend", 0, _("Add to Selection"), ""); } @@ -4343,9 +4343,9 @@ static int armature_align_bones_exec(bContext *C, wmOperator *op) void ARMATURE_OT_align(wmOperatorType *ot) { /* identifiers */ - ot->name= "Align Bones"; + ot->name= _("Align Bones"); ot->idname= "ARMATURE_OT_align"; - ot->description= "Align selected bones to the active bone (or to their parent)"; + ot->description= _("Align selected bones to the active bone (or to their parent)"); /* api callbacks */ ot->invoke = WM_operator_confirm; @@ -5058,9 +5058,9 @@ static int pose_clear_scale_exec(bContext *C, wmOperator *op) void POSE_OT_scale_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Pose Scale"; + ot->name= _("Clear Pose Scale"); ot->idname= "POSE_OT_scale_clear"; - ot->description = "Reset scaling of selected bones to their default values"; + ot->description = _("Reset scaling of selected bones to their default values"); /* api callbacks */ ot->exec = pose_clear_scale_exec; @@ -5079,9 +5079,9 @@ static int pose_clear_rot_exec(bContext *C, wmOperator *op) void POSE_OT_rot_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Pose Rotation"; + ot->name= _("Clear Pose Rotation"); ot->idname= "POSE_OT_rot_clear"; - ot->description = "Reset rotations of selected bones to their default values"; + ot->description = _("Reset rotations of selected bones to their default values"); /* api callbacks */ ot->exec = pose_clear_rot_exec; @@ -5100,9 +5100,9 @@ static int pose_clear_loc_exec(bContext *C, wmOperator *op) void POSE_OT_loc_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Pose Location"; + ot->name= _("Clear Pose Location"); ot->idname= "POSE_OT_loc_clear"; - ot->description = "Reset locations of selected bones to their default values"; + ot->description = _("Reset locations of selected bones to their default values"); /* api callbacks */ ot->exec = pose_clear_loc_exec; @@ -5121,9 +5121,9 @@ static int pose_clear_transforms_exec(bContext *C, wmOperator *op) void POSE_OT_transforms_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Pose Transforms"; + ot->name= _("Clear Pose Transforms"); ot->idname= "POSE_OT_transforms_clear"; - ot->description = "Reset location, rotation, and scaling of selected bones to their default values"; + ot->description = _("Reset location, rotation, and scaling of selected bones to their default values"); /* api callbacks */ ot->exec = pose_clear_transforms_exec; @@ -5155,9 +5155,9 @@ static int pose_select_inverse_exec(bContext *C, wmOperator *UNUSED(op)) void POSE_OT_select_inverse(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Inverse"; + ot->name= _("Select Inverse"); ot->idname= "POSE_OT_select_inverse"; - ot->description= "Flip the selection status of bones (selected -> unselected, unselected -> selected)"; + ot->description= _("Flip the selection status of bones (selected -> unselected, unselected -> selected)"); /* api callbacks */ ot->exec= pose_select_inverse_exec; @@ -5206,9 +5206,9 @@ static int pose_de_select_all_exec(bContext *C, wmOperator *op) void POSE_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select or Deselect All"; + ot->name= _("Select or Deselect All"); ot->idname= "POSE_OT_select_all"; - ot->description= "Toggle selection status of all bones"; + ot->description= _("Toggle selection status of all bones"); /* api callbacks */ ot->exec= pose_de_select_all_exec; @@ -5250,9 +5250,9 @@ static int pose_select_parent_exec(bContext *C, wmOperator *UNUSED(op)) void POSE_OT_select_parent(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Parent Bone"; + ot->name= _("Select Parent Bone"); ot->idname= "POSE_OT_select_parent"; - ot->description= "Select bones that are parents of the currently selected bones"; + ot->description= _("Select bones that are parents of the currently selected bones"); /* api callbacks */ ot->exec= pose_select_parent_exec; @@ -5361,9 +5361,9 @@ static int pose_reveal_exec(bContext *C, wmOperator *UNUSED(op)) void POSE_OT_reveal(wmOperatorType *ot) { /* identifiers */ - ot->name= "Reveal Selected"; + ot->name= _("Reveal Selected"); ot->idname= "POSE_OT_reveal"; - ot->description= "Unhide all bones that have been tagged to be hidden in Pose Mode"; + ot->description= _("Unhide all bones that have been tagged to be hidden in Pose Mode"); /* api callbacks */ ot->exec= pose_reveal_exec; @@ -5576,9 +5576,9 @@ static int armature_flip_names_exec (bContext *C, wmOperator *UNUSED(op)) void ARMATURE_OT_flip_names (wmOperatorType *ot) { /* identifiers */ - ot->name= "Flip Names"; + ot->name= _("Flip Names"); ot->idname= "ARMATURE_OT_flip_names"; - ot->description= "Flips (and corrects) the axis suffixes of the names of selected bones"; + ot->description= _("Flips (and corrects) the axis suffixes of the names of selected bones"); /* api callbacks */ ot->exec= armature_flip_names_exec; @@ -5622,15 +5622,15 @@ static int armature_autoside_names_exec (bContext *C, wmOperator *op) void ARMATURE_OT_autoside_names (wmOperatorType *ot) { static EnumPropertyItem axis_items[]= { - {0, "XAXIS", 0, "X-Axis", "Left/Right"}, - {1, "YAXIS", 0, "Y-Axis", "Front/Back"}, - {2, "ZAXIS", 0, "Z-Axis", "Top/Bottom"}, + {0, "XAXIS", 0, N_("X-Axis"), N_("Left/Right")}, + {1, "YAXIS", 0, N_("Y-Axis"), N_("Front/Back")}, + {2, "ZAXIS", 0, N_("Z-Axis"), N_("Top/Bottom")}, {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= "AutoName by Axis"; + ot->name= _("AutoName by Axis"); ot->idname= "ARMATURE_OT_autoside_names"; - ot->description= "Automatically renames the selected bones according to which side of the target axis they fall on"; + ot->description= _("Automatically renames the selected bones according to which side of the target axis they fall on"); /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -5641,7 +5641,7 @@ void ARMATURE_OT_autoside_names (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* settings */ - ot->prop= RNA_def_enum(ot->srna, "type", axis_items, 0, "Axis", "Axis tag names with."); + ot->prop= RNA_def_enum(ot->srna, "type", axis_items, 0, _("Axis"), _("Axis tag names with.")); } diff --git a/source/blender/editors/armature/editarmature_sketch.c b/source/blender/editors/armature/editarmature_sketch.c index e3a6ded3410..20f1c72ed9e 100644 --- a/source/blender/editors/armature/editarmature_sketch.c +++ b/source/blender/editors/armature/editarmature_sketch.c @@ -2843,7 +2843,7 @@ int ED_operator_sketch_mode(const bContext *C) void SKETCH_OT_delete(wmOperatorType *ot) { /* identifiers */ - ot->name= "delete"; + ot->name= _("delete"); ot->idname= "SKETCH_OT_delete"; /* api callbacks */ @@ -2858,7 +2858,7 @@ void SKETCH_OT_delete(wmOperatorType *ot) void SKETCH_OT_select(wmOperatorType *ot) { /* identifiers */ - ot->name= "select"; + ot->name= _("select"); ot->idname= "SKETCH_OT_select"; /* api callbacks */ @@ -2873,7 +2873,7 @@ void SKETCH_OT_select(wmOperatorType *ot) void SKETCH_OT_cancel_stroke(wmOperatorType *ot) { /* identifiers */ - ot->name= "cancel stroke"; + ot->name= _("cancel stroke"); ot->idname= "SKETCH_OT_cancel_stroke"; /* api callbacks */ @@ -2888,7 +2888,7 @@ void SKETCH_OT_cancel_stroke(wmOperatorType *ot) void SKETCH_OT_convert(wmOperatorType *ot) { /* identifiers */ - ot->name= "convert"; + ot->name= _("convert"); ot->idname= "SKETCH_OT_convert"; /* api callbacks */ @@ -2903,7 +2903,7 @@ void SKETCH_OT_convert(wmOperatorType *ot) void SKETCH_OT_finish_stroke(wmOperatorType *ot) { /* identifiers */ - ot->name= "end stroke"; + ot->name= _("end stroke"); ot->idname= "SKETCH_OT_finish_stroke"; /* api callbacks */ @@ -2935,7 +2935,7 @@ void SKETCH_OT_draw_preview(wmOperatorType *ot) void SKETCH_OT_draw_stroke(wmOperatorType *ot) { /* identifiers */ - ot->name= "draw stroke"; + ot->name= _("draw stroke"); ot->idname= "SKETCH_OT_draw_stroke"; /* api callbacks */ @@ -2954,7 +2954,7 @@ void SKETCH_OT_draw_stroke(wmOperatorType *ot) void SKETCH_OT_gesture(wmOperatorType *ot) { /* identifiers */ - ot->name= "gesture"; + ot->name= _("gesture"); ot->idname= "SKETCH_OT_gesture"; /* api callbacks */ diff --git a/source/blender/editors/armature/poseSlide.c b/source/blender/editors/armature/poseSlide.c index d5ad8346be2..2ec91cca250 100644 --- a/source/blender/editors/armature/poseSlide.c +++ b/source/blender/editors/armature/poseSlide.c @@ -728,9 +728,9 @@ static int pose_slide_push_exec (bContext *C, wmOperator *op) void POSE_OT_push (wmOperatorType *ot) { /* identifiers */ - ot->name= "Push Pose"; + ot->name= _("Push Pose"); ot->idname= "POSE_OT_push"; - ot->description= "Exaggerate the current pose"; + ot->description= _("Exaggerate the current pose"); /* callbacks */ ot->exec= pose_slide_push_exec; @@ -785,9 +785,9 @@ static int pose_slide_relax_exec (bContext *C, wmOperator *op) void POSE_OT_relax (wmOperatorType *ot) { /* identifiers */ - ot->name= "Relax Pose"; + ot->name= _("Relax Pose"); ot->idname= "POSE_OT_relax"; - ot->description= "Make the current pose more similar to its surrounding ones"; + ot->description= _("Make the current pose more similar to its surrounding ones"); /* callbacks */ ot->exec= pose_slide_relax_exec; @@ -842,9 +842,9 @@ static int pose_slide_breakdown_exec (bContext *C, wmOperator *op) void POSE_OT_breakdown (wmOperatorType *ot) { /* identifiers */ - ot->name= "Pose Breakdowner"; + ot->name= _("Pose Breakdowner"); ot->idname= "POSE_OT_breakdown"; - ot->description= "Create a suitable breakdown pose on the current frame"; + ot->description= _("Create a suitable breakdown pose on the current frame"); /* callbacks */ ot->exec= pose_slide_breakdown_exec; @@ -1197,18 +1197,18 @@ static int pose_propagate_exec (bContext *C, wmOperator *op) void POSE_OT_propagate (wmOperatorType *ot) { static EnumPropertyItem terminate_items[]= { - {POSE_PROPAGATE_SMART_HOLDS, "WHILE_HELD", 0, "While Held", "Propagate pose to all keyframes after current frame that don't change (Default behaviour)"}, - {POSE_PROPAGATE_NEXT_KEY, "NEXT_KEY", 0, "To Next Keyframe", "Propagate pose to first keyframe following the current frame only"}, - {POSE_PROPAGATE_LAST_KEY, "LAST_KEY", 0, "To Last Keyframe", "Propagate pose to the last keyframe only (i.e. making action cyclic)"}, - {POSE_PROPAGATE_BEFORE_FRAME, "BEFORE_FRAME", 0, "Before Frame", "Propagate pose to all keyframes between current frame and 'Frame' property"}, - {POSE_PROPAGATE_BEFORE_END, "BEFORE_END", 0, "Before Last Keyframe", "Propagate pose to all keyframes from current frame until no more are found"}, - {POSE_PROPAGATE_SELECTED_MARKERS, "SELECTED_MARKERS", 0, "On Selected Markers", "Propagate pose to all keyframes occurring on frames with Scene Markers after the current frame"}, + {POSE_PROPAGATE_SMART_HOLDS, "WHILE_HELD", 0, N_("While Held"), N_("Propagate pose to all keyframes after current frame that don't change (Default behaviour)")}, + {POSE_PROPAGATE_NEXT_KEY, "NEXT_KEY", 0, N_("To Next Keyframe"), N_("Propagate pose to first keyframe following the current frame only")}, + {POSE_PROPAGATE_LAST_KEY, "LAST_KEY", 0, N_("To Last Keyframe"), N_("Propagate pose to the last keyframe only (i.e. making action cyclic)")}, + {POSE_PROPAGATE_BEFORE_FRAME, "BEFORE_FRAME", 0, N_("Before Frame"), N_("Propagate pose to all keyframes between current frame and 'Frame' property")}, + {POSE_PROPAGATE_BEFORE_END, "BEFORE_END", 0, N_("Before Last Keyframe"), N_("Propagate pose to all keyframes from current frame until no more are found")}, + {POSE_PROPAGATE_SELECTED_MARKERS, "SELECTED_MARKERS", 0, N_("On Selected Markers"), N_("Propagate pose to all keyframes occurring on frames with Scene Markers after the current frame")}, {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= "Propagate Pose"; + ot->name= _("Propagate Pose"); ot->idname= "POSE_OT_propagate"; - ot->description= "Copy selected aspects of the current pose to subsequent poses already keyframed"; + ot->description= _("Copy selected aspects of the current pose to subsequent poses already keyframed"); /* callbacks */ ot->exec= pose_propagate_exec; @@ -1219,8 +1219,8 @@ void POSE_OT_propagate (wmOperatorType *ot) /* properties */ // TODO: add "fade out" control for tapering off amount of propagation as time goes by? - ot->prop= RNA_def_enum(ot->srna, "mode", terminate_items, POSE_PROPAGATE_SMART_HOLDS, "Terminate Mode", "Method used to determine when to stop propagating pose to keyframes"); - RNA_def_float(ot->srna, "end_frame", 250.0, FLT_MIN, FLT_MAX, "End Frame", "Frame to stop propagating frames to (for 'Before Frame' mode)", 1.0, 250.0); + ot->prop= RNA_def_enum(ot->srna, "mode", RNA_enum_items_gettexted(terminate_items), POSE_PROPAGATE_SMART_HOLDS, _("Terminate Mode"), _("Method used to determine when to stop propagating pose to keyframes")); + RNA_def_float(ot->srna, "end_frame", 250.0, FLT_MIN, FLT_MAX, _("End Frame"), _("Frame to stop propagating frames to (for 'Before Frame' mode)"), 1.0, 250.0); } /* **************************************************** */ diff --git a/source/blender/editors/armature/poselib.c b/source/blender/editors/armature/poselib.c index effe4ee5f76..dc47ad1a1e1 100644 --- a/source/blender/editors/armature/poselib.c +++ b/source/blender/editors/armature/poselib.c @@ -223,9 +223,9 @@ static int poselib_new_exec (bContext *C, wmOperator *UNUSED(op)) void POSELIB_OT_new (wmOperatorType *ot) { /* identifiers */ - ot->name = "New Pose Library"; + ot->name = _("New Pose Library"); ot->idname = "POSELIB_OT_new"; - ot->description = "Add New Pose Library to active Object"; + ot->description = _("Add New Pose Library to active Object"); /* callbacks */ ot->exec = poselib_new_exec; @@ -258,9 +258,9 @@ static int poselib_unlink_exec (bContext *C, wmOperator *UNUSED(op)) void POSELIB_OT_unlink (wmOperatorType *ot) { /* identifiers */ - ot->name = "Unlink Pose Library"; + ot->name = _("Unlink Pose Library"); ot->idname = "POSELIB_OT_unlink"; - ot->description = "Remove Pose Library from active Object"; + ot->description = _("Remove Pose Library from active Object"); /* callbacks */ ot->exec = poselib_unlink_exec; @@ -339,9 +339,9 @@ static int poselib_sanitise_exec (bContext *C, wmOperator *op) void POSELIB_OT_action_sanitise (wmOperatorType *ot) { /* identifiers */ - ot->name = "Sanitise Pose Library Action"; + ot->name = _("Sanitise Pose Library Action"); ot->idname = "POSELIB_OT_action_sanitise"; - ot->description = "Make action suitable for use as a Pose Library"; + ot->description = _("Make action suitable for use as a Pose Library"); /* callbacks */ ot->exec = poselib_sanitise_exec; @@ -393,15 +393,15 @@ static int poselib_add_menu_invoke (bContext *C, wmOperator *op, wmEvent *UNUSED uiLayoutSetOperatorContext(layout, WM_OP_EXEC_DEFAULT); /* add new (adds to the first unoccupied frame) */ - uiItemIntO(layout, "Add New", ICON_NONE, "POSELIB_OT_pose_add", "frame", poselib_get_free_index(ob->poselib)); + uiItemIntO(layout, _("Add New"), ICON_NONE, "POSELIB_OT_pose_add", "frame", poselib_get_free_index(ob->poselib)); /* check if we have any choices to add a new pose in any other way */ if ((ob->poselib) && (ob->poselib->markers.first)) { /* add new (on current frame) */ - uiItemIntO(layout, "Add New (Current Frame)", ICON_NONE, "POSELIB_OT_pose_add", "frame", CFRA); + uiItemIntO(layout, _("Add New (Current Frame)"), ICON_NONE, "POSELIB_OT_pose_add", "frame", CFRA); /* replace existing - submenu */ - uiItemMenuF(layout, "Replace Existing...", 0, poselib_add_menu_invoke__replacemenu, NULL); + uiItemMenuF(layout, _("Replace Existing..."), 0, poselib_add_menu_invoke__replacemenu, NULL); } uiPupMenuEnd(C, pup); @@ -465,9 +465,9 @@ static int poselib_add_exec (bContext *C, wmOperator *op) void POSELIB_OT_pose_add (wmOperatorType *ot) { /* identifiers */ - ot->name= "PoseLib Add Pose"; + ot->name= _("PoseLib Add Pose"); ot->idname= "POSELIB_OT_pose_add"; - ot->description= "Add the current Pose to the active Pose Library"; + ot->description= _("Add the current Pose to the active Pose Library"); /* api callbacks */ ot->invoke= poselib_add_menu_invoke; @@ -566,9 +566,9 @@ void POSELIB_OT_pose_remove (wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "PoseLib Remove Pose"; + ot->name= _("PoseLib Remove Pose"); ot->idname= "POSELIB_OT_pose_remove"; - ot->description= "Remove nth pose from the active Pose Library"; + ot->description= _("Remove nth pose from the active Pose Library"); /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -579,7 +579,7 @@ void POSELIB_OT_pose_remove (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - prop= RNA_def_enum(ot->srna, "pose", DummyRNA_DEFAULT_items, 0, "Pose", "The pose to remove"); + prop= RNA_def_enum(ot->srna, "pose", DummyRNA_DEFAULT_items, 0, _("Pose"), _("The pose to remove")); RNA_def_enum_funcs(prop, poselib_stored_pose_itemf); ot->prop= prop; } @@ -651,9 +651,9 @@ void POSELIB_OT_pose_rename (wmOperatorType *ot) }; /* identifiers */ - ot->name= "PoseLib Rename Pose"; + ot->name= _("PoseLib Rename Pose"); ot->idname= "POSELIB_OT_pose_rename"; - ot->description= "Rename specified pose from the active Pose Library"; + ot->description= _("Rename specified pose from the active Pose Library"); /* api callbacks */ ot->invoke= poselib_rename_invoke; @@ -1578,9 +1578,9 @@ static int poselib_preview_exec (bContext *C, wmOperator *op) void POSELIB_OT_browse_interactive (wmOperatorType *ot) { /* identifiers */ - ot->name= "PoseLib Browse Poses"; + ot->name= _("PoseLib Browse Poses"); ot->idname= "POSELIB_OT_browse_interactive"; - ot->description= "Interactively browse poses in 3D-View"; + ot->description= _("Interactively browse poses in 3D-View"); /* callbacks */ ot->invoke= poselib_preview_invoke; @@ -1604,9 +1604,9 @@ void POSELIB_OT_browse_interactive (wmOperatorType *ot) void POSELIB_OT_apply_pose (wmOperatorType *ot) { /* identifiers */ - ot->name = "Apply Pose Library Pose"; + ot->name = _("Apply Pose Library Pose"); ot->idname = "POSELIB_OT_apply_pose"; - ot->description = "Apply specified Pose Library pose to the rig"; + ot->description = _("Apply specified Pose Library pose to the rig"); /* callbacks */ ot->exec= poselib_preview_exec; diff --git a/source/blender/editors/armature/poseobject.c b/source/blender/editors/armature/poseobject.c index 680218551db..cd632333ce7 100644 --- a/source/blender/editors/armature/poseobject.c +++ b/source/blender/editors/armature/poseobject.c @@ -284,9 +284,9 @@ static int pose_calculate_paths_exec (bContext *C, wmOperator *UNUSED(op)) void POSE_OT_paths_calculate (wmOperatorType *ot) { /* identifiers */ - ot->name= "Calculate Bone Paths"; + ot->name= _("Calculate Bone Paths"); ot->idname= "POSE_OT_paths_calculate"; - ot->description= "Calculate paths for the selected bones"; + ot->description= _("Calculate paths for the selected bones"); /* api callbacks */ ot->exec= pose_calculate_paths_exec; @@ -352,9 +352,9 @@ static int pose_clear_paths_exec (bContext *C, wmOperator *UNUSED(op)) void POSE_OT_paths_clear (wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Bone Paths"; + ot->name= _("Clear Bone Paths"); ot->idname= "POSE_OT_paths_clear"; - ot->description= "Clear path caches for selected bones"; + ot->description= _("Clear path caches for selected bones"); /* api callbacks */ ot->exec= pose_clear_paths_exec; @@ -412,9 +412,9 @@ static int pose_select_constraint_target_exec(bContext *C, wmOperator *UNUSED(op void POSE_OT_select_constraint_target(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Constraint Target"; + ot->name= _("Select Constraint Target"); ot->idname= "POSE_OT_select_constraint_target"; - ot->description= "Select bones used as targets for the currently selected bones"; + ot->description= _("Select bones used as targets for the currently selected bones"); /* api callbacks */ ot->exec= pose_select_constraint_target_exec; @@ -483,8 +483,8 @@ static int pose_select_hierarchy_exec(bContext *C, wmOperator *op) void POSE_OT_select_hierarchy(wmOperatorType *ot) { static EnumPropertyItem direction_items[]= { - {BONE_SELECT_PARENT, "PARENT", 0, "Select Parent", ""}, - {BONE_SELECT_CHILD, "CHILD", 0, "Select Child", ""}, + {BONE_SELECT_PARENT, "PARENT", 0, N_("Select Parent"), ""}, + {BONE_SELECT_CHILD, "CHILD", 0, N_("Select Child"), ""}, {0, NULL, 0, NULL, NULL} }; @@ -501,7 +501,7 @@ void POSE_OT_select_hierarchy(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - ot->prop= RNA_def_enum(ot->srna, "direction", direction_items, BONE_SELECT_PARENT, "Direction", ""); + ot->prop= RNA_def_enum(ot->srna, "direction", RNA_enum_items_gettexted(direction_items), BONE_SELECT_PARENT, _("Direction"), ""); RNA_def_boolean(ot->srna, "extend", 0, _("Add to Selection"), ""); } @@ -642,8 +642,8 @@ static int pose_select_grouped_exec (bContext *C, wmOperator *op) void POSE_OT_select_grouped (wmOperatorType *ot) { static EnumPropertyItem prop_select_grouped_types[] = { - {0, "LAYER", 0, "Layer", "Shared layers"}, - {1, "GROUP", 0, "Group", "Shared group"}, + {0, "LAYER", 0, N_("Layer"), N_("Shared layers")}, + {1, "GROUP", 0, N_("Group"), N_("Shared group")}, {0, NULL, 0, NULL, NULL} }; @@ -662,7 +662,7 @@ void POSE_OT_select_grouped (wmOperatorType *ot) /* properties */ RNA_def_boolean(ot->srna, "extend", FALSE, _("Extend"), _("Extend selection instead of deselecting everything first.")); - ot->prop= RNA_def_enum(ot->srna, "type", prop_select_grouped_types, 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_select_grouped_types), 0, _("Type"), ""); } @@ -708,9 +708,9 @@ static int pose_bone_flip_active_exec (bContext *C, wmOperator *UNUSED(op)) void POSE_OT_select_flip_active(wmOperatorType *ot) { /* identifiers */ - ot->name= "Flip Selected Active Bone"; + ot->name= _("Flip Selected Active Bone"); ot->idname= "POSE_OT_select_flip_active"; - ot->description= "Activate the bone with a flipped name."; + ot->description= _("Activate the bone with a flipped name."); /* api callbacks */ ot->exec= pose_bone_flip_active_exec; @@ -973,9 +973,9 @@ static int pose_copy_exec (bContext *C, wmOperator *op) void POSE_OT_copy (wmOperatorType *ot) { /* identifiers */ - ot->name= "Copy Pose"; + ot->name= _("Copy Pose"); ot->idname= "POSE_OT_copy"; - ot->description= "Copies the current pose of the selected bones to copy/paste buffer"; + ot->description= _("Copies the current pose of the selected bones to copy/paste buffer"); /* api callbacks */ ot->exec= pose_copy_exec; @@ -1204,9 +1204,9 @@ static int pose_group_add_exec (bContext *C, wmOperator *UNUSED(op)) void POSE_OT_group_add (wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Bone Group"; + ot->name= _("Add Bone Group"); ot->idname= "POSE_OT_group_add"; - ot->description= "Add a new bone group"; + ot->description= _("Add a new bone group"); /* api callbacks */ ot->exec= pose_group_add_exec; @@ -1244,9 +1244,9 @@ static int pose_group_remove_exec (bContext *C, wmOperator *UNUSED(op)) void POSE_OT_group_remove (wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove Bone Group"; + ot->name= _("Remove Bone Group"); ot->idname= "POSE_OT_group_remove"; - ot->description= "Removes the active bone group"; + ot->description= _("Removes the active bone group"); /* api callbacks */ ot->exec= pose_group_remove_exec; @@ -1359,9 +1359,9 @@ static int pose_group_assign_exec (bContext *C, wmOperator *op) void POSE_OT_group_assign (wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Selected to Bone Group"; + ot->name= _("Add Selected to Bone Group"); ot->idname= "POSE_OT_group_assign"; - ot->description= "Add selected bones to the chosen bone group"; + ot->description= _("Add selected bones to the chosen bone group"); /* api callbacks */ ot->invoke= pose_groups_menu_invoke; @@ -1415,9 +1415,9 @@ static int pose_group_unassign_exec (bContext *C, wmOperator *UNUSED(op)) void POSE_OT_group_unassign (wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove Selected from Bone Groups"; + ot->name= _("Remove Selected from Bone Groups"); ot->idname= "POSE_OT_group_unassign"; - ot->description= "Remove selected bones from all bone groups"; + ot->description= _("Remove selected bones from all bone groups"); /* api callbacks */ ot->exec= pose_group_unassign_exec; @@ -1473,9 +1473,9 @@ static int pose_group_select_exec (bContext *C, wmOperator *UNUSED(op)) void POSE_OT_group_select (wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Bones of Bone Group"; + ot->name= _("Select Bones of Bone Group"); ot->idname= "POSE_OT_group_select"; - ot->description= "Select bones in active Bone Group"; + ot->description= _("Select bones in active Bone Group"); /* api callbacks */ ot->exec= pose_group_select_exec; @@ -1511,9 +1511,9 @@ static int pose_group_deselect_exec (bContext *C, wmOperator *UNUSED(op)) void POSE_OT_group_deselect (wmOperatorType *ot) { /* identifiers */ - ot->name= "Deselect Bone Group"; + ot->name= _("Deselect Bone Group"); ot->idname= "POSE_OT_group_deselect"; - ot->description= "Deselect bones of active Bone Group"; + ot->description= _("Deselect bones of active Bone Group"); /* api callbacks */ ot->exec= pose_group_deselect_exec; @@ -1556,9 +1556,9 @@ static int pose_flip_names_exec (bContext *C, wmOperator *UNUSED(op)) void POSE_OT_flip_names (wmOperatorType *ot) { /* identifiers */ - ot->name= "Flip Names"; + ot->name= _("Flip Names"); ot->idname= "POSE_OT_flip_names"; - ot->description= "Flips (and corrects) the axis suffixes of the the names of selected bones"; + ot->description= _("Flips (and corrects) the axis suffixes of the the names of selected bones"); /* api callbacks */ ot->exec= pose_flip_names_exec; @@ -1603,15 +1603,15 @@ static int pose_autoside_names_exec (bContext *C, wmOperator *op) void POSE_OT_autoside_names (wmOperatorType *ot) { static EnumPropertyItem axis_items[]= { - {0, "XAXIS", 0, "X-Axis", "Left/Right"}, - {1, "YAXIS", 0, "Y-Axis", "Front/Back"}, - {2, "ZAXIS", 0, "Z-Axis", "Top/Bottom"}, + {0, "XAXIS", 0, N_("X-Axis"), N_("Left/Right")}, + {1, "YAXIS", 0, N_("Y-Axis"), N_("Front/Back")}, + {2, "ZAXIS", 0, N_("Z-Axis"), N_("Top/Bottom")}, {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= "AutoName by Axis"; + ot->name= _("AutoName by Axis"); ot->idname= "POSE_OT_autoside_names"; - ot->description= "Automatically renames the selected bones according to which side of the target axis they fall on"; + ot->description= _("Automatically renames the selected bones according to which side of the target axis they fall on"); /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -1622,7 +1622,7 @@ void POSE_OT_autoside_names (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* settings */ - ot->prop= RNA_def_enum(ot->srna, "axis", axis_items, 0, "Axis", "Axis tag names with."); + ot->prop= RNA_def_enum(ot->srna, "axis", RNA_enum_items_gettexted(axis_items), 0, _("Axis"), _("Axis tag names with.")); } /* ********************************************** */ @@ -1668,9 +1668,9 @@ static int pose_armature_layers_showall_exec (bContext *C, wmOperator *op) void ARMATURE_OT_layers_show_all (wmOperatorType *ot) { /* identifiers */ - ot->name= "Show All Layers"; + ot->name= _("Show All Layers"); ot->idname= "ARMATURE_OT_layers_show_all"; - ot->description= "Make all armature layers visible"; + ot->description= _("Make all armature layers visible"); /* callbacks */ ot->exec= pose_armature_layers_showall_exec; @@ -1734,9 +1734,9 @@ static int pose_armature_layers_exec (bContext *C, wmOperator *op) void POSE_OT_armature_layers (wmOperatorType *ot) { /* identifiers */ - ot->name= "Change Armature Layers"; + ot->name= _("Change Armature Layers"); ot->idname= "POSE_OT_armature_layers"; - ot->description= "Change the visible armature layers"; + ot->description= _("Change the visible armature layers"); /* callbacks */ ot->invoke= pose_armature_layers_invoke; @@ -1747,15 +1747,15 @@ void POSE_OT_armature_layers (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_boolean_layer_member(ot->srna, "layers", 32, NULL, "Layer", "Armature layers to make visible"); + RNA_def_boolean_layer_member(ot->srna, "layers", 32, NULL, _("Layer"), _("Armature layers to make visible")); } void ARMATURE_OT_armature_layers (wmOperatorType *ot) { /* identifiers */ - ot->name= "Change Armature Layers"; + ot->name= _("Change Armature Layers"); ot->idname= "ARMATURE_OT_armature_layers"; - ot->description= "Change the visible armature layers"; + ot->description= _("Change the visible armature layers"); /* callbacks */ ot->invoke= pose_armature_layers_invoke; @@ -1766,7 +1766,7 @@ void ARMATURE_OT_armature_layers (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_boolean_layer_member(ot->srna, "layers", 32, NULL, "Layer", "Armature layers to make visible"); + RNA_def_boolean_layer_member(ot->srna, "layers", 32, NULL, _("Layer"), _("Armature layers to make visible")); } /* ------------------- */ @@ -1828,9 +1828,9 @@ static int pose_bone_layers_exec (bContext *C, wmOperator *op) void POSE_OT_bone_layers (wmOperatorType *ot) { /* identifiers */ - ot->name= "Change Bone Layers"; + ot->name= _("Change Bone Layers"); ot->idname= "POSE_OT_bone_layers"; - ot->description= "Change the layers that the selected bones belong to"; + ot->description= _("Change the layers that the selected bones belong to"); /* callbacks */ ot->invoke= pose_bone_layers_invoke; @@ -1841,7 +1841,7 @@ void POSE_OT_bone_layers (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_boolean_layer_member(ot->srna, "layers", 32, NULL, "Layer", "Armature layers that bone belongs to"); + RNA_def_boolean_layer_member(ot->srna, "layers", 32, NULL, _("Layer"), _("Armature layers that bone belongs to")); } /* ------------------- */ @@ -1900,9 +1900,9 @@ static int armature_bone_layers_exec (bContext *C, wmOperator *op) void ARMATURE_OT_bone_layers (wmOperatorType *ot) { /* identifiers */ - ot->name= "Change Bone Layers"; + ot->name= _("Change Bone Layers"); ot->idname= "ARMATURE_OT_bone_layers"; - ot->description= "Change the layers that the selected bones belong to"; + ot->description= _("Change the layers that the selected bones belong to"); /* callbacks */ ot->invoke= armature_bone_layers_invoke; @@ -1913,7 +1913,7 @@ void ARMATURE_OT_bone_layers (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_boolean_layer_member(ot->srna, "layers", 32, NULL, "Layer", "Armature layers that bone belongs to"); + RNA_def_boolean_layer_member(ot->srna, "layers", 32, NULL, _("Layer"), _("Armature layers that bone belongs to")); } /* ********************************************** */ @@ -1968,9 +1968,9 @@ static int pose_flip_quats_exec (bContext *C, wmOperator *UNUSED(op)) void POSE_OT_quaternions_flip (wmOperatorType *ot) { /* identifiers */ - ot->name = "Flip Quats"; + ot->name = _("Flip Quats"); ot->idname= "POSE_OT_quaternions_flip"; - ot->description= "Flip quaternion values to achieve desired rotations, while maintaining the same orientations"; + ot->description= _("Flip quaternion values to achieve desired rotations, while maintaining the same orientations"); /* callbacks */ ot->exec= pose_flip_quats_exec; diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 18544d4d154..1fc75b65eb0 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -1428,7 +1428,7 @@ static int separate_exec(bContext *C, wmOperator *op) void CURVE_OT_separate(wmOperatorType *ot) { /* identifiers */ - ot->name= "Separate"; + ot->name= _("Separate"); ot->idname= "CURVE_OT_separate"; /* api callbacks */ @@ -2097,7 +2097,7 @@ void CURVE_OT_spline_weight_set(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_float_factor(ot->srna, "weight", 1.0f, 0.0f, 1.0f, "Weight", "", 0.0f, 1.0f); + RNA_def_float_factor(ot->srna, "weight", 1.0f, 0.0f, 1.0f, _("Weight"), "", 0.0f, 1.0f); } /******************* set radius operator ******************/ @@ -2149,7 +2149,7 @@ void CURVE_OT_radius_set(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_float(ot->srna, "radius", 1.0f, 0.0f, FLT_MAX, "Radius", "", 0.0001f, 10.0f); + RNA_def_float(ot->srna, "radius", 1.0f, 0.0f, FLT_MAX, _("Radius"), "", 0.0001f, 10.0f); } /********************* smooth operator ********************/ @@ -3575,11 +3575,11 @@ static int set_spline_type_exec(bContext *C, wmOperator *op) void CURVE_OT_spline_type_set(wmOperatorType *ot) { static EnumPropertyItem type_items[]= { - {CU_POLY, "POLY", 0, "Poly", ""}, - {CU_BEZIER, "BEZIER", 0, "Bezier", ""}, -// {CU_CARDINAL, "CARDINAL", 0, "Cardinal", ""}, -// {CU_BSPLINE, "B_SPLINE", 0, "B-Spline", ""}, - {CU_NURBS, "NURBS", 0, "NURBS", ""}, + {CU_POLY, "POLY", 0, N_("Poly"), ""}, + {CU_BEZIER, "BEZIER", 0, N_("Bezier"), ""}, +// {CU_CARDINAL, "CARDINAL", 0, N_("Cardinal"), ""}, +// {CU_BSPLINE, "B_SPLINE", 0, N_("B-Spline"), ""}, + {CU_NURBS, "NURBS", 0, N_("NURBS"), ""}, {0, NULL, 0, NULL, NULL}}; /* identifiers */ @@ -3596,7 +3596,7 @@ void CURVE_OT_spline_type_set(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", type_items, CU_POLY, "Type", "Spline type"); + ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(type_items), CU_POLY, _("Type"), _("Spline type")); } /***************** set handle type operator *******************/ @@ -3618,16 +3618,16 @@ void CURVE_OT_handle_type_set(wmOperatorType *ot) { /* keep in sync with graphkeys_handle_type_items */ static EnumPropertyItem editcurve_handle_type_items[]= { - {HD_AUTO, "AUTOMATIC", 0, "Automatic", ""}, - {HD_VECT, "VECTOR", 0, "Vector", ""}, - {5, "ALIGNED", 0, "Aligned", ""}, - {6, "FREE_ALIGN", 0, "Free", ""}, - {3, "TOGGLE_FREE_ALIGN", 0, "Toggle Free/Align", ""}, + {HD_AUTO, "AUTOMATIC", 0, N_("Automatic"), ""}, + {HD_VECT, "VECTOR", 0, N_("Vector"), ""}, + {5, "ALIGNED", 0, N_("Aligned"), ""}, + {6, "FREE_ALIGN", 0, N_("Free"), ""}, + {3, "TOGGLE_FREE_ALIGN", 0, N_("Toggle Free/Align"), ""}, {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= "Set Handle Type"; - ot->description = "Set type of handles for selected control points"; + ot->name= _("Set Handle Type"); + ot->description = _("Set type of handles for selected control points"); ot->idname= "CURVE_OT_handle_type_set"; /* api callbacks */ @@ -3639,7 +3639,7 @@ void CURVE_OT_handle_type_set(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", editcurve_handle_type_items, 1, "Type", "Spline type"); + ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(editcurve_handle_type_items), 1, _("Type"), _("Spline type")); } /***************** make segment operator **********************/ @@ -4391,7 +4391,7 @@ static int spin_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)) void CURVE_OT_spin(wmOperatorType *ot) { /* identifiers */ - ot->name= "Spin"; + ot->name= _("Spin"); ot->idname= "CURVE_OT_spin"; /* api callbacks */ @@ -4402,8 +4402,8 @@ void CURVE_OT_spin(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_float_vector_xyz(ot->srna, "center", 3, NULL, -FLT_MAX, FLT_MAX, "Center", "Center in global view space", -FLT_MAX, FLT_MAX); - RNA_def_float_vector(ot->srna, "axis", 3, NULL, -1.0f, 1.0f, "Axis", "Axis in global view space", -FLT_MAX, FLT_MAX); + RNA_def_float_vector_xyz(ot->srna, "center", 3, NULL, -FLT_MAX, FLT_MAX, _("Center"), _("Center in global view space"), -FLT_MAX, FLT_MAX); + RNA_def_float_vector(ot->srna, "axis", 3, NULL, -1.0f, 1.0f, _("Axis"), _("Axis in global view space"), -FLT_MAX, FLT_MAX); } /***************** add vertex operator **********************/ @@ -4714,7 +4714,7 @@ void CURVE_OT_vertex_add(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_float_vector_xyz(ot->srna, "location", 3, NULL, -FLT_MAX, FLT_MAX, "Location", "Location to add new vertex at.", -1e4, 1e4); + RNA_def_float_vector_xyz(ot->srna, "location", 3, NULL, -FLT_MAX, FLT_MAX, _("Location"), _("Location to add new vertex at."), -1e4, 1e4); } /***************** extrude operator **********************/ @@ -4775,7 +4775,7 @@ void CURVE_OT_extrude(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* to give to transform */ - RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, "Mode", ""); + RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, _("Mode"), ""); } /***************** make cyclic operator **********************/ @@ -4886,8 +4886,8 @@ static int toggle_cyclic_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(eve void CURVE_OT_cyclic_toggle(wmOperatorType *ot) { static EnumPropertyItem direction_items[]= { - {0, "CYCLIC_U", 0, "Cyclic U", ""}, - {1, "CYCLIC_V", 0, "Cyclic V", ""}, + {0, "CYCLIC_U", 0, N_("Cyclic U"), ""}, + {1, "CYCLIC_V", 0, N_("Cyclic V"), ""}, {0, NULL, 0, NULL, NULL}}; /* identifiers */ @@ -4904,7 +4904,7 @@ void CURVE_OT_cyclic_toggle(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_enum(ot->srna, "direction", direction_items, 0, "Direction", "Direction to make surface cyclic in."); + RNA_def_enum(ot->srna, "direction", direction_items, 0, _("Direction"), _("Direction to make surface cyclic in.")); } /***************** select linked operator ******************/ @@ -5648,7 +5648,7 @@ void CURVE_OT_duplicate(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* to give to transform */ - RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, "Mode", ""); + RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, _("Mode"), ""); } /********************** delete operator *********************/ @@ -5995,9 +5995,9 @@ static int delete_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)) void CURVE_OT_delete(wmOperatorType *ot) { static EnumPropertyItem type_items[] = { - {0, "SELECTED", 0, "Select", ""}, - {1, "SEGMENT", 0, "Segment", ""}, - {2, "ALL", 0, "All", ""}, + {0, "SELECTED", 0, N_("Select"), ""}, + {1, "SEGMENT", 0, N_("Segment"), ""}, + {2, "ALL", 0, N_("All"), ""}, {0, NULL, 0, NULL, NULL}}; /* identifiers */ @@ -6014,7 +6014,7 @@ void CURVE_OT_delete(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_enum(ot->srna, "type", type_items, 0, "Type", "Which elements to delete."); + RNA_def_enum(ot->srna, "type", type_items, 0, _("Type"), _("Which elements to delete.")); } /********************** shade smooth/flat operator *********************/ diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c index 6b50bcfc93e..39f905281d4 100644 --- a/source/blender/editors/curve/editfont.c +++ b/source/blender/editors/curve/editfont.c @@ -317,8 +317,8 @@ static int insert_lorem_exec(bContext *C, wmOperator *UNUSED(op)) void FONT_OT_insert_lorem(wmOperatorType *ot) { /* identifiers */ - ot->name= "Insert Lorem"; - ot->description= "Insert placeholder text"; + ot->name= _("Insert Lorem"); + ot->description= _("Insert placeholder text"); ot->idname= "FONT_OT_insert_lorem"; /* api callbacks */ @@ -405,8 +405,8 @@ static int paste_file_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event) void FONT_OT_file_paste(wmOperatorType *ot) { /* identifiers */ - ot->name= "Paste File"; - ot->description= "Paste contents from file"; + ot->name= _("Paste File"); + ot->description= _("Paste contents from file"); ot->idname= "FONT_OT_file_paste"; /* api callbacks */ @@ -454,8 +454,8 @@ static int paste_buffer_exec(bContext *C, wmOperator *UNUSED(op)) void FONT_OT_buffer_paste(wmOperatorType *ot) { /* identifiers */ - ot->name= "Paste Buffer"; - ot->description= "Paste text from OS buffer"; + ot->name= _("Paste Buffer"); + ot->description= _("Paste text from OS buffer"); ot->idname= "FONT_OT_buffer_paste"; /* api callbacks */ @@ -612,10 +612,10 @@ static int kill_selection(Object *obedit, int ins) /* 1 == new character */ /******************* set style operator ********************/ static EnumPropertyItem style_items[]= { - {CU_CHINFO_BOLD, "BOLD", 0, "Bold", ""}, - {CU_CHINFO_ITALIC, "ITALIC", 0, "Italic", ""}, - {CU_CHINFO_UNDERLINE, "UNDERLINE", 0, "Underline", ""}, - {CU_CHINFO_SMALLCAPS, "SMALL_CAPS", 0, "Small Caps", ""}, + {CU_CHINFO_BOLD, "BOLD", 0, N_("Bold"), ""}, + {CU_CHINFO_ITALIC, "ITALIC", 0, N_("Italic"), ""}, + {CU_CHINFO_UNDERLINE, "UNDERLINE", 0, N_("Underline"), ""}, + {CU_CHINFO_SMALLCAPS, "SMALL_CAPS", 0, N_("Small Caps"), ""}, {0, NULL, 0, NULL, NULL}}; static int set_style(bContext *C, const int style, const int clear) @@ -652,8 +652,8 @@ static int set_style_exec(bContext *C, wmOperator *op) void FONT_OT_style_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Style"; - ot->description= "Set font style"; + ot->name= _("Set Style"); + ot->description= _("Set font style"); ot->idname= "FONT_OT_style_set"; /* api callbacks */ @@ -664,7 +664,7 @@ void FONT_OT_style_set(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_enum(ot->srna, "style", style_items, CU_CHINFO_BOLD, _("Style"), _("Style to set selection to.")); + RNA_def_enum(ot->srna, "style", RNA_enum_items_gettexted(style_items), CU_CHINFO_BOLD, _("Style"), _("Style to set selection to.")); RNA_def_boolean(ot->srna, "clear", 0, _("Clear"), _("Clear style rather than setting it.")); } @@ -690,8 +690,8 @@ static int toggle_style_exec(bContext *C, wmOperator *op) void FONT_OT_style_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Style"; - ot->description= "Toggle font style"; + ot->name= _("Toggle Style"); + ot->description= _("Toggle font style"); ot->idname= "FONT_OT_style_toggle"; /* api callbacks */ @@ -702,7 +702,7 @@ void FONT_OT_style_toggle(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_enum(ot->srna, "style", style_items, CU_CHINFO_BOLD, "Style", "Style to set selection to."); + RNA_def_enum(ot->srna, "style", style_items, CU_CHINFO_BOLD, _("Style"), _("Style to set selection to.")); } /******************* copy text operator ********************/ @@ -733,8 +733,8 @@ static int copy_text_exec(bContext *C, wmOperator *UNUSED(op)) void FONT_OT_text_copy(wmOperatorType *ot) { /* identifiers */ - ot->name= "Copy Text"; - ot->description= "Copy selected text to clipboard"; + ot->name= _("Copy Text"); + ot->description= _("Copy selected text to clipboard"); ot->idname= "FONT_OT_text_copy"; /* api callbacks */ @@ -764,8 +764,8 @@ static int cut_text_exec(bContext *C, wmOperator *UNUSED(op)) void FONT_OT_text_cut(wmOperatorType *ot) { /* identifiers */ - ot->name= "Cut Text"; - ot->description= "Cut selected text to clipboard"; + ot->name= _("Cut Text"); + ot->description= _("Cut selected text to clipboard"); ot->idname= "FONT_OT_text_cut"; /* api callbacks */ @@ -822,8 +822,8 @@ static int paste_text_exec(bContext *C, wmOperator *op) void FONT_OT_text_paste(wmOperatorType *ot) { /* identifiers */ - ot->name= "Paste Text"; - ot->description= "Paste text from clipboard"; + ot->name= _("Paste Text"); + ot->description= _("Paste text from clipboard"); ot->idname= "FONT_OT_text_paste"; /* api callbacks */ @@ -837,16 +837,16 @@ void FONT_OT_text_paste(wmOperatorType *ot) /************************ move operator ************************/ static EnumPropertyItem move_type_items[]= { - {LINE_BEGIN, "LINE_BEGIN", 0, "Line Begin", ""}, - {LINE_END, "LINE_END", 0, "Line End", ""}, - {PREV_CHAR, "PREVIOUS_CHARACTER", 0, "Previous Character", ""}, - {NEXT_CHAR, "NEXT_CHARACTER", 0, "Next Character", ""}, - {PREV_WORD, "PREVIOUS_WORD", 0, "Previous Word", ""}, - {NEXT_WORD, "NEXT_WORD", 0, "Next Word", ""}, - {PREV_LINE, "PREVIOUS_LINE", 0, "Previous Line", ""}, - {NEXT_LINE, "NEXT_LINE", 0, "Next Line", ""}, - {PREV_PAGE, "PREVIOUS_PAGE", 0, "Previous Page", ""}, - {NEXT_PAGE, "NEXT_PAGE", 0, "Next Page", ""}, + {LINE_BEGIN, "LINE_BEGIN", 0, N_("Line Begin"), ""}, + {LINE_END, "LINE_END", 0, N_("Line End"), ""}, + {PREV_CHAR, "PREVIOUS_CHARACTER", 0, N_("Previous Character"), ""}, + {NEXT_CHAR, "NEXT_CHARACTER", 0, N_("Next Character"), ""}, + {PREV_WORD, "PREVIOUS_WORD", 0, N_("Previous Word"), ""}, + {NEXT_WORD, "NEXT_WORD", 0, N_("Next Word"), ""}, + {PREV_LINE, "PREVIOUS_LINE", 0, N_("Previous Line"), ""}, + {NEXT_LINE, "NEXT_LINE", 0, N_("Next Line"), ""}, + {PREV_PAGE, "PREVIOUS_PAGE", 0, N_("Previous Page"), ""}, + {NEXT_PAGE, "NEXT_PAGE", 0, N_("Next Page"), ""}, {0, NULL, 0, NULL, NULL}}; static int move_cursor(bContext *C, int type, int select) @@ -958,8 +958,8 @@ static int move_exec(bContext *C, wmOperator *op) void FONT_OT_move(wmOperatorType *ot) { /* identifiers */ - ot->name= "Move Cursor"; - ot->description= "Move cursor to position type"; + ot->name= _("Move Cursor"); + ot->description= _("Move cursor to position type"); ot->idname= "FONT_OT_move"; /* api callbacks */ @@ -970,7 +970,7 @@ void FONT_OT_move(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_enum(ot->srna, "type", move_type_items, LINE_BEGIN, "Type", "Where to move cursor to."); + RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(move_type_items), LINE_BEGIN, _("Type"), _("Where to move cursor to.")); } /******************* move select operator ********************/ @@ -985,8 +985,8 @@ static int move_select_exec(bContext *C, wmOperator *op) void FONT_OT_move_select(wmOperatorType *ot) { /* identifiers */ - ot->name= "Move Select"; - ot->description= "Make selection from current cursor position to new cursor position type"; + ot->name= _("Move Select"); + ot->description= _("Make selection from current cursor position to new cursor position type"); ot->idname= "FONT_OT_move_select"; /* api callbacks */ @@ -997,7 +997,7 @@ void FONT_OT_move_select(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_enum(ot->srna, "type", move_type_items, LINE_BEGIN, "Type", "Where to move cursor to, to make a selection."); + RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(move_type_items), LINE_BEGIN, _("Type"), _("Where to move cursor to, to make a selection.")); } /************************* change spacing **********************/ @@ -1027,8 +1027,8 @@ static int change_spacing_exec(bContext *C, wmOperator *op) void FONT_OT_change_spacing(wmOperatorType *ot) { /* identifiers */ - ot->name= "Change Spacing"; - ot->description= "Change font spacing"; + ot->name= _("Change Spacing"); + ot->description= _("Change font spacing"); ot->idname= "FONT_OT_change_spacing"; /* api callbacks */ @@ -1072,8 +1072,8 @@ static int change_character_exec(bContext *C, wmOperator *op) void FONT_OT_change_character(wmOperatorType *ot) { /* identifiers */ - ot->name= "Change Character"; - ot->description= "Change font character code"; + ot->name= _("Change Character"); + ot->description= _("Change font character code"); ot->idname= "FONT_OT_change_character"; /* api callbacks */ @@ -1115,8 +1115,8 @@ static int line_break_exec(bContext *C, wmOperator *op) void FONT_OT_line_break(wmOperatorType *ot) { /* identifiers */ - ot->name= "Line Break"; - ot->description= "Insert line break at cursor position"; + ot->name= _("Line Break"); + ot->description= _("Insert line break at cursor position"); ot->idname= "FONT_OT_line_break"; /* api callbacks */ @@ -1133,12 +1133,12 @@ void FONT_OT_line_break(wmOperatorType *ot) /******************* delete operator **********************/ static EnumPropertyItem delete_type_items[]= { - {DEL_ALL, "ALL", 0, "All", ""}, - {DEL_NEXT_CHAR, "NEXT_CHARACTER", 0, "Next Character", ""}, - {DEL_PREV_CHAR, "PREVIOUS_CHARACTER", 0, "Previous Character", ""}, - {DEL_SELECTION, "SELECTION", 0, "Selection", ""}, - {DEL_NEXT_SEL, "NEXT_OR_SELECTION", 0, "Next or Selection", ""}, - {DEL_PREV_SEL, "PREVIOUS_OR_SELECTION", 0, "Previous or Selection", ""}, + {DEL_ALL, "ALL", 0, N_("All"), ""}, + {DEL_NEXT_CHAR, "NEXT_CHARACTER", 0, N_("Next Character"), ""}, + {DEL_PREV_CHAR, "PREVIOUS_CHARACTER", 0, N_("Previous Character"), ""}, + {DEL_SELECTION, "SELECTION", 0, N_("Selection"), ""}, + {DEL_NEXT_SEL, "NEXT_OR_SELECTION", 0, N_("Next or Selection"), ""}, + {DEL_PREV_SEL, "PREVIOUS_OR_SELECTION", 0, N_("Previous or Selection"), ""}, {0, NULL, 0, NULL, NULL}}; static int delete_exec(bContext *C, wmOperator *op) @@ -1205,8 +1205,8 @@ static int delete_exec(bContext *C, wmOperator *op) void FONT_OT_delete(wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete"; - ot->description= "Delete text by cursor position"; + ot->name= _("Delete"); + ot->description= _("Delete text by cursor position"); ot->idname= "FONT_OT_delete"; /* api callbacks */ @@ -1217,7 +1217,7 @@ void FONT_OT_delete(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_enum(ot->srna, "type", delete_type_items, DEL_ALL, "Type", "Which part of the text to delete."); + RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(delete_type_items), DEL_ALL, _("Type"), _("Which part of the text to delete.")); } /*********************** insert text operator *************************/ @@ -1354,8 +1354,8 @@ static int insert_text_invoke(bContext *C, wmOperator *op, wmEvent *evt) void FONT_OT_text_insert(wmOperatorType *ot) { /* identifiers */ - ot->name= "Insert Text"; - ot->description= "Insert text at cursor position"; + ot->name= _("Insert Text"); + ot->description= _("Insert text at cursor position"); ot->idname= "FONT_OT_text_insert"; /* api callbacks */ @@ -1393,8 +1393,8 @@ static int textbox_add_exec(bContext *C, wmOperator *UNUSED(op)) void FONT_OT_textbox_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Textbox"; - ot->description= "Add a new text box"; + ot->name= _("Add Textbox"); + ot->description= _("Add a new text box"); ot->idname= "FONT_OT_textbox_add"; /* api callbacks */ @@ -1436,8 +1436,8 @@ static int textbox_remove_exec(bContext *C, wmOperator *op) void FONT_OT_textbox_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove Textbox"; - ot->description= "Remove the textbox"; + ot->name= _("Remove Textbox"); + ot->description= _("Remove the textbox"); ot->idname= "FONT_OT_textbox_remove"; /* api callbacks */ @@ -1527,8 +1527,8 @@ void free_editText(Object *obedit) /********************** set case operator *********************/ static EnumPropertyItem case_items[]= { - {CASE_LOWER, "LOWER", 0, "Lower", ""}, - {CASE_UPPER, "UPPER", 0, "Upper", ""}, + {CASE_LOWER, "LOWER", 0, N_("Lower"), ""}, + {CASE_UPPER, "UPPER", 0, N_("Upper"), ""}, {0, NULL, 0, NULL, NULL}}; static int set_case(bContext *C, int ccase) @@ -1574,8 +1574,8 @@ static int set_case_exec(bContext *C, wmOperator *op) void FONT_OT_case_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Case"; - ot->description= "Set font case"; + ot->name= _("Set Case"); + ot->description= _("Set font case"); ot->idname= "FONT_OT_case_set"; /* api callbacks */ @@ -1586,7 +1586,7 @@ void FONT_OT_case_set(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_enum(ot->srna, "case", case_items, CASE_LOWER, "Case", "Lower or upper case."); + RNA_def_enum(ot->srna, "case", RNA_enum_items_gettexted(case_items), CASE_LOWER, _("Case"), _("Lower or upper case.")); } /********************** toggle case operator *********************/ @@ -1617,8 +1617,8 @@ static int toggle_case_exec(bContext *C, wmOperator *UNUSED(op)) void FONT_OT_case_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Case"; - ot->description= "Toggle font case"; + ot->name= _("Toggle Case"); + ot->description= _("Toggle font case"); ot->idname= "FONT_OT_case_toggle"; /* api callbacks */ @@ -1717,7 +1717,7 @@ static int open_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)) void FONT_OT_open(wmOperatorType *ot) { /* identifiers */ - ot->name= "Open Font"; + ot->name= _("Open Font"); ot->idname= "FONT_OT_open"; /* api callbacks */ @@ -1760,9 +1760,9 @@ static int font_unlink_exec(bContext *C, wmOperator *op) void FONT_OT_unlink(wmOperatorType *ot) { /* identifiers */ - ot->name= "Unlink"; + ot->name= _("Unlink"); ot->idname= "FONT_OT_unlink"; - ot->description= "Unlink active font data block"; + ot->description= _("Unlink active font data block"); /* api callbacks */ ot->exec= font_unlink_exec; diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index 2acc97417de..d5a128b5c5b 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -1767,7 +1767,7 @@ static EnumPropertyItem prop_gpencil_drawmodes[] = { void GPENCIL_OT_draw (wmOperatorType *ot) { /* identifiers */ - ot->name= "Grease Pencil Draw"; + ot->name= _("Grease Pencil Draw"); ot->idname= "GPENCIL_OT_draw"; ot->description= _("Make annotations on the active data"); @@ -1782,7 +1782,7 @@ void GPENCIL_OT_draw (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; /* settings for drawing */ - RNA_def_enum(ot->srna, "mode", RNA_enum_items_gettexted(prop_gpencil_drawmodes), 0, "Mode", "Way to intepret mouse movements."); + RNA_def_enum(ot->srna, "mode", RNA_enum_items_gettexted(prop_gpencil_drawmodes), 0, _("Mode"), _("Way to intepret mouse movements.")); RNA_def_collection_runtime(ot->srna, "stroke", &RNA_OperatorStrokeElement, "Stroke", ""); } diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c index 979732b6044..5cba0b4fdfb 100644 --- a/source/blender/editors/interface/view2d_ops.c +++ b/source/blender/editors/interface/view2d_ops.c @@ -294,8 +294,8 @@ static int view_pan_cancel(bContext *UNUSED(C), wmOperator *op) static void VIEW2D_OT_pan(wmOperatorType *ot) { /* identifiers */ - ot->name= "Pan View"; - ot->description= "Pan the view"; + ot->name= _("Pan View"); + ot->description= _("Pan the view"); ot->idname= "VIEW2D_OT_pan"; /* api callbacks */ @@ -344,8 +344,8 @@ static int view_scrollright_exec(bContext *C, wmOperator *op) static void VIEW2D_OT_scroll_right(wmOperatorType *ot) { /* identifiers */ - ot->name= "Scroll Right"; - ot->description= "Scroll the view right"; + ot->name= _("Scroll Right"); + ot->description= _("Scroll the view right"); ot->idname= "VIEW2D_OT_scroll_right"; /* api callbacks */ @@ -388,8 +388,8 @@ static int view_scrollleft_exec(bContext *C, wmOperator *op) static void VIEW2D_OT_scroll_left(wmOperatorType *ot) { /* identifiers */ - ot->name= "Scroll Left"; - ot->description= "Scroll the view left"; + ot->name= _("Scroll Left"); + ot->description= _("Scroll the view left"); ot->idname= "VIEW2D_OT_scroll_left"; /* api callbacks */ @@ -714,8 +714,8 @@ static int view_zoomin_invoke(bContext *C, wmOperator *op, wmEvent *event) static void VIEW2D_OT_zoom_in(wmOperatorType *ot) { /* identifiers */ - ot->name= "Zoom In"; - ot->description= "Zoom in the view"; + ot->name= _("Zoom In"); + ot->description= _("Zoom in the view"); ot->idname= "VIEW2D_OT_zoom_in"; /* api callbacks */ @@ -724,8 +724,8 @@ static void VIEW2D_OT_zoom_in(wmOperatorType *ot) ot->poll= view_zoom_poll; /* rna - must keep these in sync with the other operators */ - RNA_def_float(ot->srna, "zoomfacx", 0, -FLT_MAX, FLT_MAX, "Zoom Factor X", "", -FLT_MAX, FLT_MAX); - RNA_def_float(ot->srna, "zoomfacy", 0, -FLT_MAX, FLT_MAX, "Zoom Factor Y", "", -FLT_MAX, FLT_MAX); + RNA_def_float(ot->srna, "zoomfacx", 0, -FLT_MAX, FLT_MAX, _("Zoom Factor X"), "", -FLT_MAX, FLT_MAX); + RNA_def_float(ot->srna, "zoomfacy", 0, -FLT_MAX, FLT_MAX, _("Zoom Factor Y"), "", -FLT_MAX, FLT_MAX); } /* this operator only needs this single callback, where it callsthe view_zoom_*() methods */ @@ -771,8 +771,8 @@ static int view_zoomout_invoke(bContext *C, wmOperator *op, wmEvent *event) static void VIEW2D_OT_zoom_out(wmOperatorType *ot) { /* identifiers */ - ot->name= "Zoom Out"; - ot->description= "Zoom out the view"; + ot->name= _("Zoom Out"); + ot->description= _("Zoom out the view"); ot->idname= "VIEW2D_OT_zoom_out"; /* api callbacks */ @@ -781,8 +781,8 @@ static void VIEW2D_OT_zoom_out(wmOperatorType *ot) ot->poll= view_zoom_poll; /* rna - must keep these in sync with the other operators */ - RNA_def_float(ot->srna, "zoomfacx", 0, -FLT_MAX, FLT_MAX, "Zoom Factor X", "", -FLT_MAX, FLT_MAX); - RNA_def_float(ot->srna, "zoomfacy", 0, -FLT_MAX, FLT_MAX, "Zoom Factor Y", "", -FLT_MAX, FLT_MAX); + RNA_def_float(ot->srna, "zoomfacx", 0, -FLT_MAX, FLT_MAX, _("Zoom Factor X"), "", -FLT_MAX, FLT_MAX); + RNA_def_float(ot->srna, "zoomfacy", 0, -FLT_MAX, FLT_MAX, _("Zoom Factor Y"), "", -FLT_MAX, FLT_MAX); } /* ********************************************************* */ @@ -1066,8 +1066,8 @@ static int view_zoomdrag_modal(bContext *C, wmOperator *op, wmEvent *event) static void VIEW2D_OT_zoom(wmOperatorType *ot) { /* identifiers */ - ot->name= "Zoom 2D View"; - ot->description= "Zoom in/out the view"; + ot->name= _("Zoom 2D View"); + ot->description= _("Zoom in/out the view"); ot->idname= "VIEW2D_OT_zoom"; /* api callbacks */ @@ -1082,8 +1082,8 @@ static void VIEW2D_OT_zoom(wmOperatorType *ot) // ot->flag= OPTYPE_BLOCKING; /* rna - must keep these in sync with the other operators */ - RNA_def_float(ot->srna, "deltax", 0, -FLT_MAX, FLT_MAX, "Delta X", "", -FLT_MAX, FLT_MAX); - RNA_def_float(ot->srna, "deltay", 0, -FLT_MAX, FLT_MAX, "Delta Y", "", -FLT_MAX, FLT_MAX); + RNA_def_float(ot->srna, "deltax", 0, -FLT_MAX, FLT_MAX, _("Delta X"), "", -FLT_MAX, FLT_MAX); + RNA_def_float(ot->srna, "deltay", 0, -FLT_MAX, FLT_MAX, _("Delta Y"), "", -FLT_MAX, FLT_MAX); } /* ********************************************************* */ @@ -1167,8 +1167,8 @@ static int view_borderzoom_exec(bContext *C, wmOperator *op) static void VIEW2D_OT_zoom_border(wmOperatorType *ot) { /* identifiers */ - ot->name= "Zoom to Border"; - ot->description= "Zoom in the view to the nearest item contained in the border"; + ot->name= _("Zoom to Border"); + ot->description= _("Zoom in the view to the nearest item contained in the border"); ot->idname= "VIEW2D_OT_zoom_border"; /* api callbacks */ @@ -1569,8 +1569,8 @@ static int scroller_activate_invoke(bContext *C, wmOperator *op, wmEvent *event) static void VIEW2D_OT_scroller_activate(wmOperatorType *ot) { /* identifiers */ - ot->name= "Scroller Activate"; - ot->description= "Scroll view by mouse click and drag"; + ot->name= _("Scroller Activate"); + ot->description= _("Scroll view by mouse click and drag"); ot->idname= "VIEW2D_OT_scroller_activate"; /* flags */ @@ -1637,8 +1637,8 @@ static int reset_exec(bContext *C, wmOperator *UNUSED(op)) static void VIEW2D_OT_reset(wmOperatorType *ot) { /* identifiers */ - ot->name= "Reset View"; - ot->description= "Reset the view"; + ot->name= _("Reset View"); + ot->description= _("Reset the view"); ot->idname= "VIEW2D_OT_reset"; /* api callbacks */ diff --git a/source/blender/editors/mesh/editmesh.c b/source/blender/editors/mesh/editmesh.c index ec08bfccda3..9d99849c4d2 100644 --- a/source/blender/editors/mesh/editmesh.c +++ b/source/blender/editors/mesh/editmesh.c @@ -50,6 +50,8 @@ #include "BLI_rand.h" #include "BLI_utildefines.h" +#include "BLF_api.h" + #include "BKE_DerivedMesh.h" #include "BKE_context.h" #include "BKE_depsgraph.h" @@ -1312,9 +1314,9 @@ void remake_editMesh(Scene *scene, Object *ob) /* *************** Operator: separate parts *************/ static EnumPropertyItem prop_separate_types[] = { - {0, "SELECTED", 0, "Selection", ""}, - {1, "MATERIAL", 0, "By Material", ""}, - {2, "LOOSE", 0, "By loose parts", ""}, + {0, "SELECTED", 0, N_("Selection"), ""}, + {1, "MATERIAL", 0, N_("By Material"), ""}, + {2, "LOOSE", 0, N_("By loose parts"), ""}, {0, NULL, 0, NULL, NULL} }; @@ -1541,8 +1543,8 @@ static int mesh_separate_exec(bContext *C, wmOperator *op) void MESH_OT_separate(wmOperatorType *ot) { /* identifiers */ - ot->name= "Separate"; - ot->description= "Separate selected geometry into a new mesh"; + ot->name= _("Separate"); + ot->description= _("Separate selected geometry into a new mesh"); ot->idname= "MESH_OT_separate"; /* api callbacks */ @@ -1553,7 +1555,7 @@ void MESH_OT_separate(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - ot->prop= RNA_def_enum(ot->srna, "type", prop_separate_types, 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_separate_types), 0, _("Type"), ""); } diff --git a/source/blender/editors/mesh/editmesh_add.c b/source/blender/editors/mesh/editmesh_add.c index 8bd9c6fad79..d81a7cd8233 100644 --- a/source/blender/editors/mesh/editmesh_add.c +++ b/source/blender/editors/mesh/editmesh_add.c @@ -407,8 +407,8 @@ static int make_fgon_exec(bContext *C, wmOperator *op) void MESH_OT_fgon_make(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Make F-gon"; - ot->description= "Make fgon from selected faces"; + ot->name= _("Make F-gon"); + ot->description= _("Make fgon from selected faces"); ot->idname= "MESH_OT_fgon_make"; /* api callbacks */ @@ -439,8 +439,8 @@ static int clear_fgon_exec(bContext *C, wmOperator *op) void MESH_OT_fgon_clear(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear F-gon"; - ot->description= "Clear fgon from selected face"; + ot->name= _("Clear F-gon"); + ot->description= _("Clear fgon from selected face"); ot->idname= "MESH_OT_fgon_clear"; /* api callbacks */ @@ -851,8 +851,8 @@ static int addedgeface_mesh_exec(bContext *C, wmOperator *op) void MESH_OT_edge_face_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Make Edge/Face"; - ot->description= "Add an edge or face to selected"; + ot->name= _("Make Edge/Face"); + ot->description= _("Add an edge or face to selected"); ot->idname= "MESH_OT_edge_face_add"; /* api callbacks */ @@ -1407,8 +1407,8 @@ static int add_primitive_plane_exec(bContext *C, wmOperator *op) void MESH_OT_primitive_plane_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Plane"; - ot->description= "Construct a filled planar mesh with 4 vertices"; + ot->name= _("Add Plane"); + ot->description= _("Construct a filled planar mesh with 4 vertices"); ot->idname= "MESH_OT_primitive_plane_add"; /* api callbacks */ @@ -1440,8 +1440,8 @@ static int add_primitive_cube_exec(bContext *C, wmOperator *op) void MESH_OT_primitive_cube_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Cube"; - ot->description= "Construct a cube mesh"; + ot->name= _("Add Cube"); + ot->description= _("Construct a cube mesh"); ot->idname= "MESH_OT_primitive_cube_add"; /* api callbacks */ @@ -1475,8 +1475,8 @@ static int add_primitive_circle_exec(bContext *C, wmOperator *op) void MESH_OT_primitive_circle_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Circle"; - ot->description= "Construct a circle mesh"; + ot->name= _("Add Circle"); + ot->description= _("Construct a circle mesh"); ot->idname= "MESH_OT_primitive_circle_add"; /* api callbacks */ @@ -1516,8 +1516,8 @@ static int add_primitive_cylinder_exec(bContext *C, wmOperator *op) void MESH_OT_primitive_cylinder_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Cylinder"; - ot->description= "Construct a cylinder mesh"; + ot->name= _("Add Cylinder"); + ot->description= _("Construct a cylinder mesh"); ot->idname= "MESH_OT_primitive_cylinder_add"; /* api callbacks */ @@ -1557,8 +1557,8 @@ static int add_primitive_cone_exec(bContext *C, wmOperator *op) void MESH_OT_primitive_cone_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Cone"; - ot->description= "Construct a conic mesh (ends filled)"; + ot->name= _("Add Cone"); + ot->description= _("Construct a conic mesh (ends filled)"); ot->idname= "MESH_OT_primitive_cone_add"; /* api callbacks */ @@ -1598,8 +1598,8 @@ static int add_primitive_grid_exec(bContext *C, wmOperator *op) void MESH_OT_primitive_grid_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Grid"; - ot->description= "Construct a grid mesh"; + ot->name= _("Add Grid"); + ot->description= _("Construct a grid mesh"); ot->idname= "MESH_OT_primitive_grid_add"; /* api callbacks */ @@ -1611,9 +1611,9 @@ void MESH_OT_primitive_grid_add(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - RNA_def_int(ot->srna, "x_subdivisions", 10, INT_MIN, INT_MAX, "X Subdivisions", "", 3, 1000); - RNA_def_int(ot->srna, "y_subdivisions", 10, INT_MIN, INT_MAX, "Y Subdivisions", "", 3, 1000); - RNA_def_float(ot->srna, "size", 1.0f, 0.0, FLT_MAX, "Size", "", 0.001, FLT_MAX); + RNA_def_int(ot->srna, "x_subdivisions", 10, INT_MIN, INT_MAX, _("X Subdivisions"), "", 3, 1000); + RNA_def_int(ot->srna, "y_subdivisions", 10, INT_MIN, INT_MAX, _("Y Subdivisions"), "", 3, 1000); + RNA_def_float(ot->srna, "size", 1.0f, 0.0, FLT_MAX, _("Size"), "", 0.001, FLT_MAX); ED_object_add_generic_props(ot, TRUE); } @@ -1636,8 +1636,8 @@ static int add_primitive_monkey_exec(bContext *C, wmOperator *op) void MESH_OT_primitive_monkey_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Monkey"; - ot->description= "Construct a Suzanne mesh"; + ot->name= _("Add Monkey"); + ot->description= _("Construct a Suzanne mesh"); ot->idname= "MESH_OT_primitive_monkey_add"; /* api callbacks */ @@ -1671,8 +1671,8 @@ static int add_primitive_uvsphere_exec(bContext *C, wmOperator *op) void MESH_OT_primitive_uv_sphere_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add UV Sphere"; - ot->description= "Construct a UV sphere mesh"; + ot->name= _("Add UV Sphere"); + ot->description= _("Construct a UV sphere mesh"); ot->idname= "MESH_OT_primitive_uv_sphere_add"; /* api callbacks */ @@ -1684,9 +1684,9 @@ void MESH_OT_primitive_uv_sphere_add(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - RNA_def_int(ot->srna, "segments", 32, INT_MIN, INT_MAX, "Segments", "", 3, 500); - RNA_def_int(ot->srna, "ring_count", 16, INT_MIN, INT_MAX, "Rings", "", 3, 500); - RNA_def_float(ot->srna, "size", 1.0f, 0.0, FLT_MAX, "Size", "", 0.001, 100.00); + RNA_def_int(ot->srna, "segments", 32, INT_MIN, INT_MAX, _("Segments"), "", 3, 500); + RNA_def_int(ot->srna, "ring_count", 16, INT_MIN, INT_MAX, _("Rings"), "", 3, 500); + RNA_def_float(ot->srna, "size", 1.0f, 0.0, FLT_MAX, _("Size"), "", 0.001, 100.00); ED_object_add_generic_props(ot, TRUE); } @@ -1710,8 +1710,8 @@ static int add_primitive_icosphere_exec(bContext *C, wmOperator *op) void MESH_OT_primitive_ico_sphere_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Ico Sphere"; - ot->description= "Construct an Icosphere mesh"; + ot->name= _("Add Ico Sphere"); + ot->description= _("Construct an Icosphere mesh"); ot->idname= "MESH_OT_primitive_ico_sphere_add"; /* api callbacks */ @@ -1723,8 +1723,8 @@ void MESH_OT_primitive_ico_sphere_add(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - RNA_def_int(ot->srna, "subdivisions", 2, 0, INT_MAX, "Subdivisions", "", 0, 8); - RNA_def_float(ot->srna, "size", 1.0f, 0.0f, FLT_MAX, "Size", "", 0.001f, 100.00); + RNA_def_int(ot->srna, "subdivisions", 2, 0, INT_MAX, _("Subdivisions"), "", 0, 8); + RNA_def_float(ot->srna, "size", 1.0f, 0.0f, FLT_MAX, _("Size"), "", 0.001f, 100.00); ED_object_add_generic_props(ot, TRUE); } @@ -1758,8 +1758,8 @@ static int mesh_duplicate_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(ev void MESH_OT_duplicate(wmOperatorType *ot) { /* identifiers */ - ot->name= "Duplicate Mesh"; - ot->description= "Duplicate selected vertices, edges or faces"; + ot->name= _("Duplicate Mesh"); + ot->description= _("Duplicate selected vertices, edges or faces"); ot->idname= "MESH_OT_duplicate"; /* api callbacks */ @@ -1769,6 +1769,6 @@ void MESH_OT_duplicate(wmOperatorType *ot) ot->poll= ED_operator_editmesh; /* to give to transform */ - RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, "Mode", ""); + RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, _("Mode"), ""); } diff --git a/source/blender/editors/mesh/editmesh_loop.c b/source/blender/editors/mesh/editmesh_loop.c index 326a293fb95..6852e2a818c 100644 --- a/source/blender/editors/mesh/editmesh_loop.c +++ b/source/blender/editors/mesh/editmesh_loop.c @@ -449,9 +449,9 @@ typedef struct CutCurve { #define KNIFE_MULTICUT 3 static EnumPropertyItem knife_items[]= { - {KNIFE_EXACT, "EXACT", 0, "Exact", ""}, - {KNIFE_MIDPOINT, "MIDPOINTS", 0, "Midpoints", ""}, - {KNIFE_MULTICUT, "MULTICUT", 0, "Multicut", ""}, + {KNIFE_EXACT, "EXACT", 0, N_("Exact"), ""}, + {KNIFE_MIDPOINT, "MIDPOINTS", 0, N_("Midpoints"), ""}, + {KNIFE_MULTICUT, "MULTICUT", 0, N_("Multicut"), ""}, {0, NULL, 0, NULL, NULL} }; @@ -711,8 +711,8 @@ void MESH_OT_knife_cut(wmOperatorType *ot) { PropertyRNA *prop; - ot->name= "Knife Cut"; - ot->description= "Cut selected edges and faces into parts"; + ot->name= _("Knife Cut"); + ot->description= _("Cut selected edges and faces into parts"); ot->idname= "MESH_OT_knife_cut"; ot->invoke= WM_gesture_lines_invoke; @@ -725,14 +725,14 @@ void MESH_OT_knife_cut(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_enum(ot->srna, "type", knife_items, KNIFE_EXACT, "Type", ""); + RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(knife_items), KNIFE_EXACT, _("Type"), ""); prop= RNA_def_property(ot->srna, "path", PROP_COLLECTION, PROP_NONE); RNA_def_property_struct_runtime(prop, &RNA_OperatorMousePath); RNA_def_int(ot->srna, "num_cuts", 1, 1, MAX_CUTS, _("Number of Cuts"), _("Only for Multi-Cut"), 1, MAX_CUTS); // doesn't work atm.. RNA_def_enum(ot->srna, "corner_cut_pattern", corner_type_items, SUBDIV_CORNER_INNERVERT, "Corner Cut Pattern", "Topology pattern to use to fill a face after cutting across its corner"); /* internal */ - RNA_def_int(ot->srna, "cursor", BC_KNIFECURSOR, 0, INT_MAX, "Cursor", "", 0, INT_MAX); + RNA_def_int(ot->srna, "cursor", BC_KNIFECURSOR, 0, INT_MAX, _("Cursor"), "", 0, INT_MAX); } /* ******************************************************* */ diff --git a/source/blender/editors/mesh/editmesh_mods.c b/source/blender/editors/mesh/editmesh_mods.c index d0423806f60..f941e5243d5 100644 --- a/source/blender/editors/mesh/editmesh_mods.c +++ b/source/blender/editors/mesh/editmesh_mods.c @@ -714,22 +714,22 @@ static int unified_findnearest(ViewContext *vc, EditVert **eve, EditEdge **eed, #define SIMFACE_TOT 207 static EnumPropertyItem prop_similar_types[] = { - {SIMVERT_NORMAL, "NORMAL", 0, "Normal", ""}, - {SIMVERT_FACE, "FACE", 0, "Amount of Vertices in Face", ""}, - {SIMVERT_VGROUP, "VGROUP", 0, "Vertex Groups", ""}, - {SIMEDGE_LENGTH, "LENGTH", 0, "Length", ""}, - {SIMEDGE_DIR, "DIR", 0, "Direction", ""}, - {SIMEDGE_FACE, "FACE", 0, "Amount of Vertices in Face", ""}, - {SIMEDGE_FACE_ANGLE, "FACE_ANGLE", 0, "Face Angles", ""}, - {SIMEDGE_CREASE, "CREASE", 0, "Crease", ""}, - {SIMEDGE_SEAM, "SEAM", 0, "Seam", ""}, - {SIMEDGE_SHARP, "SHARP", 0, "Sharpness", ""}, - {SIMFACE_MATERIAL, "MATERIAL", 0, "Material", ""}, - {SIMFACE_IMAGE, "IMAGE", 0, "Image", ""}, - {SIMFACE_AREA, "AREA", 0, "Area", ""}, - {SIMFACE_PERIMETER, "PERIMETER", 0, "Perimeter", ""}, - {SIMFACE_NORMAL, "NORMAL", 0, "Normal", ""}, - {SIMFACE_COPLANAR, "COPLANAR", 0, "Co-planar", ""}, + {SIMVERT_NORMAL, "NORMAL", 0, N_("Normal"), ""}, + {SIMVERT_FACE, "FACE", 0, N_("Amount of Vertices in Face"), ""}, + {SIMVERT_VGROUP, "VGROUP", 0, N_("Vertex Groups"), ""}, + {SIMEDGE_LENGTH, "LENGTH", 0, N_("Length"), ""}, + {SIMEDGE_DIR, "DIR", 0, N_("Direction"), ""}, + {SIMEDGE_FACE, "FACE", 0, N_("Amount of Vertices in Face"), ""}, + {SIMEDGE_FACE_ANGLE, "FACE_ANGLE", 0, N_("Face Angles"), ""}, + {SIMEDGE_CREASE, "CREASE", 0, N_("Crease"), ""}, + {SIMEDGE_SEAM, "SEAM", 0, N_("Seam"), ""}, + {SIMEDGE_SHARP, "SHARP", 0, N_("Sharpness"), ""}, + {SIMFACE_MATERIAL, "MATERIAL", 0, N_("Material"), ""}, + {SIMFACE_IMAGE, "IMAGE", 0, N_("Image"), ""}, + {SIMFACE_AREA, "AREA", 0, N_("Area"), ""}, + {SIMFACE_PERIMETER, "PERIMETER", 0, N_("Perimeter"), ""}, + {SIMFACE_NORMAL, "NORMAL", 0, N_("Normal"), ""}, + {SIMFACE_COPLANAR, "COPLANAR", 0, N_("Co-planar"), ""}, {0, NULL, 0, NULL, NULL} }; @@ -1290,8 +1290,8 @@ void MESH_OT_select_similar(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Select Similar"; - ot->description= "Select similar vertices, edges or faces by property types"; + ot->name= _("Select Similar"); + ot->description= _("Select similar vertices, edges or faces by property types"); ot->idname= "MESH_OT_select_similar"; /* api callbacks */ @@ -1303,10 +1303,10 @@ void MESH_OT_select_similar(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - prop= RNA_def_enum(ot->srna, "type", prop_similar_types, SIMVERT_NORMAL, "Type", ""); + prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_similar_types), SIMVERT_NORMAL, _("Type"), ""); RNA_def_enum_funcs(prop, select_similar_type_itemf); ot->prop= prop; - RNA_def_float(ot->srna, "threshold", 0.01f, 0.0f, FLT_MAX, "Threshold", "", 0.0f, 100.f); + RNA_def_float(ot->srna, "threshold", 0.01f, 0.0f, FLT_MAX, _("Threshold"), "", 0.0f, 100.f); } /* ******************************************* */ @@ -2042,8 +2042,8 @@ static int loop_multiselect(bContext *C, wmOperator *op) void MESH_OT_loop_multi_select(wmOperatorType *ot) { /* identifiers */ - ot->name= "Multi Select Loops"; - ot->description= "Select a loop of connected edges by connection type"; + ot->name= _("Multi Select Loops"); + ot->description= _("Select a loop of connected edges by connection type"); ot->idname= "MESH_OT_loop_multi_select"; /* api callbacks */ @@ -2132,8 +2132,8 @@ static int mesh_select_loop_invoke(bContext *C, wmOperator *op, wmEvent *event) void MESH_OT_loop_select(wmOperatorType *ot) { /* identifiers */ - ot->name= "Loop Select"; - ot->description= "Select a loop of connected edges"; + ot->name= _("Loop Select"); + ot->description= _("Select a loop of connected edges"); ot->idname= "MESH_OT_loop_select"; /* api callbacks */ @@ -2263,8 +2263,8 @@ static int mesh_shortest_path_select_poll(bContext *C) void MESH_OT_select_shortest_path(wmOperatorType *ot) { /* identifiers */ - ot->name= "Shortest Path Select"; - ot->description= "Select shortest path between two selections"; + ot->name= _("Shortest Path Select"); + ot->description= _("Select shortest path between two selections"); ot->idname= "MESH_OT_select_shortest_path"; /* api callbacks */ @@ -2571,8 +2571,8 @@ static int select_linked_pick_invoke(bContext *C, wmOperator *op, wmEvent *event void MESH_OT_select_linked_pick(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Linked"; - ot->description= "(un)select all vertices linked to the active mesh"; + ot->name= _("Select Linked"); + ot->description= _("(un)select all vertices linked to the active mesh"); ot->idname= "MESH_OT_select_linked_pick"; /* api callbacks */ @@ -2660,8 +2660,8 @@ static int select_linked_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(eve void MESH_OT_select_linked(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Linked All"; - ot->description= "Select all vertices linked to the active mesh"; + ot->name= _("Select Linked All"); + ot->description= _("Select all vertices linked to the active mesh"); ot->idname= "MESH_OT_select_linked"; /* api callbacks */ @@ -2864,8 +2864,8 @@ static int reveal_mesh_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_reveal(wmOperatorType *ot) { /* identifiers */ - ot->name= "Reveal Hidden"; - ot->description= "Reveal all hidden vertices, edges and faces"; + ot->name= _("Reveal Hidden"); + ot->description= _("Reveal all hidden vertices, edges and faces"); ot->idname= "MESH_OT_reveal"; /* api callbacks */ @@ -2915,14 +2915,14 @@ static int select_by_number_vertices_exec(bContext *C, wmOperator *op) void MESH_OT_select_by_number_vertices(wmOperatorType *ot) { static const EnumPropertyItem type_items[]= { - {3, "TRIANGLES", 0, "Triangles", NULL}, - {4, "QUADS", 0, "Quads", NULL}, - {5, "OTHER", 0, "Other", NULL}, + {3, "TRIANGLES", 0, N_("Triangles"), NULL}, + {4, "QUADS", 0, N_("Quads"), NULL}, + {5, "OTHER", 0, N_("Other"), NULL}, {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= "Select by Number of Vertices"; - ot->description= "Select vertices or faces by vertex count"; + ot->name= _("Select by Number of Vertices"); + ot->description= _("Select vertices or faces by vertex count"); ot->idname= "MESH_OT_select_by_number_vertices"; /* api callbacks */ @@ -2934,7 +2934,7 @@ void MESH_OT_select_by_number_vertices(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - ot->prop= RNA_def_enum(ot->srna, "type", type_items, 3, "Type", "Type of elements to select."); + ot->prop= RNA_def_enum(ot->srna, "type", type_items, 3, _("Type"), _("Type of elements to select.")); } @@ -2955,8 +2955,8 @@ static int select_mirror_exec(bContext *C, wmOperator *op) void MESH_OT_select_mirror(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Mirror"; - ot->description= "Select mesh items at mirrored locations"; + ot->name= _("Select Mirror"); + ot->description= _("Select mesh items at mirrored locations"); ot->idname= "MESH_OT_select_mirror"; /* api callbacks */ @@ -3076,8 +3076,8 @@ static int select_sharp_edges_exec(bContext *C, wmOperator *op) void MESH_OT_edges_select_sharp(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Sharp Edges"; - ot->description= "Marked selected edges as sharp"; + ot->name= _("Select Sharp Edges"); + ot->description= _("Marked selected edges as sharp"); ot->idname= "MESH_OT_edges_select_sharp"; /* api callbacks */ @@ -3088,7 +3088,7 @@ void MESH_OT_edges_select_sharp(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - RNA_def_float(ot->srna, "sharpness", 0.01f, 0.0f, FLT_MAX, "sharpness", "", 0.0f, 180.0f); + RNA_def_float(ot->srna, "sharpness", 0.01f, 0.0f, FLT_MAX, _("sharpness"), "", 0.0f, 180.0f); } @@ -3244,8 +3244,8 @@ static int select_linked_flat_faces_exec(bContext *C, wmOperator *op) void MESH_OT_faces_select_linked_flat(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Linked Flat Faces"; - ot->description= "Select linked faces by angle"; + ot->name= _("Select Linked Flat Faces"); + ot->description= _("Select linked faces by angle"); ot->idname= "MESH_OT_faces_select_linked_flat"; /* api callbacks */ @@ -3256,7 +3256,7 @@ void MESH_OT_faces_select_linked_flat(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - RNA_def_float(ot->srna, "sharpness", 135.0f, 0.0f, FLT_MAX, "sharpness", "", 0.0f, 180.0f); + RNA_def_float(ot->srna, "sharpness", 135.0f, 0.0f, FLT_MAX, _("sharpness"), "", 0.0f, 180.0f); } static void select_non_manifold(EditMesh *em, wmOperator *op ) @@ -3345,8 +3345,8 @@ static int select_non_manifold_exec(bContext *C, wmOperator *op) void MESH_OT_select_non_manifold(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Non Manifold"; - ot->description= "Select all non-manifold vertices or edges"; + ot->name= _("Select Non Manifold"); + ot->description= _("Select all non-manifold vertices or edges"); ot->idname= "MESH_OT_select_non_manifold"; /* api callbacks */ @@ -3409,8 +3409,8 @@ static int select_inverse_mesh_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_select_inverse(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Inverse"; - ot->description= "Select inverse of (un)selected vertices, edges or faces"; + ot->name= _("Select Inverse"); + ot->description= _("Select inverse of (un)selected vertices, edges or faces"); ot->idname= "MESH_OT_select_inverse"; /* api callbacks */ @@ -3471,8 +3471,8 @@ static int select_all_exec(bContext *C, wmOperator *op) void MESH_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select or Deselect All"; - ot->description= "Change selection of all vertices, edges or faces"; + ot->name= _("Select or Deselect All"); + ot->description= _("Change selection of all vertices, edges or faces"); ot->idname= "MESH_OT_select_all"; /* api callbacks */ @@ -3544,8 +3544,8 @@ static int select_more(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_select_more(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select More"; - ot->description= "Select more vertices, edges or faces connected to initial selection"; + ot->name= _("Select More"); + ot->description= _("Select more vertices, edges or faces connected to initial selection"); ot->idname= "MESH_OT_select_more"; /* api callbacks */ @@ -3634,8 +3634,8 @@ static int select_less(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_select_less(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Less"; - ot->description= "Select less vertices, edges or faces connected to initial selection"; + ot->name= _("Select Less"); + ot->description= _("Select less vertices, edges or faces connected to initial selection"); ot->idname= "MESH_OT_select_less"; /* api callbacks */ @@ -3704,8 +3704,8 @@ static int mesh_select_random_exec(bContext *C, wmOperator *op) void MESH_OT_select_random(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Random"; - ot->description= "Randomly select vertices"; + ot->name= _("Select Random"); + ot->description= _("Randomly select vertices"); ot->idname= "MESH_OT_select_random"; /* api callbacks */ @@ -3799,8 +3799,8 @@ static int editmesh_mark_seam(bContext *C, wmOperator *op) void MESH_OT_mark_seam(wmOperatorType *ot) { /* identifiers */ - ot->name= "Mark Seam"; - ot->description= "(un)mark selected edges as a seam"; + ot->name= _("Mark Seam"); + ot->description= _("(un)mark selected edges as a seam"); ot->idname= "MESH_OT_mark_seam"; /* api callbacks */ @@ -3851,8 +3851,8 @@ static int editmesh_mark_sharp(bContext *C, wmOperator *op) void MESH_OT_mark_sharp(wmOperatorType *ot) { /* identifiers */ - ot->name= "Mark Sharp"; - ot->description= "(un)mark selected edges as sharp"; + ot->name= _("Mark Sharp"); + ot->description= _("(un)mark selected edges as sharp"); ot->idname= "MESH_OT_mark_sharp"; /* api callbacks */ @@ -4095,8 +4095,8 @@ static int normals_make_consistent_exec(bContext *C, wmOperator *op) void MESH_OT_normals_make_consistent(wmOperatorType *ot) { /* identifiers */ - ot->name= "Make Normals Consistent"; - ot->description= "Flip all selected vertex and face normals in a consistent direction"; + ot->name= _("Make Normals Consistent"); + ot->description= _("Flip all selected vertex and face normals in a consistent direction"); ot->idname= "MESH_OT_normals_make_consistent"; /* api callbacks */ @@ -4273,8 +4273,8 @@ static int smooth_vertex_exec(bContext *C, wmOperator *op) void MESH_OT_vertices_smooth(wmOperatorType *ot) { /* identifiers */ - ot->name= "Smooth Vertex"; - ot->description= "Flatten angles of selected vertices"; + ot->name= _("Smooth Vertex"); + ot->description= _("Flatten angles of selected vertices"); ot->idname= "MESH_OT_vertices_smooth"; /* api callbacks */ @@ -4347,8 +4347,8 @@ static int mesh_noise_exec(bContext *C, wmOperator *op) void MESH_OT_noise(wmOperatorType *ot) { /* identifiers */ - ot->name= "Noise"; - ot->description= "Use vertex coordinate as texture coordinate"; + ot->name= _("Noise"); + ot->description= _("Use vertex coordinate as texture coordinate"); ot->idname= "MESH_OT_noise"; /* api callbacks */ @@ -4358,7 +4358,7 @@ void MESH_OT_noise(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_float(ot->srna, "factor", 0.1f, -FLT_MAX, FLT_MAX, "Factor", "", 0.0f, 1.0f); + RNA_def_float(ot->srna, "factor", 0.1f, -FLT_MAX, FLT_MAX, _("Factor"), "", 0.0f, 1.0f); } void flipface(EditMesh *em, EditFace *efa) @@ -4409,8 +4409,8 @@ static int flip_normals(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_flip_normals(wmOperatorType *ot) { /* identifiers */ - ot->name= "Flip Normals"; - ot->description= "Toggle the direction of selected face's vertex and face normals"; + ot->name= _("Flip Normals"); + ot->description= _("Toggle the direction of selected face's vertex and face normals"); ot->idname= "MESH_OT_flip_normals"; /* api callbacks */ @@ -4451,8 +4451,8 @@ void MESH_OT_solidify(wmOperatorType *ot) { PropertyRNA *prop; /* identifiers */ - ot->name= "Solidify"; - ot->description= "Create a solid skin by extruding, compensating for sharp angles"; + ot->name= _("Solidify"); + ot->description= _("Create a solid skin by extruding, compensating for sharp angles"); ot->idname= "MESH_OT_solidify"; /* api callbacks */ @@ -4462,7 +4462,7 @@ void MESH_OT_solidify(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - prop= RNA_def_float(ot->srna, "thickness", 0.01f, -FLT_MAX, FLT_MAX, "Thickness", "", -10.0f, 10.0f); + prop= RNA_def_float(ot->srna, "thickness", 0.01f, -FLT_MAX, FLT_MAX, _("Thickness"), "", -10.0f, 10.0f); RNA_def_property_ui_range(prop, -10, 10, 0.1, 4); } @@ -4486,7 +4486,7 @@ static int mesh_select_nth_exec(bContext *C, wmOperator *op) void MESH_OT_select_nth(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Nth"; + ot->name= _("Select Nth"); ot->description= ""; ot->idname= "MESH_OT_select_nth"; diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index dba1c30e18b..1453b23da26 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -508,8 +508,8 @@ void MESH_OT_remove_doubles(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Remove Doubles"; - ot->description= "Remove duplicate vertices"; + ot->name= _("Remove Doubles"); + ot->description= _("Remove duplicate vertices"); ot->idname= "MESH_OT_remove_doubles"; /* api callbacks */ @@ -519,7 +519,7 @@ void MESH_OT_remove_doubles(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - prop= RNA_def_float(ot->srna, "limit", 0.0001f, 0.000001f, 50.0f, "Merge Threshold", "Minimum distance between merged verts", 0.00001f, 2.0f); + prop= RNA_def_float(ot->srna, "limit", 0.0001f, 0.000001f, 50.0f, _("Merge Threshold"), _("Minimum distance between merged verts"), 0.00001f, 2.0f); RNA_def_property_ui_range(prop, 0.000001f, 50.0f, 0.001, 5); } @@ -580,8 +580,8 @@ static int mesh_vertices_sort_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_vertices_sort(wmOperatorType *ot) { /* identifiers */ - ot->name= "Vertex Sort"; - ot->description= "Sort vertex order"; + ot->name= _("Vertex Sort"); + ot->description= _("Sort vertex order"); ot->idname= "MESH_OT_vertices_sort"; /* api callbacks */ @@ -663,8 +663,8 @@ static int mesh_vertices_randomize_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_vertices_randomize(wmOperatorType *ot) { /* identifiers */ - ot->name= "Vertex Randomize"; - ot->description= "Randomize vertex order"; + ot->name= _("Vertex Randomize"); + ot->description= _("Randomize vertex order"); ot->idname= "MESH_OT_vertices_randomize"; /* api callbacks */ @@ -757,10 +757,10 @@ static int mesh_extrude_exec(bContext *C, wmOperator *op) } static EnumPropertyItem extrude_items[] = { - {1, "REGION", 0, "Region", ""}, - {2, "FACES", 0, "Individual Faces", ""}, - {3, "EDGES", 0, "Only Edges", ""}, - {4, "VERTS", 0, "Only Vertices", ""}, + {1, "REGION", 0, N_("Region"), ""}, + {2, "FACES", 0, N_("Individual Faces"), ""}, + {3, "EDGES", 0, N_("Only Edges"), ""}, + {4, "VERTS", 0, N_("Only Vertices"), ""}, {0, NULL, 0, NULL, NULL}}; @@ -837,8 +837,8 @@ void MESH_OT_extrude(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Extrude"; - ot->description= "Extrude selected vertices, edges or faces"; + ot->name= _("Extrude"); + ot->description= _("Extrude selected vertices, edges or faces"); ot->idname= "MESH_OT_extrude"; /* api callbacks */ @@ -850,7 +850,8 @@ void MESH_OT_extrude(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - prop= RNA_def_enum(ot->srna, "type", extrude_items, 0, "Type", ""); + /* gettext extrude_items will raise segment fault */ + prop= RNA_def_enum(ot->srna, "type", extrude_items, 0, _("Type"), ""); RNA_def_property_flag(prop, PROP_HIDDEN); RNA_def_enum_funcs(prop, mesh_extrude_itemf); ot->prop= prop; @@ -881,8 +882,8 @@ static int split_mesh(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_split(wmOperatorType *ot) { /* identifiers */ - ot->name= "Split"; - ot->description= "Split selected geometry into separate disconnected mesh"; + ot->name= _("Split"); + ot->description= _("Split selected geometry into separate disconnected mesh"); ot->idname= "MESH_OT_split"; /* api callbacks */ @@ -948,8 +949,8 @@ static int extrude_repeat_mesh_invoke(bContext *C, wmOperator *op, wmEvent *UNUS void MESH_OT_extrude_repeat(wmOperatorType *ot) { /* identifiers */ - ot->name= "Extrude Repeat Mesh"; - ot->description= "Extrude selected vertices, edges or faces repeatedly"; + ot->name= _("Extrude Repeat Mesh"); + ot->description= _("Extrude selected vertices, edges or faces repeatedly"); ot->idname= "MESH_OT_extrude_repeat"; /* api callbacks */ @@ -1084,8 +1085,8 @@ static int spin_mesh_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)) void MESH_OT_spin(wmOperatorType *ot) { /* identifiers */ - ot->name= "Spin"; - ot->description= "Extrude selected vertices in a circle around the cursor in indicated viewport"; + ot->name= _("Spin"); + ot->description= _("Extrude selected vertices in a circle around the cursor in indicated viewport"); ot->idname= "MESH_OT_spin"; /* api callbacks */ @@ -1190,8 +1191,8 @@ static int screw_mesh_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event) void MESH_OT_screw(wmOperatorType *ot) { /* identifiers */ - ot->name= "Screw"; - ot->description= "Extrude selected vertices in screw-shaped rotation around the cursor in indicated viewport"; + ot->name= _("Screw"); + ot->description= _("Extrude selected vertices in screw-shaped rotation around the cursor in indicated viewport"); ot->idname= "MESH_OT_screw"; /* api callbacks */ @@ -1395,13 +1396,13 @@ static void delete_mesh(EditMesh *em, wmOperator *op, int event) /* Note, these values must match delete_mesh() event values */ static EnumPropertyItem prop_mesh_delete_types[] = { - {10,"VERT", 0, "Vertices", ""}, - {1, "EDGE", 0, "Edges", ""}, - {2, "FACE", 0, "Faces", ""}, - {3, "ALL", 0, "All", ""}, - {4, "EDGE_FACE",0, "Edges & Faces", ""}, - {5, "ONLY_FACE",0, "Only Faces", ""}, - {6, "EDGE_LOOP",0, "Edge Loop", ""}, + {10,"VERT", 0, N_("Vertices"), ""}, + {1, "EDGE", 0, N_("Edges"), ""}, + {2, "FACE", 0, N_("Faces"), ""}, + {3, "ALL", 0, N_("All"), ""}, + {4, "EDGE_FACE",0, N_("Edges & Faces"), ""}, + {5, "ONLY_FACE",0, N_("Only Faces"), ""}, + {6, "EDGE_LOOP",0, N_("Edge Loop"), ""}, {0, NULL, 0, NULL, NULL} }; @@ -1426,8 +1427,8 @@ static int delete_mesh_exec(bContext *C, wmOperator *op) void MESH_OT_delete(wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete"; - ot->description= "Delete selected vertices, edges or faces"; + ot->name= _("Delete"); + ot->description= _("Delete selected vertices, edges or faces"); ot->idname= "MESH_OT_delete"; /* api callbacks */ @@ -1440,7 +1441,7 @@ void MESH_OT_delete(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /*props */ - ot->prop= RNA_def_enum(ot->srna, "type", prop_mesh_delete_types, 10, "Type", "Method used for deleting mesh data"); + ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_mesh_delete_types), 10, _("Type"), _("Method used for deleting mesh data")); } @@ -5115,8 +5116,8 @@ static int mesh_rip_invoke(bContext *C, wmOperator *op, wmEvent *event) void MESH_OT_rip(wmOperatorType *ot) { /* identifiers */ - ot->name= "Rip"; - ot->description= "Rip selection from mesh (quads only)"; + ot->name= _("Rip"); + ot->description= _("Rip selection from mesh (quads only)"); ot->idname= "MESH_OT_rip"; /* api callbacks */ @@ -5196,8 +5197,8 @@ static int shape_propagate_to_all_exec(bContext *C, wmOperator *op) void MESH_OT_shape_propagate_to_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "Shape Propagate"; - ot->description= "Apply selected vertex locations to all other shape keys"; + ot->name= _("Shape Propagate"); + ot->description= _("Apply selected vertex locations to all other shape keys"); ot->idname= "MESH_OT_shape_propagate_to_all"; /* api callbacks */ @@ -5970,11 +5971,11 @@ static int merge_exec(bContext *C, wmOperator *op) } static EnumPropertyItem merge_type_items[]= { - {6, "FIRST", 0, "At First", ""}, - {1, "LAST", 0, "At Last", ""}, - {3, "CENTER", 0, "At Center", ""}, - {4, "CURSOR", 0, "At Cursor", ""}, - {5, "COLLAPSE", 0, "Collapse", ""}, + {6, "FIRST", 0, N_("At First"), ""}, + {1, "LAST", 0, N_("At Last"), ""}, + {3, "CENTER", 0, N_("At Center"), ""}, + {4, "CURSOR", 0, N_("At Cursor"), ""}, + {5, "COLLAPSE", 0, N_("Collapse"), ""}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem *merge_type_itemf(bContext *C, PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop), int *free) @@ -6018,8 +6019,8 @@ void MESH_OT_merge(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Merge"; - ot->description= "Merge selected vertices"; + ot->name= _("Merge"); + ot->description= _("Merge selected vertices"); ot->idname= "MESH_OT_merge"; /* api callbacks */ @@ -6031,7 +6032,7 @@ void MESH_OT_merge(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - prop= RNA_def_enum(ot->srna, "type", merge_type_items, 3, "Type", "Merge method to use."); + prop= RNA_def_enum(ot->srna, "type", merge_type_items, 3, _("Type"), _("Merge method to use.")); RNA_def_enum_funcs(prop, merge_type_itemf); ot->prop= prop; RNA_def_boolean(ot->srna, "uvs", 0, _("UVs"), _("Move UVs according to merge.")); @@ -6221,13 +6222,13 @@ static int select_vertex_path_exec(bContext *C, wmOperator *op) void MESH_OT_select_vertex_path(wmOperatorType *ot) { static const EnumPropertyItem type_items[] = { - {PATH_SELECT_EDGE_LENGTH, "EDGE_LENGTH", 0, "Edge Length", NULL}, - {PATH_SELECT_TOPOLOGICAL, "TOPOLOGICAL", 0, "Topological", NULL}, + {PATH_SELECT_EDGE_LENGTH, "EDGE_LENGTH", 0, N_("Edge Length"), NULL}, + {PATH_SELECT_TOPOLOGICAL, "TOPOLOGICAL", 0, N_("Topological"), NULL}, {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= "Select Vertex Path"; - ot->description= "Select shortest path between two vertices by distance type"; + ot->name= _("Select Vertex Path"); + ot->description= _("Select shortest path between two vertices by distance type"); ot->idname= "MESH_OT_select_vertex_path"; /* api callbacks */ @@ -6238,7 +6239,7 @@ void MESH_OT_select_vertex_path(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", type_items, PATH_SELECT_EDGE_LENGTH, "Type", "Method to compute distance."); + ot->prop= RNA_def_enum(ot->srna, "type", type_items, PATH_SELECT_EDGE_LENGTH, _("Type"), _("Method to compute distance.")); } /********************** Region/Loop Operators *************************/ @@ -6288,8 +6289,8 @@ static int region_to_loop(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_region_to_loop(wmOperatorType *ot) { /* identifiers */ - ot->name= "Region to Loop"; - ot->description= "Select a region as a loop of connected edges"; + ot->name= _("Region to Loop"); + ot->description= _("Select a region as a loop of connected edges"); ot->idname= "MESH_OT_region_to_loop"; /* api callbacks */ @@ -6464,8 +6465,8 @@ static int loop_to_region(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_loop_to_region(wmOperatorType *ot) { /* identifiers */ - ot->name= "Loop to Region"; - ot->description= "Select a loop of connected edges as a region"; + ot->name= _("Loop to Region"); + ot->description= _("Select a loop of connected edges as a region"); ot->idname= "MESH_OT_loop_to_region"; /* api callbacks */ @@ -6759,8 +6760,8 @@ static int mesh_mirror_colors(bContext *C, wmOperator *op) void MESH_OT_uvs_rotate(wmOperatorType *ot) { /* identifiers */ - ot->name= "Rotate UVs"; - ot->description= "Rotate selected UVs"; + ot->name= _("Rotate UVs"); + ot->description= _("Rotate selected UVs"); ot->idname= "MESH_OT_uvs_rotate"; /* api callbacks */ @@ -6771,14 +6772,14 @@ void MESH_OT_uvs_rotate(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - RNA_def_enum(ot->srna, "direction", direction_items, DIRECTION_CW, "Direction", "Direction to rotate UVs around."); + RNA_def_enum(ot->srna, "direction", direction_items, DIRECTION_CW, _("Direction"), _("Direction to rotate UVs around.")); } void MESH_OT_uvs_mirror(wmOperatorType *ot) { /* identifiers */ - ot->name= "Mirror UVs"; - ot->description= "Mirror selected UVs"; + ot->name= _("Mirror UVs"); + ot->description= _("Mirror selected UVs"); ot->idname= "MESH_OT_uvs_mirror"; /* api callbacks */ @@ -6789,14 +6790,14 @@ void MESH_OT_uvs_mirror(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - RNA_def_enum(ot->srna, "axis", axis_items_xy, DIRECTION_CW, "Axis", "Axis to mirror UVs around."); + RNA_def_enum(ot->srna, "axis", axis_items_xy, DIRECTION_CW, _("Axis"), _("Axis to mirror UVs around.")); } void MESH_OT_colors_rotate(wmOperatorType *ot) { /* identifiers */ - ot->name= "Rotate Colors"; - ot->description= "Rotate UV/image color layer"; + ot->name= _("Rotate Colors"); + ot->description= _("Rotate UV/image color layer"); ot->idname= "MESH_OT_colors_rotate"; /* api callbacks */ @@ -6807,14 +6808,14 @@ void MESH_OT_colors_rotate(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - RNA_def_enum(ot->srna, "direction", direction_items, DIRECTION_CW, "Direction", "Direction to rotate edge around."); + RNA_def_enum(ot->srna, "direction", direction_items, DIRECTION_CW, _("Direction"), _("Direction to rotate edge around.")); } void MESH_OT_colors_mirror(wmOperatorType *ot) { /* identifiers */ - ot->name= "Mirror Colors"; - ot->description= "Mirror UV/image color layer"; + ot->name= _("Mirror Colors"); + ot->description= _("Mirror UV/image color layer"); ot->idname= "MESH_OT_colors_mirror"; /* api callbacks */ @@ -6825,7 +6826,7 @@ void MESH_OT_colors_mirror(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - RNA_def_enum(ot->srna, "axis", axis_items_xy, DIRECTION_CW, "Axis", "Axis to mirror colors around."); + RNA_def_enum(ot->srna, "axis", axis_items_xy, DIRECTION_CW, _("Axis"), _("Axis to mirror colors around.")); } /********************** Subdivide Operator *************************/ @@ -6857,8 +6858,8 @@ static int subdivide_exec(bContext *C, wmOperator *op) void MESH_OT_subdivide(wmOperatorType *ot) { /* identifiers */ - ot->name= "Subdivide"; - ot->description= "Subdivide selected edges"; + ot->name= _("Subdivide"); + ot->description= _("Subdivide selected edges"); ot->idname= "MESH_OT_subdivide"; /* api callbacks */ @@ -7140,8 +7141,8 @@ static int fill_mesh_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_fill(wmOperatorType *ot) { /* identifiers */ - ot->name= "Fill"; - ot->description= "Create a segment, edge or face"; + ot->name= _("Fill"); + ot->description= _("Create a segment, edge or face"); ot->idname= "MESH_OT_fill"; /* api callbacks */ @@ -7170,8 +7171,8 @@ static int beautify_fill_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_beautify_fill(wmOperatorType *ot) { /* identifiers */ - ot->name= "Beautify Fill"; - ot->description= "Rearrange geometry on a selected surface to avoid skinny faces"; + ot->name= _("Beautify Fill"); + ot->description= _("Rearrange geometry on a selected surface to avoid skinny faces"); ot->idname= "MESH_OT_beautify_fill"; /* api callbacks */ @@ -7336,16 +7337,16 @@ static int sort_faces_exec(bContext *C, wmOperator *op) void MESH_OT_sort_faces(wmOperatorType *ot) { static EnumPropertyItem type_items[]= { - { 1, "VIEW_AXIS", 0, "View Axis", "" }, - { 2, "CURSOR_DISTANCE", 0, "Cursor Distance", "" }, - { 3, "MATERIAL", 0, "Material", "" }, - { 4, "SELECTED", 0, "Selected", "" }, - { 5, "RANDOMIZE", 0, "Randomize", "" }, + { 1, "VIEW_AXIS", 0, N_("View Axis"), "" }, + { 2, "CURSOR_DISTANCE", 0, N_("Cursor Distance"), "" }, + { 3, "MATERIAL", 0, N_("Material"), "" }, + { 4, "SELECTED", 0, N_("Selected"), "" }, + { 5, "RANDOMIZE", 0, N_("Randomize"), "" }, { 0, NULL, 0, NULL, NULL }}; /* identifiers */ - ot->name= "Sort Faces"; // XXX (Ctrl to reverse)%t| - ot->description= "The faces of the active Mesh Object are sorted, based on the current view."; + ot->name= _("Sort Faces"); // XXX (Ctrl to reverse)%t| + ot->description= _("The faces of the active Mesh Object are sorted, based on the current view."); ot->idname= "MESH_OT_sort_faces"; /* api callbacks */ @@ -7357,7 +7358,7 @@ void MESH_OT_sort_faces(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", type_items, 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(type_items), 0, _("Type"), ""); } /********************** Quad/Tri Operators *************************/ @@ -7379,8 +7380,8 @@ static int quads_convert_to_tris_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_quads_convert_to_tris(wmOperatorType *ot) { /* identifiers */ - ot->name= "Quads to Tris"; - ot->description= "Convert selected quads to triangles"; + ot->name= _("Quads to Tris"); + ot->description= _("Convert selected quads to triangles"); ot->idname= "MESH_OT_quads_convert_to_tris"; /* api callbacks */ @@ -7408,8 +7409,8 @@ static int tris_convert_to_quads_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_tris_convert_to_quads(wmOperatorType *ot) { /* identifiers */ - ot->name= "Tris to Quads"; - ot->description= "Convert selected triangles to quads"; + ot->name= _("Tris to Quads"); + ot->description= _("Convert selected triangles to quads"); ot->idname= "MESH_OT_tris_convert_to_quads"; /* api callbacks */ @@ -7437,8 +7438,8 @@ static int edge_flip_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_edge_flip(wmOperatorType *ot) { /* identifiers */ - ot->name= "Edge Flip"; - ot->description= "Flip selected edge or adjoining faces"; + ot->name= _("Edge Flip"); + ot->description= _("Flip selected edge or adjoining faces"); ot->idname= "MESH_OT_edge_flip"; /* api callbacks */ @@ -7485,8 +7486,8 @@ static int mesh_faces_shade_smooth_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_faces_shade_smooth(wmOperatorType *ot) { /* identifiers */ - ot->name= "Shade Smooth"; - ot->description= "Display faces 'smooth' (using vertex normals)"; + ot->name= _("Shade Smooth"); + ot->description= _("Display faces 'smooth' (using vertex normals)"); ot->idname= "MESH_OT_faces_shade_smooth"; /* api callbacks */ @@ -7513,8 +7514,8 @@ static int mesh_faces_shade_flat_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_faces_shade_flat(wmOperatorType *ot) { /* identifiers */ - ot->name= "Shade Flat"; - ot->description= "Display faces 'flat'"; + ot->name= _("Shade Flat"); + ot->description= _("Display faces 'flat'"); ot->idname= "MESH_OT_faces_shade_flat"; /* api callbacks */ @@ -7578,20 +7579,20 @@ static int select_axis_exec(bContext *C, wmOperator *op) void MESH_OT_select_axis(wmOperatorType *ot) { static EnumPropertyItem axis_mode_items[] = { - {0, "POSITIVE", 0, "Positive Axis", ""}, - {1, "NEGATIVE", 0, "Negative Axis", ""}, - {-1, "ALIGNED", 0, "Aligned Axis", ""}, + {0, "POSITIVE", 0, N_("Positive Axis"), ""}, + {1, "NEGATIVE", 0, N_("Negative Axis"), ""}, + {-1, "ALIGNED", 0, N_("Aligned Axis"), ""}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem axis_items_xyz[] = { - {0, "X_AXIS", 0, "X Axis", ""}, - {1, "Y_AXIS", 0, "Y Axis", ""}, - {2, "Z_AXIS", 0, "Z Axis", ""}, + {0, "X_AXIS", 0, N_("X Axis"), ""}, + {1, "Y_AXIS", 0, N_("Y Axis"), ""}, + {2, "Z_AXIS", 0, N_("Z Axis"), ""}, {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= "Select Axis"; - ot->description= "Select all data in the mesh on a single axis"; + ot->name= _("Select Axis"); + ot->description= _("Select all data in the mesh on a single axis"); ot->idname= "MESH_OT_select_axis"; /* api callbacks */ @@ -7602,7 +7603,7 @@ void MESH_OT_select_axis(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_enum(ot->srna, "mode", axis_mode_items, 0, "Axis Mode", "Axis side to use when selecting"); - RNA_def_enum(ot->srna, "axis", axis_items_xyz, 0, "Axis", "Select the axis to compare each vertex on"); + RNA_def_enum(ot->srna, "mode", RNA_enum_items_gettexted(axis_mode_items), 0, _("Axis Mode"), _("Axis side to use when selecting")); + RNA_def_enum(ot->srna, "axis", RNA_enum_items_gettexted(axis_items_xyz), 0, _("Axis"), _("Select the axis to compare each vertex on")); } diff --git a/source/blender/editors/mesh/loopcut.c b/source/blender/editors/mesh/loopcut.c index 43de28e010b..62a512fe11a 100644 --- a/source/blender/editors/mesh/loopcut.c +++ b/source/blender/editors/mesh/loopcut.c @@ -512,9 +512,9 @@ static int ringcut_modal (bContext *C, wmOperator *op, wmEvent *event) void MESH_OT_edgering_select (wmOperatorType *ot) { /* description */ - ot->name= "Edge Ring Select"; + ot->name= _("Edge Ring Select"); ot->idname= "MESH_OT_edgering_select"; - ot->description= "Select an edge ring"; + ot->description= _("Select an edge ring"); /* callbacks */ ot->invoke= ringsel_invoke; @@ -529,9 +529,9 @@ void MESH_OT_edgering_select (wmOperatorType *ot) void MESH_OT_loopcut (wmOperatorType *ot) { /* description */ - ot->name= "Loop Cut"; + ot->name= _("Loop Cut"); ot->idname= "MESH_OT_loopcut"; - ot->description= "Add a new loop between existing loops"; + ot->description= _("Add a new loop between existing loops"); /* callbacks */ ot->invoke= ringcut_invoke; diff --git a/source/blender/editors/mesh/mesh_ops.c b/source/blender/editors/mesh/mesh_ops.c index 282eeef906f..077ad756150 100644 --- a/source/blender/editors/mesh/mesh_ops.c +++ b/source/blender/editors/mesh/mesh_ops.c @@ -42,6 +42,8 @@ #include "BLI_blenlib.h" #include "BLI_editVert.h" +#include "BLF_api.h" + #include "BKE_context.h" #include "RNA_access.h" @@ -172,52 +174,52 @@ void ED_operatormacros_mesh(void) wmOperatorType *ot; wmOperatorTypeMacro *otmacro; - ot= WM_operatortype_append_macro("MESH_OT_loopcut_slide", "Loop Cut and Slide", OPTYPE_UNDO|OPTYPE_REGISTER); - ot->description = "Cut mesh loop and slide it"; + ot= WM_operatortype_append_macro("MESH_OT_loopcut_slide", _("Loop Cut and Slide"), OPTYPE_UNDO|OPTYPE_REGISTER); + ot->description = _("Cut mesh loop and slide it"); WM_operatortype_macro_define(ot, "MESH_OT_loopcut"); otmacro= WM_operatortype_macro_define(ot, "TRANSFORM_OT_edge_slide"); RNA_struct_idprops_unset(otmacro->ptr, "release_confirm"); - ot= WM_operatortype_append_macro("MESH_OT_duplicate_move", "Add Duplicate", OPTYPE_UNDO|OPTYPE_REGISTER); - ot->description = "Duplicate mesh and move"; + ot= WM_operatortype_append_macro("MESH_OT_duplicate_move", _("Add Duplicate"), OPTYPE_UNDO|OPTYPE_REGISTER); + ot->description = _("Duplicate mesh and move"); WM_operatortype_macro_define(ot, "MESH_OT_duplicate"); otmacro= WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate"); RNA_enum_set(otmacro->ptr, "proportional", 0); RNA_boolean_set(otmacro->ptr, "mirror", 0); - ot= WM_operatortype_append_macro("MESH_OT_rip_move", "Rip", OPTYPE_UNDO|OPTYPE_REGISTER); - ot->description = "Rip polygons and move the result"; + ot= WM_operatortype_append_macro("MESH_OT_rip_move", _("Rip"), OPTYPE_UNDO|OPTYPE_REGISTER); + ot->description = _("Rip polygons and move the result"); WM_operatortype_macro_define(ot, "MESH_OT_rip"); otmacro= WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate"); RNA_enum_set(otmacro->ptr, "proportional", 0); RNA_boolean_set(otmacro->ptr, "mirror", 0); - ot= WM_operatortype_append_macro("MESH_OT_extrude_region_move", "Extrude Region and Move", OPTYPE_UNDO|OPTYPE_REGISTER); - ot->description = "Extrude region and move result"; + ot= WM_operatortype_append_macro("MESH_OT_extrude_region_move", _("Extrude Region and Move"), OPTYPE_UNDO|OPTYPE_REGISTER); + ot->description = _("Extrude region and move result"); otmacro= WM_operatortype_macro_define(ot, "MESH_OT_extrude"); RNA_enum_set(otmacro->ptr, "type", 1); otmacro= WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate"); RNA_enum_set(otmacro->ptr, "proportional", 0); RNA_boolean_set(otmacro->ptr, "mirror", 0); - ot= WM_operatortype_append_macro("MESH_OT_extrude_faces_move", "Extrude Individual Faces and Move", OPTYPE_UNDO|OPTYPE_REGISTER); - ot->description = "Extrude faces and move result"; + ot= WM_operatortype_append_macro("MESH_OT_extrude_faces_move", _("Extrude Individual Faces and Move"), OPTYPE_UNDO|OPTYPE_REGISTER); + ot->description = _("Extrude faces and move result"); otmacro= WM_operatortype_macro_define(ot, "MESH_OT_extrude"); RNA_enum_set(otmacro->ptr, "type", 2); otmacro= WM_operatortype_macro_define(ot, "TRANSFORM_OT_shrink_fatten"); RNA_enum_set(otmacro->ptr, "proportional", 0); RNA_boolean_set(otmacro->ptr, "mirror", 0); - ot= WM_operatortype_append_macro("MESH_OT_extrude_edges_move", "Extrude Only Edges and Move", OPTYPE_UNDO|OPTYPE_REGISTER); - ot->description = "Extrude edges and move result"; + ot= WM_operatortype_append_macro("MESH_OT_extrude_edges_move", _("Extrude Only Edges and Move"), OPTYPE_UNDO|OPTYPE_REGISTER); + ot->description = _("Extrude edges and move result"); otmacro= WM_operatortype_macro_define(ot, "MESH_OT_extrude"); RNA_enum_set(otmacro->ptr, "type", 3); otmacro= WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate"); RNA_enum_set(otmacro->ptr, "proportional", 0); RNA_boolean_set(otmacro->ptr, "mirror", 0); - ot= WM_operatortype_append_macro("MESH_OT_extrude_vertices_move", "Extrude Only Vertices and Move", OPTYPE_UNDO|OPTYPE_REGISTER); - ot->description = "Extrude vertices and move result"; + ot= WM_operatortype_append_macro("MESH_OT_extrude_vertices_move", _("Extrude Only Vertices and Move"), OPTYPE_UNDO|OPTYPE_REGISTER); + ot->description = _("Extrude vertices and move result"); otmacro= WM_operatortype_macro_define(ot, "MESH_OT_extrude"); RNA_enum_set(otmacro->ptr, "type", 4); otmacro= WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate"); diff --git a/source/blender/editors/metaball/mball_edit.c b/source/blender/editors/metaball/mball_edit.c index 00d40d196d6..c14f57d6c8c 100644 --- a/source/blender/editors/metaball/mball_edit.c +++ b/source/blender/editors/metaball/mball_edit.c @@ -170,8 +170,8 @@ static int select_all_exec(bContext *C, wmOperator *op) void MBALL_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select or Deselect All"; - ot->description= "Change selection of all meta elements"; + ot->name= _("Select or Deselect All"); + ot->description= _("Change selection of all meta elements"); ot->idname= "MBALL_OT_select_all"; /* callback functions */ @@ -211,8 +211,8 @@ static int select_inverse_metaelems_exec(bContext *C, wmOperator *UNUSED(op)) void MBALL_OT_select_inverse_metaelems(wmOperatorType *ot) { /* identifiers */ - ot->name= "Inverse"; - ot->description= "Select inverse of (un)selected metaelements"; + ot->name= _("Inverse"); + ot->description= _("Select inverse of (un)selected metaelements"); ot->idname= "MBALL_OT_select_inverse_metaelems"; /* callback functions */ @@ -257,8 +257,8 @@ static int select_random_metaelems_exec(bContext *C, wmOperator *op) void MBALL_OT_select_random_metaelems(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Random..."; - ot->description= "Randomly select metaelements"; + ot->name= _("Random..."); + ot->description= _("Randomly select metaelements"); ot->idname= "MBALL_OT_select_random_metaelems"; /* callback functions */ @@ -270,7 +270,7 @@ void MBALL_OT_select_random_metaelems(struct wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_float_percentage(ot->srna, "percent", 0.5f, 0.0f, 1.0f, "Percent", "Percentage of metaelems to select randomly.", 0.0001f, 1.0f); + RNA_def_float_percentage(ot->srna, "percent", 0.5f, 0.0f, 1.0f, _("Percent"), _("Percentage of metaelems to select randomly."), 0.0001f, 1.0f); } /***************************** Duplicate operator *****************************/ @@ -316,8 +316,8 @@ static int duplicate_metaelems_invoke(bContext *C, wmOperator *op, wmEvent *UNUS void MBALL_OT_duplicate_metaelems(wmOperatorType *ot) { /* identifiers */ - ot->name= "Duplicate Metaelements"; - ot->description= "Delete selected metaelement(s)"; + ot->name= _("Duplicate Metaelements"); + ot->description= _("Delete selected metaelement(s)"); ot->idname= "MBALL_OT_duplicate_metaelems"; /* callback functions */ @@ -329,7 +329,7 @@ void MBALL_OT_duplicate_metaelems(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* to give to transform */ - RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, "Mode", ""); + RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, _("Mode"), ""); } /***************************** Delete operator *****************************/ @@ -362,8 +362,8 @@ static int delete_metaelems_exec(bContext *C, wmOperator *UNUSED(op)) void MBALL_OT_delete_metaelems(wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete"; - ot->description= "Delete selected metaelement(s)"; + ot->name= _("Delete"); + ot->description= _("Delete selected metaelement(s)"); ot->idname= "MBALL_OT_delete_metaelems"; /* callback functions */ @@ -402,8 +402,8 @@ static int hide_metaelems_exec(bContext *C, wmOperator *op) void MBALL_OT_hide_metaelems(wmOperatorType *ot) { /* identifiers */ - ot->name= "Hide"; - ot->description= "Hide (un)selected metaelement(s)"; + ot->name= _("Hide"); + ot->description= _("Hide (un)selected metaelement(s)"); ot->idname= "MBALL_OT_hide_metaelems"; /* callback functions */ @@ -443,8 +443,8 @@ static int reveal_metaelems_exec(bContext *C, wmOperator *UNUSED(op)) void MBALL_OT_reveal_metaelems(wmOperatorType *ot) { /* identifiers */ - ot->name= "Reveal"; - ot->description= "Reveal all hidden metaelements"; + ot->name= _("Reveal"); + ot->description= _("Reveal all hidden metaelements"); ot->idname= "MBALL_OT_reveal_metaelems"; /* callback functions */ diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 57ab39e32b2..39f77973876 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -351,7 +351,7 @@ void OBJECT_OT_add(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(object_type_items), 0, "Type", ""); + RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(object_type_items), 0, _("Type"), ""); ED_object_add_generic_props(ot, TRUE); } @@ -359,18 +359,18 @@ void OBJECT_OT_add(wmOperatorType *ot) /********************* Add Effector Operator ********************/ /* copy from rna_object_force.c*/ static EnumPropertyItem field_type_items[] = { - {PFIELD_FORCE, "FORCE", ICON_FORCE_FORCE, "Force", ""}, - {PFIELD_WIND, "WIND", ICON_FORCE_WIND, "Wind", ""}, - {PFIELD_VORTEX, "VORTEX", ICON_FORCE_VORTEX, "Vortex", ""}, - {PFIELD_MAGNET, "MAGNET", ICON_FORCE_MAGNETIC, "Magnetic", ""}, - {PFIELD_HARMONIC, "HARMONIC", ICON_FORCE_HARMONIC, "Harmonic", ""}, - {PFIELD_CHARGE, "CHARGE", ICON_FORCE_CHARGE, "Charge", ""}, - {PFIELD_LENNARDJ, "LENNARDJ", ICON_FORCE_LENNARDJONES, "Lennard-Jones", ""}, - {PFIELD_TEXTURE, "TEXTURE", ICON_FORCE_TEXTURE, "Texture", ""}, - {PFIELD_GUIDE, "GUIDE", ICON_FORCE_CURVE, "Curve Guide", ""}, - {PFIELD_BOID, "BOID", ICON_FORCE_BOID, "Boid", ""}, - {PFIELD_TURBULENCE, "TURBULENCE", ICON_FORCE_TURBULENCE, "Turbulence", ""}, - {PFIELD_DRAG, "DRAG", ICON_FORCE_DRAG, "Drag", ""}, + {PFIELD_FORCE, "FORCE", ICON_FORCE_FORCE, N_("Force"), ""}, + {PFIELD_WIND, "WIND", ICON_FORCE_WIND, N_("Wind"), ""}, + {PFIELD_VORTEX, "VORTEX", ICON_FORCE_VORTEX, N_("Vortex"), ""}, + {PFIELD_MAGNET, "MAGNET", ICON_FORCE_MAGNETIC, N_("Magnetic"), ""}, + {PFIELD_HARMONIC, "HARMONIC", ICON_FORCE_HARMONIC, N_("Harmonic"), ""}, + {PFIELD_CHARGE, "CHARGE", ICON_FORCE_CHARGE, N_("Charge"), ""}, + {PFIELD_LENNARDJ, "LENNARDJ", ICON_FORCE_LENNARDJONES, N_("Lennard-Jones"), ""}, + {PFIELD_TEXTURE, "TEXTURE", ICON_FORCE_TEXTURE, N_("Texture"), ""}, + {PFIELD_GUIDE, "GUIDE", ICON_FORCE_CURVE, N_("Curve Guide"), ""}, + {PFIELD_BOID, "BOID", ICON_FORCE_BOID, N_("Boid"), ""}, + {PFIELD_TURBULENCE, "TURBULENCE", ICON_FORCE_TURBULENCE, N_("Turbulence"), ""}, + {PFIELD_DRAG, "DRAG", ICON_FORCE_DRAG, N_("Drag"), ""}, {0, NULL, 0, NULL, NULL}}; /* for effector add primitive operators */ @@ -443,7 +443,7 @@ void OBJECT_OT_effector_add(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(field_type_items), 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(field_type_items), 0, _("Type"), ""); ED_object_add_generic_props(ot, TRUE); } @@ -575,7 +575,7 @@ void OBJECT_OT_metaball_add(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(metaelem_type_items), 0, "Primitive", ""); + RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(metaelem_type_items), 0, _("Primitive"), ""); ED_object_add_generic_props(ot, TRUE); } @@ -658,8 +658,8 @@ static int object_armature_add_exec(bContext *C, wmOperator *op) void OBJECT_OT_armature_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Armature"; - ot->description = "Add an armature object to the scene"; + ot->name= _("Add Armature"); + ot->description = _("Add an armature object to the scene"); ot->idname= "OBJECT_OT_armature_add"; /* api callbacks */ @@ -729,7 +729,7 @@ void OBJECT_OT_lamp_add(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(lamp_type_items), 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(lamp_type_items), 0, _("Type"), ""); ED_object_add_generic_props(ot, FALSE); } @@ -786,7 +786,7 @@ void OBJECT_OT_group_instance_add(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - prop= RNA_def_enum(ot->srna, "group", DummyRNA_NULL_items, 0, "Group", ""); + prop= RNA_def_enum(ot->srna, "group", DummyRNA_NULL_items, 0, _("Group"), ""); RNA_def_enum_funcs(prop, RNA_group_itemf); ot->prop= prop; ED_object_add_generic_props(ot, FALSE); @@ -1717,7 +1717,7 @@ void OBJECT_OT_duplicate(wmOperatorType *ot) /* to give to transform */ RNA_def_boolean(ot->srna, "linked", 0, _("Linked"), _("Duplicate object but not object data, linking to the original data")); - prop= RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, "Mode", ""); + prop= RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, _("Mode"), ""); RNA_def_property_flag(prop, PROP_HIDDEN); } diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c index 89ac7800c0f..6cd49ac3861 100644 --- a/source/blender/editors/object/object_constraint.c +++ b/source/blender/editors/object/object_constraint.c @@ -486,8 +486,8 @@ void object_test_constraints (Object *owner) #define EDIT_CONSTRAINT_OWNER_BONE 1 static EnumPropertyItem constraint_owner_items[] = { - {EDIT_CONSTRAINT_OWNER_OBJECT, "OBJECT", 0, "Object", "Edit a constraint on the active object"}, - {EDIT_CONSTRAINT_OWNER_BONE, "BONE", 0, "Bone", "Edit a constraint on the active bone"}, + {EDIT_CONSTRAINT_OWNER_OBJECT, "OBJECT", 0, N_("Object"), N_("Edit a constraint on the active object")}, + {EDIT_CONSTRAINT_OWNER_BONE, "BONE", 0, N_("Bone"), N_("Edit a constraint on the active bone")}, {0, NULL, 0, NULL, NULL}}; @@ -509,8 +509,8 @@ static int edit_constraint_poll(bContext *C) static void edit_constraint_properties(wmOperatorType *ot) { - RNA_def_string(ot->srna, "constraint", "", 32, "Constraint", "Name of the constraint to edit"); - RNA_def_enum(ot->srna, "owner", constraint_owner_items, 0, "Owner", "The owner of this constraint"); + RNA_def_string(ot->srna, "constraint", "", 32, _("Constraint"), _("Name of the constraint to edit")); + RNA_def_enum(ot->srna, "owner", RNA_enum_items_gettexted(constraint_owner_items), 0, _("Owner"), _("The owner of this constraint")); } static int edit_constraint_invoke_properties(bContext *C, wmOperator *op) @@ -611,9 +611,9 @@ static int stretchto_reset_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(e void CONSTRAINT_OT_stretchto_reset (wmOperatorType *ot) { /* identifiers */ - ot->name= "Reset Original Length"; + ot->name= _("Reset Original Length"); ot->idname= "CONSTRAINT_OT_stretchto_reset"; - ot->description= "Reset original length of bone for Stretch To Constraint"; + ot->description= _("Reset original length of bone for Stretch To Constraint"); ot->exec= stretchto_reset_exec; ot->invoke= stretchto_reset_invoke; @@ -654,9 +654,9 @@ static int limitdistance_reset_invoke(bContext *C, wmOperator *op, wmEvent *UNUS void CONSTRAINT_OT_limitdistance_reset (wmOperatorType *ot) { /* identifiers */ - ot->name= "Reset Distance"; + ot->name= _("Reset Distance"); ot->idname= "CONSTRAINT_OT_limitdistance_reset"; - ot->description= "Reset limiting distance for Limit Distance Constraint"; + ot->description= _("Reset limiting distance for Limit Distance Constraint"); ot->exec= limitdistance_reset_exec; ot->invoke= limitdistance_reset_invoke; @@ -744,9 +744,9 @@ static int childof_set_inverse_invoke(bContext *C, wmOperator *op, wmEvent *UNUS void CONSTRAINT_OT_childof_set_inverse (wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Inverse"; + ot->name= _("Set Inverse"); ot->idname= "CONSTRAINT_OT_childof_set_inverse"; - ot->description= "Set inverse correction for ChildOf constraint"; + ot->description= _("Set inverse correction for ChildOf constraint"); ot->exec= childof_set_inverse_exec; ot->invoke= childof_set_inverse_invoke; @@ -788,9 +788,9 @@ static int childof_clear_inverse_invoke(bContext *C, wmOperator *op, wmEvent *UN void CONSTRAINT_OT_childof_clear_inverse (wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Inverse"; + ot->name= _("Clear Inverse"); ot->idname= "CONSTRAINT_OT_childof_clear_inverse"; - ot->description= "Clear inverse correction for ChildOf constraint"; + ot->description= _("Clear inverse correction for ChildOf constraint"); ot->exec= childof_clear_inverse_exec; ot->invoke= childof_clear_inverse_invoke; @@ -874,9 +874,9 @@ static int constraint_delete_exec (bContext *C, wmOperator *UNUSED(op)) void CONSTRAINT_OT_delete (wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete Constraint"; + ot->name= _("Delete Constraint"); ot->idname= "CONSTRAINT_OT_delete"; - ot->description= "Remove constraint from constraint stack"; + ot->description= _("Remove constraint from constraint stack"); /* callbacks */ ot->exec= constraint_delete_exec; @@ -919,9 +919,9 @@ static int constraint_move_down_invoke(bContext *C, wmOperator *op, wmEvent *UNU void CONSTRAINT_OT_move_down (wmOperatorType *ot) { /* identifiers */ - ot->name= "Move Constraint Down"; + ot->name= _("Move Constraint Down"); ot->idname= "CONSTRAINT_OT_move_down"; - ot->description= "Move constraint down in constraint stack"; + ot->description= _("Move constraint down in constraint stack"); /* callbacks */ ot->exec= constraint_move_down_exec; @@ -966,9 +966,9 @@ static int constraint_move_up_invoke(bContext *C, wmOperator *op, wmEvent *UNUSE void CONSTRAINT_OT_move_up (wmOperatorType *ot) { /* identifiers */ - ot->name= "Move Constraint Up"; + ot->name= _("Move Constraint Up"); ot->idname= "CONSTRAINT_OT_move_up"; - ot->description= "Move constraint up in constraint stack"; + ot->description= _("Move constraint up in constraint stack"); /* callbacks */ ot->exec= constraint_move_up_exec; @@ -1013,9 +1013,9 @@ static int pose_constraints_clear_exec(bContext *C, wmOperator *UNUSED(op)) void POSE_OT_constraints_clear(wmOperatorType *ot) { /* identifiers */ - ot->name = "Clear Pose Constraints"; + ot->name = _("Clear Pose Constraints"); ot->idname= "POSE_OT_constraints_clear"; - ot->description= "Clear all the constraints for the selected bones"; + ot->description= _("Clear all the constraints for the selected bones"); /* callbacks */ ot->exec= pose_constraints_clear_exec; @@ -1455,7 +1455,7 @@ void OBJECT_OT_constraint_add(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", constraint_type_items, 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", constraint_type_items, 0, _("Type"), ""); } void OBJECT_OT_constraint_add_with_targets(wmOperatorType *ot) @@ -1474,7 +1474,7 @@ void OBJECT_OT_constraint_add_with_targets(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", constraint_type_items, 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", constraint_type_items, 0, _("Type"), ""); } void POSE_OT_constraint_add(wmOperatorType *ot) @@ -1493,7 +1493,7 @@ void POSE_OT_constraint_add(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", constraint_type_items, 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", constraint_type_items, 0, _("Type"), ""); } void POSE_OT_constraint_add_with_targets(wmOperatorType *ot) @@ -1512,7 +1512,7 @@ void POSE_OT_constraint_add_with_targets(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", constraint_type_items, 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", constraint_type_items, 0, _("Type"), ""); } /************************ IK Constraint operators *********************/ @@ -1636,8 +1636,8 @@ static int pose_ik_clear_exec(bContext *C, wmOperator *UNUSED(op)) void POSE_OT_ik_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove IK"; - ot->description= "Remove all IK Constraints from selected bones"; + ot->name= _("Remove IK"); + ot->description= _("Remove all IK Constraints from selected bones"); ot->idname= "POSE_OT_ik_clear"; /* api callbacks */ diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 5ee920734bf..dda2f55dee4 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -160,8 +160,8 @@ void OBJECT_OT_hide_view_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Restrict View"; - ot->description = "Reveal the object by setting the hide flag"; + ot->name= _("Clear Restrict View"); + ot->description = _("Reveal the object by setting the hide flag"); ot->idname= "OBJECT_OT_hide_view_clear"; /* api callbacks */ @@ -252,8 +252,8 @@ void OBJECT_OT_hide_render_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Restrict Render"; - ot->description = "Reveal the render object by setting the hide render flag"; + ot->name= _("Clear Restrict Render"); + ot->description = _("Reveal the render object by setting the hide render flag"); ot->idname= "OBJECT_OT_hide_render_clear"; /* api callbacks */ @@ -547,8 +547,8 @@ void OBJECT_OT_editmode_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Editmode"; - ot->description = "Toggle object's editmode"; + ot->name= _("Toggle Editmode"); + ot->description = _("Toggle object's editmode"); ot->idname= "OBJECT_OT_editmode_toggle"; /* api callbacks */ @@ -585,9 +585,9 @@ static int posemode_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_posemode_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Pose Mode"; + ot->name= _("Toggle Pose Mode"); ot->idname= "OBJECT_OT_posemode_toggle"; - ot->description= "Enables or disables posing/selecting bones"; + ot->description= _("Enables or disables posing/selecting bones"); /* api callbacks */ ot->exec= posemode_exec; @@ -1521,8 +1521,8 @@ void OBJECT_OT_forcefield_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Toggle Force Field"; - ot->description = "Toggle object's force field"; + ot->name= _("Toggle Force Field"); + ot->description = _("Toggle object's force field"); ot->idname= "OBJECT_OT_forcefield_toggle"; /* api callbacks */ @@ -1631,7 +1631,7 @@ static int object_clear_paths_exec (bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_paths_clear (wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Object Paths"; + ot->name= _("Clear Object Paths"); ot->idname= "OBJECT_OT_paths_clear"; ot->description= _("Clear path caches for selected bones"); @@ -1996,8 +1996,8 @@ void OBJECT_OT_mode_set(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Set Object Mode"; - ot->description = "Sets the object interaction mode"; + ot->name= _("Set Object Mode"); + ot->description = _("Sets the object interaction mode"); ot->idname= "OBJECT_OT_mode_set"; /* api callbacks */ @@ -2008,7 +2008,7 @@ void OBJECT_OT_mode_set(wmOperatorType *ot) /* flags */ ot->flag= 0; /* no register/undo here, leave it to operators being called */ - prop= RNA_def_enum(ot->srna, "mode", object_mode_items, OB_MODE_OBJECT, "Mode", ""); + prop= RNA_def_enum(ot->srna, "mode", object_mode_items, OB_MODE_OBJECT, _("Mode"), ""); RNA_def_enum_funcs(prop, object_mode_set_itemsf); RNA_def_boolean(ot->srna, "toggle", 0, _("Toggle"), ""); @@ -2056,8 +2056,8 @@ static int game_property_new(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_game_property_new(wmOperatorType *ot) { /* identifiers */ - ot->name= "New Game Property"; - ot->description= "Create a new property available to the game engine"; + ot->name= _("New Game Property"); + ot->description= _("Create a new property available to the game engine"); ot->idname= "OBJECT_OT_game_property_new"; /* api callbacks */ @@ -2094,8 +2094,8 @@ static int game_property_remove(bContext *C, wmOperator *op) void OBJECT_OT_game_property_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove Game Property"; - ot->description= "Remove game property"; + ot->name= _("Remove Game Property"); + ot->description= _("Remove game property"); ot->idname= "OBJECT_OT_game_property_remove"; /* api callbacks */ @@ -2113,9 +2113,9 @@ void OBJECT_OT_game_property_remove(wmOperatorType *ot) #define COPY_PROPERTIES_COPY 3 static EnumPropertyItem game_properties_copy_operations[] ={ - {COPY_PROPERTIES_REPLACE, "REPLACE", 0, "Replace Properties", ""}, - {COPY_PROPERTIES_MERGE, "MERGE", 0, "Merge Properties", ""}, - {COPY_PROPERTIES_COPY, "COPY", 0, "Copy a Property", ""}, + {COPY_PROPERTIES_REPLACE, "REPLACE", 0, N_("Replace Properties"), ""}, + {COPY_PROPERTIES_MERGE, "MERGE", 0, N_("Merge Properties"), ""}, + {COPY_PROPERTIES_COPY, "COPY", 0, N_("Copy a Property"), ""}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem gameprops_items[]= { @@ -2187,7 +2187,7 @@ void OBJECT_OT_game_property_copy(wmOperatorType *ot) { PropertyRNA *prop; /* identifiers */ - ot->name= "Copy Game Property"; + ot->name= _("Copy Game Property"); ot->idname= "OBJECT_OT_game_property_copy"; /* api callbacks */ @@ -2197,8 +2197,8 @@ void OBJECT_OT_game_property_copy(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_enum(ot->srna, "operation", game_properties_copy_operations, 3, "Operation", ""); - prop=RNA_def_enum(ot->srna, "property", gameprops_items, 0, "Property", "Properties to copy"); + RNA_def_enum(ot->srna, "operation", game_properties_copy_operations, 3, _("Operation"), ""); + prop=RNA_def_enum(ot->srna, "property", gameprops_items, 0, _("Property"), _("Properties to copy")); RNA_def_enum_funcs(prop, gameprops_itemf); ot->prop=prop; } @@ -2273,8 +2273,8 @@ static int logicbricks_copy_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_logic_bricks_copy(wmOperatorType *ot) { /* identifiers */ - ot->name= "Copy Logic Bricks to Selected"; - ot->description = "Copy logic bricks to other selected objects."; + ot->name= _("Copy Logic Bricks to Selected"); + ot->description = _("Copy logic bricks to other selected objects."); ot->idname= "OBJECT_OT_logic_bricks_copy"; /* api callbacks */ diff --git a/source/blender/editors/object/object_group.c b/source/blender/editors/object/object_group.c index 11883ec56e4..374f2ff918d 100644 --- a/source/blender/editors/object/object_group.c +++ b/source/blender/editors/object/object_group.c @@ -226,7 +226,7 @@ void GROUP_OT_create(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_string(ot->srna, "name", "Group", 32, "Name", "Name of the new group"); + RNA_def_string(ot->srna, "name", "Group", 32, _("Name"), _("Name of the new group")); } /****************** properties window operators *********************/ @@ -295,7 +295,7 @@ void OBJECT_OT_group_link(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - prop= RNA_def_enum(ot->srna, "group", DummyRNA_NULL_items, 0, "Group", ""); + prop= RNA_def_enum(ot->srna, "group", DummyRNA_NULL_items, 0, _("Group"), ""); RNA_def_enum_funcs(prop, RNA_group_local_itemf); ot->prop= prop; } diff --git a/source/blender/editors/object/object_lattice.c b/source/blender/editors/object/object_lattice.c index 14ce223db5e..688e1209750 100644 --- a/source/blender/editors/object/object_lattice.c +++ b/source/blender/editors/object/object_lattice.c @@ -39,6 +39,8 @@ #include "BLI_listbase.h" #include "BLI_utildefines.h" +#include "BLF_api.h" + #include "DNA_curve_types.h" #include "DNA_key_types.h" #include "DNA_lattice_types.h" @@ -241,8 +243,8 @@ static int select_all_exec(bContext *C, wmOperator *op) void LATTICE_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select or Deselect All"; - ot->description= "Change selection of all UVW control points"; + ot->name= _("Select or Deselect All"); + ot->description= _("Change selection of all UVW control points"); ot->idname= "LATTICE_OT_select_all"; /* api callbacks */ @@ -289,8 +291,8 @@ static int make_regular_exec(bContext *C, wmOperator *UNUSED(op)) void LATTICE_OT_make_regular(wmOperatorType *ot) { /* identifiers */ - ot->name= "Make Regular"; - ot->description= "Set UVW control points a uniform distance apart"; + ot->name= _("Make Regular"); + ot->description= _("Set UVW control points a uniform distance apart"); ot->idname= "LATTICE_OT_make_regular"; /* api callbacks */ diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index f751ed0bb62..23221885fa0 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -251,8 +251,8 @@ static int vertex_parent_set_exec(bContext *C, wmOperator *op) void OBJECT_OT_vertex_parent_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Make Vertex Parent"; - ot->description = "Parent selected objects to the selected vertices"; + ot->name= _("Make Vertex Parent"); + ot->description = _("Parent selected objects to the selected vertices"); ot->idname= "OBJECT_OT_vertex_parent_set"; /* api callbacks */ @@ -391,9 +391,9 @@ void OBJECT_OT_proxy_make (wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Make Proxy"; + ot->name= _("Make Proxy"); ot->idname= "OBJECT_OT_proxy_make"; - ot->description= "Add empty object to become local replacement data of a library-linked object"; + ot->description= _("Add empty object to become local replacement data of a library-linked object"); /* callbacks */ ot->invoke= make_proxy_invoke; @@ -404,8 +404,8 @@ void OBJECT_OT_proxy_make (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_string(ot->srna, "object", "", MAX_ID_NAME-2, "Proxy Object", "Name of lib-linked/grouped object to make a proxy for."); - prop= RNA_def_enum(ot->srna, "type", DummyRNA_DEFAULT_items, 0, "Type", "Group object"); /* XXX, relies on hard coded ID at the moment */ + RNA_def_string(ot->srna, "object", "", MAX_ID_NAME-2, _("Proxy Object"), _("Name of lib-linked/grouped object to make a proxy for.")); + prop= RNA_def_enum(ot->srna, "type", DummyRNA_DEFAULT_items, 0, _("Type"), _("Group object")); /* XXX, relies on hard coded ID at the moment */ RNA_def_enum_funcs(prop, proxy_group_object_itemf); ot->prop= prop; } @@ -413,9 +413,9 @@ void OBJECT_OT_proxy_make (wmOperatorType *ot) /********************** Clear Parent Operator ******************* */ static EnumPropertyItem prop_clear_parent_types[] = { - {0, "CLEAR", 0, "Clear Parent", ""}, - {1, "CLEAR_KEEP_TRANSFORM", 0, "Clear and Keep Transformation", ""}, - {2, "CLEAR_INVERSE", 0, "Clear Parent Inverse", ""}, + {0, "CLEAR", 0, N_("Clear Parent"), ""}, + {1, "CLEAR_KEEP_TRANSFORM", 0, N_("Clear and Keep Transformation"), ""}, + {2, "CLEAR_INVERSE", 0, N_("Clear Parent Inverse"), ""}, {0, NULL, 0, NULL, NULL} }; @@ -455,8 +455,8 @@ static int parent_clear_exec(bContext *C, wmOperator *op) void OBJECT_OT_parent_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Parent"; - ot->description = "Clear the object's parenting"; + ot->name= _("Clear Parent"); + ot->description = _("Clear the object's parenting"); ot->idname= "OBJECT_OT_parent_clear"; /* api callbacks */ @@ -468,7 +468,7 @@ void OBJECT_OT_parent_clear(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - ot->prop= RNA_def_enum(ot->srna, "type", prop_clear_parent_types, 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_clear_parent_types), 0, _("Type"), ""); } /* ******************** Make Parent Operator *********************** */ @@ -487,18 +487,18 @@ void OBJECT_OT_parent_clear(wmOperatorType *ot) #define PAR_TRIA 11 static EnumPropertyItem prop_make_parent_types[] = { - {PAR_OBJECT, "OBJECT", 0, "Object", ""}, - {PAR_ARMATURE, "ARMATURE", 0, "Armature Deform", ""}, - {PAR_ARMATURE_NAME, "ARMATURE_NAME", 0, " With Empty Groups", ""}, - {PAR_ARMATURE_AUTO, "ARMATURE_AUTO", 0, " With Automatic Weights", ""}, - {PAR_ARMATURE_ENVELOPE, "ARMATURE_ENVELOPE", 0, " With Envelope Weights", ""}, - {PAR_BONE, "BONE", 0, "Bone", ""}, - {PAR_CURVE, "CURVE", 0, "Curve Deform", ""}, - {PAR_FOLLOW, "FOLLOW", 0, "Follow Path", ""}, - {PAR_PATH_CONST, "PATH_CONST", 0, "Path Constraint", ""}, - {PAR_LATTICE, "LATTICE", 0, "Lattice Deform", ""}, - {PAR_VERTEX, "VERTEX", 0, "Vertex", ""}, - {PAR_TRIA, "TRIA", 0, "Triangle", ""}, + {PAR_OBJECT, "OBJECT", 0, N_("Object"), ""}, + {PAR_ARMATURE, "ARMATURE", 0, N_("Armature Deform"), ""}, + {PAR_ARMATURE_NAME, "ARMATURE_NAME", 0, N_(" With Empty Groups"), ""}, + {PAR_ARMATURE_AUTO, "ARMATURE_AUTO", 0, N_(" With Automatic Weights"), ""}, + {PAR_ARMATURE_ENVELOPE, "ARMATURE_ENVELOPE", 0, N_(" With Envelope Weights"), ""}, + {PAR_BONE, "BONE", 0, N_("Bone"), ""}, + {PAR_CURVE, "CURVE", 0, N_("Curve Deform"), ""}, + {PAR_FOLLOW, "FOLLOW", 0, N_("Follow Path"), ""}, + {PAR_PATH_CONST, "PATH_CONST", 0, N_("Path Constraint"), ""}, + {PAR_LATTICE, "LATTICE", 0, N_("Lattice Deform"), ""}, + {PAR_VERTEX, "VERTEX", 0, N_("Vertex"), ""}, + {PAR_TRIA, "TRIA", 0, N_("Triangle"), ""}, {0, NULL, 0, NULL, NULL} }; @@ -728,8 +728,8 @@ static int parent_set_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *UNUSE void OBJECT_OT_parent_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Make Parent"; - ot->description = "Set the object's parenting"; + ot->name= _("Make Parent"); + ot->description = _("Set the object's parenting"); ot->idname= "OBJECT_OT_parent_set"; /* api callbacks */ @@ -741,7 +741,7 @@ void OBJECT_OT_parent_set(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_enum(ot->srna, "type", prop_make_parent_types, 0, "Type", ""); + RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_make_parent_types), 0, _("Type"), ""); } /* ************ Make Parent Without Inverse Operator ******************* */ @@ -785,8 +785,8 @@ static int parent_noinv_set_exec(bContext *C, wmOperator *op) void OBJECT_OT_parent_no_inverse_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Make Parent without Inverse"; - ot->description = "Set the object's parenting without setting the inverse parent correction"; + ot->name= _("Make Parent without Inverse"); + ot->description = _("Set the object's parenting without setting the inverse parent correction"); ot->idname= "OBJECT_OT_parent_no_inverse_set"; /* api callbacks */ @@ -827,8 +827,8 @@ void OBJECT_OT_slow_parent_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Slow Parent"; - ot->description = "Clear the object's slow parent"; + ot->name= _("Clear Slow Parent"); + ot->description = _("Clear the object's slow parent"); ot->idname= "OBJECT_OT_slow_parent_clear"; /* api callbacks */ @@ -866,8 +866,8 @@ void OBJECT_OT_slow_parent_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Slow Parent"; - ot->description = "Set the object's slow parent"; + ot->name= _("Set Slow Parent"); + ot->description = _("Set the object's slow parent"); ot->idname= "OBJECT_OT_slow_parent_set"; /* api callbacks */ @@ -882,8 +882,8 @@ void OBJECT_OT_slow_parent_set(wmOperatorType *ot) /* ******************** Clear Track Operator ******************* */ static EnumPropertyItem prop_clear_track_types[] = { - {0, "CLEAR", 0, "Clear Track", ""}, - {1, "CLEAR_KEEP_TRANSFORM", 0, "Clear and Keep Transformation (Clear Track)", ""}, + {0, "CLEAR", 0, N_("Clear Track"), ""}, + {1, "CLEAR_KEEP_TRANSFORM", 0, N_("Clear and Keep Transformation (Clear Track)"), ""}, {0, NULL, 0, NULL, NULL} }; @@ -927,8 +927,8 @@ static int object_track_clear_exec(bContext *C, wmOperator *op) void OBJECT_OT_track_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear track"; - ot->description = "Clear tracking constraint or flag from object"; + ot->name= _("Clear track"); + ot->description = _("Clear tracking constraint or flag from object"); ot->idname= "OBJECT_OT_track_clear"; /* api callbacks */ @@ -940,15 +940,15 @@ void OBJECT_OT_track_clear(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - ot->prop= RNA_def_enum(ot->srna, "type", prop_clear_track_types, 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_clear_track_types), 0, _("Type"), ""); } /************************** Make Track Operator *****************************/ static EnumPropertyItem prop_make_track_types[] = { - {1, "DAMPTRACK", 0, "Damped Track Constraint", ""}, - {2, "TRACKTO", 0, "Track To Constraint", ""}, - {3, "LOCKTRACK", 0, "Lock Track Constraint", ""}, + {1, "DAMPTRACK", 0, N_("Damped Track Constraint"), ""}, + {2, "TRACKTO", 0, N_("Track To Constraint"), ""}, + {3, "LOCKTRACK", 0, N_("Lock Track Constraint"), ""}, {0, NULL, 0, NULL, NULL} }; @@ -1032,8 +1032,8 @@ static int track_set_exec(bContext *C, wmOperator *op) void OBJECT_OT_track_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Make Track"; - ot->description = "Make the object track another object, either by constraint or old way or locked track"; + ot->name= _("Make Track"); + ot->description = _("Make the object track another object, either by constraint or old way or locked track"); ot->idname= "OBJECT_OT_track_set"; /* api callbacks */ @@ -1046,7 +1046,7 @@ void OBJECT_OT_track_set(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", prop_make_track_types, 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_make_track_types), 0, _("Type"), ""); } /************************** Move to Layer Operator *****************************/ @@ -1143,8 +1143,8 @@ static int move_to_layer_exec(bContext *C, wmOperator *op) void OBJECT_OT_move_to_layer(wmOperatorType *ot) { /* identifiers */ - ot->name= "Move to Layer"; - ot->description = "Move the object to different layers"; + ot->name= _("Move to Layer"); + ot->description = _("Move the object to different layers"); ot->idname= "OBJECT_OT_move_to_layer"; /* api callbacks */ @@ -1156,7 +1156,7 @@ void OBJECT_OT_move_to_layer(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_boolean_layer_member(ot->srna, "layers", 20, NULL, "Layer", ""); + RNA_def_boolean_layer_member(ot->srna, "layers", 20, NULL, _("Layer"), ""); } /************************** Link to Scene Operator *****************************/ @@ -1319,7 +1319,7 @@ void OBJECT_OT_make_links_scene(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Link Objects to Scene"; + ot->name= _("Link Objects to Scene"); ot->description = _("Make linked data local to each object"); ot->idname= "OBJECT_OT_make_links_scene"; @@ -1348,8 +1348,8 @@ void OBJECT_OT_make_links_data(wmOperatorType *ot) {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= "Link Data"; - ot->description = "Make links from the active object to other selected objects"; + ot->name= _("Link Data"); + ot->description = _("Make links from the active object to other selected objects"); ot->idname= "OBJECT_OT_make_links_data"; /* api callbacks */ @@ -1789,8 +1789,8 @@ void OBJECT_OT_make_local(wmOperatorType *ot) {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= "Make Local"; - ot->description = "Make library linked datablocks local to this file"; + ot->name= _("Make Local"); + ot->description = _("Make library linked datablocks local to this file"); ot->idname= "OBJECT_OT_make_local"; /* api callbacks */ @@ -1802,7 +1802,7 @@ void OBJECT_OT_make_local(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(type_items), 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(type_items), 0, _("Type"), ""); } static int make_single_user_exec(bContext *C, wmOperator *op) @@ -1837,8 +1837,8 @@ static int make_single_user_exec(bContext *C, wmOperator *op) void OBJECT_OT_make_single_user(wmOperatorType *ot) { static EnumPropertyItem type_items[]= { - {SELECT, "SELECTED_OBJECTS", 0, "Selected Objects", ""}, - {0, "ALL", 0, "All", ""}, + {SELECT, "SELECTED_OBJECTS", 0, N_("Selected Objects"), ""}, + {0, "ALL", 0, N_("All"), ""}, {0, NULL, 0, NULL, NULL}}; /* identifiers */ @@ -1855,7 +1855,7 @@ void OBJECT_OT_make_single_user(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", type_items, SELECT, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(type_items), SELECT, _("Type"), ""); RNA_def_boolean(ot->srna, "object", 0, _("Object"), _("Make single user objects")); RNA_def_boolean(ot->srna, "obdata", 0, _("Object Data"), _("Make single user object data")); @@ -1890,7 +1890,7 @@ void OBJECT_OT_drop_named_material(wmOperatorType *ot) { /* identifiers */ - ot->name= "Drop Named Material on Object"; + ot->name= _("Drop Named Material on Object"); ot->description = ""; ot->idname= "OBJECT_OT_drop_named_material"; @@ -1902,5 +1902,5 @@ void OBJECT_OT_drop_named_material(wmOperatorType *ot) ot->flag= OPTYPE_UNDO; /* properties */ - RNA_def_string(ot->srna, "name", "Material", 24, "Name", "Material name to assign."); + RNA_def_string(ot->srna, "name", "Material", 24, _("Name"), _("Material name to assign.")); } diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c index 3492eda742a..0e88c84ea2a 100644 --- a/source/blender/editors/object/object_select.c +++ b/source/blender/editors/object/object_select.c @@ -166,7 +166,7 @@ void OBJECT_OT_select_by_type(wmOperatorType *ot) /* properties */ RNA_def_boolean(ot->srna, "extend", FALSE, _("Extend"), _("Extend selection instead of deselecting everything first.")); - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(object_type_items), 1, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(object_type_items), 1, _("Type"), ""); } /*********************** Selection by Links *********************/ @@ -348,7 +348,7 @@ void OBJECT_OT_select_linked(wmOperatorType *ot) /* properties */ RNA_def_boolean(ot->srna, "extend", FALSE, _("Extend"), _("Extend selection instead of deselecting everything first.")); - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_select_linked_types), 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_select_linked_types), 0, _("Type"), ""); } /*********************** Selected Grouped ********************/ @@ -636,7 +636,7 @@ void OBJECT_OT_select_grouped(wmOperatorType *ot) /* properties */ RNA_def_boolean(ot->srna, "extend", FALSE, _("Extend"), _("Extend selection instead of deselecting everything first.")); - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_select_grouped_types), 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_select_grouped_types), 0, _("Type"), ""); } /************************* Select by Layer **********************/ @@ -710,8 +710,8 @@ void OBJECT_OT_select_inverse(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Inverse"; - ot->description = "Invert selection of all visible objects"; + ot->name= _("Select Inverse"); + ot->description = _("Invert selection of all visible objects"); ot->idname= "OBJECT_OT_select_inverse"; /* api callbacks */ @@ -771,8 +771,8 @@ void OBJECT_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select or Deselect All"; - ot->description = "Change selection of all visible objects in scene"; + ot->name= _("Select or Deselect All"); + ot->description = _("Change selection of all visible objects in scene"); ot->idname= "OBJECT_OT_select_all"; /* api callbacks */ @@ -820,8 +820,8 @@ void OBJECT_OT_select_same_group(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Same Group"; - ot->description = "Select object in the same group"; + ot->name= _("Select Same Group"); + ot->description = _("Select object in the same group"); ot->idname= "OBJECT_OT_select_same_group"; /* api callbacks */ @@ -831,7 +831,7 @@ void OBJECT_OT_select_same_group(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_string(ot->srna, "group", "", 32, "Group", "Name of the group to select."); + RNA_def_string(ot->srna, "group", "", 32, _("Group"), _("Name of the group to select.")); } /**************************** Select Mirror ****************************/ diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c index dfe0b6e96bc..f4bcc622a0f 100644 --- a/source/blender/editors/object/object_transform.c +++ b/source/blender/editors/object/object_transform.c @@ -272,8 +272,8 @@ static int object_location_clear_exec(bContext *C, wmOperator *op) void OBJECT_OT_location_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Location"; - ot->description = "Clear the object's location"; + ot->name= _("Clear Location"); + ot->description = _("Clear the object's location"); ot->idname= "OBJECT_OT_location_clear"; /* api callbacks */ @@ -292,8 +292,8 @@ static int object_rotation_clear_exec(bContext *C, wmOperator *op) void OBJECT_OT_rotation_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Rotation"; - ot->description = "Clear the object's rotation"; + ot->name= _("Clear Rotation"); + ot->description = _("Clear the object's rotation"); ot->idname= "OBJECT_OT_rotation_clear"; /* api callbacks */ @@ -312,8 +312,8 @@ static int object_scale_clear_exec(bContext *C, wmOperator *op) void OBJECT_OT_scale_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Scale"; - ot->description = "Clear the object's scale"; + ot->name= _("Clear Scale"); + ot->description = _("Clear the object's scale"); ot->idname= "OBJECT_OT_scale_clear"; /* api callbacks */ @@ -357,8 +357,8 @@ static int object_origin_clear_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_origin_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Origin"; - ot->description = "Clear the object's origin"; + ot->name= _("Clear Origin"); + ot->description = _("Clear the object's origin"); ot->idname= "OBJECT_OT_origin_clear"; /* api callbacks */ @@ -586,8 +586,8 @@ static int visual_transform_apply_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_visual_transform_apply(wmOperatorType *ot) { /* identifiers */ - ot->name= "Apply Visual Transform"; - ot->description = "Apply the object's visual transformation to its data"; + ot->name= _("Apply Visual Transform"); + ot->description = _("Apply the object's visual transformation to its data"); ot->idname= "OBJECT_OT_visual_transform_apply"; /* api callbacks */ @@ -925,8 +925,8 @@ void OBJECT_OT_origin_set(wmOperatorType *ot) }; static EnumPropertyItem prop_set_bounds_types[] = { - {V3D_CENTROID, "MEDIAN", 0, "Median Center", ""}, - {V3D_CENTER, "BOUNDS", 0, "Bounds Center", ""}, + {V3D_CENTROID, "MEDIAN", 0, N_("Median Center"), ""}, + {V3D_CENTER, "BOUNDS", 0, N_("Bounds Center"), ""}, {0, NULL, 0, NULL, NULL} }; @@ -944,7 +944,7 @@ void OBJECT_OT_origin_set(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_set_center_types), 0, "Type", ""); - RNA_def_enum(ot->srna, "center", prop_set_bounds_types, V3D_CENTROID, "Center", ""); + ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_set_center_types), 0, _("Type"), ""); + RNA_def_enum(ot->srna, "center", RNA_enum_items_gettexted(prop_set_bounds_types), V3D_CENTROID, _("Center"), ""); } diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index b5eae97d6cd..8a82df89403 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -1356,7 +1356,7 @@ static int select_all_exec(bContext *C, wmOperator *op) void PARTICLE_OT_select_all(wmOperatorType *ot) { /* identifiers */ - ot->name= "Selection of all particles"; + ot->name= _("Selection of all particles"); ot->idname= "PARTICLE_OT_select_all"; /* api callbacks */ @@ -1430,7 +1430,7 @@ static int select_roots_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_select_roots(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Roots"; + ot->name= _("Select Roots"); ot->idname= "PARTICLE_OT_select_roots"; /* api callbacks */ @@ -1470,7 +1470,7 @@ static int select_tips_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_select_tips(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Tips"; + ot->name= _("Select Tips"); ot->idname= "PARTICLE_OT_select_tips"; /* api callbacks */ @@ -1527,7 +1527,7 @@ void PARTICLE_OT_select_linked(wmOperatorType *ot) /* properties */ RNA_def_boolean(ot->srna, "deselect", 0, _("Deselect"), _("Deselect linked keys rather than selecting them.")); - RNA_def_int_vector(ot->srna, "location", 2, NULL, 0, INT_MAX, "Location", "", 0, 16384); + RNA_def_int_vector(ot->srna, "location", 2, NULL, 0, INT_MAX, _("Location"), "", 0, 16384); } /************************ border select operator ************************/ @@ -1744,7 +1744,7 @@ static int reveal_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_reveal(wmOperatorType *ot) { /* identifiers */ - ot->name= "Reveal"; + ot->name= _("Reveal"); ot->idname= "PARTICLE_OT_reveal"; /* api callbacks */ @@ -1802,7 +1802,7 @@ static int select_less_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_select_less(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Less"; + ot->name= _("Select Less"); ot->idname= "PARTICLE_OT_select_less"; /* api callbacks */ @@ -1863,7 +1863,7 @@ static int select_more_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_select_more(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select More"; + ot->name= _("Select More"); ot->idname= "PARTICLE_OT_select_more"; /* api callbacks */ @@ -1900,7 +1900,7 @@ static int select_inverse_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_select_inverse(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Inverse"; + ot->name= _("Select Inverse"); ot->idname= "PARTICLE_OT_select_inverse"; /* api callbacks */ @@ -1996,7 +1996,7 @@ static int rekey_exec(bContext *C, wmOperator *op) void PARTICLE_OT_rekey(wmOperatorType *ot) { /* identifiers */ - ot->name= "Rekey"; + ot->name= _("Rekey"); ot->idname= "PARTICLE_OT_rekey"; /* api callbacks */ @@ -2326,7 +2326,7 @@ static int subdivide_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_subdivide(wmOperatorType *ot) { /* identifiers */ - ot->name= "Subdivide"; + ot->name= _("Subdivide"); ot->idname= "PARTICLE_OT_subdivide"; /* api callbacks */ @@ -2414,7 +2414,7 @@ static int remove_doubles_exec(bContext *C, wmOperator *op) void PARTICLE_OT_remove_doubles(wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove Doubles"; + ot->name= _("Remove Doubles"); ot->idname= "PARTICLE_OT_remove_doubles"; /* api callbacks */ @@ -2425,7 +2425,7 @@ void PARTICLE_OT_remove_doubles(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_float(ot->srna, "threshold", 0.0002f, 0.0f, FLT_MAX, "Threshold", "Threshold distance withing which particles are removed", 0.00001f, 0.1f); + RNA_def_float(ot->srna, "threshold", 0.0002f, 0.0f, FLT_MAX, _("Threshold"), _("Threshold distance withing which particles are removed"), 0.00001f, 0.1f); } @@ -2464,7 +2464,7 @@ static int weight_set_exec(bContext *C, wmOperator *op) void PARTICLE_OT_weight_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Weight Set"; + ot->name= _("Weight Set"); ot->idname= "PARTICLE_OT_weight_set"; /* api callbacks */ @@ -2474,7 +2474,7 @@ void PARTICLE_OT_weight_set(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_float(ot->srna, "factor", 1, 0, 1, "Factor", "", 0, 1); + RNA_def_float(ot->srna, "factor", 1, 0, 1, _("Factor"), "", 0, 1); } /************************ cursor drawing *******************************/ @@ -2567,7 +2567,7 @@ static int delete_exec(bContext *C, wmOperator *op) void PARTICLE_OT_delete(wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete"; + ot->name= _("Delete"); ot->idname= "PARTICLE_OT_delete"; /* api callbacks */ @@ -2579,7 +2579,7 @@ void PARTICLE_OT_delete(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", delete_type_items, DEL_PARTICLE, "Type", "Delete a full particle or only keys."); + ot->prop= RNA_def_enum(ot->srna, "type", delete_type_items, DEL_PARTICLE, _("Type"), _("Delete a full particle or only keys.")); } /*************************** mirror operator **************************/ @@ -2727,7 +2727,7 @@ static int mirror_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_mirror(wmOperatorType *ot) { /* identifiers */ - ot->name= "Mirror"; + ot->name= _("Mirror"); ot->idname= "PARTICLE_OT_mirror"; /* api callbacks */ @@ -3744,7 +3744,7 @@ static int brush_edit_cancel(bContext *UNUSED(C), wmOperator *op) void PARTICLE_OT_brush_edit(wmOperatorType *ot) { /* identifiers */ - ot->name= "Brush Edit"; + ot->name= _("Brush Edit"); ot->idname= "PARTICLE_OT_brush_edit"; /* api callbacks */ @@ -3758,7 +3758,7 @@ void PARTICLE_OT_brush_edit(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; /* properties */ - RNA_def_collection_runtime(ot->srna, "stroke", &RNA_OperatorStrokeElement, "Stroke", ""); + RNA_def_collection_runtime(ot->srna, "stroke", &RNA_OperatorStrokeElement, _("Stroke"), ""); } /*********************** undo ***************************/ @@ -4234,7 +4234,7 @@ static int particle_edit_toggle_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_particle_edit_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Particle Edit Toggle"; + ot->name= _("Particle Edit Toggle"); ot->idname= "PARTICLE_OT_particle_edit_toggle"; /* api callbacks */ @@ -4283,7 +4283,7 @@ static int clear_edited_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_edited_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Edited"; + ot->name= _("Clear Edited"); ot->idname= "PARTICLE_OT_edited_clear"; /* api callbacks */ diff --git a/source/blender/editors/render/render_view.c b/source/blender/editors/render/render_view.c index 21c820a1e07..3fa6c2123a8 100644 --- a/source/blender/editors/render/render_view.c +++ b/source/blender/editors/render/render_view.c @@ -282,8 +282,8 @@ static int render_view_cancel_exec(bContext *C, wmOperator *UNUSED(op)) void RENDER_OT_view_cancel(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Cancel Render View"; - ot->description= "Cancel show render view"; + ot->name= _("Cancel Render View"); + ot->description= _("Cancel show render view"); ot->idname= "RENDER_OT_view_cancel"; /* api callbacks */ diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 3c406c80926..e81b032fdf3 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -639,8 +639,8 @@ static int actionzone_cancel(bContext *UNUSED(C), wmOperator *op) static void SCREEN_OT_actionzone(wmOperatorType *ot) { /* identifiers */ - ot->name= "Handle area action zones"; - ot->description= "Handle area action zones for mouse actions/gestures"; + ot->name= _("Handle area action zones"); + ot->description= _("Handle area action zones for mouse actions/gestures"); ot->idname= "SCREEN_OT_actionzone"; ot->invoke= actionzone_invoke; @@ -762,8 +762,8 @@ static int area_swap_modal(bContext *C, wmOperator *op, wmEvent *event) static void SCREEN_OT_area_swap(wmOperatorType *ot) { - ot->name= "Swap areas"; - ot->description= "Swap selected areas screen positions"; + ot->name= _("Swap areas"); + ot->description= _("Swap selected areas screen positions"); ot->idname= "SCREEN_OT_area_swap"; ot->invoke= area_swap_invoke; @@ -1078,8 +1078,8 @@ static int area_move_modal(bContext *C, wmOperator *op, wmEvent *event) static void SCREEN_OT_area_move(wmOperatorType *ot) { /* identifiers */ - ot->name= "Move area edges"; - ot->description= "Move selected area edges"; + ot->name= _("Move area edges"); + ot->description= _("Move selected area edges"); ot->idname= "SCREEN_OT_area_move"; ot->exec= area_move_exec; @@ -1492,14 +1492,14 @@ static int area_split_modal(bContext *C, wmOperator *op, wmEvent *event) } static EnumPropertyItem prop_direction_items[] = { -{'h', "HORIZONTAL", 0, "Horizontal", ""}, -{'v', "VERTICAL", 0, "Vertical", ""}, +{'h', "HORIZONTAL", 0, N_("Horizontal"), ""}, +{'v', "VERTICAL", 0, N_("Vertical"), ""}, {0, NULL, 0, NULL, NULL}}; static void SCREEN_OT_area_split(wmOperatorType *ot) { - ot->name = "Split area"; - ot->description= "Split selected area into new windows"; + ot->name = _("Split area"); + ot->description= _("Split selected area into new windows"); ot->idname = "SCREEN_OT_area_split"; ot->exec= area_split_exec; @@ -1511,7 +1511,7 @@ static void SCREEN_OT_area_split(wmOperatorType *ot) ot->flag= OPTYPE_BLOCKING; /* rna */ - RNA_def_enum(ot->srna, "direction", prop_direction_items, 'h', _("Direction"), ""); + RNA_def_enum(ot->srna, "direction", RNA_enum_items_gettexted(prop_direction_items), 'h', _("Direction"), ""); RNA_def_float(ot->srna, "factor", 0.5f, 0.0, 1.0, _("Factor"), "", 0.0, 1.0); RNA_def_int(ot->srna, "mouse_x", -100, INT_MIN, INT_MAX, _("Mouse X"), "", INT_MIN, INT_MAX); RNA_def_int(ot->srna, "mouse_y", -100, INT_MIN, INT_MAX, _("Mouse Y"), "", INT_MIN, INT_MAX); @@ -1716,8 +1716,8 @@ int region_scale_cancel(bContext *UNUSED(C), wmOperator *op) static void SCREEN_OT_region_scale(wmOperatorType *ot) { /* identifiers */ - ot->name= "Scale Region Size"; - ot->description= "Scale selected area"; + ot->name= _("Scale Region Size"); + ot->description= _("Scale selected area"); ot->idname= "SCREEN_OT_region_scale"; ot->invoke= region_scale_invoke; @@ -1751,7 +1751,7 @@ static int frame_offset_exec(bContext *C, wmOperator *op) static void SCREEN_OT_frame_offset(wmOperatorType *ot) { - ot->name = "Frame Offset"; + ot->name = _("Frame Offset"); ot->idname = "SCREEN_OT_frame_offset"; ot->exec= frame_offset_exec; @@ -1946,8 +1946,8 @@ static int screen_set_exec(bContext *C, wmOperator *op) static void SCREEN_OT_screen_set(wmOperatorType *ot) { - ot->name = "Set Screen"; - ot->description= "Cycle through available screens"; + ot->name = _("Set Screen"); + ot->description= _("Cycle through available screens"); ot->idname = "SCREEN_OT_screen_set"; ot->exec= screen_set_exec; @@ -2268,8 +2268,8 @@ static int area_join_modal(bContext *C, wmOperator *op, wmEvent *event) static void SCREEN_OT_area_join(wmOperatorType *ot) { /* identifiers */ - ot->name= "Join area"; - ot->description= "Join selected areas into new window"; + ot->name= _("Join area"); + ot->description= _("Join selected areas into new window"); ot->idname= "SCREEN_OT_area_join"; /* api callbacks */ @@ -2327,8 +2327,8 @@ static int screen_area_options_invoke(bContext *C, wmOperator *op, wmEvent *even static void SCREEN_OT_area_options(wmOperatorType *ot) { /* identifiers */ - ot->name= "Area Options"; - ot->description= "Operations for splitting and merging"; + ot->name= _("Area Options"); + ot->description= _("Operations for splitting and merging"); ot->idname= "SCREEN_OT_area_options"; /* api callbacks */ @@ -2368,8 +2368,8 @@ static int spacedata_cleanup(bContext *C, wmOperator *op) static void SCREEN_OT_spacedata_cleanup(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clean-up space-data"; - ot->description= "Remove unused settings for invisible editors"; + ot->name= _("Clean-up space-data"); + ot->description= _("Remove unused settings for invisible editors"); ot->idname= "SCREEN_OT_spacedata_cleanup"; /* api callbacks */ @@ -2446,7 +2446,7 @@ static int repeat_history_exec(bContext *C, wmOperator *op) static void SCREEN_OT_repeat_history(wmOperatorType *ot) { /* identifiers */ - ot->name= "Repeat History"; + ot->name= _("Repeat History"); ot->description= _("Display menu for previous actions performed"); ot->idname= "SCREEN_OT_repeat_history"; @@ -2474,8 +2474,8 @@ static int redo_last_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *UNUSED static void SCREEN_OT_redo_last(wmOperatorType *ot) { /* identifiers */ - ot->name= "Redo Last"; - ot->description= "Display menu for last action performed"; + ot->name= _("Redo Last"); + ot->description= _("Display menu for last action performed"); ot->idname= "SCREEN_OT_redo_last"; /* api callbacks */ @@ -2619,7 +2619,7 @@ static int region_flip_exec(bContext *C, wmOperator *UNUSED(op)) static void SCREEN_OT_region_flip(wmOperatorType *ot) { /* identifiers */ - ot->name= "Flip Region"; + ot->name= _("Flip Region"); ot->idname= "SCREEN_OT_region_flip"; /* api callbacks */ @@ -2668,7 +2668,7 @@ static int header_flip_exec(bContext *C, wmOperator *UNUSED(op)) static void SCREEN_OT_header_flip(wmOperatorType *ot) { /* identifiers */ - ot->name= "Flip Header Region"; + ot->name= _("Flip Header Region"); ot->idname= "SCREEN_OT_header_flip"; /* api callbacks */ @@ -2714,8 +2714,8 @@ static int header_toolbox_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *U static void SCREEN_OT_header_toolbox(wmOperatorType *ot) { /* identifiers */ - ot->name= "Header Toolbox"; - ot->description="Display header region toolbox"; + ot->name= _("Header Toolbox"); + ot->description=_("Display header region toolbox"); ot->idname= "SCREEN_OT_header_toolbox"; /* api callbacks */ @@ -2914,8 +2914,8 @@ static int screen_animation_step(bContext *C, wmOperator *UNUSED(op), wmEvent *e static void SCREEN_OT_animation_step(wmOperatorType *ot) { /* identifiers */ - ot->name= "Animation Step"; - ot->description= "Step through animation by position"; + ot->name= _("Animation Step"); + ot->description= _("Step through animation by position"); ot->idname= "SCREEN_OT_animation_step"; /* api callbacks */ @@ -3061,7 +3061,7 @@ static int border_select_do(bContext *C, wmOperator *op) static void SCREEN_OT_border_select(wmOperatorType *ot) { /* identifiers */ - ot->name= "Border select"; + ot->name= _("Border select"); ot->idname= "SCREEN_OT_border_select"; /* api callbacks */ @@ -3107,8 +3107,8 @@ static int fullscreen_back_exec(bContext *C, wmOperator *op) static void SCREEN_OT_back_to_previous(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Back to Previous Screen"; - ot->description= "Revert back to the original screen layout, before fullscreen area overlay"; + ot->name= _("Back to Previous Screen"); + ot->description= _("Revert back to the original screen layout, before fullscreen area overlay"); ot->idname= "SCREEN_OT_back_to_previous"; /* api callbacks */ @@ -3142,7 +3142,7 @@ static int userpref_show_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *ev static void SCREEN_OT_userpref_show(struct wmOperatorType *ot) { /* identifiers */ - ot->name= "Show/Hide User Preferences"; + ot->name= _("Show/Hide User Preferences"); ot->description= _("Show/hide user preferences"); ot->idname= "SCREEN_OT_userpref_show"; @@ -3167,7 +3167,7 @@ static int screen_new_exec(bContext *C, wmOperator *UNUSED(op)) static void SCREEN_OT_new(wmOperatorType *ot) { /* identifiers */ - ot->name= "New Screen"; + ot->name= _("New Screen"); ot->description= _("Add a new screen"); ot->idname= "SCREEN_OT_new"; @@ -3346,15 +3346,15 @@ void ED_operatortypes_screen(void) static void keymap_modal_set(wmKeyConfig *keyconf) { static EnumPropertyItem modal_items[] = { - {KM_MODAL_CANCEL, "CANCEL", 0, "Cancel", ""}, - {KM_MODAL_APPLY, "APPLY", 0, "Apply", ""}, - {KM_MODAL_STEP10, "STEP10", 0, "Steps on", ""}, - {KM_MODAL_STEP10_OFF, "STEP10_OFF", 0, "Steps off", ""}, + {KM_MODAL_CANCEL, "CANCEL", 0, N_("Cancel"), ""}, + {KM_MODAL_APPLY, "APPLY", 0, N_("Apply"), ""}, + {KM_MODAL_STEP10, "STEP10", 0, N_("Steps on"), ""}, + {KM_MODAL_STEP10_OFF, "STEP10_OFF", 0, N_("Steps off"), ""}, {0, NULL, 0, NULL, NULL}}; wmKeyMap *keymap; /* Standard Modal keymap ------------------------------------------------ */ - keymap= WM_modalkeymap_add(keyconf, "Standard Modal Map", modal_items); + keymap= WM_modalkeymap_add(keyconf, "Standard Modal Map", RNA_enum_items_gettexted(modal_items)); WM_modalkeymap_add_item(keymap, ESCKEY, KM_PRESS, KM_ANY, 0, KM_MODAL_CANCEL); WM_modalkeymap_add_item(keymap, LEFTMOUSE, KM_ANY, KM_ANY, 0, KM_MODAL_APPLY); diff --git a/source/blender/editors/screen/screendump.c b/source/blender/editors/screen/screendump.c index 916d50f7ee4..d9b3961c8b8 100644 --- a/source/blender/editors/screen/screendump.c +++ b/source/blender/editors/screen/screendump.c @@ -386,7 +386,7 @@ void SCREEN_OT_screencast(wmOperatorType *ot) ot->flag= 0; - RNA_def_property(ot->srna, "filepath", PROP_STRING, PROP_FILEPATH); + RNA_def_property(ot->srna, _("filepath"), PROP_STRING, PROP_FILEPATH); RNA_def_boolean(ot->srna, "full", 1, _("Full Screen"), ""); } diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index cae5c14aa97..ccfb7b9d4ea 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -52,6 +52,8 @@ #include "BLI_threads.h" #include "BLI_utildefines.h" +#include "BLF_api.h" + #include "PIL_time.h" #include "IMB_imbuf.h" @@ -4981,7 +4983,7 @@ static int paint_cancel(bContext *C, wmOperator *op) void PAINT_OT_image_paint(wmOperatorType *ot) { /* identifiers */ - ot->name= "Image Paint"; + ot->name= _("Image Paint"); ot->idname= "PAINT_OT_image_paint"; /* api callbacks */ @@ -4995,7 +4997,7 @@ void PAINT_OT_image_paint(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; /* properties */ - RNA_def_collection_runtime(ot->srna, "stroke", &RNA_OperatorStrokeElement, "Stroke", ""); + RNA_def_collection_runtime(ot->srna, "stroke", &RNA_OperatorStrokeElement, _("Stroke"), ""); } static int get_imapaint_zoom(bContext *C, float *zoomx, float *zoomy) @@ -5170,7 +5172,7 @@ static int grab_clone_cancel(bContext *UNUSED(C), wmOperator *op) void PAINT_OT_grab_clone(wmOperatorType *ot) { /* identifiers */ - ot->name= "Grab Clone"; + ot->name= _("Grab Clone"); ot->idname= "PAINT_OT_grab_clone"; /* api callbacks */ @@ -5184,7 +5186,7 @@ void PAINT_OT_grab_clone(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; /* properties */ - RNA_def_float_vector(ot->srna, "delta", 2, NULL, -FLT_MAX, FLT_MAX, "Delta", "Delta offset of clone image in 0.0..1.0 coordinates.", -1.0f, 1.0f); + RNA_def_float_vector(ot->srna, "delta", 2, NULL, -FLT_MAX, FLT_MAX, _("Delta"), _("Delta offset of clone image in 0.0..1.0 coordinates."), -1.0f, 1.0f); } /******************** sample color operator ********************/ @@ -5252,7 +5254,7 @@ static int image_paint_sample_color_poll(bContext *C) void PAINT_OT_sample_color(wmOperatorType *ot) { /* identifiers */ - ot->name= "Sample Color"; + ot->name= _("Sample Color"); ot->idname= "PAINT_OT_sample_color"; /* api callbacks */ @@ -5265,7 +5267,7 @@ void PAINT_OT_sample_color(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_int_vector(ot->srna, "location", 2, NULL, 0, INT_MAX, "Location", "Cursor location in region coordinates.", 0, 16384); + RNA_def_int_vector(ot->srna, "location", 2, NULL, 0, INT_MAX, _("Location"), _("Cursor location in region coordinates."), 0, 16384); } /******************** set clone cursor operator ********************/ @@ -5303,7 +5305,7 @@ static int set_clone_cursor_invoke(bContext *C, wmOperator *op, wmEvent *event) void PAINT_OT_clone_cursor_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Clone Cursor"; + ot->name= _("Set Clone Cursor"); ot->idname= "PAINT_OT_clone_cursor_set"; /* api callbacks */ @@ -5315,7 +5317,7 @@ void PAINT_OT_clone_cursor_set(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_float_vector(ot->srna, "location", 3, NULL, -FLT_MAX, FLT_MAX, "Location", "Cursor location in world space coordinates.", -10000.0f, 10000.0f); + RNA_def_float_vector(ot->srna, "location", 3, NULL, -FLT_MAX, FLT_MAX, _("Location"), _("Cursor location in world space coordinates."), -10000.0f, 10000.0f); } /******************** texture paint toggle operator ********************/ @@ -5385,7 +5387,7 @@ static int texture_paint_toggle_exec(bContext *C, wmOperator *op) void PAINT_OT_texture_paint_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Texture Paint Toggle"; + ot->name= _("Texture Paint Toggle"); ot->idname= "PAINT_OT_texture_paint_toggle"; /* api callbacks */ @@ -5521,9 +5523,9 @@ void PAINT_OT_project_image(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Project Image"; + ot->name= _("Project Image"); ot->idname= "PAINT_OT_project_image"; - ot->description= "Project an edited render from the active camera back onto the object"; + ot->description= _("Project an edited render from the active camera back onto the object"); /* api callbacks */ ot->invoke= WM_enum_search_invoke; @@ -5532,7 +5534,7 @@ void PAINT_OT_project_image(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - prop= RNA_def_enum(ot->srna, "image", DummyRNA_NULL_items, 0, "Image", ""); + prop= RNA_def_enum(ot->srna, "image", DummyRNA_NULL_items, 0, _("Image"), ""); RNA_def_enum_funcs(prop, RNA_image_itemf); ot->prop= prop; } @@ -5600,9 +5602,9 @@ static int texture_paint_image_from_view_exec(bContext *C, wmOperator *op) void PAINT_OT_image_from_view(wmOperatorType *ot) { /* identifiers */ - ot->name= "Image from View"; + ot->name= _("Image from View"); ot->idname= "PAINT_OT_image_from_view"; - ot->description= "Make an image from the current 3D view for re-projection"; + ot->description= _("Make an image from the current 3D view for re-projection"); /* api callbacks */ ot->exec= texture_paint_image_from_view_exec; @@ -5611,5 +5613,5 @@ void PAINT_OT_image_from_view(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER; - RNA_def_string_file_name(ot->srna, "filepath", "", FILE_MAX, "File Path", "Name of the file"); + RNA_def_string_file_name(ot->srna, "filepath", "", FILE_MAX, _("File Path"), _("Name of the file")); } diff --git a/source/blender/editors/sculpt_paint/paint_ops.c b/source/blender/editors/sculpt_paint/paint_ops.c index 69af50415cc..f53bc4208e0 100644 --- a/source/blender/editors/sculpt_paint/paint_ops.c +++ b/source/blender/editors/sculpt_paint/paint_ops.c @@ -29,6 +29,8 @@ #include "BLI_string.h" #include "BLI_utildefines.h" +#include "BLF_api.h" + #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_brush_types.h" @@ -76,8 +78,8 @@ static int brush_add_exec(bContext *C, wmOperator *UNUSED(op)) static void BRUSH_OT_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Brush"; - ot->description= "Add brush by mode type"; + ot->name= _("Add Brush"); + ot->description= _("Add brush by mode type"); ot->idname= "BRUSH_OT_add"; /* api callbacks */ @@ -131,8 +133,8 @@ static int brush_scale_size_exec(bContext *C, wmOperator *op) static void BRUSH_OT_scale_size(wmOperatorType *ot) { /* identifiers */ - ot->name= "Scale Sculpt/Paint Brush Size"; - ot->description= "Change brush size by a scalar"; + ot->name= _("Scale Sculpt/Paint Brush Size"); + ot->description= _("Change brush size by a scalar"); ot->idname= "BRUSH_OT_scale_size"; /* api callbacks */ @@ -141,7 +143,7 @@ static void BRUSH_OT_scale_size(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_float(ot->srna, "scalar", 1, 0, 2, "Scalar", "Factor to scale brush size by", 0, 2); + RNA_def_float(ot->srna, "scalar", 1, 0, 2, _("Scalar"), _("Factor to scale brush size by"), 0, 2); } static int vertex_color_set_exec(bContext *C, wmOperator *UNUSED(op)) @@ -158,7 +160,7 @@ static int vertex_color_set_exec(bContext *C, wmOperator *UNUSED(op)) static void PAINT_OT_vertex_color_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Vertex Colors"; + ot->name= _("Set Vertex Colors"); ot->idname= "PAINT_OT_vertex_color_set"; /* api callbacks */ @@ -187,8 +189,8 @@ static int brush_reset_exec(bContext *C, wmOperator *UNUSED(op)) static void BRUSH_OT_reset(wmOperatorType *ot) { /* identifiers */ - ot->name= "Reset Brush"; - ot->description= "Return brush to defaults based on current tool"; + ot->name= _("Reset Brush"); + ot->description= _("Return brush to defaults based on current tool"); ot->idname= "BRUSH_OT_reset"; /* api callbacks */ @@ -250,8 +252,8 @@ static int brush_sculpt_tool_set_exec(bContext *C, wmOperator *op) static void BRUSH_OT_sculpt_tool_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Sculpt Tool Set"; - ot->description= "Set the sculpt tool"; + ot->name= _("Sculpt Tool Set"); + ot->description= _("Set the sculpt tool"); ot->idname= "BRUSH_OT_sculpt_tool_set"; /* api callbacks */ @@ -261,7 +263,7 @@ static void BRUSH_OT_sculpt_tool_set(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - ot->prop= RNA_def_enum(ot->srna, "tool", brush_sculpt_tool_items, 0, "Tool", ""); + ot->prop= RNA_def_enum(ot->srna, "tool", brush_sculpt_tool_items, 0, _("Tool"), ""); } static int brush_vertex_tool_set_exec(bContext *C, wmOperator *op) @@ -275,8 +277,8 @@ static int brush_vertex_tool_set_exec(bContext *C, wmOperator *op) static void BRUSH_OT_vertex_tool_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Vertex Paint Tool Set"; - ot->description= "Set the vertex paint tool"; + ot->name= _("Vertex Paint Tool Set"); + ot->description= _("Set the vertex paint tool"); ot->idname= "BRUSH_OT_vertex_tool_set"; /* api callbacks */ @@ -286,7 +288,7 @@ static void BRUSH_OT_vertex_tool_set(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - ot->prop= RNA_def_enum(ot->srna, "tool", brush_vertex_tool_items, 0, "Tool", ""); + ot->prop= RNA_def_enum(ot->srna, "tool", brush_vertex_tool_items, 0, _("Tool"), ""); } static int brush_weight_tool_set_exec(bContext *C, wmOperator *op) @@ -300,8 +302,8 @@ static int brush_weight_tool_set_exec(bContext *C, wmOperator *op) static void BRUSH_OT_weight_tool_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Weight Paint Tool Set"; - ot->description= "Set the weight paint tool"; + ot->name= _("Weight Paint Tool Set"); + ot->description= _("Set the weight paint tool"); ot->idname= "BRUSH_OT_weight_tool_set"; /* api callbacks */ @@ -311,7 +313,7 @@ static void BRUSH_OT_weight_tool_set(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - ot->prop= RNA_def_enum(ot->srna, "tool", brush_vertex_tool_items, 0, "Tool", ""); + ot->prop= RNA_def_enum(ot->srna, "tool", brush_vertex_tool_items, 0, _("Tool"), ""); } static int brush_image_tool_set_exec(bContext *C, wmOperator *op) @@ -325,8 +327,8 @@ static int brush_image_tool_set_exec(bContext *C, wmOperator *op) static void BRUSH_OT_image_tool_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Image Paint Tool Set"; - ot->description= "Set the image tool"; + ot->name= _("Image Paint Tool Set"); + ot->description= _("Set the image tool"); ot->idname= "BRUSH_OT_image_tool_set"; /* api callbacks */ diff --git a/source/blender/editors/sculpt_paint/paint_utils.c b/source/blender/editors/sculpt_paint/paint_utils.c index b3d690373f8..a1855f254ef 100644 --- a/source/blender/editors/sculpt_paint/paint_utils.c +++ b/source/blender/editors/sculpt_paint/paint_utils.c @@ -273,16 +273,16 @@ static int brush_curve_preset_poll(bContext *C) void BRUSH_OT_curve_preset(wmOperatorType *ot) { static EnumPropertyItem prop_shape_items[] = { - {CURVE_PRESET_SHARP, "SHARP", 0, "Sharp", ""}, - {CURVE_PRESET_SMOOTH, "SMOOTH", 0, "Smooth", ""}, - {CURVE_PRESET_MAX, "MAX", 0, "Max", ""}, - {CURVE_PRESET_LINE, "LINE", 0, "Line", ""}, - {CURVE_PRESET_ROUND, "ROUND", 0, "Round", ""}, - {CURVE_PRESET_ROOT, "ROOT", 0, "Root", ""}, + {CURVE_PRESET_SHARP, "SHARP", 0, N_("Sharp"), ""}, + {CURVE_PRESET_SMOOTH, "SMOOTH", 0, N_("Smooth"), ""}, + {CURVE_PRESET_MAX, "MAX", 0, N_("Max"), ""}, + {CURVE_PRESET_LINE, "LINE", 0, N_("Line"), ""}, + {CURVE_PRESET_ROUND, "ROUND", 0, N_("Round"), ""}, + {CURVE_PRESET_ROOT, "ROOT", 0, N_("Root"), ""}, {0, NULL, 0, NULL, NULL}}; - ot->name= "Preset"; - ot->description= "Set brush shape"; + ot->name= _("Preset"); + ot->description= _("Set brush shape"); ot->idname= "BRUSH_OT_curve_preset"; ot->exec= brush_curve_preset_exec; @@ -290,7 +290,7 @@ void BRUSH_OT_curve_preset(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_enum(ot->srna, "shape", prop_shape_items, CURVE_PRESET_SMOOTH, "Mode", ""); + RNA_def_enum(ot->srna, "shape", RNA_enum_items_gettexted(prop_shape_items), CURVE_PRESET_SMOOTH, _("Mode"), ""); } @@ -304,8 +304,8 @@ static int paint_select_linked_exec(bContext *C, wmOperator *UNUSED(op)) void PAINT_OT_face_select_linked(wmOperatorType *ot) { - ot->name= "Select Linked"; - ot->description= "Select linked faces"; + ot->name= _("Select Linked"); + ot->description= _("Select linked faces"); ot->idname= "PAINT_OT_face_select_linked"; ot->exec= paint_select_linked_exec; @@ -348,8 +348,8 @@ static int face_select_all_exec(bContext *C, wmOperator *op) void PAINT_OT_face_select_all(wmOperatorType *ot) { - ot->name= "Face Selection"; - ot->description= "Change selection for all faces"; + ot->name= _("Face Selection"); + ot->description= _("Change selection for all faces"); ot->idname= "PAINT_OT_face_select_all"; ot->exec= face_select_all_exec; @@ -371,8 +371,8 @@ static int face_select_inverse_exec(bContext *C, wmOperator *UNUSED(op)) void PAINT_OT_face_select_inverse(wmOperatorType *ot) { - ot->name= "Face Select Invert"; - ot->description= "Invert selection of faces"; + ot->name= _("Face Select Invert"); + ot->description= _("Invert selection of faces"); ot->idname= "PAINT_OT_face_select_inverse"; ot->exec= face_select_inverse_exec; diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index 3da19ba7346..8f4458ff72a 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -48,6 +48,8 @@ #include "BLI_utildefines.h" #include "BLI_ghash.h" +#include "BLF_api.h" + #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" @@ -946,7 +948,7 @@ static int weight_sample_invoke(bContext *C, wmOperator *op, wmEvent *event) void PAINT_OT_weight_sample(wmOperatorType *ot) { /* identifiers */ - ot->name= "Weight Paint Sample Weight"; + ot->name= _("Weight Paint Sample Weight"); ot->idname= "PAINT_OT_weight_sample"; /* api callbacks */ @@ -1044,7 +1046,7 @@ void PAINT_OT_weight_sample_group(wmOperatorType *ot) PropertyRNA *prop= NULL; /* identifiers */ - ot->name= "Weight Paint Sample Group"; + ot->name= _("Weight Paint Sample Group"); ot->idname= "PAINT_OT_weight_sample_group"; /* api callbacks */ @@ -1056,7 +1058,7 @@ void PAINT_OT_weight_sample_group(wmOperatorType *ot) ot->flag= OPTYPE_UNDO; /* keyingset to use (dynamic enum) */ - prop= RNA_def_enum(ot->srna, "group", DummyRNA_DEFAULT_items, 0, "Keying Set", "The Keying Set to use"); + prop= RNA_def_enum(ot->srna, "group", DummyRNA_DEFAULT_items, 0, _("Keying Set"), _("The Keying Set to use")); RNA_def_enum_funcs(prop, weight_paint_sample_enum_itemf); ot->prop= prop; } @@ -1203,7 +1205,7 @@ void PAINT_OT_weight_paint_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Weight Paint Mode"; + ot->name= _("Weight Paint Mode"); ot->idname= "PAINT_OT_weight_paint_toggle"; /* api callbacks */ @@ -1611,7 +1613,7 @@ void PAINT_OT_weight_paint(wmOperatorType *ot) { /* identifiers */ - ot->name= "Weight Paint"; + ot->name= _("Weight Paint"); ot->idname= "PAINT_OT_weight_paint"; /* api callbacks */ @@ -1624,7 +1626,7 @@ void PAINT_OT_weight_paint(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; - RNA_def_collection_runtime(ot->srna, "stroke", &RNA_OperatorStrokeElement, "Stroke", ""); + RNA_def_collection_runtime(ot->srna, "stroke", &RNA_OperatorStrokeElement, _("Stroke"), ""); } static int weight_paint_set_exec(bContext *C, wmOperator *UNUSED(op)) @@ -1640,7 +1642,7 @@ static int weight_paint_set_exec(bContext *C, wmOperator *UNUSED(op)) void PAINT_OT_weight_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Weight"; + ot->name= _("Set Weight"); ot->idname= "PAINT_OT_weight_set"; /* api callbacks */ @@ -1702,7 +1704,7 @@ void PAINT_OT_vertex_paint_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Vertex Paint Mode"; + ot->name= _("Vertex Paint Mode"); ot->idname= "PAINT_OT_vertex_paint_toggle"; /* api callbacks */ @@ -1910,7 +1912,7 @@ static int vpaint_cancel(bContext *C, wmOperator *op) void PAINT_OT_vertex_paint(wmOperatorType *ot) { /* identifiers */ - ot->name= "Vertex Paint"; + ot->name= _("Vertex Paint"); ot->idname= "PAINT_OT_vertex_paint"; /* api callbacks */ @@ -1923,7 +1925,7 @@ void PAINT_OT_vertex_paint(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING; - RNA_def_collection_runtime(ot->srna, "stroke", &RNA_OperatorStrokeElement, "Stroke", ""); + RNA_def_collection_runtime(ot->srna, "stroke", &RNA_OperatorStrokeElement, _("Stroke"), ""); } /* ********************** weight from bones operator ******************* */ @@ -1954,12 +1956,12 @@ static int weight_from_bones_exec(bContext *C, wmOperator *op) void PAINT_OT_weight_from_bones(wmOperatorType *ot) { static EnumPropertyItem type_items[]= { - {ARM_GROUPS_AUTO, "AUTOMATIC", 0, "Automatic", "Automatic weights froms bones"}, - {ARM_GROUPS_ENVELOPE, "ENVELOPES", 0, "From Envelopes", "Weights from envelopes with user defined radius"}, + {ARM_GROUPS_AUTO, "AUTOMATIC", 0, N_("Automatic"), N_("Automatic weights froms bones")}, + {ARM_GROUPS_ENVELOPE, "ENVELOPES", 0, N_("From Envelopes"), N_("Weights from envelopes with user defined radius")}, {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= "Weight from Bones"; + ot->name= _("Weight from Bones"); ot->idname= "PAINT_OT_weight_from_bones"; /* api callbacks */ @@ -1971,6 +1973,6 @@ void PAINT_OT_weight_from_bones(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", type_items, 0, "Type", "Method to use for assigning weights."); + ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(type_items), 0, _("Type"), _("Method to use for assigning weights.")); } diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index f0e02dde2e8..b05a67c9e06 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -3582,9 +3582,9 @@ static int sculpt_brush_stroke_cancel(bContext *C, wmOperator *op) static void SCULPT_OT_brush_stroke(wmOperatorType *ot) { static EnumPropertyItem stroke_mode_items[] = { - {BRUSH_STROKE_NORMAL, "NORMAL", 0, "Normal", "Apply brush normally"}, - {BRUSH_STROKE_INVERT, "INVERT", 0, "Invert", "Invert action of brush for duration of stroke"}, - {BRUSH_STROKE_SMOOTH, "SMOOTH", 0, "Smooth", "Switch brush to smooth mode for duration of stroke"}, + {BRUSH_STROKE_NORMAL, "NORMAL", 0, N_("Normal"), N_("Apply brush normally")}, + {BRUSH_STROKE_INVERT, "INVERT", 0, N_("Invert"), N_("Invert action of brush for duration of stroke")}, + {BRUSH_STROKE_SMOOTH, "SMOOTH", 0, N_("Smooth"), N_("Switch brush to smooth mode for duration of stroke")}, {0} }; @@ -3605,11 +3605,11 @@ static void SCULPT_OT_brush_stroke(wmOperatorType *ot) /* properties */ RNA_def_collection_runtime(ot->srna, "stroke", &RNA_OperatorStrokeElement, - "Stroke", ""); + _("Stroke"), ""); - RNA_def_enum(ot->srna, "mode", stroke_mode_items, BRUSH_STROKE_NORMAL, - "Sculpt Stroke Mode", - "Action taken when a sculpt stroke is made"); + RNA_def_enum(ot->srna, "mode", RNA_enum_items_gettexted(stroke_mode_items), BRUSH_STROKE_NORMAL, + _("Sculpt Stroke Mode"), + _("Action taken when a sculpt stroke is made")); RNA_def_boolean(ot->srna, "ignore_background_click", 0, _("Ignore Background Click"), @@ -3634,7 +3634,7 @@ static int sculpt_set_persistent_base(bContext *C, wmOperator *UNUSED(op)) static void SCULPT_OT_set_persistent_base(wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Persistent Base"; + ot->name= _("Set Persistent Base"); ot->idname= "SCULPT_OT_set_persistent_base"; /* api callbacks */ @@ -3712,7 +3712,7 @@ static int sculpt_toggle_mode(bContext *C, wmOperator *UNUSED(op)) static void SCULPT_OT_sculptmode_toggle(wmOperatorType *ot) { /* identifiers */ - ot->name= "Sculpt Mode"; + ot->name= _("Sculpt Mode"); ot->idname= "SCULPT_OT_sculptmode_toggle"; /* api callbacks */ diff --git a/source/blender/editors/space_graph/graph_buttons.c b/source/blender/editors/space_graph/graph_buttons.c index fb1144b4fa8..f11f530be9e 100644 --- a/source/blender/editors/space_graph/graph_buttons.c +++ b/source/blender/editors/space_graph/graph_buttons.c @@ -48,6 +48,8 @@ #include "BLI_rand.h" #include "BLI_utildefines.h" +#include "BLF_api.h" + #include "BKE_context.h" #include "BKE_depsgraph.h" #include "BKE_fcurve.h" @@ -760,9 +762,9 @@ static int graph_properties(bContext *C, wmOperator *UNUSED(op)) void GRAPH_OT_properties(wmOperatorType *ot) { - ot->name= "Properties"; + ot->name= _("Properties"); ot->idname= "GRAPH_OT_properties"; - ot->description= "Toggle display properties panel"; + ot->description= _("Toggle display properties panel"); ot->exec= graph_properties; ot->poll= ED_operator_graphedit_active; diff --git a/source/blender/editors/space_graph/graph_edit.c b/source/blender/editors/space_graph/graph_edit.c index 4acb80cb8cc..6deeb92b459 100644 --- a/source/blender/editors/space_graph/graph_edit.c +++ b/source/blender/editors/space_graph/graph_edit.c @@ -184,9 +184,9 @@ static int graphkeys_previewrange_exec(bContext *C, wmOperator *UNUSED(op)) void GRAPH_OT_previewrange_set (wmOperatorType *ot) { /* identifiers */ - ot->name= "Auto-Set Preview Range"; + ot->name= _("Auto-Set Preview Range"); ot->idname= "GRAPH_OT_previewrange_set"; - ot->description= "Automatically set Preview Range based on range of keyframes"; + ot->description= _("Automatically set Preview Range based on range of keyframes"); /* api callbacks */ ot->exec= graphkeys_previewrange_exec; @@ -246,9 +246,9 @@ static int graphkeys_view_selected_exec(bContext *C, wmOperator *UNUSED(op)) void GRAPH_OT_view_all (wmOperatorType *ot) { /* identifiers */ - ot->name= "View All"; + ot->name= _("View All"); ot->idname= "GRAPH_OT_view_all"; - ot->description= "Reset viewable area to show full keyframe range"; + ot->description= _("Reset viewable area to show full keyframe range"); /* api callbacks */ ot->exec= graphkeys_viewall_exec; @@ -261,9 +261,9 @@ void GRAPH_OT_view_all (wmOperatorType *ot) void GRAPH_OT_view_selected (wmOperatorType *ot) { /* identifiers */ - ot->name= "View Selected"; + ot->name= _("View Selected"); ot->idname= "GRAPH_OT_view_selected"; - ot->description= "Reset viewable area to show selected keyframe range"; + ot->description= _("Reset viewable area to show selected keyframe range"); /* api callbacks */ ot->exec= graphkeys_view_selected_exec; @@ -376,9 +376,9 @@ static int graphkeys_create_ghostcurves_exec(bContext *C, wmOperator *UNUSED(op) void GRAPH_OT_ghost_curves_create (wmOperatorType *ot) { /* identifiers */ - ot->name= "Create Ghost Curves"; + ot->name= _("Create Ghost Curves"); ot->idname= "GRAPH_OT_ghost_curves_create"; - ot->description= "Create snapshot (Ghosts) of selected F-Curves as background aid for active Graph Editor"; + ot->description= _("Create snapshot (Ghosts) of selected F-Curves as background aid for active Graph Editor"); /* api callbacks */ ot->exec= graphkeys_create_ghostcurves_exec; @@ -419,9 +419,9 @@ static int graphkeys_clear_ghostcurves_exec(bContext *C, wmOperator *UNUSED(op)) void GRAPH_OT_ghost_curves_clear (wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Ghost Curves"; + ot->name= _("Clear Ghost Curves"); ot->idname= "GRAPH_OT_ghost_curves_clear"; - ot->description= "Clear F-Curve snapshots (Ghosts) for active Graph Editor"; + ot->description= _("Clear F-Curve snapshots (Ghosts) for active Graph Editor"); /* api callbacks */ ot->exec= graphkeys_clear_ghostcurves_exec; @@ -438,8 +438,8 @@ void GRAPH_OT_ghost_curves_clear (wmOperatorType *ot) /* defines for insert keyframes tool */ static EnumPropertyItem prop_graphkeys_insertkey_types[] = { - {1, "ALL", 0, "All Channels", ""}, - {2, "SEL", 0, "Only Selected Channels", ""}, + {1, "ALL", 0, N_("All Channels"), ""}, + {2, "SEL", 0, N_("Only Selected Channels"), ""}, {0, NULL, 0, NULL, NULL} }; @@ -514,9 +514,9 @@ static int graphkeys_insertkey_exec(bContext *C, wmOperator *op) void GRAPH_OT_keyframe_insert (wmOperatorType *ot) { /* identifiers */ - ot->name= "Insert Keyframes"; + ot->name= _("Insert Keyframes"); ot->idname= "GRAPH_OT_keyframe_insert"; - ot->description= "Insert keyframes for the specified channels"; + ot->description= _("Insert keyframes for the specified channels"); /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -527,7 +527,7 @@ void GRAPH_OT_keyframe_insert (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", prop_graphkeys_insertkey_types, 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_graphkeys_insertkey_types), 0, "Type", ""); } /* ******************** Click-Insert Keyframes Operator ************************* */ @@ -621,9 +621,9 @@ static int graphkeys_click_insert_invoke (bContext *C, wmOperator *op, wmEvent * void GRAPH_OT_click_insert (wmOperatorType *ot) { /* identifiers */ - ot->name= "Click-Insert Keyframes"; + ot->name= _("Click-Insert Keyframes"); ot->idname= "GRAPH_OT_click_insert"; - ot->description= "Insert new keyframe at the cursor position for the active F-Curve"; + ot->description= _("Insert new keyframe at the cursor position for the active F-Curve"); /* api callbacks */ ot->invoke= graphkeys_click_insert_invoke; @@ -634,8 +634,8 @@ void GRAPH_OT_click_insert (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_float(ot->srna, "frame", 1.0f, -FLT_MAX, FLT_MAX, "Frame Number", "Frame to insert keyframe on", 0, 100); - RNA_def_float(ot->srna, "value", 1.0f, -FLT_MAX, FLT_MAX, "Value", "Value for keyframe on", 0, 100); + RNA_def_float(ot->srna, "frame", 1.0f, -FLT_MAX, FLT_MAX, _("Frame Number"), _("Frame to insert keyframe on"), 0, 100); + RNA_def_float(ot->srna, "value", 1.0f, -FLT_MAX, FLT_MAX, _("Value"), _("Value for keyframe on"), 0, 100); } /* ******************** Copy/Paste Keyframes Operator ************************* */ @@ -704,9 +704,9 @@ static int graphkeys_copy_exec(bContext *C, wmOperator *op) void GRAPH_OT_copy (wmOperatorType *ot) { /* identifiers */ - ot->name= "Copy Keyframes"; + ot->name= _("Copy Keyframes"); ot->idname= "GRAPH_OT_copy"; - ot->description= "Copy selected keyframes to the copy/paste buffer"; + ot->description= _("Copy selected keyframes to the copy/paste buffer"); /* api callbacks */ ot->exec= graphkeys_copy_exec; @@ -750,9 +750,9 @@ static int graphkeys_paste_exec(bContext *C, wmOperator *op) void GRAPH_OT_paste (wmOperatorType *ot) { /* identifiers */ - ot->name= "Paste Keyframes"; + ot->name= _("Paste Keyframes"); ot->idname= "GRAPH_OT_paste"; - ot->description= "Paste keyframes from copy/paste buffer for the selected channels, starting on the current frame"; + ot->description= _("Paste keyframes from copy/paste buffer for the selected channels, starting on the current frame"); /* api callbacks */ // ot->invoke= WM_operator_props_popup; // better wait for graph redo panel @@ -762,8 +762,8 @@ void GRAPH_OT_paste (wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_enum(ot->srna, "offset", keyframe_paste_offset_items, KEYFRAME_PASTE_OFFSET_CFRA_START, "Offset", "Paste time offset of keys"); - RNA_def_enum(ot->srna, "merge", keyframe_paste_merge_items, KEYFRAME_PASTE_MERGE_MIX, "Type", "Method of merking pasted keys and existing"); + RNA_def_enum(ot->srna, "offset", keyframe_paste_offset_items, KEYFRAME_PASTE_OFFSET_CFRA_START, _("Offset"), _("Paste time offset of keys")); + RNA_def_enum(ot->srna, "merge", keyframe_paste_merge_items, KEYFRAME_PASTE_MERGE_MIX, _("Type"), _("Method of merking pasted keys and existing")); } /* ******************** Duplicate Keyframes Operator ************************* */ @@ -819,9 +819,9 @@ static int graphkeys_duplicate_invoke(bContext *C, wmOperator *op, wmEvent *UNUS void GRAPH_OT_duplicate (wmOperatorType *ot) { /* identifiers */ - ot->name= "Duplicate Keyframes"; + ot->name= _("Duplicate Keyframes"); ot->idname= "GRAPH_OT_duplicate"; - ot->description= "Make a copy of all selected keyframes"; + ot->description= _("Make a copy of all selected keyframes"); /* api callbacks */ ot->invoke= graphkeys_duplicate_invoke; @@ -832,7 +832,7 @@ void GRAPH_OT_duplicate (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* to give to transform */ - RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, "Mode", ""); + RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, _("Mode"), ""); } /* ******************** Delete Keyframes Operator ************************* */ @@ -889,9 +889,9 @@ static int graphkeys_delete_exec(bContext *C, wmOperator *UNUSED(op)) void GRAPH_OT_delete (wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete Keyframes"; + ot->name= _("Delete Keyframes"); ot->idname= "GRAPH_OT_delete"; - ot->description= "Remove all selected keyframes"; + ot->description= _("Remove all selected keyframes"); /* api callbacks */ ot->invoke= WM_operator_confirm; @@ -951,9 +951,9 @@ static int graphkeys_clean_exec(bContext *C, wmOperator *op) void GRAPH_OT_clean (wmOperatorType *ot) { /* identifiers */ - ot->name= "Clean Keyframes"; + ot->name= _("Clean Keyframes"); ot->idname= "GRAPH_OT_clean"; - ot->description= "Simplify F-Curves by removing closely spaced keyframes"; + ot->description= _("Simplify F-Curves by removing closely spaced keyframes"); /* api callbacks */ //ot->invoke= // XXX we need that number popup for this! @@ -964,7 +964,7 @@ void GRAPH_OT_clean (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_float(ot->srna, "threshold", 0.001f, 0.0f, FLT_MAX, "Threshold", "", 0.0f, 1000.0f); + ot->prop= RNA_def_float(ot->srna, "threshold", 0.001f, 0.0f, FLT_MAX, _("Threshold"), "", 0.0f, 1000.0f); } /* ******************** Bake F-Curve Operator *********************** */ @@ -1034,9 +1034,9 @@ static int graphkeys_bake_exec(bContext *C, wmOperator *UNUSED(op)) void GRAPH_OT_bake (wmOperatorType *ot) { /* identifiers */ - ot->name= "Bake Curve"; + ot->name= _("Bake Curve"); ot->idname= "GRAPH_OT_bake"; - ot->description= "Bake selected F-Curves to a set of sampled points defining a similar curve"; + ot->description= _("Bake selected F-Curves to a set of sampled points defining a similar curve"); /* api callbacks */ ot->invoke= WM_operator_confirm; // FIXME... @@ -1165,9 +1165,9 @@ static int graphkeys_sound_bake_invoke (bContext *C, wmOperator *op, wmEvent *ev void GRAPH_OT_sound_bake (wmOperatorType *ot) { /* identifiers */ - ot->name= "Bake Sound to F-Curves"; + ot->name= _("Bake Sound to F-Curves"); ot->idname= "GRAPH_OT_sound_bake"; - ot->description= "Bakes a sound wave to selected F-Curves"; + ot->description= _("Bakes a sound wave to selected F-Curves"); /* api callbacks */ ot->invoke= graphkeys_sound_bake_invoke; @@ -1239,9 +1239,9 @@ static int graphkeys_sample_exec(bContext *C, wmOperator *UNUSED(op)) void GRAPH_OT_sample (wmOperatorType *ot) { /* identifiers */ - ot->name= "Sample Keyframes"; + ot->name= _("Sample Keyframes"); ot->idname= "GRAPH_OT_sample"; - ot->description= "Add keyframes on every frame between the selected keyframes"; + ot->description= _("Add keyframes on every frame between the selected keyframes"); /* api callbacks */ ot->exec= graphkeys_sample_exec; @@ -1259,8 +1259,8 @@ void GRAPH_OT_sample (wmOperatorType *ot) /* defines for set extrapolation-type for selected keyframes tool */ static EnumPropertyItem prop_graphkeys_expo_types[] = { - {FCURVE_EXTRAPOLATE_CONSTANT, "CONSTANT", 0, "Constant Extrapolation", ""}, - {FCURVE_EXTRAPOLATE_LINEAR, "LINEAR", 0, "Linear Extrapolation", ""}, + {FCURVE_EXTRAPOLATE_CONSTANT, "CONSTANT", 0, N_("Constant Extrapolation"), ""}, + {FCURVE_EXTRAPOLATE_LINEAR, "LINEAR", 0, N_("Linear Extrapolation"), ""}, {0, NULL, 0, NULL, NULL} }; @@ -1314,9 +1314,9 @@ static int graphkeys_expo_exec(bContext *C, wmOperator *op) void GRAPH_OT_extrapolation_type (wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Keyframe Extrapolation"; + ot->name= _("Set Keyframe Extrapolation"); ot->idname= "GRAPH_OT_extrapolation_type"; - ot->description= "Set extrapolation mode for selected F-Curves"; + ot->description= _("Set extrapolation mode for selected F-Curves"); /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -1327,7 +1327,7 @@ void GRAPH_OT_extrapolation_type (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", prop_graphkeys_expo_types, 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_graphkeys_expo_types), 0, _("Type"), ""); } /* ******************** Set Interpolation-Type Operator *********************** */ @@ -1383,9 +1383,9 @@ static int graphkeys_ipo_exec(bContext *C, wmOperator *op) void GRAPH_OT_interpolation_type (wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Keyframe Interpolation"; + ot->name= _("Set Keyframe Interpolation"); ot->idname= "GRAPH_OT_interpolation_type"; - ot->description= "Set interpolation mode for the F-Curve segments starting from the selected keyframes"; + ot->description= _("Set interpolation mode for the F-Curve segments starting from the selected keyframes"); /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -1396,7 +1396,7 @@ void GRAPH_OT_interpolation_type (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", beztriple_interpolation_mode_items, 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", beztriple_interpolation_mode_items, 0, _("Type"), ""); } /* ******************** Set Handle-Type Operator *********************** */ @@ -1469,17 +1469,17 @@ static int graphkeys_handletype_exec(bContext *C, wmOperator *op) { /* sync with editcurve_handle_type_items */ static EnumPropertyItem graphkeys_handle_type_items[] = { - {HD_AUTO, "AUTO", 0, "Automatic", "Handles that are automatically adjusted upon moving the keyframe. Whole curve"}, - {HD_VECT, "VECTOR", 0, "Vector", ""}, - {HD_ALIGN, "ALIGNED", 0, "Aligned", ""}, - {HD_FREE, "FREE_ALIGN", 0, "Free", ""}, - {HD_AUTO_ANIM, "ANIM_CLAMPED", 0, "Auto Clamped", "Auto handles clamped to not overshoot. Whole curve"}, + {HD_AUTO, "AUTO", 0, N_("Automatic"), N_("Handles that are automatically adjusted upon moving the keyframe. Whole curve")}, + {HD_VECT, "VECTOR", 0, N_("Vector"), ""}, + {HD_ALIGN, "ALIGNED", 0, N_("Aligned"), ""}, + {HD_FREE, "FREE_ALIGN", 0, N_("Free"), ""}, + {HD_AUTO_ANIM, "ANIM_CLAMPED", 0, N_("Auto Clamped"), N_("Auto handles clamped to not overshoot. Whole curve")}, {0, NULL, 0, NULL, NULL}}; /* identifiers */ - ot->name= "Set Keyframe Handle Type"; + ot->name= _("Set Keyframe Handle Type"); ot->idname= "GRAPH_OT_handle_type"; - ot->description= "Set type of handle for selected keyframes"; + ot->description= _("Set type of handle for selected keyframes"); /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -1490,7 +1490,7 @@ static int graphkeys_handletype_exec(bContext *C, wmOperator *op) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", graphkeys_handle_type_items, 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(graphkeys_handle_type_items), 0, _("Type"), ""); } /* ************************************************************************** */ @@ -1671,9 +1671,9 @@ static int graphkeys_euler_filter_exec (bContext *C, wmOperator *op) void GRAPH_OT_euler_filter (wmOperatorType *ot) { /* identifiers */ - ot->name= "Euler Discontinuity Filter"; + ot->name= _("Euler Discontinuity Filter"); ot->idname= "GRAPH_OT_euler_filter"; - ot->description= "Fixes the most common causes of gimbal lock in the selected Euler Rotation F-Curves"; + ot->description= _("Fixes the most common causes of gimbal lock in the selected Euler Rotation F-Curves"); /* api callbacks */ ot->exec= graphkeys_euler_filter_exec; @@ -1745,9 +1745,9 @@ static int graphkeys_framejump_exec(bContext *C, wmOperator *UNUSED(op)) void GRAPH_OT_frame_jump (wmOperatorType *ot) { /* identifiers */ - ot->name= "Jump to Frame"; + ot->name= _("Jump to Frame"); ot->idname= "GRAPH_OT_frame_jump"; - ot->description= "Set the current frame to the average frame of the selected keyframes"; + ot->description= _("Set the current frame to the average frame of the selected keyframes"); /* api callbacks */ ot->exec= graphkeys_framejump_exec; @@ -1761,12 +1761,12 @@ void GRAPH_OT_frame_jump (wmOperatorType *ot) /* defines for snap keyframes tool */ static EnumPropertyItem prop_graphkeys_snap_types[] = { - {GRAPHKEYS_SNAP_CFRA, "CFRA", 0, "Current Frame", ""}, - {GRAPHKEYS_SNAP_VALUE, "VALUE", 0, "Cursor Value", ""}, - {GRAPHKEYS_SNAP_NEAREST_FRAME, "NEAREST_FRAME", 0, "Nearest Frame", ""}, // XXX as single entry? - {GRAPHKEYS_SNAP_NEAREST_SECOND, "NEAREST_SECOND", 0, "Nearest Second", ""}, // XXX as single entry? - {GRAPHKEYS_SNAP_NEAREST_MARKER, "NEAREST_MARKER", 0, "Nearest Marker", ""}, - {GRAPHKEYS_SNAP_HORIZONTAL, "HORIZONTAL", 0, "Flatten Handles", ""}, + {GRAPHKEYS_SNAP_CFRA, "CFRA", 0, N_("Current Frame"), ""}, + {GRAPHKEYS_SNAP_VALUE, "VALUE", 0, N_("Cursor Value"), ""}, + {GRAPHKEYS_SNAP_NEAREST_FRAME, "NEAREST_FRAME", 0, N_("Nearest Frame"), ""}, // XXX as single entry? + {GRAPHKEYS_SNAP_NEAREST_SECOND, "NEAREST_SECOND", 0, N_("Nearest Second"), ""}, // XXX as single entry? + {GRAPHKEYS_SNAP_NEAREST_MARKER, "NEAREST_MARKER", 0, N_("Nearest Marker"), ""}, + {GRAPHKEYS_SNAP_HORIZONTAL, "HORIZONTAL", 0, N_("Flatten Handles"), ""}, {0, NULL, 0, NULL, NULL} }; @@ -1849,9 +1849,9 @@ static int graphkeys_snap_exec(bContext *C, wmOperator *op) void GRAPH_OT_snap (wmOperatorType *ot) { /* identifiers */ - ot->name= "Snap Keys"; + ot->name= _("Snap Keys"); ot->idname= "GRAPH_OT_snap"; - ot->description= "Snap selected keyframes to the chosen times/values"; + ot->description= _("Snap selected keyframes to the chosen times/values"); /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -1862,18 +1862,18 @@ void GRAPH_OT_snap (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", prop_graphkeys_snap_types, 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_graphkeys_snap_types), 0, _("Type"), ""); } /* ******************** Mirror Keyframes Operator *********************** */ /* defines for mirror keyframes tool */ static EnumPropertyItem prop_graphkeys_mirror_types[] = { - {GRAPHKEYS_MIRROR_CFRA, "CFRA", 0, "By Times over Current Frame", ""}, - {GRAPHKEYS_MIRROR_VALUE, "VALUE", 0, "By Values over Cursor Value", ""}, - {GRAPHKEYS_MIRROR_YAXIS, "YAXIS", 0, "By Times over Time=0", ""}, - {GRAPHKEYS_MIRROR_XAXIS, "XAXIS", 0, "By Values over Value=0", ""}, - {GRAPHKEYS_MIRROR_MARKER, "MARKER", 0, "By Times over First Selected Marker", ""}, + {GRAPHKEYS_MIRROR_CFRA, "CFRA", 0, N_("By Times over Current Frame"), ""}, + {GRAPHKEYS_MIRROR_VALUE, "VALUE", 0, N_("By Values over Cursor Value"), ""}, + {GRAPHKEYS_MIRROR_YAXIS, "YAXIS", 0, N_("By Times over Time=0"), ""}, + {GRAPHKEYS_MIRROR_XAXIS, "XAXIS", 0, N_("By Values over Value=0"), ""}, + {GRAPHKEYS_MIRROR_MARKER, "MARKER", 0, N_("By Times over First Selected Marker"), ""}, {0, NULL, 0, NULL, NULL} }; @@ -1967,9 +1967,9 @@ static int graphkeys_mirror_exec(bContext *C, wmOperator *op) void GRAPH_OT_mirror (wmOperatorType *ot) { /* identifiers */ - ot->name= "Mirror Keys"; + ot->name= _("Mirror Keys"); ot->idname= "GRAPH_OT_mirror"; - ot->description= "Flip selected keyframes over the selected mirror line"; + ot->description= _("Flip selected keyframes over the selected mirror line"); /* api callbacks */ ot->invoke= WM_menu_invoke; @@ -1980,7 +1980,7 @@ void GRAPH_OT_mirror (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", prop_graphkeys_mirror_types, 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_graphkeys_mirror_types), 0, _("Type"), ""); } /* ******************** Smooth Keyframes Operator *********************** */ @@ -2022,9 +2022,9 @@ static int graphkeys_smooth_exec(bContext *C, wmOperator *UNUSED(op)) void GRAPH_OT_smooth (wmOperatorType *ot) { /* identifiers */ - ot->name= "Smooth Keys"; + ot->name= _("Smooth Keys"); ot->idname= "GRAPH_OT_smooth"; - ot->description= "Apply weighted moving means to make selected F-Curves less bumpy"; + ot->description= _("Apply weighted moving means to make selected F-Curves less bumpy"); /* api callbacks */ ot->exec= graphkeys_smooth_exec; @@ -2124,9 +2124,9 @@ static int graph_fmodifier_add_exec(bContext *C, wmOperator *op) void GRAPH_OT_fmodifier_add (wmOperatorType *ot) { /* identifiers */ - ot->name= "Add F-Curve Modifier"; + ot->name= _("Add F-Curve Modifier"); ot->idname= "GRAPH_OT_fmodifier_add"; - ot->description= "Add F-Modifiers to the selected F-Curves"; + ot->description= _("Add F-Modifiers to the selected F-Curves"); /* api callbacks */ ot->invoke= graph_fmodifier_add_invoke; @@ -2137,7 +2137,7 @@ void GRAPH_OT_fmodifier_add (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "type", fmodifier_type_items, 0, "Type", ""); + ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(fmodifier_type_items), 0, _("Type"), ""); RNA_def_boolean(ot->srna, "only_active", 1, _("Only Active"), _("Only add F-Modifier to active F-Curve.")); } @@ -2182,9 +2182,9 @@ static int graph_fmodifier_copy_exec(bContext *C, wmOperator *op) void GRAPH_OT_fmodifier_copy (wmOperatorType *ot) { /* identifiers */ - ot->name= "Copy F-Modifiers"; + ot->name= _("Copy F-Modifiers"); ot->idname= "GRAPH_OT_fmodifier_copy"; - ot->description= "Copy the F-Modifier(s) of the active F-Curve."; + ot->description= _("Copy the F-Modifier(s) of the active F-Curve."); /* api callbacks */ ot->exec= graph_fmodifier_copy_exec; @@ -2244,9 +2244,9 @@ static int graph_fmodifier_paste_exec(bContext *C, wmOperator *op) void GRAPH_OT_fmodifier_paste (wmOperatorType *ot) { /* identifiers */ - ot->name= "Paste F-Modifiers"; + ot->name= _("Paste F-Modifiers"); ot->idname= "GRAPH_OT_fmodifier_paste"; - ot->description= "Add copied F-Modifiers to the selected F-Curves"; + ot->description= _("Add copied F-Modifiers to the selected F-Curves"); /* api callbacks */ ot->exec= graph_fmodifier_paste_exec; diff --git a/source/blender/editors/space_graph/graph_ops.c b/source/blender/editors/space_graph/graph_ops.c index a79f1761499..4a5bebb6b91 100644 --- a/source/blender/editors/space_graph/graph_ops.c +++ b/source/blender/editors/space_graph/graph_ops.c @@ -165,9 +165,9 @@ static int graphview_cursor_modal(bContext *C, wmOperator *op, wmEvent *event) static void GRAPH_OT_cursor_set(wmOperatorType *ot) { /* identifiers */ - ot->name= "Set Cursor"; + ot->name= _("Set Cursor"); ot->idname= "GRAPH_OT_cursor_set"; - ot->description= "Interactively set the current frame number and value cursor"; + ot->description= _("Interactively set the current frame number and value cursor"); /* api callbacks */ ot->exec= graphview_cursor_exec; @@ -205,9 +205,9 @@ static int view_toggle_handles_exec (bContext *C, wmOperator *UNUSED(op)) static void GRAPH_OT_view_togglehandles (wmOperatorType *ot) { /* identification */ - ot->name= "Show/Hide All Handles"; + ot->name= _("Show/Hide All Handles"); ot->idname= "GRAPH_OT_handles_view_toggle"; - ot->description= "Toggle whether handles are drawn on all keyframes that need them"; + ot->description= _("Toggle whether handles are drawn on all keyframes that need them"); /* callbacks */ ot->exec= view_toggle_handles_exec; @@ -274,7 +274,7 @@ void ED_operatormacros_graph(void) wmOperatorType *ot; wmOperatorTypeMacro *otmacro; - ot= WM_operatortype_append_macro("GRAPH_OT_duplicate_move", "Duplicate", OPTYPE_UNDO|OPTYPE_REGISTER); + ot= WM_operatortype_append_macro("GRAPH_OT_duplicate_move", _("Duplicate"), OPTYPE_UNDO|OPTYPE_REGISTER); if (ot) { WM_operatortype_macro_define(ot, "GRAPH_OT_duplicate"); otmacro= WM_operatortype_macro_define(ot, "TRANSFORM_OT_transform"); diff --git a/source/blender/editors/space_graph/graph_select.c b/source/blender/editors/space_graph/graph_select.c index 7557aeb24fa..df1932ecf69 100644 --- a/source/blender/editors/space_graph/graph_select.c +++ b/source/blender/editors/space_graph/graph_select.c @@ -169,9 +169,9 @@ static int graphkeys_deselectall_exec(bContext *C, wmOperator *op) void GRAPH_OT_select_all_toggle (wmOperatorType *ot) { /* identifiers */ - ot->name= "Select All"; + ot->name= _("Select All"); ot->idname= "GRAPH_OT_select_all_toggle"; - ot->description= "Toggle selection of all keyframes"; + ot->description= _("Toggle selection of all keyframes"); /* api callbacks */ ot->exec= graphkeys_deselectall_exec; @@ -338,9 +338,9 @@ static int graphkeys_borderselect_exec(bContext *C, wmOperator *op) void GRAPH_OT_select_border(wmOperatorType *ot) { /* identifiers */ - ot->name= "Border Select"; + ot->name= _("Border Select"); ot->idname= "GRAPH_OT_select_border"; - ot->description= "Select all keyframes within the specified region"; + ot->description= _("Select all keyframes within the specified region"); /* api callbacks */ ot->invoke= WM_border_select_invoke; @@ -370,10 +370,10 @@ void GRAPH_OT_select_border(wmOperatorType *ot) /* defines for column-select mode */ static EnumPropertyItem prop_column_select_types[] = { - {GRAPHKEYS_COLUMNSEL_KEYS, "KEYS", 0, "On Selected Keyframes", ""}, - {GRAPHKEYS_COLUMNSEL_CFRA, "CFRA", 0, "On Current Frame", ""}, - {GRAPHKEYS_COLUMNSEL_MARKERS_COLUMN, "MARKERS_COLUMN", 0, "On Selected Markers", ""}, - {GRAPHKEYS_COLUMNSEL_MARKERS_BETWEEN, "MARKERS_BETWEEN", 0, "Between Min/Max Selected Markers", ""}, + {GRAPHKEYS_COLUMNSEL_KEYS, "KEYS", 0, N_("On Selected Keyframes"), ""}, + {GRAPHKEYS_COLUMNSEL_CFRA, "CFRA", 0, N_("On Current Frame"), ""}, + {GRAPHKEYS_COLUMNSEL_MARKERS_COLUMN, "MARKERS_COLUMN", 0, N_("On Selected Markers"), ""}, + {GRAPHKEYS_COLUMNSEL_MARKERS_BETWEEN, "MARKERS_BETWEEN", 0, N_("Between Min/Max Selected Markers"), ""}, {0, NULL, 0, NULL, NULL} }; @@ -527,9 +527,9 @@ static int graphkeys_columnselect_exec(bContext *C, wmOperator *op) void GRAPH_OT_select_column (wmOperatorType *ot) { /* identifiers */ - ot->name= "Select All"; + ot->name= _("Select All"); ot->idname= "GRAPH_OT_select_column"; - ot->description= "Select all keyframes on the specified frame(s)"; + ot->description= _("Select all keyframes on the specified frame(s)"); /* api callbacks */ ot->exec= graphkeys_columnselect_exec; @@ -539,7 +539,7 @@ void GRAPH_OT_select_column (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER/*|OPTYPE_UNDO*/; /* props */ - ot->prop= RNA_def_enum(ot->srna, "mode", prop_column_select_types, 0, "Mode", ""); + ot->prop= RNA_def_enum(ot->srna, "mode", RNA_enum_items_gettexted(prop_column_select_types), 0, _("Mode"), ""); } /* ******************** Select Linked Operator *********************** */ @@ -585,9 +585,9 @@ static int graphkeys_select_linked_exec (bContext *C, wmOperator *UNUSED(op)) void GRAPH_OT_select_linked (wmOperatorType *ot) { /* identifiers */ - ot->name = "Select Linked"; + ot->name = _("Select Linked"); ot->idname= "GRAPH_OT_select_linked"; - ot->description = "Select keyframes occurring the same F-Curves as selected ones"; + ot->description = _("Select keyframes occurring the same F-Curves as selected ones"); /* api callbacks */ ot->exec= graphkeys_select_linked_exec; @@ -663,9 +663,9 @@ static int graphkeys_select_more_exec (bContext *C, wmOperator *UNUSED(op)) void GRAPH_OT_select_more (wmOperatorType *ot) { /* identifiers */ - ot->name = "Select More"; + ot->name = _("Select More"); ot->idname= "GRAPH_OT_select_more"; - ot->description = "Select keyframes beside already selected ones"; + ot->description = _("Select keyframes beside already selected ones"); /* api callbacks */ ot->exec= graphkeys_select_more_exec; @@ -697,9 +697,9 @@ static int graphkeys_select_less_exec (bContext *C, wmOperator *UNUSED(op)) void GRAPH_OT_select_less (wmOperatorType *ot) { /* identifiers */ - ot->name = "Select Less"; + ot->name = _("Select Less"); ot->idname= "GRAPH_OT_select_less"; - ot->description = "Deselect keyframes on ends of selection islands"; + ot->description = _("Deselect keyframes on ends of selection islands"); /* api callbacks */ ot->exec= graphkeys_select_less_exec; @@ -714,9 +714,9 @@ void GRAPH_OT_select_less (wmOperatorType *ot) /* defines for left-right select tool */ static EnumPropertyItem prop_graphkeys_leftright_select_types[] = { - {GRAPHKEYS_LRSEL_TEST, "CHECK", 0, "Check if Select Left or Right", ""}, - {GRAPHKEYS_LRSEL_LEFT, "LEFT", 0, "Before current frame", ""}, - {GRAPHKEYS_LRSEL_RIGHT, "RIGHT", 0, "After current frame", ""}, + {GRAPHKEYS_LRSEL_TEST, "CHECK", 0, N_("Check if Select Left or Right"), ""}, + {GRAPHKEYS_LRSEL_LEFT, "LEFT", 0, N_("Before current frame"), ""}, + {GRAPHKEYS_LRSEL_RIGHT, "RIGHT", 0, N_("After current frame"), ""}, {0, NULL, 0, NULL, NULL} }; @@ -837,9 +837,9 @@ static int graphkeys_select_leftright_invoke (bContext *C, wmOperator *op, wmEve void GRAPH_OT_select_leftright (wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Left/Right"; + ot->name= _("Select Left/Right"); ot->idname= "GRAPH_OT_select_leftright"; - ot->description= "Select keyframes to the left or the right of the current frame"; + ot->description= _("Select keyframes to the left or the right of the current frame"); /* api callbacks */ ot->invoke= graphkeys_select_leftright_invoke; @@ -850,7 +850,7 @@ void GRAPH_OT_select_leftright (wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* id-props */ - ot->prop= RNA_def_enum(ot->srna, "mode", prop_graphkeys_leftright_select_types, GRAPHKEYS_LRSEL_TEST, "Mode", ""); + ot->prop= RNA_def_enum(ot->srna, "mode", RNA_enum_items_gettexted(prop_graphkeys_leftright_select_types), GRAPHKEYS_LRSEL_TEST, _("Mode"), ""); RNA_def_boolean(ot->srna, "extend", 0, _("Extend Select"), ""); } @@ -1330,9 +1330,9 @@ static int graphkeys_clickselect_invoke(bContext *C, wmOperator *op, wmEvent *ev void GRAPH_OT_clickselect (wmOperatorType *ot) { /* identifiers */ - ot->name= "Mouse Select Keys"; + ot->name= _("Mouse Select Keys"); ot->idname= "GRAPH_OT_clickselect"; - ot->description= "Select keyframes by clicking on them"; + ot->description= _("Select keyframes by clicking on them"); /* api callbacks */ ot->invoke= graphkeys_clickselect_invoke; diff --git a/source/blender/editors/space_script/CMakeLists.txt b/source/blender/editors/space_script/CMakeLists.txt index 1aed177eed1..eaa782908a7 100644 --- a/source/blender/editors/space_script/CMakeLists.txt +++ b/source/blender/editors/space_script/CMakeLists.txt @@ -21,6 +21,7 @@ set(INC ../include + ../../blenfont ../../blenkernel ../../blenloader ../../blenlib diff --git a/source/blender/editors/space_script/SConscript b/source/blender/editors/space_script/SConscript index c30e204f6f4..b718ff59576 100644 --- a/source/blender/editors/space_script/SConscript +++ b/source/blender/editors/space_script/SConscript @@ -3,7 +3,7 @@ Import ('env') sources = env.Glob('*.c') -incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' +incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' incs += ' ../../makesrna ../../blenloader' incs += ' ../../python' diff --git a/source/blender/editors/space_script/script_edit.c b/source/blender/editors/space_script/script_edit.c index 02cbc81aaa5..89b71db8b47 100644 --- a/source/blender/editors/space_script/script_edit.c +++ b/source/blender/editors/space_script/script_edit.c @@ -37,6 +37,8 @@ #include "BLI_blenlib.h" #include "BLI_utildefines.h" +#include "BLF_api.h" + #include "BKE_context.h" #include "WM_api.h" @@ -73,8 +75,8 @@ static int run_pyfile_exec(bContext *C, wmOperator *op) void SCRIPT_OT_python_file_run(wmOperatorType *ot) { /* identifiers */ - ot->name= "Run python file"; - ot->description= "Run Python file"; + ot->name= _("Run python file"); + ot->description= _("Run Python file"); ot->idname= "SCRIPT_OT_python_file_run"; ot->flag = OPTYPE_UNDO; @@ -105,8 +107,8 @@ static int script_reload_exec(bContext *C, wmOperator *UNUSED(op)) void SCRIPT_OT_reload(wmOperatorType *ot) { /* identifiers */ - ot->name= "Reload Scripts"; - ot->description= "Reload Scripts"; + ot->name= _("Reload Scripts"); + ot->description= _("Reload Scripts"); ot->idname= "SCRIPT_OT_reload"; /* api callbacks */ diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 1f3fed02c85..fca22dc8c8b 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -574,13 +574,13 @@ enum { void viewrotate_modal_keymap(wmKeyConfig *keyconf) { static EnumPropertyItem modal_items[] = { - {VIEW_MODAL_CONFIRM, "CONFIRM", 0, "Confirm", ""}, + {VIEW_MODAL_CONFIRM, "CONFIRM", 0, N_("Confirm"), ""}, - {VIEWROT_MODAL_AXIS_SNAP_ENABLE, "AXIS_SNAP_ENABLE", 0, "Enable Axis Snap", ""}, - {VIEWROT_MODAL_AXIS_SNAP_DISABLE, "AXIS_SNAP_DISABLE", 0, "Disable Axis Snap", ""}, + {VIEWROT_MODAL_AXIS_SNAP_ENABLE, "AXIS_SNAP_ENABLE", 0, N_("Enable Axis Snap"), ""}, + {VIEWROT_MODAL_AXIS_SNAP_DISABLE, "AXIS_SNAP_DISABLE", 0, N_("Disable Axis Snap"), ""}, - {VIEWROT_MODAL_SWITCH_ZOOM, "SWITCH_TO_ZOOM", 0, "Switch to Zoom"}, - {VIEWROT_MODAL_SWITCH_MOVE, "SWITCH_TO_MOVE", 0, "Switch to Move"}, + {VIEWROT_MODAL_SWITCH_ZOOM, "SWITCH_TO_ZOOM", 0, N_("Switch to Zoom")}, + {VIEWROT_MODAL_SWITCH_MOVE, "SWITCH_TO_MOVE", 0, N_("Switch to Move")}, {0, NULL, 0, NULL, NULL}}; @@ -589,7 +589,7 @@ void viewrotate_modal_keymap(wmKeyConfig *keyconf) /* this function is called for each spacetype, only needs to add map once */ if(keymap) return; - keymap= WM_modalkeymap_add(keyconf, "View3D Rotate Modal", modal_items); + keymap= WM_modalkeymap_add(keyconf, _("View3D Rotate Modal"), RNA_enum_items_gettexted(modal_items)); /* items for modal map */ WM_modalkeymap_add_item(keymap, MIDDLEMOUSE, KM_RELEASE, KM_ANY, 0, VIEW_MODAL_CONFIRM); @@ -940,10 +940,10 @@ void VIEW3D_OT_rotate(wmOperatorType *ot) void viewmove_modal_keymap(wmKeyConfig *keyconf) { static EnumPropertyItem modal_items[] = { - {VIEW_MODAL_CONFIRM, "CONFIRM", 0, "Confirm", ""}, + {VIEW_MODAL_CONFIRM, "CONFIRM", 0, N_("Confirm"), ""}, - {VIEWROT_MODAL_SWITCH_ZOOM, "SWITCH_TO_ZOOM", 0, "Switch to Zoom"}, - {VIEWROT_MODAL_SWITCH_ROTATE, "SWITCH_TO_ROTATE", 0, "Switch to Rotate"}, + {VIEWROT_MODAL_SWITCH_ZOOM, "SWITCH_TO_ZOOM", 0, N_("Switch to Zoom")}, + {VIEWROT_MODAL_SWITCH_ROTATE, "SWITCH_TO_ROTATE", 0, N_("Switch to Rotate")}, {0, NULL, 0, NULL, NULL}}; @@ -952,7 +952,7 @@ void viewmove_modal_keymap(wmKeyConfig *keyconf) /* this function is called for each spacetype, only needs to add map once */ if(keymap) return; - keymap= WM_modalkeymap_add(keyconf, "View3D Move Modal", modal_items); + keymap= WM_modalkeymap_add(keyconf, _("View3D Move Modal"), RNA_enum_items_gettexted(modal_items)); /* items for modal map */ WM_modalkeymap_add_item(keymap, MIDDLEMOUSE, KM_RELEASE, KM_ANY, 0, VIEW_MODAL_CONFIRM); @@ -1100,10 +1100,10 @@ void VIEW3D_OT_move(wmOperatorType *ot) void viewzoom_modal_keymap(wmKeyConfig *keyconf) { static EnumPropertyItem modal_items[] = { - {VIEW_MODAL_CONFIRM, "CONFIRM", 0, "Confirm", ""}, + {VIEW_MODAL_CONFIRM, "CONFIRM", 0, N_("Confirm"), ""}, - {VIEWROT_MODAL_SWITCH_ROTATE, "SWITCH_TO_ROTATE", 0, "Switch to Rotate"}, - {VIEWROT_MODAL_SWITCH_MOVE, "SWITCH_TO_MOVE", 0, "Switch to Move"}, + {VIEWROT_MODAL_SWITCH_ROTATE, "SWITCH_TO_ROTATE", 0, N_("Switch to Rotate")}, + {VIEWROT_MODAL_SWITCH_MOVE, "SWITCH_TO_MOVE", 0, N_("Switch to Move")}, {0, NULL, 0, NULL, NULL}}; @@ -1112,7 +1112,7 @@ void viewzoom_modal_keymap(wmKeyConfig *keyconf) /* this function is called for each spacetype, only needs to add map once */ if(keymap) return; - keymap= WM_modalkeymap_add(keyconf, "View3D Zoom Modal", modal_items); + keymap= WM_modalkeymap_add(keyconf, _("View3D Zoom Modal"), RNA_enum_items_gettexted(modal_items)); /* items for modal map */ WM_modalkeymap_add_item(keymap, MIDDLEMOUSE, KM_RELEASE, KM_ANY, 0, VIEW_MODAL_CONFIRM); @@ -1351,10 +1351,10 @@ static int viewzoom_exec(bContext *C, wmOperator *op) void viewdolly_modal_keymap(wmKeyConfig *keyconf) { static EnumPropertyItem modal_items[] = { - {VIEW_MODAL_CONFIRM, "CONFIRM", 0, "Confirm", ""}, + {VIEW_MODAL_CONFIRM, "CONFIRM", 0, N_("Confirm"), ""}, - {VIEWROT_MODAL_SWITCH_ROTATE, "SWITCH_TO_ROTATE", 0, "Switch to Rotate"}, - {VIEWROT_MODAL_SWITCH_MOVE, "SWITCH_TO_MOVE", 0, "Switch to Move"}, + {VIEWROT_MODAL_SWITCH_ROTATE, "SWITCH_TO_ROTATE", 0, N_("Switch to Rotate")}, + {VIEWROT_MODAL_SWITCH_MOVE, "SWITCH_TO_MOVE", 0, N_("Switch to Move")}, {0, NULL, 0, NULL, NULL}}; @@ -1363,7 +1363,7 @@ void viewdolly_modal_keymap(wmKeyConfig *keyconf) /* this function is called for each spacetype, only needs to add map once */ if(keymap) return; - keymap= WM_modalkeymap_add(keyconf, "View3D Dolly Modal", modal_items); + keymap= WM_modalkeymap_add(keyconf, _("View3D Dolly Modal"), RNA_enum_items_gettexted(modal_items)); /* items for modal map */ WM_modalkeymap_add_item(keymap, MIDDLEMOUSE, KM_RELEASE, KM_ANY, 0, VIEW_MODAL_CONFIRM); @@ -2511,7 +2511,7 @@ void VIEW3D_OT_viewnumpad(wmOperatorType *ot) /* flags */ ot->flag= 0; - RNA_def_enum(ot->srna, "type", prop_view_items, 0, "View", "The Type of view"); + RNA_def_enum(ot->srna, "type", prop_view_items, 0, _("View"), _("The Type of view")); RNA_def_boolean(ot->srna, "align_active", 0, _("Align Active"), _("Align to the active objects axis")); } @@ -2579,7 +2579,7 @@ void VIEW3D_OT_view_orbit(wmOperatorType *ot) /* flags */ ot->flag= 0; - RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_view_orbit_items), 0, "Orbit", "Direction of View Orbit"); + RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_view_orbit_items), 0, _("Orbit"), _("Direction of View Orbit")); } static EnumPropertyItem prop_view_pan_items[] = { @@ -2627,7 +2627,7 @@ void VIEW3D_OT_view_pan(wmOperatorType *ot) /* flags */ ot->flag= 0; - RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_view_pan_items), 0, "Pan", "Direction of View Pan"); + RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(prop_view_pan_items), 0, _("Pan"), _("Direction of View Pan")); } static int viewpersportho_exec(bContext *C, wmOperator *UNUSED(op)) diff --git a/source/blender/editors/space_view3d/view3d_fly.c b/source/blender/editors/space_view3d/view3d_fly.c index 604b0f155ff..79f2d98cabd 100644 --- a/source/blender/editors/space_view3d/view3d_fly.c +++ b/source/blender/editors/space_view3d/view3d_fly.c @@ -40,6 +40,7 @@ #include "BLI_utildefines.h" #include "BLF_api.h" +#include "RNA_define.h" #include "BKE_context.h" #include "BKE_object.h" @@ -82,26 +83,26 @@ void fly_modal_keymap(wmKeyConfig *keyconf) { static EnumPropertyItem modal_items[] = { - {FLY_MODAL_CANCEL, "CANCEL", 0, "Cancel", ""}, - {FLY_MODAL_CONFIRM, "CONFIRM", 0, "Confirm", ""}, - {FLY_MODAL_ACCELERATE, "ACCELERATE", 0, "Accelerate", ""}, - {FLY_MODAL_DECELERATE, "DECELERATE", 0, "Decelerate", ""}, + {FLY_MODAL_CANCEL, "CANCEL", 0, N_("Cancel"), ""}, + {FLY_MODAL_CONFIRM, "CONFIRM", 0, N_("Confirm"), ""}, + {FLY_MODAL_ACCELERATE, "ACCELERATE", 0, N_("Accelerate"), ""}, + {FLY_MODAL_DECELERATE, "DECELERATE", 0, N_("Decelerate"), ""}, - {FLY_MODAL_PAN_ENABLE, "PAN_ENABLE", 0, "Pan Enable", ""}, - {FLY_MODAL_PAN_DISABLE, "PAN_DISABLE", 0, "Pan Disable", ""}, + {FLY_MODAL_PAN_ENABLE, "PAN_ENABLE", 0, N_("Pan Enable"), ""}, + {FLY_MODAL_PAN_DISABLE, "PAN_DISABLE", 0, N_("Pan Disable"), ""}, - {FLY_MODAL_DIR_FORWARD, "FORWARD", 0, "Fly Forward", ""}, - {FLY_MODAL_DIR_BACKWARD,"BACKWARD", 0, "Fly Backward", ""}, - {FLY_MODAL_DIR_LEFT, "LEFT", 0, "Fly Left", ""}, - {FLY_MODAL_DIR_RIGHT, "RIGHT", 0, "Fly Right", ""}, - {FLY_MODAL_DIR_UP, "UP", 0, "Fly Up", ""}, - {FLY_MODAL_DIR_DOWN, "DOWN", 0, "Fly Down", ""}, + {FLY_MODAL_DIR_FORWARD, "FORWARD", 0, N_("Fly Forward"), ""}, + {FLY_MODAL_DIR_BACKWARD,"BACKWARD", 0, N_("Fly Backward"), ""}, + {FLY_MODAL_DIR_LEFT, "LEFT", 0, N_("Fly Left"), ""}, + {FLY_MODAL_DIR_RIGHT, "RIGHT", 0, N_("Fly Right"), ""}, + {FLY_MODAL_DIR_UP, "UP", 0, N_("Fly Up"), ""}, + {FLY_MODAL_DIR_DOWN, "DOWN", 0, N_("Fly Down"), ""}, - {FLY_MODAL_AXIS_LOCK_X, "AXIS_LOCK_X", 0, "X Axis Correction", "X axis correction (toggle)"}, - {FLY_MODAL_AXIS_LOCK_Z, "AXIS_LOCK_Z", 0, "X Axis Correction", "Z axis correction (toggle)"}, + {FLY_MODAL_AXIS_LOCK_X, "AXIS_LOCK_X", 0, N_("X Axis Correction"), N_("X axis correction (toggle)")}, + {FLY_MODAL_AXIS_LOCK_Z, "AXIS_LOCK_Z", 0, N_("X Axis Correction"), N_("Z axis correction (toggle)")}, - {FLY_MODAL_PRECISION_ENABLE, "PRECISION_ENABLE", 0, "Precision Enable", ""}, - {FLY_MODAL_PRECISION_DISABLE, "PRECISION_DISABLE", 0, "Precision Disable", ""}, + {FLY_MODAL_PRECISION_ENABLE, "PRECISION_ENABLE", 0, N_("Precision Enable"), ""}, + {FLY_MODAL_PRECISION_DISABLE, "PRECISION_DISABLE", 0, N_("Precision Disable"), ""}, {0, NULL, 0, NULL, NULL}}; @@ -110,7 +111,7 @@ void fly_modal_keymap(wmKeyConfig *keyconf) /* this function is called for each spacetype, only needs to add map once */ if(keymap) return; - keymap= WM_modalkeymap_add(keyconf, "View3D Fly Modal", modal_items); + keymap= WM_modalkeymap_add(keyconf, "View3D Fly Modal", RNA_enum_items_gettexted(modal_items)); /* items for modal map */ WM_modalkeymap_add_item(keymap, ESCKEY, KM_PRESS, KM_ANY, 0, FLY_MODAL_CANCEL); diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 181fb0f0aac..59008e2b6a3 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -53,6 +53,7 @@ #include "DNA_scene_types.h" /* PET modes */ #include "RNA_access.h" +#include "RNA_define.h" #include "BIF_gl.h" #include "BIF_glutil.h" @@ -85,6 +86,8 @@ #include "BLI_ghash.h" #include "BLI_linklist.h" +#include "BLF_api.h" + #include "UI_resources.h" //#include "blendef.h" @@ -489,29 +492,29 @@ static void view_editmove(unsigned short UNUSED(event)) wmKeyMap* transform_modal_keymap(wmKeyConfig *keyconf) { static EnumPropertyItem modal_items[] = { - {TFM_MODAL_CANCEL, "CANCEL", 0, "Cancel", ""}, - {TFM_MODAL_CONFIRM, "CONFIRM", 0, "Confirm", ""}, - {TFM_MODAL_TRANSLATE, "TRANSLATE", 0, "Translate", ""}, - {TFM_MODAL_ROTATE, "ROTATE", 0, "Rotate", ""}, - {TFM_MODAL_RESIZE, "RESIZE", 0, "Resize", ""}, - {TFM_MODAL_SNAP_INV_ON, "SNAP_INV_ON", 0, "Invert Snap On", ""}, - {TFM_MODAL_SNAP_INV_OFF, "SNAP_INV_OFF", 0, "Invert Snap Off", ""}, - {TFM_MODAL_SNAP_TOGGLE, "SNAP_TOGGLE", 0, "Snap Toggle", ""}, - {TFM_MODAL_AXIS_X, "AXIS_X", 0, "Orientation X axis", ""}, - {TFM_MODAL_AXIS_Y, "AXIS_Y", 0, "Orientation Y axis", ""}, - {TFM_MODAL_AXIS_Z, "AXIS_Z", 0, "Orientation Z axis", ""}, - {TFM_MODAL_PLANE_X, "PLANE_X", 0, "Orientation X plane", ""}, - {TFM_MODAL_PLANE_Y, "PLANE_Y", 0, "Orientation Y plane", ""}, - {TFM_MODAL_PLANE_Z, "PLANE_Z", 0, "Orientation Z plane", ""}, - {TFM_MODAL_CONS_OFF, "CONS_OFF", 0, "Remove Constraints", ""}, - {TFM_MODAL_ADD_SNAP, "ADD_SNAP", 0, "Add Snap Point", ""}, - {TFM_MODAL_REMOVE_SNAP, "REMOVE_SNAP", 0, "Remove Last Snap Point", ""}, - {NUM_MODAL_INCREMENT_UP, "INCREMENT_UP", 0, "Numinput Increment Up", ""}, - {NUM_MODAL_INCREMENT_DOWN, "INCREMENT_DOWN", 0, "Numinput Increment Down", ""}, - {TFM_MODAL_PROPSIZE_UP, "PROPORTIONAL_SIZE_UP", 0, "Increase Proportional Influence", ""}, - {TFM_MODAL_PROPSIZE_DOWN, "PROPORTIONAL_SIZE_DOWN", 0, "Decrease Poportional Influence", ""}, - {TFM_MODAL_AUTOIK_LEN_INC, "AUTOIK_CHAIN_LEN_UP", 0, "Increase Max AutoIK Chain Length", ""}, - {TFM_MODAL_AUTOIK_LEN_DEC, "AUTOIK_CHAIN_LEN_DOWN", 0, "Decrease Max AutoIK Chain Length", ""}, + {TFM_MODAL_CANCEL, "CANCEL", 0, N_("Cancel"), ""}, + {TFM_MODAL_CONFIRM, "CONFIRM", 0, N_("Confirm"), ""}, + {TFM_MODAL_TRANSLATE, "TRANSLATE", 0, N_("Translate"), ""}, + {TFM_MODAL_ROTATE, "ROTATE", 0, N_("Rotate"), ""}, + {TFM_MODAL_RESIZE, "RESIZE", 0, N_("Resize"), ""}, + {TFM_MODAL_SNAP_INV_ON, "SNAP_INV_ON", 0, N_("Invert Snap On"), ""}, + {TFM_MODAL_SNAP_INV_OFF, "SNAP_INV_OFF", 0, N_("Invert Snap Off"), ""}, + {TFM_MODAL_SNAP_TOGGLE, "SNAP_TOGGLE", 0, N_("Snap Toggle"), ""}, + {TFM_MODAL_AXIS_X, "AXIS_X", 0, N_("Orientation X axis"), ""}, + {TFM_MODAL_AXIS_Y, "AXIS_Y", 0, N_("Orientation Y axis"), ""}, + {TFM_MODAL_AXIS_Z, "AXIS_Z", 0, N_("Orientation Z axis"), ""}, + {TFM_MODAL_PLANE_X, "PLANE_X", 0, N_("Orientation X plane"), ""}, + {TFM_MODAL_PLANE_Y, "PLANE_Y", 0, N_("Orientation Y plane"), ""}, + {TFM_MODAL_PLANE_Z, "PLANE_Z", 0, N_("Orientation Z plane"), ""}, + {TFM_MODAL_CONS_OFF, "CONS_OFF", 0, N_("Remove Constraints"), ""}, + {TFM_MODAL_ADD_SNAP, "ADD_SNAP", 0, N_("Add Snap Point"), ""}, + {TFM_MODAL_REMOVE_SNAP, "REMOVE_SNAP", 0, N_("Remove Last Snap Point"), ""}, + {NUM_MODAL_INCREMENT_UP, "INCREMENT_UP", 0, N_("Numinput Increment Up"), ""}, + {NUM_MODAL_INCREMENT_DOWN, "INCREMENT_DOWN", 0, N_("Numinput Increment Down"), ""}, + {TFM_MODAL_PROPSIZE_UP, "PROPORTIONAL_SIZE_UP", 0, N_("Increase Proportional Influence"), ""}, + {TFM_MODAL_PROPSIZE_DOWN, "PROPORTIONAL_SIZE_DOWN", 0, N_("Decrease Poportional Influence"), ""}, + {TFM_MODAL_AUTOIK_LEN_INC, "AUTOIK_CHAIN_LEN_UP", 0, N_("Increase Max AutoIK Chain Length"), ""}, + {TFM_MODAL_AUTOIK_LEN_DEC, "AUTOIK_CHAIN_LEN_DOWN", 0, N_("Decrease Max AutoIK Chain Length"), ""}, {0, NULL, 0, NULL, NULL}}; wmKeyMap *keymap= WM_modalkeymap_get(keyconf, "Transform Modal Map"); @@ -519,7 +522,7 @@ wmKeyMap* transform_modal_keymap(wmKeyConfig *keyconf) /* this function is called for each spacetype, only needs to add map once */ if(keymap) return NULL; - keymap= WM_modalkeymap_add(keyconf, "Transform Modal Map", modal_items); + keymap= WM_modalkeymap_add(keyconf, "Transform Modal Map", RNA_enum_items_gettexted(modal_items)); /* items for modal map */ WM_modalkeymap_add_item(keymap, ESCKEY, KM_PRESS, KM_ANY, 0, TFM_MODAL_CANCEL); diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c index bb2ba654d9c..fdf9e947590 100644 --- a/source/blender/editors/transform/transform_ops.c +++ b/source/blender/editors/transform/transform_ops.c @@ -114,34 +114,34 @@ static TransformModeItem transform_modes[] = EnumPropertyItem transform_mode_types[] = { - {TFM_INIT, "INIT", 0, "Init", ""}, - {TFM_DUMMY, "DUMMY", 0, "Dummy", ""}, - {TFM_TRANSLATION, "TRANSLATION", 0, "Translation", ""}, - {TFM_ROTATION, "ROTATION", 0, "Rotation", ""}, - {TFM_RESIZE, "RESIZE", 0, "Resize", ""}, - {TFM_TOSPHERE, "TOSPHERE", 0, "Tosphere", ""}, - {TFM_SHEAR, "SHEAR", 0, "Shear", ""}, - {TFM_WARP, "WARP", 0, "Warp", ""}, - {TFM_SHRINKFATTEN, "SHRINKFATTEN", 0, "Shrinkfatten", ""}, - {TFM_TILT, "TILT", 0, "Tilt", ""}, - {TFM_TRACKBALL, "TRACKBALL", 0, "Trackball", ""}, - {TFM_PUSHPULL, "PUSHPULL", 0, "Pushpull", ""}, - {TFM_CREASE, "CREASE", 0, "Crease", ""}, - {TFM_MIRROR, "MIRROR", 0, "Mirror", ""}, - {TFM_BONESIZE, "BONE_SIZE", 0, "Bonesize", ""}, - {TFM_BONE_ENVELOPE, "BONE_ENVELOPE", 0, "Bone_Envelope", ""}, - {TFM_CURVE_SHRINKFATTEN, "CURVE_SHRINKFATTEN", 0, "Curve_Shrinkfatten", ""}, - {TFM_BONE_ROLL, "BONE_ROLL", 0, "Bone_Roll", ""}, - {TFM_TIME_TRANSLATE, "TIME_TRANSLATE", 0, "Time_Translate", ""}, - {TFM_TIME_SLIDE, "TIME_SLIDE", 0, "Time_Slide", ""}, - {TFM_TIME_SCALE, "TIME_SCALE", 0, "Time_Scale", ""}, - {TFM_TIME_EXTEND, "TIME_EXTEND", 0, "Time_Extend", ""}, - {TFM_BAKE_TIME, "BAKE_TIME", 0, "Bake_Time", ""}, - {TFM_BEVEL, "BEVEL", 0, "Bevel", ""}, - {TFM_BWEIGHT, "BWEIGHT", 0, "Bweight", ""}, - {TFM_ALIGN, "ALIGN", 0, "Align", ""}, - {TFM_EDGE_SLIDE, "EDGESLIDE", 0, "Edge Slide", ""}, - {TFM_SEQ_SLIDE, "SEQSLIDE", 0, "Sequence Slide", ""}, + {TFM_INIT, "INIT", 0, N_("Init"), ""}, + {TFM_DUMMY, "DUMMY", 0, N_("Dummy"), ""}, + {TFM_TRANSLATION, "TRANSLATION", 0, N_("Translation"), ""}, + {TFM_ROTATION, "ROTATION", 0, N_("Rotation"), ""}, + {TFM_RESIZE, "RESIZE", 0, N_("Resize"), ""}, + {TFM_TOSPHERE, "TOSPHERE", 0, N_("Tosphere"), ""}, + {TFM_SHEAR, "SHEAR", 0, N_("Shear"), ""}, + {TFM_WARP, "WARP", 0, N_("Warp"), ""}, + {TFM_SHRINKFATTEN, "SHRINKFATTEN", 0, N_("Shrinkfatten"), ""}, + {TFM_TILT, "TILT", 0, N_("Tilt"), ""}, + {TFM_TRACKBALL, "TRACKBALL", 0, N_("Trackball"), ""}, + {TFM_PUSHPULL, "PUSHPULL", 0, N_("Pushpull"), ""}, + {TFM_CREASE, "CREASE", 0, N_("Crease"), ""}, + {TFM_MIRROR, "MIRROR", 0, N_("Mirror"), ""}, + {TFM_BONESIZE, "BONE_SIZE", 0, N_("Bonesize"), ""}, + {TFM_BONE_ENVELOPE, "BONE_ENVELOPE", 0, N_("Bone_Envelope"), ""}, + {TFM_CURVE_SHRINKFATTEN, "CURVE_SHRINKFATTEN", 0, N_("Curve_Shrinkfatten"), ""}, + {TFM_BONE_ROLL, "BONE_ROLL", 0, N_("Bone_Roll"), ""}, + {TFM_TIME_TRANSLATE, "TIME_TRANSLATE", 0, N_("Time_Translate"), ""}, + {TFM_TIME_SLIDE, "TIME_SLIDE", 0, N_("Time_Slide"), ""}, + {TFM_TIME_SCALE, "TIME_SCALE", 0, N_("Time_Scale"), ""}, + {TFM_TIME_EXTEND, "TIME_EXTEND", 0, N_("Time_Extend"), ""}, + {TFM_BAKE_TIME, "BAKE_TIME", 0, N_("Bake_Time"), ""}, + {TFM_BEVEL, "BEVEL", 0, N_("Bevel"), ""}, + {TFM_BWEIGHT, "BWEIGHT", 0, N_("Bweight"), ""}, + {TFM_ALIGN, "ALIGN", 0, N_("Align"), ""}, + {TFM_EDGE_SLIDE, "EDGESLIDE", 0, N_("Edge Slide"), ""}, + {TFM_SEQ_SLIDE, "SEQSLIDE", 0, N_("Sequence Slide"), ""}, {0, NULL, 0, NULL, NULL} }; @@ -159,8 +159,8 @@ static int snap_type_exec(bContext *C, wmOperator *op) static void TRANSFORM_OT_snap_type(wmOperatorType *ot) { /* identifiers */ - ot->name= "Snap Type"; - ot->description= "Set the snap element type"; + ot->name= _("Snap Type"); + ot->description= _("Set the snap element type"); ot->idname= "TRANSFORM_OT_snap_type"; /* api callbacks */ @@ -173,7 +173,7 @@ static void TRANSFORM_OT_snap_type(wmOperatorType *ot) ot->flag= OPTYPE_UNDO; /* props */ - ot->prop= RNA_def_enum(ot->srna, "type", snap_element_items, 0, "Type", "Set the snap element type"); + ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(snap_element_items), 0, _("Type"), _("Set the snap element type")); } @@ -206,8 +206,8 @@ static void TRANSFORM_OT_select_orientation(struct wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name = "Select Orientation"; - ot->description= "Select transformation orientation"; + ot->name = _("Select Orientation"); + ot->description= _("Select transformation orientation"); ot->idname = "TRANSFORM_OT_select_orientation"; ot->flag = OPTYPE_UNDO; @@ -259,8 +259,8 @@ static int delete_orientation_poll(bContext *C) static void TRANSFORM_OT_delete_orientation(struct wmOperatorType *ot) { /* identifiers */ - ot->name = "Delete Orientation"; - ot->description= "Delete transformation orientation"; + ot->name = _("Delete Orientation"); + ot->description= _("Delete transformation orientation"); ot->idname = "TRANSFORM_OT_delete_orientation"; ot->flag = OPTYPE_UNDO; @@ -446,15 +446,15 @@ void Transform_Properties(struct wmOperatorType *ot, int flags) RNA_def_property_array(prop, 3); /* Make this not hidden when there's a nice axis selection widget */ RNA_def_property_flag(prop, PROP_HIDDEN); - RNA_def_property_ui_text(prop, "Axis", "The axis around which the transformation occurs"); + RNA_def_property_ui_text(prop, _("Axis"), _("The axis around which the transformation occurs")); } if (flags & P_CONSTRAINT) { - RNA_def_boolean_vector(ot->srna, "constraint_axis", 3, NULL, "Constraint Axis", ""); + RNA_def_boolean_vector(ot->srna, "constraint_axis", 3, NULL, _("Constraint Axis"), ""); prop= RNA_def_property(ot->srna, "constraint_orientation", PROP_ENUM, PROP_NONE); - RNA_def_property_ui_text(prop, "Orientation", "Transformation orientation"); + RNA_def_property_ui_text(prop, _("Orientation"), _("Transformation orientation")); RNA_def_enum_funcs(prop, rna_TransformOrientation_itemf); @@ -468,26 +468,26 @@ void Transform_Properties(struct wmOperatorType *ot, int flags) if (flags & P_PROPORTIONAL) { - RNA_def_enum(ot->srna, "proportional", proportional_editing_items, 0, "Proportional Editing", ""); - RNA_def_enum(ot->srna, "proportional_edit_falloff", proportional_falloff_items, 0, "Proportional Editing Falloff", "Falloff type for proportional editing mode."); - RNA_def_float(ot->srna, "proportional_size", 1, 0.00001f, FLT_MAX, "Proportional Size", "", 0.001, 100); + RNA_def_enum(ot->srna, "proportional", proportional_editing_items, 0, _("Proportional Editing"), ""); + RNA_def_enum(ot->srna, "proportional_edit_falloff", proportional_falloff_items, 0, _("Proportional Editing Falloff"), _("Falloff type for proportional editing mode.")); + RNA_def_float(ot->srna, "proportional_size", 1, 0.00001f, FLT_MAX, _("Proportional Size"), "", 0.001, 100); } if (flags & P_SNAP) { - prop= RNA_def_boolean(ot->srna, "snap", 0, "Use Snapping Options", ""); + prop= RNA_def_boolean(ot->srna, "snap", 0, _("Use Snapping Options"), ""); RNA_def_property_flag(prop, PROP_HIDDEN); if (flags & P_GEO_SNAP) { - prop= RNA_def_enum(ot->srna, "snap_target", snap_target_items, 0, "Target", ""); + prop= RNA_def_enum(ot->srna, "snap_target", snap_target_items, 0, _("Target"), ""); RNA_def_property_flag(prop, PROP_HIDDEN); - prop= RNA_def_float_vector(ot->srna, "snap_point", 3, NULL, -FLT_MAX, FLT_MAX, "Point", "", -FLT_MAX, FLT_MAX); + prop= RNA_def_float_vector(ot->srna, "snap_point", 3, NULL, -FLT_MAX, FLT_MAX, _("Point"), "", -FLT_MAX, FLT_MAX); RNA_def_property_flag(prop, PROP_HIDDEN); if (flags & P_ALIGN_SNAP) { - prop= RNA_def_boolean(ot->srna, "snap_align", 0, "Align with Point Normal", ""); + prop= RNA_def_boolean(ot->srna, "snap_align", 0, _("Align with Point Normal"), ""); RNA_def_property_flag(prop, PROP_HIDDEN); - prop= RNA_def_float_vector(ot->srna, "snap_normal", 3, NULL, -FLT_MAX, FLT_MAX, "Normal", "", -FLT_MAX, FLT_MAX); + prop= RNA_def_float_vector(ot->srna, "snap_normal", 3, NULL, -FLT_MAX, FLT_MAX, _("Normal"), "", -FLT_MAX, FLT_MAX); RNA_def_property_flag(prop, PROP_HIDDEN); } } @@ -495,11 +495,11 @@ void Transform_Properties(struct wmOperatorType *ot, int flags) if (flags & P_OPTIONS) { - RNA_def_boolean(ot->srna, "texture_space", 0, "Edit Object data texture space", ""); + RNA_def_boolean(ot->srna, "texture_space", 0, _("Edit Object data texture space"), ""); } // Add confirm method all the time. At the end because it's not really that important and should be hidden only in log, not in keymap edit - /*prop =*/ RNA_def_boolean(ot->srna, "release_confirm", 0, "Confirm on Release", "Always confirm operation when releasing button"); + /*prop =*/ RNA_def_boolean(ot->srna, "release_confirm", 0, _("Confirm on Release"), _("Always confirm operation when releasing button")); //RNA_def_property_flag(prop, PROP_HIDDEN); } @@ -518,7 +518,7 @@ void TRANSFORM_OT_translate(struct wmOperatorType *ot) ot->cancel = transform_cancel; ot->poll = ED_operator_screenactive; - RNA_def_float_vector_xyz(ot->srna, "value", 3, NULL, -FLT_MAX, FLT_MAX, "Vector", "", -FLT_MAX, FLT_MAX); + RNA_def_float_vector_xyz(ot->srna, "value", 3, NULL, -FLT_MAX, FLT_MAX, _("Vector"), "", -FLT_MAX, FLT_MAX); Transform_Properties(ot, P_CONSTRAINT|P_PROPORTIONAL|P_MIRROR|P_ALIGN_SNAP|P_OPTIONS); } @@ -538,7 +538,7 @@ void TRANSFORM_OT_resize(struct wmOperatorType *ot) ot->cancel = transform_cancel; ot->poll = ED_operator_screenactive; - RNA_def_float_vector(ot->srna, "value", 3, VecOne, -FLT_MAX, FLT_MAX, "Vector", "", -FLT_MAX, FLT_MAX); + RNA_def_float_vector(ot->srna, "value", 3, VecOne, -FLT_MAX, FLT_MAX, _("Vector"), "", -FLT_MAX, FLT_MAX); Transform_Properties(ot, P_CONSTRAINT|P_PROPORTIONAL|P_MIRROR|P_GEO_SNAP|P_OPTIONS); } @@ -559,7 +559,7 @@ void TRANSFORM_OT_trackball(struct wmOperatorType *ot) ot->cancel = transform_cancel; ot->poll = ED_operator_screenactive; - RNA_def_float_vector(ot->srna, "value", 2, VecOne, -FLT_MAX, FLT_MAX, "angle", "", -FLT_MAX, FLT_MAX); + RNA_def_float_vector(ot->srna, "value", 2, VecOne, -FLT_MAX, FLT_MAX, _("angle"), "", -FLT_MAX, FLT_MAX); Transform_Properties(ot, P_PROPORTIONAL|P_MIRROR|P_SNAP); } @@ -579,7 +579,7 @@ void TRANSFORM_OT_rotate(struct wmOperatorType *ot) ot->cancel = transform_cancel; ot->poll = ED_operator_screenactive; - RNA_def_float_rotation(ot->srna, "value", 1, NULL, -FLT_MAX, FLT_MAX, "Angle", "", -M_PI*2, M_PI*2); + RNA_def_float_rotation(ot->srna, "value", 1, NULL, -FLT_MAX, FLT_MAX, _("Angle"), "", -M_PI*2, M_PI*2); Transform_Properties(ot, P_AXIS|P_CONSTRAINT|P_PROPORTIONAL|P_MIRROR|P_GEO_SNAP); } @@ -602,7 +602,7 @@ void TRANSFORM_OT_tilt(struct wmOperatorType *ot) ot->cancel = transform_cancel; ot->poll = ED_operator_editcurve; - RNA_def_float_rotation(ot->srna, "value", 1, NULL, -FLT_MAX, FLT_MAX, "Angle", "", -M_PI*2, M_PI*2); + RNA_def_float_rotation(ot->srna, "value", 1, NULL, -FLT_MAX, FLT_MAX, _("Angle"), "", -M_PI*2, M_PI*2); Transform_Properties(ot, P_CONSTRAINT|P_PROPORTIONAL|P_MIRROR|P_SNAP); } @@ -622,7 +622,7 @@ void TRANSFORM_OT_warp(struct wmOperatorType *ot) ot->cancel = transform_cancel; ot->poll = ED_operator_screenactive; - RNA_def_float_rotation(ot->srna, "value", 1, NULL, -FLT_MAX, FLT_MAX, "Angle", "", 0, 1); + RNA_def_float_rotation(ot->srna, "value", 1, NULL, -FLT_MAX, FLT_MAX, _("Angle"), "", 0, 1); Transform_Properties(ot, P_PROPORTIONAL|P_MIRROR|P_SNAP); // XXX Warp axis? @@ -643,7 +643,7 @@ void TRANSFORM_OT_shear(struct wmOperatorType *ot) ot->cancel = transform_cancel; ot->poll = ED_operator_screenactive; - RNA_def_float(ot->srna, "value", 0, -FLT_MAX, FLT_MAX, "Offset", "", -FLT_MAX, FLT_MAX); + RNA_def_float(ot->srna, "value", 0, -FLT_MAX, FLT_MAX, _("Offset"), "", -FLT_MAX, FLT_MAX); Transform_Properties(ot, P_PROPORTIONAL|P_MIRROR|P_SNAP); // XXX Shear axis? @@ -664,7 +664,7 @@ void TRANSFORM_OT_push_pull(struct wmOperatorType *ot) ot->cancel = transform_cancel; ot->poll = ED_operator_screenactive; - RNA_def_float(ot->srna, "value", 0, -FLT_MAX, FLT_MAX, "Distance", "", -FLT_MAX, FLT_MAX); + RNA_def_float(ot->srna, "value", 0, -FLT_MAX, FLT_MAX, _("Distance"), "", -FLT_MAX, FLT_MAX); Transform_Properties(ot, P_PROPORTIONAL|P_MIRROR|P_SNAP); } @@ -684,7 +684,7 @@ void TRANSFORM_OT_shrink_fatten(struct wmOperatorType *ot) ot->cancel = transform_cancel; ot->poll = ED_operator_editmesh; - RNA_def_float(ot->srna, "value", 0, -FLT_MAX, FLT_MAX, "Offset", "", -FLT_MAX, FLT_MAX); + RNA_def_float(ot->srna, "value", 0, -FLT_MAX, FLT_MAX, _("Offset"), "", -FLT_MAX, FLT_MAX); Transform_Properties(ot, P_PROPORTIONAL|P_MIRROR|P_SNAP); } @@ -705,7 +705,7 @@ void TRANSFORM_OT_tosphere(struct wmOperatorType *ot) ot->cancel = transform_cancel; ot->poll = ED_operator_screenactive; - RNA_def_float_factor(ot->srna, "value", 0, 0, 1, "Factor", "", 0, 1); + RNA_def_float_factor(ot->srna, "value", 0, 0, 1, _("Factor"), "", 0, 1); Transform_Properties(ot, P_PROPORTIONAL|P_MIRROR|P_SNAP); } @@ -743,7 +743,7 @@ void TRANSFORM_OT_edge_slide(struct wmOperatorType *ot) ot->cancel = transform_cancel; ot->poll = ED_operator_editmesh; - RNA_def_float_factor(ot->srna, "value", 0, -1.0f, 1.0f, "Factor", "", -1.0f, 1.0f); + RNA_def_float_factor(ot->srna, "value", 0, -1.0f, 1.0f, _("Factor"), "", -1.0f, 1.0f); Transform_Properties(ot, P_MIRROR|P_SNAP); } @@ -763,7 +763,7 @@ void TRANSFORM_OT_edge_crease(struct wmOperatorType *ot) ot->cancel = transform_cancel; ot->poll = ED_operator_editmesh; - RNA_def_float_factor(ot->srna, "value", 0, -1.0f, 1.0f, "Factor", "", -1.0f, 1.0f); + RNA_def_float_factor(ot->srna, "value", 0, -1.0f, 1.0f, _("Factor"), "", -1.0f, 1.0f); Transform_Properties(ot, P_SNAP); } @@ -783,7 +783,7 @@ void TRANSFORM_OT_seq_slide(struct wmOperatorType *ot) ot->cancel = transform_cancel; ot->poll = ED_operator_sequencer_active; - RNA_def_float_vector(ot->srna, "value", 2, VecOne, -FLT_MAX, FLT_MAX, "angle", "", -FLT_MAX, FLT_MAX); + RNA_def_float_vector(ot->srna, "value", 2, VecOne, -FLT_MAX, FLT_MAX, _("angle"), "", -FLT_MAX, FLT_MAX); Transform_Properties(ot, P_SNAP); } @@ -805,10 +805,10 @@ void TRANSFORM_OT_transform(struct wmOperatorType *ot) ot->cancel = transform_cancel; ot->poll = ED_operator_screenactive; - prop= RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, "Mode", ""); + prop= RNA_def_enum(ot->srna, "mode", transform_mode_types, TFM_TRANSLATION, _("Mode"), ""); RNA_def_property_flag(prop, PROP_HIDDEN); - RNA_def_float_vector(ot->srna, "value", 4, NULL, -FLT_MAX, FLT_MAX, "Values", "", -FLT_MAX, FLT_MAX); + RNA_def_float_vector(ot->srna, "value", 4, NULL, -FLT_MAX, FLT_MAX, _("Values"), "", -FLT_MAX, FLT_MAX); Transform_Properties(ot, P_AXIS|P_CONSTRAINT|P_PROPORTIONAL|P_MIRROR|P_ALIGN_SNAP); } diff --git a/source/blender/editors/util/undo.c b/source/blender/editors/util/undo.c index 9d3d0e43e07..d139a4b5150 100644 --- a/source/blender/editors/util/undo.c +++ b/source/blender/editors/util/undo.c @@ -518,7 +518,7 @@ void ED_OT_undo_history(wmOperatorType *ot) ot->exec= undo_history_exec; ot->poll= ED_operator_screenactive; - RNA_def_int(ot->srna, "item", 0, 0, INT_MAX, "Item", "", 0, INT_MAX); + RNA_def_int(ot->srna, "item", 0, 0, INT_MAX, _("Item"), "", 0, INT_MAX); } |